Merge branch 'test-split' into 'master'

Test split

See merge request !1

538 files changed, 275 insertions, 55663 deletions

diff --git a/classes/mlinux-image.bbclass b/classes/mlinux-image.bbclass
index e3190a1..dab5e5b 100644
--- a/classes/mlinux-image.bbclass
+++ b/classes/mlinux-image.bbclass
@@ -37,61 +37,73 @@ mlinux_set_product_version () {
 ROOTFS_POSTPROCESS_COMMAND += "mlinux_set_product_version;"
 
 # generate upgrade.bin files -- provides single file for upgrades
-do_firmware () {
+do_firmware() {
     cd ${DEPLOY_DIR_IMAGE}
-    rm -f bstrap.bin* uboot.bin* uImage.bin* rootfs.jffs2* model
 
-    cp at91bootstrap_pmecc_padded.bin bstrap.bin
-    cp u-boot-${MACHINE}.bin uboot.bin
-    cp uImage-${MACHINE}.bin uImage.bin
-    cp ${IMAGE_BASENAME}-${MACHINE}.jffs2 rootfs.jffs2
+    case "${MTBSP}" in
+        mtbsp-at91)
+            rm -f bstrap.bin* uboot.bin* uImage.bin* rootfs.jffs2* model
 
-    cat bstrap.bin | md5sum > bstrap.bin.md5
-    cat uboot.bin | md5sum > uboot.bin.md5
-    cat uImage.bin | md5sum > uImage.bin.md5
-    cat rootfs.jffs2 | md5sum > rootfs.jffs2.md5
+            cp at91bootstrap_pmecc_padded.bin bstrap.bin
+            cp u-boot-${MACHINE}.bin uboot.bin
+            cp uImage-${MACHINE}.bin uImage.bin
+            cp ${IMAGE_BASENAME}-${MACHINE}.jffs2 rootfs.jffs2
 
-    case "${MACHINE}" in
-    mtcdt)
-        echo "mtcdt|mtcdtip|mtcdtiphp" >model
-        ;;
-    mtrv1)
-        echo "mtrv1|mths" >model
-        ;;
-    *)
-        echo "${MACHINE}" > model
-        ;;
-    esac
+            cat bstrap.bin | md5sum > bstrap.bin.md5
+            cat uboot.bin | md5sum > uboot.bin.md5
+            cat uImage.bin | md5sum > uImage.bin.md5
+            cat rootfs.jffs2 | md5sum > rootfs.jffs2.md5
 
-    tar cvf ${IMAGE_BASENAME}-${MACHINE}-upgrade.bin uImage.bin* rootfs.jffs2* model
-    tar cvf ${IMAGE_BASENAME}-${MACHINE}-upgrade-withboot.bin bstrap.bin* uboot.bin* uImage.bin* rootfs.jffs2* model
-    rm -f bstrap.bin* uboot.bin* uImage.bin* rootfs.jffs2* model
-}
+            case "${MACHINE}" in
+            mtcdt)
+                echo "mtcdt|mtcdtip|mtcdtiphp" >model
+                ;;
+            mtrv1)
+                echo "mtrv1|mths" >model
+                ;;
+            *)
+                echo "${MACHINE}" > model
+                ;;
+            esac
 
+            tar cvf ${IMAGE_BASENAME}-${MACHINE}-upgrade.bin uImage.bin* rootfs.jffs2* model
+            tar cvf ${IMAGE_BASENAME}-${MACHINE}-upgrade-withboot.bin bstrap.bin* uboot.bin* uImage.bin* rootfs.jffs2* model
+            rm -f bstrap.bin* uboot.bin* uImage.bin* rootfs.jffs2* model
+            ;;
+        *)
+            ;;
+    esac
+}
 addtask firmware after do_image_complete before do_build
 
 # make links to images in TFTPBOOT_DIR for ease of development
 do_tftpboot_links() {
-    TFTPBOOT_CLEAN="oe_bootstrap.bin oe_bootstrap_pmecc_padded.bin \
-                    oe_u-boot.bin oe_uImage.bin oe_rootfs.jffs2 oe_images oe_upgrade.bin oe_upgrade-withboot.bin"
-
     if [ -n "${TFTPBOOT_DIR}" ]; then
-        install -d ${DEPLOY_DIR_IMAGE}
+        case "${MTBSP}" in
+            mtbsp-at91)
+                TFTPBOOT_CLEAN="oe_bootstrap.bin oe_bootstrap_pmecc_padded.bin \
+                                oe_u-boot.bin oe_uImage.bin oe_rootfs.jffs2 oe_images oe_upgrade.bin oe_upgrade-withboot.bin"
 
-        for f in ${TFTPBOOT_CLEAN}; do
-            rm -f ${TFTPBOOT_DIR}/$f
-        done
+                install -d ${DEPLOY_DIR_IMAGE}
 
-        ln -nfs ${DEPLOY_DIR_IMAGE}/at91bootstrap.bin ${TFTPBOOT_DIR}/oe_bootstrap.bin
-        if [ -f ${DEPLOY_DIR_IMAGE}/at91bootstrap_pmecc_padded.bin ]; then
-            ln -nfs ${DEPLOY_DIR_IMAGE}/at91bootstrap_pmecc_padded.bin ${TFTPBOOT_DIR}/oe_bootstrap_pmecc_padded.bin
-        fi
-        ln -nfs ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.bin ${TFTPBOOT_DIR}/oe_u-boot.bin
-        ln -nfs ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE}.bin ${TFTPBOOT_DIR}/oe_uImage.bin
-        ln -nfs ${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.jffs2 ${TFTPBOOT_DIR}/oe_rootfs.jffs2
-        ln -nfs ${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}-upgrade.bin ${TFTPBOOT_DIR}/oe_upgrade.bin
-        ln -nfs ${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}-upgrade-withboot.bin ${TFTPBOOT_DIR}/oe_upgrade-withboot.bin
-        ln -nfs ${DEPLOY_DIR_IMAGE} ${TFTPBOOT_DIR}/oe_images
+                for f in ${TFTPBOOT_CLEAN}; do
+                    rm -f ${TFTPBOOT_DIR}/$f
+                done
+
+                ln -nfs ${DEPLOY_DIR_IMAGE}/at91bootstrap.bin ${TFTPBOOT_DIR}/oe_bootstrap.bin
+                if [ -f ${DEPLOY_DIR_IMAGE}/at91bootstrap_pmecc_padded.bin ]; then
+                    ln -nfs ${DEPLOY_DIR_IMAGE}/at91bootstrap_pmecc_padded.bin ${TFTPBOOT_DIR}/oe_bootstrap_pmecc_padded.bin
+                fi
+                ln -nfs ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.bin ${TFTPBOOT_DIR}/oe_u-boot.bin
+                ln -nfs ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE}.bin ${TFTPBOOT_DIR}/oe_uImage.bin
+                ln -nfs ${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.jffs2 ${TFTPBOOT_DIR}/oe_rootfs.jffs2
+                ln -nfs ${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}-upgrade.bin ${TFTPBOOT_DIR}/oe_upgrade.bin
+                ln -nfs ${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}-upgrade-withboot.bin ${TFTPBOOT_DIR}/oe_upgrade-withboot.bin
+                ln -nfs ${DEPLOY_DIR_IMAGE} ${TFTPBOOT_DIR}/oe_images
+            ;;
+            *)
+                ;;
+        esac
     fi
 }
 addtask tftpboot_links after do_firmware before do_build
diff --git a/classes/mlinux_metadata_scm.bbclass b/classes/mlinux_metadata_scm.bbclass
index 64da21f..b220344 100644
--- a/classes/mlinux_metadata_scm.bbclass
+++ b/classes/mlinux_metadata_scm.bbclass
@@ -3,7 +3,7 @@ MLINUX_METADATA_BRANCH = "${@base_get_metadata_git_branch("${OEROOT}",None).stri
 MLINUX_LAYERS = "${@mlinux_layers(bb,d)}"
 
 def mlinux_layers(bb, d):
-  layers = (bb.data.getVar("BBLAYERS", d, 1) or "").split()
+  layers = (d.getVar("BBLAYERS", d, 1) or "").split()
   layer_revs = ""
 
   for layer in layers:
diff --git a/conf/distro/java.inc b/conf/distro/java.inc
deleted file mode 100644
index 6980075..0000000
--- a/conf/distro/java.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native"
-PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
-
-#PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
-
-PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
-
-#PREFERRED_VERSION_openjdk-7-jre = "25b30-2.3.12"
-#PREFERRED_VERSION_icedtea7-native = "2.1.3"
-
-#PREFERRED_PROVIDER_openjdk-7-jre = "openjdk-7-jre"
diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf
deleted file mode 100644
index acb7351..0000000
--- a/conf/distro/mlinux.conf
+++ /dev/null
@@ -1,75 +0,0 @@
-DISTRO = "mlinux"
-DISTRO_NAME = "mLinux"
-DISTRO_BASE_VERSION = "5.2"
-DISTRO_VERSION = "${DISTRO_BASE_VERSION}.1"
-DISTRO_CODENAME = ""
-SDK_VENDOR = "-mlinux"
-SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
-SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}"
-SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
-
-# add static libs to toolchain builds
-SDKIMAGE_FEATURES = "dev-pkgs dbg-pkgs staticdev-pkgs"
-
-MAINTAINER = "MultiTech Systems <oe-devel@multitech.net>"
-
-TARGET_VENDOR = "-mlinux"
-
-LOCALCONF_VERSION = "1"
-LAYER_CONF_VERSION ?= "6"
-
-DISTRO_FEATURES_MLINUX = "argp largefile xattr \
-                           ipv6 ipsec ppp \
-                           bluetooth irda usbgadget usbhost wifi \
-                           cramfs ext2 smbfs nfs \
-                           libc-crypt pam \
-                           sysvinit x11"
-DISTRO_FEATURES ?= "${DISTRO_FEATURES_LIBC} ${DISTRO_FEATURES_MLINUX}"
-
-# disable pulseaudio
-DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
-
-# extra packages to add to images
-DISTRO_EXTRA_RDEPENDS += "mlinux-version"
-
-# add mlinux source mirror
-INHERIT += "mlinux-mirrors"
-
-# Package feed configuration
-DISTRO_FEED_URI = "http://multitech.net/mlinux/feeds/${DISTRO_VERSION}"
-DISTRO_FEED_PREFIX = "mlinux"
-
-EXTRAOPKGCONFIG = ""
-
-# don't append to tmpdir
-TCLIBCAPPEND = ""
-
-IPKG_VARIANT = "opkg"
-DEFAULT_TIMEZONE = "America/Chicago"
-
-# default mtadm password
-MTADM_PASSWORD_HASH ?= "e97PZLy9l09O6"
-
-SANITY_TESTED_DISTROS ?= " \
-            Ubuntu-14.04 \n \
-            Ubuntu-14.10 \n \
-            Ubuntu-15.04 \n \
-            Ubuntu-15.10 \n \
-            Ubuntu-16.04 \n \
-            Fedora-22 \n \
-            Fedora-23 \n \
-            Fedora-24 \n \
-            CentOSLinux-7.* \n \
-            Debian-8.* \n \
-            openSUSE-13.2 \n \
-            SUSELINUX-42.1 \n \
-            "
-
-PREFERRED_PROVIDER_jpeg = "jpeg"
-PREFERRED_PROVIDER_jpeg-native = "jpeg-native"
-require java.inc
-
-PREFERRED_VERSION_nodejs ?= "0.10.%"
-PREFERRED_VERSION_nodejs-native ?= "0.10.%"
-
-PREFERRED_VERSION_gpsd ?= "3.16"
diff --git a/conf/layer.conf b/conf/layer.conf
index ce3d432..6b87bc4 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -3,8 +3,8 @@ BBPATH .= ":${LAYERDIR}"
 
 # We have recipes-* directories, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
-	${LAYERDIR}/recipes-*/*/*.bbappend"
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "mlinux"
-BBFILE_PATTERN_mlinux = "^${LAYERDIR}/"
-BBFILE_PRIORITY_mlinux = "50"
+BBFILE_COLLECTIONS += "meta-mlinux-atmel"
+BBFILE_PATTERN_meta-mlinux-atmel  = "^${LAYERDIR}/"
+BBFILE_PRIORITY_meta-mlinux-atmel = "50"
diff --git a/contrib/env-oe.sh b/contrib/env-oe.sh
deleted file mode 100644
index 53a3297..0000000
--- a/contrib/env-oe.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-export OETREE=$(pwd)
-
-OECORE="${OETREE}/layers/openembedded-core"
-
-if [[ ! "${PATH}" =~ ${OETREE}/bitbake/bin ]]; then
-    export PATH="${OECORE}/scripts:${OETREE}/bitbake/bin:${PATH}"
-fi
-
-# define if you wish to create soft links to the image in the tftpboot dir
-#export TFTPBOOT_DIR=/tftpboot
-
-export BUILDDIR="${OETREE}"
-export BBPATH="${OETREE}:${OECORE}/meta"
-export BB_ENV_EXTRAWHITE="MACHINE DISTRO OETREE TFTPBOOT_DIR TCLIBC TCMODE GIT_PROXY_COMMAND http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS"
diff --git a/contrib/local.conf b/contrib/local.conf
deleted file mode 100644
index 515c4f0..0000000
--- a/contrib/local.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-# CONF_VERSION is increased each time build/conf/ changes incompatibly
-CONF_VERSION = "1"
-
-# Use MultiTech mLinux distribution
-DISTRO = "mlinux"
-MACHINE ?= "mtcdt"
-
-# Where to store downloaded sources
-DL_DIR = "${TOPDIR}/downloads"
-
-# Where to save shared state
-SSTATE_DIR = "${TOPDIR}/sstate-cache"
-# bitbake cache location
-PERSISTENT_DIR = "${TOPDIR}/cache"
-# build output
-TMPDIR = "${TOPDIR}/tmp"
-
-# Which files do we want to parse:
-BBFILES ?= "${TOPDIR}/layers/openembedded-core/meta/recipes-*/*/*.bb"
-
-# Go through the Firewall
-#HTTP_PROXY        = "http://:/"
-
-# Uncomment this to remove unpacked source and intermediate work
-# after successfully building a package.
-# Saves a LOT of disk space, but leaving work around is useful for debugging.
-INHERIT += "rm_work"
-
-# skip parsing of masked files
-BBMASK = ""
-
-# Make use of SMP:
-#   PARALLEL_MAKE specifies how many concurrent compiler threads are spawned per bitbake process
-#   BB_NUMBER_THREADS specifies how many concurrent bitbake tasks will be run
-BB_NUMBER_THREADS ?= "${@oe.utils.cpu_count()*2}"
-PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()*2}"
-
-# Don't generate the mirror tarball for SCM repos, the snapshot is enough
-BB_GENERATE_MIRROR_TARBALLS = "0"
-
-# Disable build time patch resolution. This would lauch a devshell
-# and wait for manual intervention. We disable it.
-PATCHRESOLVE = "noop"
-
-# enable local PR server
-PRSERV_HOST = "localhost:0"
-
-# enable buildhistory for images
-INHERIT += "buildhistory"
-BUILDHISTORY_COMMIT = "0"
-BUILDHISTORY_FEATURES = "image"
-
-IMAGE_FSTYPES =+ "jffs2 tar.gz"
-
-# OpenJDK Java runtime
-# Uncomment for a bigger image with java.
-# Java requires using tftp or a flash drive
-# for updating.
-# IMAGE_INSTALL += "openjdk-8"
-# OpenJDK with JamVM VM (Multi-Tech default)
-# IMAGE_INSTALL += "jamvm"
-# OpenJDK with CACAO VM (run with 'java -cacao')
-# IMAGE_INSTALL += "openjdk-7-vm-cacao"
-# OpenJDK Zero VM (run with 'java -zero')
-# IMAGE_INSTALL += "openjdk-7-vm-zero"
-
-PACKAGECONFIG_append_pn-boost = " python"
diff --git a/contrib/user-layer.conf b/contrib/user-layer.conf
deleted file mode 100644
index 609f95b..0000000
--- a/contrib/user-layer.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
-	${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "user"
-BBFILE_PATTERN_user = "^${LAYERDIR}/"
-BBFILE_PRIORITY_user = "99"
diff --git a/recipes-connectivity/bluez/bluez5.inc b/recipes-connectivity/bluez/bluez5.inc
deleted file mode 100644
index 35ebd0c..0000000
--- a/recipes-connectivity/bluez/bluez5.inc
+++ /dev/null
@@ -1,159 +0,0 @@
-SUMMARY = "Linux Bluetooth Stack Userland V5"
-PR = "m4"
-DESCRIPTION = "Linux Bluetooth stack V5 userland components.  These include a system configurations, daemons, tools and system libraries."
-HOMEPAGE = "http://www.bluez.org"
-SECTION = "libs"
-LICENSE = "GPLv2+ & LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
-                    file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
-                    file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e"
-DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline"
-RDEPENDS_${PN}-pand += "bash python-dbus python-logging python-syslog python-subprocess python-argparse"
-RDEPENDS_${PN}-rfcomm += "bash python-pygobject python-syslog python-logging python-dbus"
-PROVIDES += "bluez-hcidump"
-RPROVIDES_${PN} += "bluez-hcidump"
-
-RCONFLICTS_${PN} = "bluez4"
-
-PACKAGECONFIG ??= "obex-profiles"
-PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical"
-PACKAGECONFIG[experimental] = "--enable-experimental,--enable-experimental"
-
-SRC_URI = "\
-    ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
-    file://out-of-tree.patch \
-    file://init \
-    file://run-ptest \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \
-    file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \
-    file://default \
-    file://main.conf \
-    file://bt-pan/init \
-    file://bt-pan/default \
-    file://bt-pan/bt-pan \
-    file://rfcomm/rfcomm.py \
-    file://rfcomm/init \
-    file://rfcomm/default \
-"
-S = "${WORKDIR}/bluez-${PV}"
-
-inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest
-
-EXTRA_OECONF = "\
-  --enable-tools \
-  --disable-cups \
-  --enable-test \
-  --enable-datafiles \
-  ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd', '--disable-systemd', d)} \
-  --enable-library \
-  --enable-deprecated \
-  --enable-experimental \
-"
-
-# bluez5 builds a large number of useful utilities but does not
-# install them.  Specify which ones we want put into ${PN}-noinst-tools.
-NOINST_TOOLS_READLINE ??= ""
-NOINST_TOOLS_EXPERIMENTAL ??= ""
-NOINST_TOOLS = " \
-    ${NOINST_TOOLS_READLINE} \
-    ${@bb.utils.contains('PACKAGECONFIG', 'experimental', '${NOINST_TOOLS_EXPERIMENTAL}', '', d)} \
-"
-
-DBTEXEC = "${D}${libexecdir}/bluetooth/"
-
-do_install_append() {
-	install -d ${D}${INIT_D_DIR}
-	install -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/bluetooth
-	install -m 0755 ${WORKDIR}/bt-pan/init ${D}${INIT_D_DIR}/bt-pan
-	install -m 0755 ${WORKDIR}/rfcomm/init ${D}${INIT_D_DIR}/rfcomm
-	install -d ${DBTEXEC}
-	install -m 0755 ${WORKDIR}/bt-pan/bt-pan ${DBTEXEC}
-	install -m 0755 ${WORKDIR}/rfcomm/rfcomm.py ${DBTEXEC}/rfcomm
-
-	install -d ${D}${sysconfdir}/bluetooth/
-	if [ -f ${S}/profiles/audio/audio.conf ]; then
-	    install -m 0644 ${S}/profiles/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
-	fi
-	if [ -f ${S}/profiles/network/network.conf ]; then
-	    install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/
-	fi
-	if [ -f ${S}/profiles/input/input.conf ]; then
-	    install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/
-	fi
-
-        if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then
-            sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth
-        fi
-
-	# Install desired tools that upstream leaves in build area
-        for f in ${NOINST_TOOLS} ; do
-	    install -m 755 ${B}/$f ${D}/${bindir}
-	done
-
-        # Patch python tools to use Python 3; they should be source compatible, but
-        # still refer to Python 2 in the shebang
-        sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/*
-        
-        install -d ${D}${sysconfdir}/default
-        install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/bluetooth
-        install -m 0644 ${WORKDIR}/bt-pan/default ${D}${sysconfdir}/default/bt-pan
-        install -m 0644 ${WORKDIR}/rfcomm/default ${D}${sysconfdir}/default/rfcomm
-        install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/bluetooth/
-}
-
-ALLOW_EMPTY_libasound-module-bluez = "1"
-PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex ${PN}-noinst-tools ${PN}-pand ${PN}-rfcomm"
-
-FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
-FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${systemd_unitdir}/ ${datadir}/dbus-1"
-CONFFILES_${PN} += "${sysconfdir}/default/bluetooth ${sysconfdir}/bluetooth/main.conf ${sysconfdir}/bluetooth/input.conf ${sysconfdir}/bluetooth/network.conf"
-FILES_${PN}-dev += "\
-  ${libdir}/bluetooth/plugins/*.la \
-  ${libdir}/alsa-lib/*.la \
-"
-
-FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \
-                    ${exec_prefix}/lib/systemd/user/obex.service \
-                    ${datadir}/dbus-1/services/org.bluez.obex.service \
-                   "
-
-FILES_${PN}-pand = "${libexecdir}/bluetooth/bt-pan ${sysconfdir}/default/bt-pan ${sysconfdir}/init.d/bt-pan"
-FILES_${PN}-rfcomm = "${libexecdir}/bluetooth/bt-pan ${sysconfdir}/default/bt-pan ${sysconfdir}/init.d/bt-pan"
-FILES_${PN}-rfcomm =  "${libexecdir}/bluetooth/rfcomm ${sysconfdir}/default/rfcomm ${sysconfdir}/init.d/rfcomm"
-CONFFILES_${PN}-pand = "${sysconfdir}/default/bt-pan"
-CONFFILES_${PN}-rfcomm = "${sysconfdir}/default/rfcomm"
-SYSTEMD_SERVICE_${PN}-obex = "obex.service"
-
-FILES_${PN}-testtools = "${libdir}/bluez/test/*"
-
-def get_noinst_tools_paths (d, bb, tools):
-    s = list()
-    bindir = d.getVar("bindir", True)
-    for bdp in tools.split():
-        f = os.path.basename(bdp)
-        s.append("%s/%s" % (bindir, f))
-    return "\n".join(s)
-
-FILES_${PN}-noinst-tools = "${@get_noinst_tools_paths(d, bb, d.getVar('NOINST_TOOLS', True))}"
-
-RDEPENDS_${PN}-testtools += "python3 python3-dbus python3-pygobject"
-
-SYSTEMD_SERVICE_${PN} = "bluetooth.service"
-INITSCRIPT_PACKAGES = "${PN} ${PN}-pand ${PN}-rfcomm"
-INITSCRIPT_NAME_${PN} = "bluetooth"
-INITSCRIPT_NAME_${PN}-pand = "bt-pan"
-INITSCRIPT_NAME_${PN}-rfcomm = "rfcomm"
-INITSCRIPT_PARAMS_${PN} = "defaults 20 20"
-INITSCRIPT_PARAMS_${PN}-pand = "defaults 22 22"
-INITSCRIPT_PARAMS_${PN}-rfcomm = "defaults 22 22"
-
-EXCLUDE_FROM_WORLD = "1"
-
-do_compile_ptest() {
-        oe_runmake buildtests
-}
-
-do_install_ptest() {
-        cp -r ${B}/unit/ ${D}${PTEST_PATH}
-        rm -f ${D}${PTEST_PATH}/unit/*.o
-}
diff --git a/recipes-connectivity/bluez/bluez5/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch b/recipes-connectivity/bluez/bluez5/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
deleted file mode 100644
index 2fde7bc..0000000
--- a/recipes-connectivity/bluez/bluez5/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org>
-Date: Sat, 12 Oct 2013 17:45:25 +0200
-Subject: [PATCH] Allow using obexd without systemd in the user session
-
-Not all sessions run systemd --user (actually, the majority
-doesn't), so the dbus daemon must be able to spawn obexd
-directly, and to do so it needs the full path of the daemon.
-
-Upstream-Status: Denied
-
-Not accepted by upstream maintainer for being a distro specific
-configuration. See thread:
-
-http://thread.gmane.org/gmane.linux.bluez.kernel/38725/focus=38843
-
-Signed-off-by: Javier Viguera <javier.viguera@digi.com>
----
- Makefile.obexd                      | 4 ++--
- obexd/src/org.bluez.obex.service    | 4 ----
- obexd/src/org.bluez.obex.service.in | 4 ++++
- 3 files changed, 6 insertions(+), 6 deletions(-)
- delete mode 100644 obexd/src/org.bluez.obex.service
- create mode 100644 obexd/src/org.bluez.obex.service.in
-
-diff --git a/Makefile.obexd b/Makefile.obexd
-index 2e33cbc72f2b..d5d858c857b4 100644
---- a/Makefile.obexd
-+++ b/Makefile.obexd
-@@ -2,12 +2,12 @@
- if SYSTEMD
- systemduserunitdir = @SYSTEMD_USERUNITDIR@
- systemduserunit_DATA = obexd/src/obex.service
-+endif
- 
- dbussessionbusdir = @DBUS_SESSIONBUSDIR@
- dbussessionbus_DATA = obexd/src/org.bluez.obex.service
--endif
- 
--EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
-+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
- 
- obex_plugindir = $(libdir)/obex/plugins
- 
-diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
-deleted file mode 100644
-index a53808884554..000000000000
---- a/obexd/src/org.bluez.obex.service
-+++ /dev/null
-@@ -1,4 +0,0 @@
--[D-BUS Service]
--Name=org.bluez.obex
--Exec=/bin/false
--SystemdService=dbus-org.bluez.obex.service
-diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
-new file mode 100644
-index 000000000000..9c815f246b77
---- /dev/null
-+++ b/obexd/src/org.bluez.obex.service.in
-@@ -0,0 +1,4 @@
-+[D-BUS Service]
-+Name=org.bluez.obex
-+Exec=@libexecdir@/obexd
-+SystemdService=dbus-org.bluez.obex.service
diff --git a/recipes-connectivity/bluez/bluez5/0001-tests-add-a-target-for-building-tests-without-runnin.patch b/recipes-connectivity/bluez/bluez5/0001-tests-add-a-target-for-building-tests-without-runnin.patch
deleted file mode 100644
index 24ddae6..0000000
--- a/recipes-connectivity/bluez/bluez5/0001-tests-add-a-target-for-building-tests-without-runnin.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4bdf0f96dcaa945fd29f26d56e5b36d8c23e4c8b Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Fri, 1 Apr 2016 17:07:34 +0300
-Subject: [PATCH] tests: add a target for building tests without running them
-
-Upstream-Status: Inappropriate [oe specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- Makefile.am | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index 1a48a71..ba3b92f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -425,6 +425,9 @@ endif
- TESTS = $(unit_tests)
- AM_TESTS_ENVIRONMENT = MALLOC_CHECK_=3 MALLOC_PERTURB_=69
- 
-+# This allows building tests without running them
-+buildtests: $(TESTS)
-+
- if DBUS_RUN_SESSION
- AM_TESTS_ENVIRONMENT += dbus-run-session --
- endif
--- 
-2.8.0.rc3
-
diff --git a/recipes-connectivity/bluez/bluez5/CVE-2017-1000250.patch b/recipes-connectivity/bluez/bluez5/CVE-2017-1000250.patch
deleted file mode 100644
index 05359da..0000000
--- a/recipes-connectivity/bluez/bluez5/CVE-2017-1000250.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9e009647b14e810e06626dde7f1bb9ea3c375d09 Mon Sep 17 00:00:00 2001
-From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
-Date: Wed, 13 Sep 2017 10:01:40 +0300
-Subject: sdp: Fix Out-of-bounds heap read in service_search_attr_req function
-
-Check if there is enough data to continue otherwise return an error.
----
- src/sdpd-request.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sdpd-request.c b/src/sdpd-request.c
-index 1eefdce..318d044 100644
---- a/src/sdpd-request.c
-+++ b/src/sdpd-request.c
-@@ -917,7 +917,7 @@ static int service_search_attr_req(sdp_req_t *req, sdp_buf_t *buf)
- 	} else {
- 		/* continuation State exists -> get from cache */
- 		sdp_buf_t *pCache = sdp_get_cached_rsp(cstate);
--		if (pCache) {
-+		if (pCache && cstate->cStateValue.maxBytesSent < pCache->data_size) {
- 			uint16_t sent = MIN(max, pCache->data_size - cstate->cStateValue.maxBytesSent);
- 			pResponse = pCache->data;
- 			memcpy(buf->data, pResponse + cstate->cStateValue.maxBytesSent, sent);
--- 
-cgit v1.1
-
diff --git a/recipes-connectivity/bluez/bluez5/bt-pan/bt-pan b/recipes-connectivity/bluez/bluez5/bt-pan/bt-pan
deleted file mode 100755
index f142bb1..0000000
--- a/recipes-connectivity/bluez/bluez5/bt-pan/bt-pan
+++ /dev/null
@@ -1,422 +0,0 @@
-#!/usr/bin/env python2
-from __future__ import absolute_import, print_function
-
-import os, sys, time, types, subprocess, signal
-
-import dbus
-import logging
-import logging.handlers
-
-# cgitb is in python-misc and requires python-pkgutil and python-pydoc
-# It is very usefull for analyzing exceptions.
-# import cgitb
-
-# who am i
-myscript = os.path.basename(__file__)
-
-# Log formating class
-class flog:
-    # priority strings to be used
-    # with the __init__ function
-    priorities = {
-        'debug':    logging.DEBUG,
-        'info':     logging.INFO,
-        'warn':     logging.WARNING,
-        'warning':  logging.WARNING,
-        'error':    logging.ERROR,
-        'critical': logging.CRITICAL,
-        }
-    
-    def __init__(self,myscript,facility,priority):
-        """
-        Initialize for logging
-
-        :param myscript:    The name of the python program script
-        :param facility:    The syslog facility, such as daemon or user
-        :param priority:    The minimum priority to be printed to the log
-        :returns: Nothing
-        :raises TBD:        logging class errors.
-        """
-        name_len = str(len(myscript))
-        self.myscript = myscript
-        self.log = logging.getLogger(myscript)
-        self.handler = logging.handlers.SysLogHandler(address=('/dev/log'),facility=facility)
-        self.default_fmt = ' %(levelname)-9s %(name)-' + name_len + 's %(message)s'
-        self.verbose_fmt1 = ' %(levelname)-9s %(name)-' + name_len + 's %(threadName)-14s '
-        self.verbose_fmt2 = ' %(message)s'
-        formatter = logging.Formatter(self.default_fmt)
-        self.handler.setFormatter(formatter)
-        self.log.setLevel(self.priorities[priority]) # Minimum infolevel to log
-        self.log.addHandler(self.handler)
-        self.handler.createLock()
-
-    def __default(self,func,*args):
-        self.handler.acquire()
-        formatter = logging.Formatter(self.default_fmt)
-        self.handler.setFormatter(formatter)
-        func(*args)
-        self.handler.release()
-
-    def setThreshold(self,threshold):
-        """
-        Change the syslog priority threshold
-        
-        :param priority:    Character string corresponding to the threshold
-        """
-        self.handler.acquire()
-        self.log.setLevel(self.priorities[threshold]) # Minimum infolevel to log
-        self.handler.release()
-
-    def critical(self,*args):
-        """
-        Prints a variable argument list at critical priority
-        
-        :returns: logging result
-        """
-        self.__default(self.log.critical,*args)
-
-    def error(self,*args):
-        """
-        Prints a variable argument list at error priority
-            
-        :returns: logging result
-        """
-        self.__default(self.log.error,*args)
-
-    def warning(self,*args):
-        """
-        Prints a variable argument list at warning priority
-        
-        :returns: logging result
-        """
-        self.__default(self.log.warning,*args)
-
-    #  Python has no notice level!
-
-    def info(self,*args):
-        """
-        Prints a variable argument list at info priority
-        
-        :returns: logging result
-        """
-        self.__default(self.log.info,*args)
-
-    def debug(self,*args):
-        """
-        Prints a variable argument list at debug priority
-
-        Printing debug includes function name and line
-        number.
-        
-        :returns: logging result
-        """
-        caller_frame = sys._getframe().f_back
-        callerfunc = caller_frame.f_code.co_name + '@' + str(caller_frame.f_lineno);
-        callerfunc = callerfunc.ljust(16)
-        self.handler.acquire()
-        log = logging.getLogger(self.myscript)
-        formatter = logging.Formatter(self.verbose_fmt1+callerfunc+self.verbose_fmt2)
-        self.handler.setFormatter(formatter)
-        log.debug(*args)
-        self.handler.release()
-
-# End of log handler
-
-### ~bluezutils.py
-
-iface_base = 'org.bluez'
-iface_dev = '{}.Device1'.format(iface_base)
-iface_adapter = '{}.Adapter1'.format(iface_base)
-iface_props = 'org.freedesktop.DBus.Properties'
-global lg
-
-# Will this write to syslog?????
-class BTError(Exception): pass
-
-def get_bus():
-	bus = getattr(get_bus, 'cached_obj', None)
-	if not bus: bus = get_bus.cached_obj = dbus.SystemBus()
-	return bus
-
-def get_manager():
-	manager = getattr(get_manager, 'cached_obj', None)
-	if not manager:
-            try:
-		manager = get_manager.cached_obj = dbus.Interface(
-			get_bus().get_object(iface_base, '/'),
-			'org.freedesktop.DBus.ObjectManager' )
-            except dbus.exceptions.DBusException as e:
-                s=""
-                try:
-                    s = e.__dict__["_dbus_error_name"]
-                except KeyError:
-                    pass
-                unk = 'org.freedesktop.DBus.Error.ServiceUnknown'
-                cexit = 'org.freedesktop.DBus.Error.Spawn.ChildExited'
-                if (s == unk) or (s == cexit):
-                    msg = 'Is bluetoothd running? Bluetooth tree missing from DBUS'
-                    lg.error(msg)
-                    print(msg)
-                    exit(1)
-                else:
-                    raise
-	return manager
-
-def prop_get(obj, k, iface=None):
-	if iface is None: iface = obj.dbus_interface
-	return obj.Get(iface, k, dbus_interface=iface_props)
-def prop_set(obj, k, v, iface=None):
-	if iface is None: iface = obj.dbus_interface
-	return obj.Set(iface, k, v, dbus_interface=iface_props)
-
-msg=''
-def find_adapter(pattern=None):
-        try:
-            adapter = find_adapter_in_objects(get_manager().GetManagedObjects(), pattern)
-        
-        # DBusException
-        # Original code:
-        #    template = "An exception of type {0} occurred. Arguments:\n{1!r}"
-        #    message = template.format(type(ex).__name__, ex.args)
-        #    print message
-        # dbus.exceptions.DBusException:
-        # org.freedesktop.DBus.Error.AccessDenied:
-        except dbus.exceptions.DBusException as e:
-            s=""
-            try:
-                s = e.__dict__["_dbus_error_name"]
-            except KeyError:
-                pass
-
-            if "org.freedesktop.DBus.Error.AccessDenied" == s:
-                rot="You do not have sufficient privilege to run bt-pan"
-                print(rot)
-                lg.error(rot)
-                exit(1)
-            else:
-                raise
-  	return adapter
-
-def find_adapter_in_objects(objects, pattern=None):
-	bus, obj = get_bus(), None
-	for path, ifaces in objects.iteritems():
-		adapter = ifaces.get(iface_adapter)
-		if adapter is None: continue
-		if not pattern or pattern == adapter['Address'] or path.endswith(pattern):
-			obj = bus.get_object(iface_base, path)
-			yield dbus.Interface(obj, iface_adapter)
-	if obj is None:
-                msg = 'Bluetooth adapter not found'
-		lg.error(msg)
-		raise BTError(msg)
-
-def find_device(device_address, adapter_pattern=None):
-	return find_device_in_objects(get_manager().GetManagedObjects(), device_address, adapter_pattern)
-
-def find_device_in_objects(objects, device_address, adapter_pattern=None):
-	bus = get_bus()
-	path_prefix = ''
-	if adapter_pattern:
-		if not isinstance(adapter_pattern, types.StringTypes): adapter = adapter_pattern
-		else: adapter = find_adapter_in_objects(objects, adapter_pattern)
-		path_prefix = adapter.object_path
-	for path, ifaces in objects.iteritems():
-		device = ifaces.get(iface_dev)
-		if device is None: continue
-		if device['Address'] == device_address and path.startswith(path_prefix):
-			obj = bus.get_object(iface_base, path)
-			return dbus.Interface(obj, iface_dev)
-        msg = 'Bluetooth device not found'
-	lg.error(msg)
-	raise BTError(msg)
-
-pidPath = ""
-
-def writePidFile(device):
-    global pidPath
-    pid = str(os.getpid())
-    pidPath = '/run/bt-pan.' + device + '.pid'
-    f = open(pidPath, 'w')
-    f.write(pid)
-    f.close()
-
-def hexdump(string):
-    return ":".join("{:02x}".format(ord(c)) for c in string)
-
-### bt-pan
-
-def main(args=None):
-	import argparse
-	global lg
-
-	# Set up logging initially info and above	
-	lg = flog(myscript,'daemon','info')
-
-        # cgitb.enable(format='text')
-	
-	parser = argparse.ArgumentParser(
-		description='BlueZ bluetooth PAN network server/client.')
-
-	parser.add_argument('-i', '--device', metavar='local-addr/pattern',
-		help='Local device address/pattern to use (if not default).')
-	parser.add_argument('-a', '--device-all', action='store_true',
-		help='Use all local hci devices, not just default one.'
-			' Only valid with "server" mode, mutually exclusive with --device option.')
-	parser.add_argument('-u', '--uuid',
-		metavar='uuid_or_shortcut', default='nap',
-		help='Service UUID to use. Can be either full UUID'
-			' or one of the shortcuts: gn, panu, nap. Default: %(default)s.')
-	parser.add_argument('--systemd', action='store_true',
-		help='Use systemd service'
-			' notification/watchdog mechanisms in daemon modes, if available.')
-	parser.add_argument('--debug',
-		action='store_true', help='Verbose operation mode.')
-
-	cmds = parser.add_subparsers( dest='call',
-		title='Supported operations (have their own suboptions as well)' )
-
-	cmd = cmds.add_parser('server', help='Run infinitely as a NAP network server.')
-	cmd.add_argument('iface_name',
-		help='Bridge interface name to which each link will be added by bluez.'
-			' It must be created and configured before starting the server.')
-
-	cmd = cmds.add_parser('client', help='Connect to a PAN network.')
-	cmd.add_argument('remote_addr', help='Remote device address to connect to.')
-	cmd.add_argument('-d', '--disconnect', action='store_true',
-		help='Instead of connecting (default action), disconnect'
-			' (if connected) and exit. Overrides all other options for this command.')
-	cmd.add_argument('-w', '--wait', action='store_true',
-		help='Go into an endless wait-loop after connection, terminating it on exit.')
-	cmd.add_argument('-c', '--if-not-connected', action='store_true',
-		help='Dont raise error if connection is already established.')
-	cmd.add_argument('-r', '--reconnect', action='store_true',
-		help='Force reconnection if some connection is already established.')
-
-	opts = parser.parse_args()
-
-        if opts.debug:
-            lg.setThreshold('debug')
-
-	if not opts.device_all: devs = [next(iter(find_adapter(opts.device)))]
-	else:
-		if opts.call != 'server':
-			parser.error('--device-all option is only valid with "server" mode.')
-		devs = list(find_adapter())
-	devs = dict((prop_get(dev, 'Address'), dev) for dev in devs)
-	for dev_addr, dev in devs.viewitems():
-		prop_set(dev, 'Powered', True)
-		lg.debug('Using local device (addr: %s): %s', dev_addr, dev.object_path)
-
-	wait_iter_noop = 3600
-	if opts.systemd:
-		from systemd import daemon
-		def wait_iter():
-			if not wait_iter.sd_ready:
-				daemon.notify('READY=1')
-				daemon.notify('STATUS=Running in {} mode...'.format(opts.call))
-				wait_iter.sd_ready = True
-			time.sleep(wait_iter.timeout)
-			if wait_iter.sd_wdt: daemon.notify('WATCHDOG=1')
-		wd_pid, wd_usec = (os.environ.get(k) for k in ['WATCHDOG_PID', 'WATCHDOG_USEC'])
-		if wd_pid and wd_pid.isdigit() and int(wd_pid) == os.getpid():
-			wd_interval = float(wd_usec) / 2e6 # half of interval in seconds
-			assert wd_interval > 0, wd_interval
-		else: wd_interval = None
-		if wd_interval:
-			lg.debug('Initializing systemd watchdog pinger with interval: %ss', wd_interval)
-			wait_iter.sd_wdt, wait_iter.timeout = True, min(wd_interval, wait_iter_noop)
-		else: wait_iter.sd_wdt, wait_iter.timeout = False, wait_iter_noop
-		wait_iter.sd_ready = False
-	else: wait_iter = lambda: time.sleep(wait_iter_noop)
-	signal.signal(signal.SIGTERM, lambda sig,frm: sys.exit(0))
-
-
-	if opts.call == 'server':
-                inm = opts.iface_name
-		brctl = subprocess.Popen(
-			['brctl', 'show', inm],
-			stdout=open(os.devnull, 'wb'), stderr=subprocess.PIPE )
-		brctl_stderr = brctl.stderr.read()
-                writePidFile(opts.iface_name)
-		if brctl.wait() or brctl_stderr:
-			lg.error('brctl check failed for interface (missing?): {}'.format(inm)) 
-			lg.error('Bridge interface must be added and configured before starting server, e.g. with:')
-			lg.error('  brctl addbr {}'.format(inm))
-			lg.error('  brctl setfd {} 0'.format(inm))
-			lg.error('  brctl stp {} off'.format(inm))
-			lg.error('  ip addr add 10.101.225.84/24 dev {}'.format(inm))
-			lg.error('  ip link set {} up'.format(inm))
-			return 1
-
-		servers = list()
-		try:
-			for dev_addr, dev in devs.viewitems():
-				server = dbus.Interface(dev, 'org.bluez.NetworkServer1')
-				server.Unregister(opts.uuid) # in case already registered
-				server.Register(opts.uuid, opts.iface_name)
-				servers.append(server)
-				lg.debug( 'Registered uuid %r with'
-					' bridge/dev: %s / %s', opts.uuid, opts.iface_name, dev_addr )
-			while True: wait_iter()
-		except KeyboardInterrupt: pass
-		finally:
-			if servers:
-				for server in servers: server.Unregister(opts.uuid)
-				lg.debug('Unregistered server uuids')
-
-
-	elif opts.call == 'client':
-		dev_remote = find_device(opts.remote_addr, devs.values()[0])
-		lg.debug( 'Using remote device (addr: %s): %s',
-			prop_get(dev_remote, 'Address'), dev_remote.object_path )
-		try: dev_remote.ConnectProfile(opts.uuid)
-		except: pass # no idea why it fails sometimes, but still creates dbus interface
-		net = dbus.Interface(dev_remote, 'org.bluez.Network1')
-
-		if opts.disconnect:
-			try: net.Disconnect()
-			except dbus.exceptions.DBusException as err:
-				if err.get_dbus_name() != 'org.bluez.Error.Failed': raise
-				connected = prop_get(net, 'Connected')
-				if connected: raise
-			lg.debug(
-				'Disconnected from network'
-					' (dev_remote: %s, addr: %s) uuid %r, by explicit command',
-				dev_remote.object_path, prop_get(dev_remote, 'Address'), opts.uuid )
-			return
-
-		for n in xrange(2):
-			try: iface = net.Connect(opts.uuid)
-			except dbus.exceptions.DBusException as err:
-				if err.get_dbus_name() != 'org.bluez.Error.Failed': raise
-				connected = prop_get(net, 'Connected')
-				if not connected: raise
-				if opts.reconnect:
-					lg.debug( 'Detected pre-established connection'
-						' (iface: %s), reconnecting', prop_get(net, 'Interface') )
-					net.Disconnect()
-					continue
-				if not opts.if_not_connected: raise
-			else: break
-		lg.debug(
-			'Connected to network (dev_remote: %s, addr: %s) uuid %r with iface: %s',
-			dev_remote.object_path, prop_get(dev_remote, 'Address'), opts.uuid, iface )
-
-		if opts.wait:
-			try:
-				while True: wait_iter()
-			except KeyboardInterrupt: pass
-			finally:
-				net.Disconnect()
-				lg.debug('Disconnected from network')
-
-
-	else: raise ValueError(opts.call)
-        global pidPath
-	try:
-        	os.remove(pidPath)
-        except OSError:
-		pass
-	lg.debug('Finished')
-
-if __name__ == '__main__': sys.exit(main())
diff --git a/recipes-connectivity/bluez/bluez5/bt-pan/default b/recipes-connectivity/bluez/bluez5/bt-pan/default
deleted file mode 100755
index c960298..0000000
--- a/recipes-connectivity/bluez/bluez5/bt-pan/default
+++ /dev/null
@@ -1,2 +0,0 @@
-ENABLED="no"
-PANOPTS="--debug"
diff --git a/recipes-connectivity/bluez/bluez5/bt-pan/init b/recipes-connectivity/bluez/bluez5/bt-pan/init
deleted file mode 100755
index 3f7062e..0000000
--- a/recipes-connectivity/bluez/bluez5/bt-pan/init
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-NAME=bt-pan
-SERVER=/usr/libexec/bluetooth/${NAME}
-PYTHON=$(readlink -f /usr/bin/python2)
-BRIDGE=pan0
-DNAME="${NAME}.${BRIDGE}"
-PIDFILE="/run/${DNAME}.pid"
-
-ENABLED=yes
-[ -f /etc/default/$NAME ] && . /etc/default/$NAME
-
-if [ "$ENABLED" != "yes" ]; then
-  echo "$NAME: disabled in /etc/default"
-  exit
-fi
-
-case $1 in
-  start)
-    echo "Starting ${DNAME}"
-    /usr/sbin/start-stop-daemon -S -p ${PIDFILE} -x ${PYTHON} -b -- ${SERVER} ${PANOPTS} server $BRIDGE
-    ;;
-
-  stop)
-    /usr/sbin/start-stop-daemon -K -p ${PIDFILE} -x ${PYTHON}
-    echo "Stopping ${DNAME}"
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-
-  *)
-    echo "Usage: $0 {start|stop|restart}"
-    exit 2
-    ;;
-esac
-
-
diff --git a/recipes-connectivity/bluez/bluez5/default b/recipes-connectivity/bluez/bluez5/default
deleted file mode 100644
index e912922..0000000
--- a/recipes-connectivity/bluez/bluez5/default
+++ /dev/null
@@ -1,8 +0,0 @@
-# Set to 1 to enable bluetooth daemon
-BLUETOOTH_ENABLED=0
-
-# Use the following to setup bluetooth usability
-BLUETOOTHCTL_CMD="power on\ndiscoverable on\npairable on\n"
-
-#Compatilitity mode
-#MOREOPTIONS="-C"
diff --git a/recipes-connectivity/bluez/bluez5/init b/recipes-connectivity/bluez/bluez5/init
deleted file mode 100755
index 4d84195..0000000
--- a/recipes-connectivity/bluez/bluez5/init
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DESC=bluetooth
-
-DAEMON=/usr/libexec/bluetooth/bluetoothd
-
-# If you want to be ignore error of "org.freedesktop.hostname1",
-# please enable NOPLUGIN_OPTION.
-# NOPLUGIN_OPTION="--noplugin=hostname"
-NOPLUGIN_OPTION=""
-SSD_OPTIONS="--oknodo --quiet --exec $DAEMON -- $NOPLUGIN_OPTION"
-
-test -f $DAEMON || exit 0
-
-# FIXME: any of the sourced files may fail if/with syntax errors
-test -f /etc/default/bluetooth && . /etc/default/bluetooth
-test -f /etc/default/rcS && . /etc/default/rcS
-
-set -e
-
-case $1 in
-  start)
-	echo "Starting $DESC"
-
-	if test "$BLUETOOTH_ENABLED" = 0; then
-		echo "disabled. see /etc/default/bluetooth"
-		exit 0
-	fi
-
-	start-stop-daemon --start --background $SSD_OPTIONS $MOREOPTIONS
-	sleep 1
-        if [[ -n ${BLUETOOTHCTL_CMD} ]] ; then
-		echo -e "${BLUETOOTHCTL_CMD}" | /usr/bin/bluetoothctl 2>&1 | logger -t bluetoothctl -p daemon.info
-	fi
-	echo "${DAEMON##*/}"
-
-  ;;
-  stop)
-	echo "Stopping $DESC"
-	if test "$BLUETOOTH_ENABLED" = 0; then
-		echo "disabled."
-		exit 0
-	fi
-	start-stop-daemon --stop $SSD_OPTIONS
-	echo "${DAEMON}"
-  ;;
-  restart|force-reload)
-	$0 stop
-	sleep 1
-	$0 start
-  ;;
-  status)
-	 pidof ${DAEMON} >/dev/null
-	 status=$?
-        if [ $status -eq 0 ]; then
-                 echo "bluetooth is running."
-        else
-                echo "bluetooth is not running"
-        fi
-        exit $status
-   ;;
-   *)
-	N=/etc/init.d/bluetooth
-	echo "Usage: $N {start|stop|restart|force-reload|status}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
-
-# vim:noet
diff --git a/recipes-connectivity/bluez/bluez5/main.conf b/recipes-connectivity/bluez/bluez5/main.conf
deleted file mode 100644
index 40ad113..0000000
--- a/recipes-connectivity/bluez/bluez5/main.conf
+++ /dev/null
@@ -1,108 +0,0 @@
-[General]
-
-# Default adapter name
-# Defaults to 'BlueZ X.YZ'
-Name = MTCDT-Bluez
-
-# Default device class. Only the major and minor device class bits are
-# considered. Defaults to '0x000000'.
-#Class = 0x000100
-
-# How long to stay in discoverable mode before going back to non-discoverable
-# The value is in seconds. Default is 180, i.e. 3 minutes.
-# 0 = disable timer, i.e. stay discoverable forever
-DiscoverableTimeout = 0
-
-# How long to stay in pairable mode before going back to non-discoverable
-# The value is in seconds. Default is 0.
-# 0 = disable timer, i.e. stay pairable forever
-#PairableTimeout = 0
-
-# Automatic connection for bonded devices driven by platform/user events.
-# If a platform plugin uses this mechanism, automatic connections will be
-# enabled during the interval defined below. Initially, this feature
-# intends to be used to establish connections to ATT channels. Default is 60.
-AutoConnectTimeout = 0
-
-# Use vendor id source (assigner), vendor, product and version information for
-# DID profile support. The values are separated by ":" and assigner, VID, PID
-# and version.
-# Possible vendor id source values: bluetooth, usb (defaults to usb)
-#DeviceID = bluetooth:1234:5678:abcd
-
-# Do reverse service discovery for previously unknown devices that connect to
-# us. This option is really only needed for qualification since the BITE tester
-# doesn't like us doing reverse SDP for some test cases (though there could in
-# theory be other useful purposes for this too). Defaults to 'true'.
-#ReverseServiceDiscovery = true
-
-# Enable name resolving after inquiry. Set it to 'false' if you don't need
-# remote devices name and want shorter discovery cycle. Defaults to 'true'.
-#NameResolving = true
-
-# Enable runtime persistency of debug link keys. Default is false which
-# makes debug link keys valid only for the duration of the connection
-# that they were created for.
-#DebugKeys = false
-
-# Restricts all controllers to the specified transport. Default value
-# is "dual", i.e. both BR/EDR and LE enabled (when supported by the HW).
-# Possible values: "dual", "bredr", "le"
-#ControllerMode = dual
-
-# Enables Multi Profile Specification support. This allows to specify if
-# system supports only Multiple Profiles Single Device (MPSD) configuration
-# or both Multiple Profiles Single Device (MPSD) and Multiple Profiles Multiple
-# Devices (MPMD) configurations.
-# Possible values: "off", "single", "multiple"
-#MultiProfile = off
-
-# Permanently enables the Fast Connectable setting for adapters that
-# support it. When enabled other devices can connect faster to us,
-# however the tradeoff is increased power consumptions. This feature
-# will fully work only on kernel version 4.1 and newer. Defaults to
-# 'false'.
-#FastConnectable = false
-
-# Default privacy setting.
-# Enables use of private address.
-# Possible values: "off", "device", "network"
-# "network" option not supported currently
-# Defaults to "off"
-# Privacy = off
-
-[GATT]
-# GATT attribute cache.
-# Possible values:
-# always: Always cache attributes even for devices not paired, this is
-# recommended as it is best for interoperability, with more consistent
-# reconnection times and enables proper tracking of notifications for all
-# devices.
-# yes: Only cache attributes of paired devices.
-# no: Never cache attributes
-# Default: always
-#Cache = always
-
-[Policy]
-#
-# The ReconnectUUIDs defines the set of remote services that should try
-# to be reconnected to in case of a link loss (link supervision
-# timeout). The policy plugin should contain a sane set of values by
-# default, but this list can be overridden here. By setting the list to
-# empty the reconnection feature gets disabled.
-#ReconnectUUIDs=00001112-0000-1000-8000-00805f9b34fb,0000111f-0000-1000-8000-00805f9b34fb,0000110a-0000-1000-8000-00805f9b34fb
-
-# ReconnectAttempts define the number of attempts to reconnect after a link
-# lost. Setting the value to 0 disables reconnecting feature.
-#ReconnectAttempts=7
-
-# ReconnectIntervals define the set of intervals in seconds to use in between
-# attempts.
-# If the number of attempts defined in ReconnectAttempts is bigger than the
-# set of intervals the last interval is repeated until the last attempt.
-#ReconnectIntervals=1,2,4,8,16,32,64
-
-# AutoEnable defines option to enable all controllers when they are found.
-# This includes adapters present on start as well as adapters that are plugged
-# in later on. Defaults to 'false'.
-AutoEnable=true
diff --git a/recipes-connectivity/bluez/bluez5/out-of-tree.patch b/recipes-connectivity/bluez/bluez5/out-of-tree.patch
deleted file mode 100644
index 3ee79d7..0000000
--- a/recipes-connectivity/bluez/bluez5/out-of-tree.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ed55b49a226ca3909f52416be2ae5ce1c5ca2cb2 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Fri, 22 Apr 2016 15:40:37 +0100
-Subject: [PATCH] Makefile.obexd: add missing mkdir in builtin.h generation
-
-In parallel out-of-tree builds it's possible that obexd/src/builtin.h is
-generated before the target directory has been implicitly created. Solve this by
-creating the directory before writing into it.
-
-Upstream-Status: Submitted
-Signed-off-by: Ross Burton <ross.burton@intel.com>
----
- Makefile.obexd | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile.obexd b/Makefile.obexd
-index 2e33cbc..c8286f0 100644
---- a/Makefile.obexd
-+++ b/Makefile.obexd
-@@ -105,2 +105,3 @@ obexd/src/plugin.$(OBJEXT): obexd/src/builtin.h
- obexd/src/builtin.h: obexd/src/genbuiltin $(obexd_builtin_sources)
-+	$(AM_V_at)$(MKDIR_P) $(dir $@)
- 	$(AM_V_GEN)$(srcdir)/obexd/src/genbuiltin $(obexd_builtin_modules) > $@
--- 
-2.8.0.rc3
-
diff --git a/recipes-connectivity/bluez/bluez5/rfcomm/default b/recipes-connectivity/bluez/bluez5/rfcomm/default
deleted file mode 100755
index 613a72c..0000000
--- a/recipes-connectivity/bluez/bluez5/rfcomm/default
+++ /dev/null
@@ -1,2 +0,0 @@
-ENABLED="no"
-RFCOMMOPTS="--debug --login"
diff --git a/recipes-connectivity/bluez/bluez5/rfcomm/init b/recipes-connectivity/bluez/bluez5/rfcomm/init
deleted file mode 100755
index 69455d8..0000000
--- a/recipes-connectivity/bluez/bluez5/rfcomm/init
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-NAME=rfcomm
-SERVER=/usr/libexec/bluetooth/${NAME}
-PYTHON=$(readlink -f /usr/bin/python2)
-PIDFILE="/run/${NAME}.pid"
-
-ENABLED=yes
-[ -f /etc/default/$NAME ] && . /etc/default/$NAME
-
-if [ "$ENABLED" != "yes" ]; then
-  echo "$NAME: disabled in /etc/default"
-  exit
-fi
-
-case $1 in
-  start)
-    echo "Starting ${NAME}"
-    echo /usr/sbin/start-stop-daemon -S -p ${PIDFILE} -x ${PYTHON} -b -- ${SERVER} ${RFCOMMOPTS}
-    /usr/sbin/start-stop-daemon -S -p ${PIDFILE} -x ${PYTHON} -b -- ${SERVER} ${RFCOMMOPTS}
-    ;;
-
-  stop)
-    /usr/sbin/start-stop-daemon -K -p ${PIDFILE} -x ${PYTHON}
-    echo "Stopping ${DNAME}"
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-
-  *)
-    echo "Usage: $0 {start|stop|restart}"
-    exit 2
-    ;;
-esac
-
-
diff --git a/recipes-connectivity/bluez/bluez5/rfcomm/rfcomm.py b/recipes-connectivity/bluez/bluez5/rfcomm/rfcomm.py
deleted file mode 100644
index e8f2554..0000000
--- a/recipes-connectivity/bluez/bluez5/rfcomm/rfcomm.py
+++ /dev/null
@@ -1,650 +0,0 @@
-#!/usr/bin/env python2
-import thread
-import os
-import dbus
-import dbus.service
-import dbus.mainloop.glib
-from gi.repository import GObject, GLib
-import sys
-import time
-import threading
-import socket
-import logging
-import logging.handlers
-import syslog
-import grp
-import stat
-import atexit
-import re
-import mmap
-import subprocess
-import threading
-import struct
-import fcntl
-import termios
-import signal
-import time
-import bluetooth
-
-# Do we need stty onlcr????
-
-#SerialPortProfile = '00001101-0000-1000-8000-00805f9b34fb'
-
-global lg
-global opts
-global RFCOMMDIR
-RFCOMMDIR = '/run/rfcomm'
-SLAVEDIR='/dev/pts'
-BLUEZLIB='/var/lib/bluetooth'
-
-global TTY_GID  # Group-ID number of the TTY group
-global doterm  # If true, this python program is a terminal console.
-global needpseudot # Login option and pseudoterminal option
-needpseudot = False
-global terminatenow
-terminatenow = False
-
-myscript = os.path.basename(__file__)
-class dopidfile(object):
-    pidPath = "/"
-
-    def writePidFile(self):
-        global pidPath
-        pid = str(os.getpid())
-        pidPath = '/run/rfcomm' + '.pid'
-        f = open(pidPath, 'w')
-        f.write(pid)
-        f.close()
-
-    def rmPidFile(self):
-        try:
-            os.remove(pidPath)
-        except OSError:
-            pass
-
-
-# Log formating class
-class flog:
-    # priority strings to be used
-    # with the __init__ function
-    priorities = {
-        'debug':    logging.DEBUG,
-        'info':     logging.INFO,
-        'warn':     logging.WARNING,
-        'warning':  logging.WARNING,
-        'error':    logging.ERROR,
-        'critical': logging.CRITICAL,
-        }
-    
-    def __init__(self,myscript,facility,priority):
-        """
-        Initialize for logging
-
-        :param myscript:    The name of the python program script
-        :param facility:    The syslog facility, such as daemon or user
-        :param priority:    The minimum priority to be printed to the log
-        :returns: Nothing
-        :raises TBD:        logging class errors.
-        """
-        name_len = str(len(myscript))
-        self.myscript = myscript
-        self.log = logging.getLogger(myscript)
-        self.handler = logging.handlers.SysLogHandler(address=('/dev/log'),facility=facility)
-        self.default_fmt = ' %(levelname)-9s %(name)-' + name_len + 's %(message)s'
-        self.verbose_fmt1 = ' %(levelname)-9s %(name)-' + name_len + 's %(threadName)-14s '
-        self.verbose_fmt2 = ' %(message)s'
-        formatter = logging.Formatter(self.default_fmt)
-        self.handler.setFormatter(formatter)
-        self.log.setLevel(self.priorities[priority]) # Minimum infolevel to log
-        self.log.addHandler(self.handler)
-        self.handler.createLock()
-
-    def __default(self,func,*args):
-        self.handler.acquire()
-        formatter = logging.Formatter(self.default_fmt)
-        self.handler.setFormatter(formatter)
-        func(*args)
-        self.handler.release()
-
-    def setThreshold(self,threshold):
-        """
-        Change the syslog priority threshold
-        
-        :param priority:    Character string corresponding to the threshold
-        """
-        self.handler.acquire()
-        self.log.setLevel(self.priorities[threshold]) # Minimum infolevel to log
-        self.handler.release()
-
-    def critical(self,*args):
-        """
-        Prints a variable argument list at critical priority
-        
-        :returns: logging result
-        """
-        self.__default(self.log.critical,*args)
-
-    def error(self,*args):
-        """
-        Prints a variable argument list at error priority
-            
-        :returns: logging result
-        """
-        self.__default(self.log.error,*args)
-
-    def warning(self,*args):
-        """
-        Prints a variable argument list at warning priority
-        
-        :returns: logging result
-        """
-        self.__default(self.log.warning,*args)
-
-    #  Python has no notice level!
-
-    def info(self,*args):
-        """
-        Prints a variable argument list at info priority
-        
-        :returns: logging result
-        """
-        self.__default(self.log.info,*args)
-
-    def debug(self,*args):
-        """
-        Prints a variable argument list at debug priority
-
-        Printing debug includes function name and line
-        number.
-        
-        :returns: logging result
-        """
-        caller_frame = sys._getframe().f_back
-        callerfunc = caller_frame.f_code.co_name + '@' + str(caller_frame.f_lineno);
-        callerfunc = callerfunc.ljust(16)
-        self.handler.acquire()
-        log = logging.getLogger(self.myscript)
-        formatter = logging.Formatter(self.verbose_fmt1+callerfunc+self.verbose_fmt2)
-        self.handler.setFormatter(formatter)
-        log.debug(*args)
-        self.handler.release()
-
-# End of log handler
-
-
-    
-# Thread to create login process, with
-# stdin, stdout, stderr matching the file descriptor
-# This is because NewConnection cannot create threads or
-# use a mutex.  Workarounds are pipes, IPC semamphores,
-# IPC messaging
-class logins(object):
-    slavefd = -1
-
-    # Thread to wait on our children
-    def IgnoreWait(self,pid):
-        lg.debug("IgnoreWait: Waiting on process pid: %d" % (pid.pid))
-        pid.wait()
-        lg.debug("login terminated: %d" % (pid.pid))
-    
-    def StartLogin(self,rpipe,mainloop):
-        datafd=''
-        masters = []
-        lg.debug("StartLogin enter: rpipe fd=%d" % (rpipe))
-        while 1:
-            try:
-                datafd=os.read(rpipe,8)
-            except Exception as e:
-                lg.error('os.read error: %s' % (e))
-                lg.debug('Done with StartLogin, calling quit')
-                for fd in masters:
-                    os.close(fd)
-                os.kill(os.getpid(), signal.SIGINT)
-                thread.exit()
-            # Single integer.
-            (slavefd,masterfd) = struct.unpack("ii",bytearray(datafd))
-            if masterfd > 0:
-                masters.append(masterfd)
-            lg.debug("StartLogin: slavefd %d" % (slavefd))
-            if slavefd < 0:
-                lg.debug("Told to exit, so exiting StartLogin thread")
-                os.close(rpipe)
-                # We try to close all the masters, as it gets
-                # things wound down in a hurry.
-                for fd in masters:
-                    lg.debug('StartLogin: Try to close fd %d' % (fd))
-                    try:
-                        os.close(fd)
-                    except Exception as e:
-                        lg.debug('StartLogin (ignore error): OK: Did not close fd: %d %s' % (fd,e))
-                        sys.exc_clear()
-                os.kill(os.getpid(), signal.SIGINT)
-                thread.exit()
-            # Start login with fd, and close it.
-            Env = {'TERM': 'dumb'}
-            self.slavefd = slavefd
-            lg.debug('Popen slavefd: %d' % (slavefd))
-            try:
-                # Mar 16 14:23:35 mtcdt daemon.err  ERROR     rfcomm.py Popen login: global name 's' is not defined
-                pid = subprocess.Popen(['/bin/login','--'],env=Env,preexec_fn = lambda: ( os.setsid(),fcntl.ioctl(0, termios.TIOCSCTTY, 0)  ),stdin=slavefd,stdout=slavefd,stderr=slavefd,close_fds=True,cwd='/')
-                lg.debug('Start IgnoreWait thread')
-                try:
-                    IgnoreWaitThread = threading.Thread(target=self.IgnoreWait,args=[pid])
-                except Exception as e:
-                    lg.error('IgnoreWaitThread: threading.Thread: %s' % (e))
-                try:
-                    IgnoreWaitThread.start()
-                except Exception as e:
-                    lg.error('IgnoreWaitThread: start: %s' % (e))
-            except Exception as e:
-                lg.error('Popen login: %s' % (e))
-            os.close(slavefd)
-
-class Profile(dbus.service.Object):
-    fd = -1
-    readThread = None
-    path = None
-    io_id = -1
-    io_id2 = -1
-    hup_id = -1
-    hup_id2 = -1
-    io_pty_master = -1
-    io_pty_slave = -1
-    slavePath = None
-    linkPath = None
-    w = -1
-    # True False pseudonyms for making code readable (or not!)
-    exiting = True
-    notexiting = False
-    
-    @dbus.service.method('org.bluez.Profile1',
-                         in_signature='',
-                         out_signature='')
-    def Release(self):
-        lg.info('Release/quit')
-        mainloop.quit()
-
-    @dbus.service.method("org.bluez.Profile1",
-        in_signature="", out_signature="")
-    def Cancel(self):
-        lg.info("Cancel")
-        
-    def removeLink(self,state):
-        lg.debug('removeLink: state: %r' % (state))
-        path = self.linkPath
-        lg.debug('removeLink: path %s' % (path))
-        if state == self.exiting:
-            lg.debug('Clearing out linkPath')
-            self.linkPath = None  # Burn bridges, do it once.
-        if path and os.path.lexists(path):
-            try:
-                os.remove(path)
-            except Exception as e:
-                lg.error("os.remove(self.linkPath): Tried to remove %s" % (path))
-                lg.error('%s' % (e))
-
-        
-
-    # New Connection is called when a new Bluetooth
-    # is established
-    @dbus.service.method('org.bluez.Profile1',
-                         in_signature='oha{sv}',
-                         out_signature='')
-    def NewConnection(self, path, fd, properties):
-        dbus.mainloop.glib.threads_init()
-        self.fd = fd.take()  # Extract File Descriptor from dbus UnixFD class.
-        self.path = path
-        
-        # Bluetooth address portion of the path
-        address = os.path.basename(self.path)
-
-	numaddr = address[address.find("_")+1:]
-	# Replace _ with :
-	Name = bluetooth.lookup_name(numaddr.replace("_",":"))
-        
-        print('NewConnection(%s, %s, %s:%d)' % (path,Name,type(fd).__name__,self.fd))
-        lg.info('NewConnection(%s, %s, %s:%d)' % (path,Name,type(fd).__name__,self.fd))
-        atexit.register(self.RequestDisconnection,self.path)
-        lg.debug('Past atexit.register')
-        
-        # Get a pseudoterminal to provide an I/O driver for
-        # a program that needs a TTY.
-        if needpseudot:
-            (self.io_pty_master,self.io_pty_slave) = os.openpty()
-            slavestat = os.fstat(self.io_pty_slave)
-            self.minor = os.minor(slavestat.st_rdev)
-            lg.debug('pseudoterminal major and minor: (%d,%d)' % (os.major(slavestat.st_rdev),self.minor))
-            if not os.path.isdir(RFCOMMDIR):
-                lg.debug('Before mkdir: RFCOMMDIR %s' % (RFCOMMDIR))
-                os.mkdir(RFCOMMDIR,0755)
-                            
-                    
-            lg.debug('Address %s' % (address))
-            self.linkPath = RFCOMMDIR + '/' + address + '_' + Name + '_pts' + str(self.minor)
-	    self.slavePath = SLAVEDIR + '/' + str(self.minor)
-            lg.debug('termPath %s' % (self.linkPath))
-            self.removeLink(self.notexiting)
-            # linkPath was removed
-            
-            lg.debug('os.symlink(%s,%s)' % (self.slavePath,self.linkPath))
-            old = os.umask(002)
-            lg.debug('past umask')
-            try:
-                os.symlink(self.slavePath,self.linkPath)
-                try:
-                    atexit.register(self.removeLink,self.exiting);
-                except Exception as e:
-                    lg.error('Register atexit: %s' % (e))
-            except Exception as e:
-                lg.error('symlink failed: %s' % (e))
-                return False
-            lg.debug('Before umask')
-            os.umask(old)
-            lg.debug('After umask')
-            # os.chown(self.myPath,0,TTY_GID)
-
-        # Completed pseudoterminal case to create device and node
-
-        # +  For loopback, we only monitor the RFCOMM line (self.fd).
-        # +  For interactive (not pseudoterminal or loopback option,
-        #    we monitor the stdin (0) and the RFCOMM line for input
-        # +  For pseudoterminal, we monitor input on the RFCOMM line,
-        #    and the slave pseudoterminal.
-        # Note that io_add_watch causes a poll to be done by the
-        # python GI library.  The callback functions (io_term and io_cb)
-        # will be called when there is an event on the file descriptor
-        # being polled.
-        sys.stdout.flush()
-        if not opts.loopback:
-            if needpseudot:
-                local_fd = self.io_pty_master
-                lg.debug('NewConnection: master_fd: %d slave_fd: %d' % (local_fd,self.io_pty_slave))  #success to here.
-            else:
-                # stdin
-                local_fd = 0
-            lg.debug('Ready to do io_add_watch on local_fd: %d' % (local_fd))
-            try:
-                self.io_id2 = GObject.io_add_watch(local_fd,
-                                     GObject.PRIORITY_DEFAULT,
-                                     GObject.IO_IN | GObject.IO_PRI | GObject.IO_HUP | GObject.IO_ERR,
-                                     self.io_term)
-            except Exception as e:
-                lg.error('io_addwatch failed for local_fd %d: IO_IN, IO_PRI %s' % (local_fd,e))
-             
-        if opts.login:
-            # Writing the slave file descriptor causes the login process to start.
-            lg.debug('opts.login is true slave fd: %d pipe: %d' % (self.io_pty_slave,self.w))
-            try:
-                os.write(self.w,struct.pack('ii',self.io_pty_slave,self.io_pty_master))
-            except Exception as e:
-                lg.error('os.write of slave fd:%d master fd: %d failed: %s' % (self.io_pty_slave,self.io_pty_slave,e))
-                os.close(self.io_pty_slave)
-                self.io_pty_slave = -1
-                return False
-            self.io_pty_slave = -1
-
-        if doterm:
-            lg.debug('Profile: Write the prompt')
-            os.write(1,'TTY> ')
-
-        lg.debug('NewConnection: doterm: %s,  io_add_watch is next' % doterm)
-            
-        self.io_id = GObject.io_add_watch(self.fd,
-                                     GObject.PRIORITY_DEFAULT,
-                                     GObject.IO_IN | GObject.IO_PRI | GObject.IO_HUP | GObject.IO_ERR,
-                                     self.io_cb)
-        lg.debug('io_id(remote input) = %d io_id2(local input) = %d' % (self.io_id,self.io_id2))
-
-
-    # I/O read from Bluetooth remote to local application.
-    def io_cb(self, fd, conditions):
-        if terminatenow:
-            self.RequestDisconnection(self.path)
-
-        if (conditions & GObject.IO_HUP or conditions & GObject.IO_ERR):
-            lg.debug('Found HUP on fd: %d, so terminate' % (fd))
-            self.RequestDisconnection(self.path)
-            return False
-        # Read from remote
-        data = None
-        try:
-            data = os.read(fd, 1024)
-        except:
-            return True
-        lg.debug('io_cb: past read: doterm: %s' % doterm)
-        if opts.loopback:
-            toutput = fd # same as input
-        else:
-            toutput = self.io_pty_master
-    
-        if opts.loopback or needpseudot or opts.login:
-            if data:
-                start = 0
-                remain = len(data)
-                result = 1
-                lg.debug('remain is %d entering the loop' % (remain))
-                while remain > 0 and result > 0:
-                    try:
-                        result = os.write(toutput,data)
-                    except Exception as e:
-                        lg.debug('os.write failed: %s' %  (e))
-                        return True
-                    lg.debug('os.write returned %d for %s remain: %d' % (result,data,remain))
-                    if remain != result and remain > 0:
-                        remain -= result
-                        lg.debug('remain is now %d result is %d' % (remain,result))
-                        data = data[-remain:]
-                        lg.debug('remain to print %s' % (data))
-                    else:
-                        remain = 0
-            lg.debug('returning true to end this routing')
-            return True
-        
-        if data and len(data) > 0:
-            final = data[-1]
-            if data[-1] == '\n':
-                date = data[:-1]
-            if doterm:
-                print('\n'+data.decode('ascii'))
-                os.write(1,'TTY> ')
-                
-        return True
-
-    # I/O written to bluetooth from local slave (application write to remote)
-    def io_term(self, fd0, conditions):
-        if terminatenow:
-            self.RequestDisconnection(self.path)
-        if (conditions & GObject.IO_HUP or conditions & GObject.IO_ERR):
-            lg.debug('Found HUP on fd0: %d, so terminate' % (fd0))
-            self.RequestDisconnection(self.path)
-            return False
-        # Read from local (not used for loopback)
-        data = None
-        data = os.read(fd0, 1024)
-        lg.debug('io_term: fd0: %d len(data): %d' % (fd0,len(data)))
-        if not data:
-            # No Data == EOF
-            self.RequestDisconnection(self.path)
-            return True
-        #for character in data:
-        #    print character, character.encode('hex')
-        try:
-            os.write(self.fd,data)
-        except Exception as e:
-            print '%s' % (e)
-            lg.error('%s' % (e))
-            self.RequestDisconnection(self.path)
-            return True
-        if doterm:
-            os.write(fd0,'TTY> ')
-        return True
-  
-    @dbus.service.method('org.bluez.Profile1',
-                         in_signature='o',
-                         out_signature='')
-    def RequestDisconnection(self, path):
-        print('RequestDisconnection(%s)' % (path))
-        lg.info('RequestDisconnection(%s)' % (path))
-        if self.fd != -1:
-            lg.debug('closing fd: %s' % (self.fd))
-            s = socket.fromfd(self.fd,socket.AF_INET,socket.SOCK_STREAM)
-            result = s.shutdown(socket.SHUT_RDWR)
-            lg.debug('After shutdown fd: %s %s %s' % (self.fd,' result:',result))
-            result = os.close(self.fd)
-            lg.debug('After closing fd: %s %s %s' % (self.fd,' result:',result))
-            self.fd = -1
-        if self.io_id != -1:
-            lg.debug('remove id: %s' % (self.io_id))
-            rmv = GObject.source_remove(self.io_id)
-        self.io_id = -1
-        if self.io_id2 != -1:
-            lg.debug('closing id2: %s' % (self.io_id2))
-            rmv = GObject.source_remove(self.io_id2)
-            lg.debug('removed id2: %s %s %s' % (self.io_id2,'result: ',rmv))
-            self.io_id2 = -1
-        if self.hup_id != -1:
-            lg.debug('closing hup_id: %s' % (self.hup_id))
-            rmv = GObject.source_remove(self.hup_id)
-            lg.debug('removed id2: %s %s %s' % (self.hup_id,'result: ',rmv))
-            self.hup_id = -1
-        if self.hup_id2 != -1:
-            lg.debug('closing hup_id2: %s' % (self.hup_id2))
-            rmv = GObject.source_remove(self.hup_id2)
-            lg.debug('removed id2: %s %s %s' % (self.hup_id2,'result: ',rmv))
-            self.hup_id2 = -1
-        if needpseudot:
-            if self.io_pty_slave != -1:
-                os.close(self.io_pty_slave)
-                self.io_pty_slave = -1
-            if self.io_pty_master != -1:
-                try:
-                    savefd = self.io_pty_master
-                    self.io_pty_master = -1
-                    os.close(savefd)
-                except Exception as e:
-                    lg.error("close(io_pty_master): Tried to close %d" % (savefd))
-                    lg.error('%s' % (e))
-
-                self.removeLink(self.exiting)
-
-def terminationHandler(mainloop):
-    lg.debug('SIGTERM: terminationHandler was called')
-    mainloop.quit()
-
-        
-if __name__ == '__main__':
-    import argparse
-
-    doterm = False
-    TTY_GID = grp.getgrnam('tty').gr_gid
-    # Set up logging initially info and above	
-    lg = flog(myscript,'daemon','info')
-
-    parser = argparse.ArgumentParser(
-		description='BlueZ RFCOMM server.')
-
-    parser.add_argument('-u', '--uuid',
-            metavar='uuid_or_shortcut', default='spp',
-            help='Service UUID to use. Can be either full UUID'
-                    ' or one of the shortcuts: gn, panu, nap. Default: %(default)s.')
-    parser.add_argument('--pseudoterminal', action='store_true',
-            help='Create a pseudoterminal and put slave in /run/rfcomm'
-                    ' Suitable for background operation.')
-    parser.add_argument('--loopback', action='store_true',
-            help='Echo data for testing (exclusive with pseudoterminal)')
-    parser.add_argument('--debug',
-            action='store_true', help='Verbose operation mode.')
-    parser.add_argument('--login',
-            action='store_true', help='Use RFCOMM to log into this device.')
-    opts = parser.parse_args()
-
-    if opts.debug:
-        lg.setThreshold('debug')
-
-    if opts.pseudoterminal and opts.loopback:
-        msg = 'Cannot have both pseudoterminal and loopback option'
-        print msg
-        lg.error(msg)
-        exit(1)
-    if not opts.pseudoterminal and not opts.loopback and not opts.login:
-        doterm = True
-        print "main: doterm is %s" % (str(doterm))
-
-    if opts.pseudoterminal or opts.login:
-        needpseudot = True
-    
-  
-
-    dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
-    
-    bus = dbus.SystemBus()
-    
-    manager = dbus.Interface(bus.get_object('org.bluez',
-                                            '/org/bluez'),
-                             'org.bluez.ProfileManager1')
-
-    mainloop = GObject.MainLoop()
-
-    GLib.unix_signal_add(GLib.PRIORITY_HIGH,signal.SIGTERM,terminationHandler,mainloop)
-    mypidfile = dopidfile()
-    mypidfile.writePidFile()
-
-    if opts.login:
-        # Need to create thead to exec logins.
-        rpipe,wpipe = os.pipe()
-        loginProcess = logins()
-        Profile.w = wpipe
-        lg.debug('Call threading next')
-        try:
-            StartLoginThread = threading.Thread(target=loginProcess.StartLogin,args=[rpipe,mainloop])
-        except Exception as e:
-            lg.error('threading.Thread: StartLogin %s' % (e))
-        try:
-            StartLoginThread.start()
-        except Exception as e:
-            lg.error('StartLogin.start: %s' % (e))
-
-    
-    profile_path = '/foo/bar/profile'
-    
-    SPP_opts = {
-        'AutoConnect': True,
-        'Role': 'server',
-        'Name': 'SerialPort'
-    }
-
-    print('Starting Serial Port Profile...')
-    lg.info('Starting Serial Port Profile...')
-
-    profile = Profile(bus, profile_path)
-
-    try:
-        manager.RegisterProfile(profile_path, opts.uuid, SPP_opts)
-    except dbus.exceptions.DBusException as inst:
-        print 'dbus exception:',inst._dbus_error_name
-        lg.error('dbus exception: %s',inst._dbus_error_name)
-        if inst._dbus_error_name == 'org.freedesktop.DBus.Error.AccessDenied':
-	    print 'Try running as root'
-        exit(1)
-    
-    lg.debug('Completed Register Profile...')
-    dbus.mainloop.glib.threads_init()
-    lg.debug('Completed threads init... Now mainloop.run')
-    try:
-        mainloop.run()
-    except KeyboardInterrupt:
-        pass
-    except Exception as e:
-        lg.error('mainloop exception: %s' % (e))
-        print '\nSerial Port Profile: ERROR Goodbye'
-        lg.error('Serial Port Profile: ERROR Goodbye')
-        data = struct.pack('i',-1)
-        os.write(wpipe,data)
-        mainloop.quit()
-
-    lg.info('Serial Port Profile: Goodbye')
-    if opts.login:
-        data = struct.pack('ii',-1,-1)
-        os.write(wpipe,data)
-    mypidfile.rmPidFile()
-    mainloop.quit()
diff --git a/recipes-connectivity/bluez/bluez5/run-ptest b/recipes-connectivity/bluez/bluez5/run-ptest
deleted file mode 100644
index 21df00c..0000000
--- a/recipes-connectivity/bluez/bluez5/run-ptest
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-
-cd unit
-
-failed=0
-all=0
-
-for f in test-*; do
-    "./$f"
-    case "$?" in
-        0)
-            echo "PASS: $f"
-            all=$((all + 1))
-            ;;
-        77)
-            echo "SKIP: $f"
-            ;;
-        *)
-            echo "FAIL: $f"
-            failed=$((failed + 1))
-            all=$((all + 1))
-            ;;
-    esac
-done
-
-if [ "$failed" -eq 0 ] ; then
-  echo "All $all tests passed"
-else
-  echo "$failed of $all tests failed"
-fi
-
diff --git a/recipes-connectivity/bluez/bluez5_%.bbappend b/recipes-connectivity/bluez/bluez5_%.bbappend
deleted file mode 100644
index ab89900..0000000
--- a/recipes-connectivity/bluez/bluez5_%.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-EXTRA_OECONF += "--enable-deprecated --enable-experimental"
-
-RDEPENDS_${PN}-rfcomm += "python-pybluez"
-
diff --git a/recipes-connectivity/bluez/bluez5_5.47.bb b/recipes-connectivity/bluez/bluez5_5.47.bb
deleted file mode 100644
index fb17add..0000000
--- a/recipes-connectivity/bluez/bluez5_5.47.bb
+++ /dev/null
@@ -1,55 +0,0 @@
-require bluez5.inc
-
-REQUIRED_DISTRO_FEATURES = "bluez5"
-
-SRC_URI[md5sum] = "783e15f65e70cdb8f721c659e140dd56"
-SRC_URI[sha256sum] = "cf75bf7cd5d564f21cc4a2bd01d5c39ce425397335fd47d9bbe43af0a58342c8"
-
-# noinst programs in Makefile.tools that are conditional on READLINE
-# support
-NOINST_TOOLS_READLINE ?= " \
-    attrib/gatttool \
-    tools/obex-client-tool \
-    tools/obex-server-tool \
-    tools/bluetooth-player \
-    tools/obexctl \
-    tools/btmgmt \
-"
-
-# noinst programs in Makefile.tools that are conditional on EXPERIMENTAL
-# support
-NOINST_TOOLS_EXPERIMENTAL ?= " \
-    emulator/btvirt \
-    emulator/b1ee \
-    emulator/hfp \
-    tools/3dsp \
-    tools/mgmt-tester \
-    tools/gap-tester \
-    tools/l2cap-tester \
-    tools/sco-tester \
-    tools/smp-tester \
-    tools/hci-tester \
-    tools/rfcomm-tester \
-    tools/bdaddr \
-    tools/avinfo \
-    tools/avtest \
-    tools/scotest \
-    tools/amptest \
-    tools/hwdb \
-    tools/hcieventmask \
-    tools/hcisecfilter \
-    tools/btinfo \
-    tools/btattach \
-    tools/btsnoop \
-    tools/btproxy \
-    tools/btiotest \
-    tools/mcaptest \
-    tools/cltest \
-    tools/oobtest \
-    tools/seq2bseq \
-    tools/ibeacon \
-    tools/btgatt-client \
-    tools/btgatt-server \
-    tools/gatt-service \
-    profiles/iap/iapd \
-"
diff --git a/recipes-connectivity/bluez/python-gatt-server_1.0.bb b/recipes-connectivity/bluez/python-gatt-server_1.0.bb
deleted file mode 100644
index 76069f6..0000000
--- a/recipes-connectivity/bluez/python-gatt-server_1.0.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-inherit allarch
-HOMEPAGE = "https://github.com/Jumperr-labs/python-gatt-server"
-SRCREV = "a39ef9773e9ba845f4303b1dfd2efddf24b02238"
-PR = "r0"
-
-S = "${WORKDIR}/git"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c53d04442d1a229d62549856b7ec456a"
-
-SRC_URI = "git://github.com/Jumperr-labs/python-gatt-server.git;protocol=git"
-
-RDEPENDS_${PN} += "python-dbus python-pygobject"
-
-DBTEXEC = "${libexecdir}/bluetooth/"
-DEST = "${D}${DBTEXEC}"
-
-FILES_${PN} = "${DBTEXEC}"
-
-
-do_install_append() {
-	install -d ${DEST}/${PN}
-	install -m 0755 ${S}/*.py ${DEST}/${PN}
-}
diff --git a/recipes-connectivity/c-ares/c-ares_1.10.0.bb b/recipes-connectivity/c-ares/c-ares_1.10.0.bb
deleted file mode 100644
index 0d1ef9d..0000000
--- a/recipes-connectivity/c-ares/c-ares_1.10.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "C library for asynchronous DNS requests (including name resolves)"
-HOMEPAGE = "http://c-ares.haxx.se/"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://README;beginline=17;endline=23;md5=d08205a43bc63c12cf394ac1d2cce7c3"
-
-PR = "r0"
-
-SRC_URI = "http://c-ares.haxx.se/download/c-ares-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "1196067641411a75d3cbebe074fd36d8"
-SRC_URI[sha256sum] = "3d701674615d1158e56a59aaede7891f2dde3da0f46a6d3c684e0ae70f52d3db"
-
-inherit autotools
diff --git a/recipes-connectivity/hostapd/files/cfg80211.conf b/recipes-connectivity/hostapd/files/cfg80211.conf
deleted file mode 100644
index 4b6d264..0000000
--- a/recipes-connectivity/hostapd/files/cfg80211.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# IEEE 802.11 Regulatory Domain for cfg80211 driver
-# AU -- Australia
-# AT -- Austria
-# BE -- Belgium
-# US -- USA
-# 00 -- World
-options cfg80211 ieee80211_regdom=00
diff --git a/recipes-connectivity/hostapd/hostap-daemon-1.0/default b/recipes-connectivity/hostapd/hostap-daemon-1.0/default
deleted file mode 100644
index 0923a8c..0000000
--- a/recipes-connectivity/hostapd/hostap-daemon-1.0/default
+++ /dev/null
@@ -1,2 +0,0 @@
-# set to "yes" to start hostapd on boot
-START_ON_BOOT="no"
diff --git a/recipes-connectivity/hostapd/hostap-daemon-1.0/init b/recipes-connectivity/hostapd/hostap-daemon-1.0/init
deleted file mode 100644
index a8d622f..0000000
--- a/recipes-connectivity/hostapd/hostap-daemon-1.0/init
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-DAEMON=/usr/sbin/hostapd
-NAME=hostapd
-DESC="HOSTAP Daemon"
-ARGS="/etc/hostapd.conf -B"
-
-test -f $DAEMON || exit 0
-
-[ -f /etc/default/$NAME ] && . /etc/default/$NAME
-
-if [ "$START_ON_BOOT" != "yes" ]; then
-	exit 0
-fi
-
-set -e
-
-case "$1" in
-    start)
-	echo -n "Starting $DESC: "
-	start-stop-daemon -S -x $DAEMON -- $ARGS
-	echo "$NAME."
-	;;
-    stop)
-	echo -n "Stopping $DESC: "
-	start-stop-daemon -K -x $DAEMON
-	echo "$NAME."
-	;;
-    restart)
-	$0 stop
-	$0 start
-	;;
-    reload)
-	echo -n "Reloading $DESC: "
-	killall -HUP $(basename ${DAEMON})
-	echo "$NAME."
-	;;
-    *)
-	echo "Usage: $0 {start|stop|restart|reload}"
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/recipes-connectivity/hostapd/hostap-daemon-2.7/default b/recipes-connectivity/hostapd/hostap-daemon-2.7/default
deleted file mode 100644
index a274de1..0000000
--- a/recipes-connectivity/hostapd/hostap-daemon-2.7/default
+++ /dev/null
@@ -1,6 +0,0 @@
-# set to "yes" to start hostapd on boot
-START_ON_BOOT="no"
-# Stuff to creat the device if needed.
-DEV=wifi1
-PREUP="[[ -d /sys/class/net/${DEV} ]] || (ifdown wifi1;/opt/rs9113/onebox_util rpine0 create_vap ${DEV} ap;rfkill unblock all)"
-POSTUP="ifup wifi1"
diff --git a/recipes-connectivity/hostapd/hostap-daemon-2.7/defconfig b/recipes-connectivity/hostapd/hostap-daemon-2.7/defconfig
deleted file mode 100644
index 321b7c1..0000000
--- a/recipes-connectivity/hostapd/hostap-daemon-2.7/defconfig
+++ /dev/null
@@ -1,319 +0,0 @@
-# Example hostapd build time configuration
-#
-# This file lists the configuration options that are used when building the
-# hostapd binary. All lines starting with # are ignored. Configuration option
-# lines must be commented out complete, if they are not to be included, i.e.,
-# just setting VARIABLE=n is not disabling that variable.
-#
-# This file is included in Makefile, so variables like CFLAGS and LIBS can also
-# be modified from here. In most cass, these lines should use += in order not
-# to override previous values of the variables.
-
-# Driver interface for Host AP driver
-CONFIG_DRIVER_HOSTAP=y
-
-# Driver interface for wired authenticator
-CONFIG_DRIVER_WIRED=y
-
-# Driver interface for madwifi driver
-#CONFIG_DRIVER_MADWIFI=y
-#CFLAGS += -I../../madwifi # change to the madwifi source directory
-
-# Driver interface for drivers using the nl80211 kernel interface
-CONFIG_DRIVER_NL80211=y
-CONFIG_LIBNL32=y
-
-# driver_nl80211.c requires libnl. If you are compiling it yourself
-# you may need to point hostapd to your version of libnl.
-#
-#CFLAGS += -I$<path to libnl include files>
-#LIBS += -L$<path to libnl library files>
-
-# Use libnl v2.0 (or 3.0) libraries.
-#CONFIG_LIBNL20=y
-
-# Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored)
-#CONFIG_LIBNL32=y
-
-
-# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
-#CONFIG_DRIVER_BSD=y
-#CFLAGS += -I/usr/local/include
-#LIBS += -L/usr/local/lib
-#LIBS_p += -L/usr/local/lib
-#LIBS_c += -L/usr/local/lib
-
-# Driver interface for no driver (e.g., RADIUS server only)
-CONFIG_DRIVER_NONE=y
-
-# IEEE 802.11F/IAPP
-CONFIG_IAPP=y
-
-# WPA2/IEEE 802.11i RSN pre-authentication
-CONFIG_RSN_PREAUTH=y
-
-# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
-CONFIG_PEERKEY=y
-
-# IEEE 802.11w (management frame protection)
-CONFIG_IEEE80211W=y
-
-# Integrated EAP server
-CONFIG_EAP=y
-
-# EAP-MD5 for the integrated EAP server
-CONFIG_EAP_MD5=y
-
-# EAP-TLS for the integrated EAP server
-CONFIG_EAP_TLS=y
-
-# EAP-MSCHAPv2 for the integrated EAP server
-CONFIG_EAP_MSCHAPV2=y
-
-# EAP-PEAP for the integrated EAP server
-CONFIG_EAP_PEAP=y
-
-# EAP-GTC for the integrated EAP server
-CONFIG_EAP_GTC=y
-
-# EAP-TTLS for the integrated EAP server
-CONFIG_EAP_TTLS=y
-
-# EAP-SIM for the integrated EAP server
-#CONFIG_EAP_SIM=y
-
-# EAP-AKA for the integrated EAP server
-#CONFIG_EAP_AKA=y
-
-# EAP-AKA' for the integrated EAP server
-# This requires CONFIG_EAP_AKA to be enabled, too.
-#CONFIG_EAP_AKA_PRIME=y
-
-# EAP-PAX for the integrated EAP server
-#CONFIG_EAP_PAX=y
-
-# EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK)
-#CONFIG_EAP_PSK=y
-
-# EAP-pwd for the integrated EAP server (secure authentication with a password)
-#CONFIG_EAP_PWD=y
-
-# EAP-SAKE for the integrated EAP server
-#CONFIG_EAP_SAKE=y
-
-# EAP-GPSK for the integrated EAP server
-#CONFIG_EAP_GPSK=y
-# Include support for optional SHA256 cipher suite in EAP-GPSK
-#CONFIG_EAP_GPSK_SHA256=y
-
-# EAP-FAST for the integrated EAP server
-# Note: If OpenSSL is used as the TLS library, OpenSSL 1.0 or newer is needed
-# for EAP-FAST support. Older OpenSSL releases would need to be patched, e.g.,
-# with openssl-0.9.8x-tls-extensions.patch, to add the needed functions.
-CONFIG_EAP_FAST=y
-
-# Wi-Fi Protected Setup (WPS)
-CONFIG_WPS=y
-# Enable UPnP support for external WPS Registrars
-CONFIG_WPS_UPNP=y
-# Enable WPS support with NFC config method
-#CONFIG_WPS_NFC=y
-
-# EAP-IKEv2
-#CONFIG_EAP_IKEV2=y
-
-# Trusted Network Connect (EAP-TNC)
-#CONFIG_EAP_TNC=y
-
-# EAP-EKE for the integrated EAP server
-#CONFIG_EAP_EKE=y
-
-# PKCS#12 (PFX) support (used to read private key and certificate file from
-# a file that usually has extension .p12 or .pfx)
-CONFIG_PKCS12=y
-
-# RADIUS authentication server. This provides access to the integrated EAP
-# server from external hosts using RADIUS.
-CONFIG_RADIUS_SERVER=y
-
-# Build IPv6 support for RADIUS operations
-CONFIG_IPV6=y
-
-# IEEE Std 802.11r-2008 (Fast BSS Transition)
-#CONFIG_IEEE80211R=y
-
-# Use the hostapd's IEEE 802.11 authentication (ACL), but without
-# the IEEE 802.11 Management capability (e.g., madwifi or FreeBSD/net80211)
-#CONFIG_DRIVER_RADIUS_ACL=y
-
-# IEEE 802.11n (High Throughput) support
-CONFIG_IEEE80211N=y
-
-# Wireless Network Management (IEEE Std 802.11v-2011)
-# Note: This is experimental and not complete implementation.
-CONFIG_WNM=y
-
-# IEEE 802.11ac (Very High Throughput) support
-CONFIG_IEEE80211AC=y
-
-# Remove debugging code that is printing out debug messages to stdout.
-# This can be used to reduce the size of the hostapd considerably if debugging
-# code is not needed.
-#CONFIG_NO_STDOUT_DEBUG=y
-
-# Add support for writing debug log to a file: -f /tmp/hostapd.log
-# Disabled by default.
-#CONFIG_DEBUG_FILE=y
-
-# Add support for sending all debug messages (regardless of debug verbosity)
-# to the Linux kernel tracing facility. This helps debug the entire stack by
-# making it easy to record everything happening from the driver up into the
-# same file, e.g., using trace-cmd.
-#CONFIG_DEBUG_LINUX_TRACING=y
-
-# Remove support for RADIUS accounting
-#CONFIG_NO_ACCOUNTING=y
-
-# Remove support for RADIUS
-#CONFIG_NO_RADIUS=y
-
-# Remove support for VLANs
-#CONFIG_NO_VLAN=y
-
-# Enable support for fully dynamic VLANs. This enables hostapd to
-# automatically create bridge and VLAN interfaces if necessary.
-#CONFIG_FULL_DYNAMIC_VLAN=y
-
-# Use netlink-based kernel API for VLAN operations instead of ioctl()
-# Note: This requires libnl 3.1 or newer.
-#CONFIG_VLAN_NETLINK=y
-
-# Remove support for dumping internal state through control interface commands
-# This can be used to reduce binary size at the cost of disabling a debugging
-# option.
-#CONFIG_NO_DUMP_STATE=y
-
-# Enable tracing code for developer debugging
-# This tracks use of memory allocations and other registrations and reports
-# incorrect use with a backtrace of call (or allocation) location.
-#CONFIG_WPA_TRACE=y
-# For BSD, comment out these.
-#LIBS += -lexecinfo
-#LIBS_p += -lexecinfo
-#LIBS_c += -lexecinfo
-
-# Use libbfd to get more details for developer debugging
-# This enables use of libbfd to get more detailed symbols for the backtraces
-# generated by CONFIG_WPA_TRACE=y.
-#CONFIG_WPA_TRACE_BFD=y
-# For BSD, comment out these.
-#LIBS += -lbfd -liberty -lz
-#LIBS_p += -lbfd -liberty -lz
-#LIBS_c += -lbfd -liberty -lz
-
-# hostapd depends on strong random number generation being available from the
-# operating system. os_get_random() function is used to fetch random data when
-# needed, e.g., for key generation. On Linux and BSD systems, this works by
-# reading /dev/urandom. It should be noted that the OS entropy pool needs to be
-# properly initialized before hostapd is started. This is important especially
-# on embedded devices that do not have a hardware random number generator and
-# may by default start up with minimal entropy available for random number
-# generation.
-#
-# As a safety net, hostapd is by default trying to internally collect
-# additional entropy for generating random data to mix in with the data
-# fetched from the OS. This by itself is not considered to be very strong, but
-# it may help in cases where the system pool is not initialized properly.
-# However, it is very strongly recommended that the system pool is initialized
-# with enough entropy either by using hardware assisted random number
-# generator or by storing state over device reboots.
-#
-# hostapd can be configured to maintain its own entropy store over restarts to
-# enhance random number generation. This is not perfect, but it is much more
-# secure than using the same sequence of random numbers after every reboot.
-# This can be enabled with -e<entropy file> command line option. The specified
-# file needs to be readable and writable by hostapd.
-#
-# If the os_get_random() is known to provide strong random data (e.g., on
-# Linux/BSD, the board in question is known to have reliable source of random
-# data from /dev/urandom), the internal hostapd random pool can be disabled.
-# This will save some in binary size and CPU use. However, this should only be
-# considered for builds that are known to be used on devices that meet the
-# requirements described above.
-#CONFIG_NO_RANDOM_POOL=y
-
-# Select TLS implementation
-# openssl = OpenSSL (default)
-# gnutls = GnuTLS
-# internal = Internal TLSv1 implementation (experimental)
-# none = Empty template
-#CONFIG_TLS=openssl
-CONFIG_TLS=internal
-
-# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1)
-# can be enabled to get a stronger construction of messages when block ciphers
-# are used.
-CONFIG_TLSV11=y
-
-# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2)
-# can be enabled to enable use of stronger crypto algorithms.
-#CONFIG_TLSV12=y
-
-# If CONFIG_TLS=internal is used, additional library and include paths are
-# needed for LibTomMath. Alternatively, an integrated, minimal version of
-# LibTomMath can be used. See beginning of libtommath.c for details on benefits
-# and drawbacks of this option.
-CONFIG_INTERNAL_LIBTOMMATH=y
-ifndef CONFIG_INTERNAL_LIBTOMMATH
-LTM_PATH=/usr/src/libtommath-0.39
-CFLAGS += -I$(LTM_PATH)
-LIBS += -L$(LTM_PATH)
-LIBS_p += -L$(LTM_PATH)
-endif
-# At the cost of about 4 kB of additional binary size, the internal LibTomMath
-# can be configured to include faster routines for exptmod, sqr, and div to
-# speed up DH and RSA calculation considerably
-#CONFIG_INTERNAL_LIBTOMMATH_FAST=y
-
-# Interworking (IEEE 802.11u)
-# This can be used to enable functionality to improve interworking with
-# external networks.
-#CONFIG_INTERWORKING=y
-
-# Hotspot 2.0
-#CONFIG_HS20=y
-
-# Enable SQLite database support in hlr_auc_gw, EAP-SIM DB, and eap_user_file
-CONFIG_SQLITE=y
-
-# Testing options
-# This can be used to enable some testing options (see also the example
-# configuration file) that are really useful only for testing clients that
-# connect to this hostapd. These options allow, for example, to drop a
-# certain percentage of probe requests or auth/(re)assoc frames.
-#
-CONFIG_TESTING_OPTIONS=y
-
-# Automatic Channel Selection
-# This will allow hostapd to pick the channel automatically when channel is set
-# to "acs_survey" or "0". Eventually, other ACS algorithms can be added in
-# similar way.
-#
-# Automatic selection is currently only done through initialization, later on
-# we hope to do background checks to keep us moving to more ideal channels as
-# time goes by. ACS is currently only supported through the nl80211 driver and
-# your driver must have survey dump capability that is filled by the driver
-# during scanning.
-#
-# You can customize the ACS survey algorithm with the hostapd.conf variable
-# acs_num_scans.
-#
-# Supported ACS drivers:
-# * ath9k
-# * ath5k
-# * ath10k
-#
-# For more details refer to:
-# http://wireless.kernel.org/en/users/Documentation/acs
-#
-CONFIG_ACS=y
diff --git a/recipes-connectivity/hostapd/hostap-daemon-2.7/init b/recipes-connectivity/hostapd/hostap-daemon-2.7/init
deleted file mode 100755
index 5bd7ab6..0000000
--- a/recipes-connectivity/hostapd/hostap-daemon-2.7/init
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-DAEMON=/usr/sbin/hostapd
-NAME=hostapd
-DESC="HOSTAP Daemon"
-ARGS="/etc/hostapd.conf -B"
-
-test -f $DAEMON || exit 0
-
-[ -f /etc/default/$NAME ] && . /etc/default/$NAME
-
-
-set -e
-
-case "$1" in
-    start)
-        if [ "$START_ON_BOOT" != "yes" ]; then
-	    exit 0
-        fi
-        if [[ -n $PREUP ]] ; then
-		bash -c "$PREUP"
-        fi
-	echo -n "Starting $DESC: "
-	start-stop-daemon -S -x $DAEMON -- $ARGS
-        if [[ -n $POSTUP ]] ; then
-                bash -c "$POSTUP"
-        fi
-	echo "$NAME."
-	;;
-    stop)
-	echo -n "Stopping $DESC: "
-	start-stop-daemon -K -x $DAEMON
-	echo "$NAME."
-	;;
-    restart)
-	$0 stop
-	$0 start
-	;;
-    reload)
-	echo -n "Reloading $DESC: "
-	killall -HUP $(basename ${DAEMON})
-	echo "$NAME."
-	;;
-    *)
-	echo "Usage: $0 {start|stop|restart|reload}"
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/recipes-connectivity/hostapd/hostap-daemon.inc b/recipes-connectivity/hostapd/hostap-daemon.inc
deleted file mode 100644
index 5525953..0000000
--- a/recipes-connectivity/hostapd/hostap-daemon.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-# -p option is striplevel
-SRC_URI += " file://cfg80211.conf \
-           "
-
-do_install() {
-    install -d ${D}${sbindir} ${D}${sysconfdir}/init.d
-    install -m 0644 ${S}/hostapd.conf ${D}${sysconfdir}
-    install -m 0755 ${S}/hostapd ${D}${sbindir}
-    install -m 0755 ${S}/hostapd_cli ${D}${sbindir}
-    install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd
-    
-    install -m 644 -D ${WORKDIR}/cfg80211.conf ${D}${sysconfdir}/modprobe.d/cfg80211.conf
-}
diff --git a/recipes-connectivity/hostapd/hostap-daemon_2.7.bb b/recipes-connectivity/hostapd/hostap-daemon_2.7.bb
deleted file mode 100644
index c0809b4..0000000
--- a/recipes-connectivity/hostapd/hostap-daemon_2.7.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-require hostap-daemon.inc
-
-HOMEPAGE = "http://hostap.epitest.fi"
-SECTION = "kernel/userland"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://README;md5=9f542dba9d227d1a51f4405a415cc2b2"
-DEPENDS = "libnl openssl sqlite3"
-SUMMARY = "User space daemon for extended IEEE 802.11 management"
-
-PR = "r1"
-inherit update-rc.d
-INITSCRIPT_NAME = "hostapd"
-
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI += " \
-    http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \
-    file://defconfig \
-    file://init \
-	file://default \
-"
-
-S = "${WORKDIR}/hostapd-${PV}/hostapd"
-
-
-do_configure() {
-    install -m 0644 ${WORKDIR}/defconfig ${S}/.config
-}
-
-do_compile() {
-    export CFLAGS="-MMD -O2 -Wall -g -I${STAGING_INCDIR}/libnl3"
-    make
-}
-
-CONFFILES_${PN} += "${sysconfdir}/hostapd.conf ${sysconfdir}/modprobe.d/cfg80211.conf"
-
-SRC_URI[md5sum] = "8d3799f3a3c247cff47d41503698721b"
-SRC_URI[sha256sum] = "21b0dda3cc3abe75849437f6b9746da461f88f0ea49dd621216936f87440a141"
-
-do_install_append() {
-    mkdir -p ${D}${sysconfdir}/default
-	install -m 644 ${WORKDIR}/default ${D}${sysconfdir}/default/hostapd
-}
diff --git a/recipes-connectivity/lldpd/lldpd/lldpd.default b/recipes-connectivity/lldpd/lldpd/lldpd.default
deleted file mode 100644
index b33facf..0000000
--- a/recipes-connectivity/lldpd/lldpd/lldpd.default
+++ /dev/null
@@ -1,3 +0,0 @@
-ENABLED="no"
-# Uncomment to start SNMP subagent and enable CDP, SONMP and EDP protocol
-#DAEMON_ARGS="-x -c -s -e"
diff --git a/recipes-connectivity/lldpd/lldpd/lldpd.init.d b/recipes-connectivity/lldpd/lldpd/lldpd.init.d
deleted file mode 100644
index d071e1b..0000000
--- a/recipes-connectivity/lldpd/lldpd/lldpd.init.d
+++ /dev/null
@@ -1,129 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          lldpd
-# Required-Start:    $remote_fs $network $syslog
-# Required-Stop:     $network $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: LLDP daemon
-# Description:       lldpd is a 802.1AB implementation, a L2 network
-#                    discovery protocol. It also supports CDP, EDP and
-#                    various other protocols.
-### END INIT INFO
-
-# Do NOT "set -e"
-
-log_daemon_msg() {
-    echo $*
-}
-
-log_end_msg() {
-    if [ $1 -eq 0 ]; then
-        success $*
-    else
-        failure $*
-    fi
-}
-
-log_failure_msg() {
-    echo $*
-}
-
-log_success_msg() {
-    echo $*
-}
-
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="LLDP daemon"
-NAME=lldpd
-DAEMON=/usr/sbin/$NAME
-DAEMON_ARGS=""
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-CHROOT=/var/run/$NAME
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-[ "$ENABLED" == "yes" ] || exit 0
-
-# LSB log_* functions
-. /etc/init.d/functions
-
-do_start()
-{
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-		$DAEMON_ARGS \
-		|| return 2
-}
-
-do_stop()
-{
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
-	RETVAL="$?"
-	[ "$RETVAL" = 2 ] && return 2
-	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	[ "$?" = 2 ] && return 2
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-do_reload() {
-	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
-	return 0
-}
-
-case "$1" in
-  start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  reload)
-	log_daemon_msg "Reloading $DESC" "$NAME"
-	do_reload
-	log_end_msg $?
-	;;
-  restart|force-reload)
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-	  	# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  status)
-	status_of_proc $DAEMON $NAME -p $PIDFILE && exit 0 || exit $?
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload|status}" >&2
-	exit 3
-	;;
-esac
-
-:
diff --git a/recipes-connectivity/lldpd/lldpd_%.bbappend b/recipes-connectivity/lldpd/lldpd_%.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/recipes-connectivity/lldpd/lldpd_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/recipes-connectivity/lora/lora-basic-station/lora-basic-station-disable-device-mode.patch b/recipes-connectivity/lora/lora-basic-station/lora-basic-station-disable-device-mode.patch
deleted file mode 100644
index d81d041..0000000
--- a/recipes-connectivity/lora/lora-basic-station/lora-basic-station-disable-device-mode.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/sx1301conf.c b/src/sx1301conf.c
-index bca649c..c2681a4 100644
---- a/src/sx1301conf.c
-+++ b/src/sx1301conf.c
-@@ -433,7 +433,10 @@ int sx1301conf_start (struct sx1301conf* sx1301conf, u4_t cca_region) {
-     }
- 
-     LOG(MOD_RAL|INFO, "Station device: %s (PPS capture %sabled)", sx1301conf->device, sx1301conf->pps ? "en":"dis");
-+
-+#ifndef CFG_prod
-     lgwx_device_mode = sys_deviceMode;
-+#endif
-     int err = lgw_start();
-     if( err == LGW_HAL_SUCCESS ) {
-         lgw_reg_w(LGW_GPS_EN, sx1301conf->pps ? 1 : 0);
diff --git a/recipes-connectivity/lora/lora-basic-station/lora-basic-station-fix-clksrc-0.patch b/recipes-connectivity/lora/lora-basic-station/lora-basic-station-fix-clksrc-0.patch
deleted file mode 100644
index c534460..0000000
--- a/recipes-connectivity/lora/lora-basic-station/lora-basic-station-fix-clksrc-0.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/sx1301conf.c b/src/sx1301conf.c
-index bca649c..fe62351 100644
---- a/src/sx1301conf.c
-+++ b/src/sx1301conf.c
-@@ -193,7 +193,8 @@ static void parse_sx1301_conf (ujdec_t* D, struct sx1301conf* sx1301conf) {
-             break;
-         }
-         case J_clksrc: {
-             sx1301conf->boardconf.clksrc = uj_intRange(D, 0, LGW_RF_CHAIN_NB-1);
-+            sx1301conf->boardconf.clksrc = 0;
-             break;
-         }
-         case J_tx_gain_lut: {
-
diff --git a/recipes-connectivity/lora/lora-basic-station/lora-basic-station-sys-linux-log-fix.patch b/recipes-connectivity/lora/lora-basic-station/lora-basic-station-sys-linux-log-fix.patch
deleted file mode 100644
index 83be080..0000000
--- a/recipes-connectivity/lora/lora-basic-station/lora-basic-station-sys-linux-log-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src-linux/sys_linux.c b/src-linux/sys_linux.c
-index f8286c8..7afc073 100644
---- a/src-linux/sys_linux.c
-+++ b/src-linux/sys_linux.c
-@@ -724,7 +724,7 @@ static int parseStationConf () {
-                 case J_nodc:
-                 case J_nodwell:
-                 case J_device_mode: {
--                    LOG(MOD_S2E|WARNING, "Feature not supported in production level code (station.conf) - ignored: %s", D->field.name);
--                    uj_skipValue(D);
-+                    LOG(MOD_S2E|WARNING, "Feature not supported in production level code (station.conf) - ignored: %s", D.field.name);
-+                    uj_skipValue(&D);
-                     break;
-                 }
diff --git a/recipes-connectivity/lora/lora-basic-station/lora-basic-station.default b/recipes-connectivity/lora/lora-basic-station/lora-basic-station.default
deleted file mode 100644
index 0f92640..0000000
--- a/recipes-connectivity/lora/lora-basic-station/lora-basic-station.default
+++ /dev/null
@@ -1,2 +0,0 @@
-# set to "yes" or "no" to control starting on boot
-ENABLED="no"
diff --git a/recipes-connectivity/lora/lora-basic-station/lora-basic-station.init b/recipes-connectivity/lora/lora-basic-station/lora-basic-station.init
deleted file mode 100755
index 45c6eee..0000000
--- a/recipes-connectivity/lora/lora-basic-station/lora-basic-station.init
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/bin/bash
-
-
-NAME="lora-basic-station"
-ENABLED="yes"
-
-
-[ -f /etc/default/$NAME ] && source /etc/default/$NAME
-
-run_dir=/var/run/lora
-opt_conf_dir=/opt/lora
-conf_dir=/var/config/lora
-conf_file=$conf_dir/station.conf
-tc_uri_file=$conf_dir/tc.uri
-tc_key_file=$conf_dir/tc.key
-tc_trust_file=$conf_dir/tc.trust
-
-pkt_fwd=$run_dir/1/station
-pkt_fwd_pidfile=$run_dir/station.pid
-
-port1=/sys/devices/platform/mts-io/ap1
-port2=/sys/devices/platform/mts-io/ap2
-
-lora_mtac_id="MTAC-LORA"
-lora_1_0_hw="MTAC-LORA-1.0"
-lora_1_5_h_hw="MTAC-LORA-1.5"
-lora_2_1_hw="MTAC-LORA-2.1"
-
-lora_mtac_id="MTAC-LORA"
-lora_mtac_id915="MTAC-LORA-915"
-lora_mtac_id868="MTAC-LORA-868"
-lora_mtac_h_id915="MTAC-LORA-H-915"
-lora_mtac_h_id868="MTAC-LORA-H-868"
-
-lora_mtcap_id="MTCAP-LORA"
-lora_mtcap_id868="MTCAP-LORA-868"
-lora_mtcap_id915="MTCAP-LORA-915"
-
-lora_mtac_g_id="MTAC-LORA-G"
-lora_mtac_g16_id868="MTAC-LORA-G16-868"
-lora_mtac_g16_id915="MTAC-LORA-G16-915"
-lora_mtac_g64_id868="MTAC-LORA-G64-868"
-lora_mtac_g64_id915="MTAC-LORA-G64-915"
-
-pkt_fwd_options=""
-
-gps_path="/dev/gps0"
-
-read_lora_hw_info() {
-    lora_id=$(mts-io-sysfs show lora/product-id 2> /dev/null)
-    lora_hw=$(mts-io-sysfs show lora/hw-version 2> /dev/null)
-    lora_eui=$(mts-io-sysfs show lora/eui 2> /dev/null)
-    lora_eui_raw=${lora_eui//:/}
-}
-
-hardware_found() {
-    if [[ "$lora_id" =~ "$lora_mtac_g_id" ]]; then
-        setup_mtcdt_2_1
-    elif [[ "$lora_id" =~ "$lora_mtcap_id" ]]; then
-        setup_mtcap
-    elif [[ "$lora_id" =~ "$lora_mtac_id" ]]; then
-        setup_mtcdt
-    else
-        return 1
-    fi
-    return 0
-}
-
-setup_mtcdt() {
-    if [ -d $port1 ] && [[ $(cat $port1/hw-version) = $lora_hw ]]; then
-        ln -sf /dev/spidev32766.2 /dev/spidev0.0
-    elif [ -d $port2 ] && [[ $(cat $port2/hw-version) = $lora_hw ]]; then
-        ln -sf /dev/spidev32765.2 /dev/spidev0.0
-    fi
-
-    ln -sf /opt/lora/station $pkt_fwd
-}
-
-setup_mtcap() {
-
-    ln -sf /opt/lora/station $pkt_fwd
-}
-
-setup_mtcdt_2_1() {
-    echo LORA-2.1 not supported
-    return 1
-}
-
-do_start() {
-
-    mkdir -p $run_dir/1
-    rm -rf $run_dir/1/*
-
-    read_lora_hw_info
-
-    if hardware_found; then
-        echo "Found $lora_id with $lora_hw hardware. Configuring"
-    else
-        echo "$0: LORA card not detected"
-        exit 1
-    fi
-
-    if ! [ -f $conf_file ]; then
-        echo "$0: $conf_file missing"
-        exit 1
-    fi
-
-    #
-    # copy conf files to the run directory
-    #
-    cp $conf_file $run_dir/1/
-    cp $tc_uri_file $run_dir/1/
-    cp $tc_key_file $run_dir/1/
-    cp $tc_trust_file $run_dir/1/
-
-    sed -i.bak "s/\(.*routerid\"\s*\:\s*\"\)<.*>[^\"]*\(.*\)/\1${lora_eui_raw}\2/g" /var/run/lora/1/station.conf
-
-    #
-    # start packet forwarder
-    #
-    echo -n "Starting $NAME: "
-
-    /usr/sbin/start-stop-daemon --chdir $run_dir/1 --background --start --make-pidfile \
-        --pidfile $pkt_fwd_pidfile --startas /bin/bash -- -c "exec $pkt_fwd $pkt_fwd_options"
-
-    renice -n -20 -p $(pgrep $(basename $pkt_fwd))
-
-    echo "OK"
-}
-
-
-do_stop() {
-    echo -n "Stopping $NAME: "
-    start-stop-daemon --stop --quiet --oknodo --pidfile $pkt_fwd_pidfile --retry 5
-    rm -f $pkt_fwd_pidfile
-    echo "OK"
-}
-
-
-if [ "$ENABLED" != "yes" ]; then
-    echo "$NAME: disabled in /etc/default"
-    exit
-fi
-
-
-case "$1" in
-    "start")
-    do_start
-        ;;
-    "stop")
-    do_stop
-        ;;
-    "restart")
-        ## Stop the service and regardless of whether it was
-        ## running or not, start it again.
-        do_stop
-        do_start
-        ;;
-    *)
-        ## If no parameters are given, print which are avaiable.
-        echo "Usage: $0 {start|stop|restart}"
-        exit 1
-    ;;
-esac
-
diff --git a/recipes-connectivity/lora/lora-basic-station/setup.gmk b/recipes-connectivity/lora/lora-basic-station/setup.gmk
deleted file mode 100644
index 1319e79..0000000
--- a/recipes-connectivity/lora/lora-basic-station/setup.gmk
+++ /dev/null
@@ -1,91 +0,0 @@
-# -*- makefile -*-
-
-# Top dir of s2core
-# - override accordingly in makefile including this setup.gmk
-
-platform ?= mlinux
-variant  ?= std
-
-
-ARCH ?=
-CROSS_COMPILE ?=
-export
-
-# TOOLPREFIX=${CROSS_COMPILE}
-
-
-BD=build-${platform}-${variant}
-
-# -- Architecture specific
-CFG.arm-linux-gnueabihf = mlinux
-# CFG.x86_64-linux-gnu    = linux
-
-# -- Variant specific
-#  testsim runs libloragw inside master process
-#  testms  uses a master slave model
-#CFG.testsim = logini_lvl=DEBUG selftests tlsdebug lgwsim ral_lgw
-#CFG.testms  = logini_lvl=DEBUG selftests tlsdebug lgwsim ral_master_slave
-#CFG.testfs  = logini_lvl=DEBUG selftests tlsdebug lgwsim ral_lgw
-#CFG.testpin = logini_lvl=INFO tlsdebug ral_lgw testpin
-#CFG.std     = logini_lvl=INFO tlsdebug ral_lgw
-#CFG.stdn    = logini_lvl=INFO tlsdebug ral_master_slave
-#CFG.debug   = logini_lvl=DEBUG selftests tlsdebug ral_lgw
-#CFG.debugn  = logini_lvl=DEBUG selftests tlsdebug ral_master_slave
-
-# -- Platform specific
-CFG.linux   = linux lgw1 no_leds
-CFG.rpi     = linux lgw1 no_leds
-CFG.kerlink = linux lgw1 no_leds
-CFG.mlinux = linux lgw1 no_leds ral_lgw prod
-
-SD.default = src-linux
-
-SD = $(or ${SD.${platform}}, ${SD.default})
-
-UTILS.linux = mtuns
-
-UTILS = $(or ${UTILS.${platform}}, ${UTILS.default})
-
-PERSO.default =
-PERSO  = $(or ${PERSO.${platform}}, ${PERSO.default})
-PERSOH = $(if ${PERSO},perso.h,)
-
-# Paths to dependencies
-MBEDLIBS = -lmbedtls -lmbedx509 -lmbedcrypto
-
-# -lm: Needed for lgw which uses pow/ceil
-ifneq (minihub,$(platform))
-SYSLIBS  = -lm
-endif
-
-CFLAGS.linux.testsim  = -g -O0 --coverage
-CFLAGS.linux.testms   = -g -O0 --coverage
-CFLAGS.linux.testfs   = -g -O0 --coverage
-CFLAGS.linux.testpin  = -g -O3
-CFLAGS.linux.std      = -g -O3
-CFLAGS.mlinux.std      = -g -O3
-
-LIBS.mlinux   = -lloragw ${MBEDLIBS} -lrt -lm -lpthread 
-LIBS.linux   = -llgw   ${MBEDLIBS}      -lpthread
-LIBS.rpi     = -llgw   ${MBEDLIBS}      -lpthread
-LIBS.kerlink = -llgw   ${MBEDLIBS} -lrt -lpthread
-
-xCFG     =     ${CFG.${ARCH}}     ${CFG.${platform}}     ${CFG.${variant}}    ${CFG.${platform}.${variant}}
-xCFLAGS  =  ${CFLAGS.${ARCH}}  ${CFLAGS.${platform}}  ${CFLAGS.${variant}} ${CFLAGS.${platform}.${variant}}
-xINCS    =    ${INCS.${ARCH}}    ${INCS.${platform}}    ${INCS.${variant}}
-xLDFLAGS = ${LDFLAGS.${ARCH}} ${LDFLAGS.${platform}} ${LDFLAGS.${variant}}
-xLIBS    =    ${LIBS.${ARCH}}    ${LIBS.${platform}}    ${LIBS.${variant}}
-xFILES   =   ${FILES.${ARCH}}   ${FILES.${platform}}   ${FILES.${variant}}
-xOCFLAGS = ${OCFLAGS.${ARCH}} ${OCFLAGS.${platform}} ${OCFLAGS.${variant}}
-
-DEFS     = -DCFG_platform_${platform} -DCFG_platform=\"${platform}\" -DCFG_variant_${variant} -DCFG_variant=\"${variant}\"
-DEFS    += -DCFG_bdate='"$(shell date -u '+%Y-%m-%d %H:%M:%S')"'
-DEFS    += -DCFG_version='"$(shell if [ -f ${TD}/VERSION.txt ]; then cat ${TD}/VERSION.txt; else git describe --tag; fi)(${platform}/${variant})"'
-DEFS    += -DCFG_commit='"$(shell if git rev-parse --git-dir >/dev/null 2>&1; then git rev-parse --short HEAD; else echo -; fi)"'
-DEFS    += ${xCFG:%=-DCFG_%}
-INCS     = ${VPATH:%=-I%} -I ${TD}/${BD}/include ${xINCS}
-CFLAGS   += -std=gnu11 ${INCS} ${DEFS} ${xCFLAGS} ${MORECFLAGS}
-LDFLAGS  += -L ${TD}/${BD}/lib ${xLDFLAGS}
-LIBS     = ${xLIBS} ${SYSLIBS}
-FILES    = ${xFILES}
-OCFLAGS  = ${xOCFLAGS}
diff --git a/recipes-connectivity/lora/lora-basic-station/tc.uri b/recipes-connectivity/lora/lora-basic-station/tc.uri
deleted file mode 100644
index 62ad13e..0000000
--- a/recipes-connectivity/lora/lora-basic-station/tc.uri
+++ /dev/null
@@ -1 +0,0 @@
-wss://127.0.0.1:9002
diff --git a/recipes-connectivity/lora/lora-basic-station_2.0.3.bb b/recipes-connectivity/lora/lora-basic-station_2.0.3.bb
deleted file mode 100644
index 2db6a14..0000000
--- a/recipes-connectivity/lora/lora-basic-station_2.0.3.bb
+++ /dev/null
@@ -1,58 +0,0 @@
-DESCRIPTION = "LoRa Basic Station"
-HOMEPAGE = "https://github.com/lorabasics/basicstation"
-PRIORITY = "optional"
-SECTION = "console/utils"
-# Semtech license is a modified BSD-style license
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7706b51ea6d730e45568141c660072d5"
-DEPENDS = "lora-gateway logrotate lora-logging mbedtls"
-RDEPENDS_${PN} += "bash"
-PR = "r1"
-
-SRCREV = "v${PV}"
-
-SRC_URI = "git://github.com/lorabasics/basicstation.git;protocol=git \
-           file://setup.gmk \
-           file://lora-basic-station.init \
-           file://lora-basic-station.default \
-           file://tc.uri \
-           file://lora-basic-station-disable-device-mode.patch \
-           file://lora-basic-station-sys-linux-log-fix.patch \
-           file://lora-basic-station-fix-clksrc-0.patch \
-"
-
-
-S = "${WORKDIR}/git"
-B = "${S}"
-
-LORA_DIR = "/opt/lora"
-
-export LGW_PATH = "${STAGING_LIBDIR}/lora"
-export LGW_INC = "${STAGING_INCDIR}/lora"
-
-CFLAGS += "-I${STAGING_INCDIR} -I${STAGING_INCDIR}/lora -I${WORKDIR}/git/deps -Iinc -I. -std=gnu11 -L${STAGING_LIBDIR}/lora"
-
-do_compile() {
-  rm -fr ${S}/deps/lgw
-  ln -s ${STAGING_INCDIR}/lora ${S}/deps/lgw
-  cp ${WORKDIR}/setup.gmk ${S}/setup.gmk
-  oe_runmake
-}
-
-do_install() {
-  install -d ${D}${LORA_DIR}
-  install -m 755 ${S}/build-mlinux-std/bin/station ${D}${LORA_DIR}/
-  install -m 755 ${WORKDIR}/tc.uri ${D}${LORA_DIR}/
-
-  install -d ${D}${sysconfdir}/default
-  install -m 0644 ${WORKDIR}/lora-basic-station.default ${D}${sysconfdir}/default/lora-basic-station
-  install -d ${D}${sysconfdir}/init.d
-  install -m 0755 ${WORKDIR}/lora-basic-station.init ${D}${sysconfdir}/init.d/lora-basic-station
-}
-
-FILES_${PN} += "${LORA_DIR}"
-
-# disable this on purpose for dev purposes
-do_rm_work() {
-  echo "skipping"
-}
diff --git a/recipes-connectivity/lora/lora-gateway-geolocation/config.json b/recipes-connectivity/lora/lora-gateway-geolocation/config.json
deleted file mode 100644
index 0413918..0000000
--- a/recipes-connectivity/lora/lora-gateway-geolocation/config.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-    "SX1301_array_conf":[
-    {
-        "board_type": "MASTER",
-        "board_rx_freq": 866500000, /* ad9361 RX center frequency in Hz */
-        "board_rx_bw": 7000000, /* ad9361 RX bandwidth in Hz */
-        'full_duplex": false,
-        "rf_chain_conf":[
-        {
-            "rx_enable": true,
-            "tx_enable": false,
-            "rssi_offset": -202.5,
-            "rssi_offset_coeff_a": 20,
-            "rssi_offset_coeff_b": 2925
-        },{
-            "rx_enable": true,
-            "tx_enable": false,
-            "rssi_offset": -202.5,
-            "rssi_offset_coeff_a": 20,
-            "rssi_offset_coeff_b": 2925
-        }],
-        "SX1301_conf":[
-        {
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 1,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        }],
-        "FSK_sync": "C194C1",
-        "loramac_public": true,
-        "dsp_stat_interval": 10,
-        "nb_dsp": 1,
-        "aes_key": "ABCDEF0123456789ABCDEF0123456789",
-        "calibration_temperature_celsius_room": 22,
-        "calibration_temperature_code_ad9361": 77
-    }],
-    "gateway_conf": {
-        "gateway_ID": "00AEAEFFFE000000",
-        "log_rotate_period": 600
-    }
-}
diff --git a/recipes-connectivity/lora/lora-gateway-geolocation/config_64ch.json b/recipes-connectivity/lora/lora-gateway-geolocation/config_64ch.json
deleted file mode 100644
index 570b62f..0000000
--- a/recipes-connectivity/lora/lora-gateway-geolocation/config_64ch.json
+++ /dev/null
@@ -1,153 +0,0 @@
-{
-    "SX1301_array_conf":[
-    {
-        "board_type": "MASTER",
-        "board_rx_freq": 866500000, /* radio RX central frequency in Hz */
-        "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */
-        "full_duplex": false, /* radio mode */
-        "rf_chain_conf":[
-        {
-            "rx_enable": true,
-            "tx_enable": false,
-            "rssi_offset": -202.5,
-            "rssi_offset_coeff_a": 20,
-            "rssi_offset_coeff_b": 2925
-        }],
-        "SX1301_conf":[
-        {
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        }],
-        "FSK_sync": "C194C1",
-        "loramac_public": true,
-        "nb_dsp": 1,
-        "dsp_stat_interval": 10,
-        "aes_key": "ABCDEF0123456789ABCDEF0123456789",
-        "calibration_temperature_celsius_room": 22,
-        "calibration_temperature_code_ad9361": 77
-    },
-    {
-        "board_type": "SLAVE",
-        "board_rx_freq": 866500000, /* radio RX central frequency in Hz */
-        "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */
-        "SX1301_conf":[
-        {
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        }],
-        "FSK_sync": "C194C1",
-        "loramac_public": true,
-        "nb_dsp": 3,
-        "dsp_stat_interval": 10
-    }],
-    "gateway_conf": {
-        "gateway_ID": "00AEAEFFFE000000",
-        "log_rotate_period": 600
-    }
-}
diff --git a/recipes-connectivity/lora/lora-gateway-geolocation_5.1.0.bb b/recipes-connectivity/lora/lora-gateway-geolocation_5.1.0.bb
deleted file mode 100644
index 403670a..0000000
--- a/recipes-connectivity/lora/lora-gateway-geolocation_5.1.0.bb
+++ /dev/null
@@ -1,55 +0,0 @@
-DESCRIPTION = "LoRa Gateway Geolocation library"
-PRIORITY = "optional"
-SECTION = "console/utils"
-# Semtech license is a modified BSD-style license
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://mlinux4/LICENSE.TXT;md5=86776875df1423114abfcec938f3e565"
-DEPENDS = ""
-# Source revision
-PSR = "r4"
-# Recipe revision
-PR = "r6"
-SRCREV = "v${PV}"
-
-SRC_URI = "http://multitech.net/downloads/lora-packet-forwarder-geolocation_arm926ejste_${PV}-${PSR}.tar.gz \
-		   file://config.json \
-		   file://config_64ch.json \
-		  "
-
-SRC_URI[md5sum] = "542f02198a3258ca2ad4e549524e3ddc"
-SRC_URI[sha256sum] = "8176f5f55f96b7a72946cfb51743a8ea4f88a4033e54009e7bcf8f03077d248e"
-
-S = "${WORKDIR}"
-
-CFLAGS += "-Iinc -I."
-
-do_compile() {
-}
-
-do_install() {
-	install -d ${D}${includedir}/lora
-	install -d ${D}${libdir}/lora
-	install -m 0644 mlinux4/libsx1301ar/* ${D}${includedir}/lora 	
-
-	install -d ${D}/sbin
-        # Set UID to be able to read FPGA revision as non-root.
-	install -m 04755 mlinux4/gateway-utils-geo/fpga_flash_loader ${D}/sbin/sem-fpga-loader
-
-	install -d ${D}/opt/lora/
-	install -d ${D}/opt/lora/gateway-utils-geo
-	install -m 0755 mlinux4/gateway-utils-geo/* ${D}/opt/lora/gateway-utils-geo/
-	install -m 0755 ${WORKDIR}/config.json ${D}/opt/lora/gateway-utils-geo/
-	install -m 0755 ${WORKDIR}/config_64ch.json ${D}/opt/lora/gateway-utils-geo/
-}
-
-PACKAGES += "${PN}-utils ${PN}-utils-dbg"
-
-FILES_${PN} = "${libdir}/lora/lora-gw-geolocation-readme.md ${includedir}/lora /usr/lib/"
-FILES_${PN}-utils = "/opt/lora/gateway-utils-geo/* /sbin/sem-fpga-loader"
-FILES_${PN}-utils-dbg = "/opt/lora/gateway-utils-geo/.debug "
-FILES_${PN}-staticdev = "${libdir}/lora/libsx1301ar.a"
-
-# disable this on purpose for dev purposes
-do_rm_work() {
-	echo "skipping"
-}
diff --git a/recipes-connectivity/lora/lora-gateway-usb/library.cfg b/recipes-connectivity/lora/lora-gateway-usb/library.cfg
deleted file mode 100644
index 3d5d95a..0000000
--- a/recipes-connectivity/lora/lora-gateway-usb/library.cfg
+++ /dev/null
@@ -1,70 +0,0 @@
-# That file will be included in the Makefile files that have hardware dependencies
-
-### SPI interface to the concentrator ###
-# Accepted values:
-#	native		Linux native SPI driver (/dev/spidev32766.0)
-#	ftdi		FTDI SPI-over-USB bridge using libmpsse/libftdi/libusb
-
-CFG_SPI= ftdi
-CFG_SPI_DEV = "/dev/spidev32766.2"
-
-### Concentrator chip ###
-# Accepted values:
-#	sx1301		Semtech SX1301 production chip
-#	fpga1301	FPGA containing the SX1301 IP
-
-CFG_CHIP= sx1301
-
-### Radio chip(s) ###
-# Accepted values:
-#	sx1257		Dual SX1257 transceivers, covering 860-1000 MHz
-#	sx1255		Dual SX1255 transceivers, covering 400-510 MHz
-
-CFG_RADIO= sx1257
-
-### RF band configuration ###
-# Used to configured frequency restrictions (eg. if a SAW filter is installed)
-# Accepted values:
-#	full		Full range supported by the radio(s)
-#	eu868		ETSI 868 (866) MHz band
-#	us915		FCC 915 MHz band
-#	cn470		China 470 MHz band
-#	eu433		ETSI 433 MHz band
-#	cn780		China 780 MHz band
-
-CFG_BAND= full
-
-### Board misc parameters & calibration ###
-# Used to configure misc board options.
-# RX RSSI indication and TX power are highly dependant on radio, band, filter
-# and RF front-ends, and must be calibrated for each new board design.
-# Available calibration parameters:
-#	dev_nano_868		FPGA-based nano-concentrator, with 868 MHz SAW filter
-#	ref_1301_868		SX1301 reference board with SX1257 radios, 868 MHz filters
-#	ref_1301_433		SX1301 reference board with SX1255 radios, 433 MHz filters
-#	kerlink_868			Kerlink LoRa 868MHz gateway
-#	kerlink_433			Kerlink LoRa 433MHz gateway
-#	cisco_433			Cisco LoRa 433MHz gateway
-#	cisco_470			Cisco LoRa 470MHz gateway
-#	cisco_780			Cisco LoRa 780MHz gateway
-# Keep empty for no calibration parameters (neutral values will be used).
-
-# MTAC-LORA 900MHz
-CFG_BRD= mtaclora
-
-### Network Type ###
-# Accepted values:
-#	private			Default
-#	lora_mac		Only compliant with devices running LoRa MAC
-
-CFG_NET= private
-
-### Debug options ###
-# Set the DEBUG_* to 1 to activate debug mode in individual modules.
-# Warning: that makes the module *very verbose*, do not use for production
-
-DEBUG_AUX= 0
-DEBUG_SPI= 0
-DEBUG_REG= 0
-DEBUG_HAL= 0 
-DEBUG_GPS= 0
diff --git a/recipes-connectivity/lora/lora-gateway-usb/lora-gateway-debug.patch b/recipes-connectivity/lora/lora-gateway-usb/lora-gateway-debug.patch
deleted file mode 100644
index dba4392..0000000
--- a/recipes-connectivity/lora/lora-gateway-usb/lora-gateway-debug.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: git/libloragw/src/loragw_hal.c
-===================================================================
---- git.orig/libloragw/src/loragw_hal.c	2014-12-16 16:07:20.812506157 -0600
-+++ git/libloragw/src/loragw_hal.c	2014-12-16 16:18:34.427454833 -0600
-@@ -1626,6 +1626,8 @@
- 			break;
- 		}
- 	}
-+
-+	DEBUG_PRINTF("DEBUG: Tx pow_index %d, rf_power %d\n", pow_index, tx_pow_table[pow_index].rf_power);
- 	
- 	/* loading TX imbalance correction */
- 	target_mix_gain = tx_pow_table[pow_index].mix_gain;
diff --git a/recipes-connectivity/lora/lora-gateway-usb/lora-gateway-sync-word.patch b/recipes-connectivity/lora/lora-gateway-usb/lora-gateway-sync-word.patch
deleted file mode 100644
index e51e02a..0000000
--- a/recipes-connectivity/lora/lora-gateway-usb/lora-gateway-sync-word.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/libloragw/inc/loragw_hal.h b/libloragw/inc/loragw_hal.h
-index 1516b65..24c5969 100644
---- a/libloragw/inc/loragw_hal.h
-+++ b/libloragw/inc/loragw_hal.h
-@@ -302,6 +312,11 @@ struct lgw_pkt_tx_s {
- 
- /* -------------------------------------------------------------------------- */
- /* --- PUBLIC FUNCTIONS PROTOTYPES ------------------------------------------ */
-+/**
-+ * @brief Configure the lora synch word
-+ * @param word for synch
-+ */
-+void lgw_conf_lora_synch_word(uint8_t word);
- 
- /**
- @brief Configure an RF chain (must configure before start)
-diff --git a/libloragw/src/loragw_hal.c b/libloragw/src/loragw_hal.c
-index 5dbdf45..d0fe288 100644
---- a/libloragw/src/loragw_hal.c
-+++ b/libloragw/src/loragw_hal.c
-@@ -827,6 +851,19 @@ void lgw_constant_adjust(void) {
- /* -------------------------------------------------------------------------- */
- /* --- PUBLIC FUNCTIONS DEFINITION ------------------------------------------ */
- 
-+void lgw_conf_lora_synch_word(uint8_t word) {
-+    uint8_t peak1 = word >> 4;
-+    uint8_t peak2 = word & 0x0F;
-+
-+  	lgw_reg_w(LGW_FRAME_SYNCH_PEAK1_POS, peak1);   /* default 1 */
-+    lgw_reg_w(LGW_FRAME_SYNCH_PEAK2_POS, peak2); /* default 2 */
-+    lgw_reg_w(LGW_MBWSSF_FRAME_SYNCH_PEAK1_POS, peak1); /* default 1 */
-+    lgw_reg_w(LGW_MBWSSF_FRAME_SYNCH_PEAK2_POS, peak2); /* default 2 */
-+    lgw_reg_w(LGW_TX_FRAME_SYNCH_PEAK1_POS, peak1); /* default 1 */
-+    lgw_reg_w(LGW_TX_FRAME_SYNCH_PEAK2_POS, peak2); /* default 2 */
-+}
-+
-+
- int lgw_rxrf_setconf(uint8_t rf_chain, struct lgw_conf_rxrf_s conf) {
- 	
- 	/* check if the concentrator is running */
diff --git a/recipes-connectivity/lora/lora-gateway-usb_1.7.0mts.bb b/recipes-connectivity/lora/lora-gateway-usb_1.7.0mts.bb
deleted file mode 100644
index e7e5fed..0000000
--- a/recipes-connectivity/lora/lora-gateway-usb_1.7.0mts.bb
+++ /dev/null
@@ -1,59 +0,0 @@
-DESCRIPTION = "LoRa Gateway library"
-HOMEPAGE = "https://www.semtech.com/"
-PRIORITY = "optional"
-SECTION = "console/utils"
-# Semtech license is a modified BSD-style license
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a2bdef95625509f821ba00460e3ae0eb"
-DEPENDS = "libftdi libmpsse libusb1"
-INC_PR = "r9"
-PR = "${INC_PR}.1"
-BRANCH = "1.7.0-mts"
-SRCREV = "631dfedf1b535b6c3861d3c3868e02f48a84fb06"
-
-SRC_URI = "git://git.multitech.net/lora_gateway;protocol=git;branch=${BRANCH} \
-           file://lora-gateway-debug.patch \
-           file://lora-gateway-sync-word.patch \
-           file://library.cfg \
-          "
-
-S = "${WORKDIR}/git"
-
-CFLAGS += "-Iinc -I. -DLIBFTDI1=1"
-
-do_configure_append() {
-    # copy over custom library.cfg
-    cp ${WORKDIR}/library.cfg ${S}/libloragw/
-}
-
-do_compile() {
-    oe_runmake
-}
-
-do_install() {
-	install -d ${D}${includedir}/lora-usb
-	install -d ${D}${libdir}/lora-usb
-	install -m 0644 libloragw/libloragw.a ${D}${libdir}/lora-usb
-	install -m 0644 libloragw/library.cfg ${D}${libdir}/lora-usb
-	install -m 0644 libloragw/inc/* ${D}${includedir}/lora-usb
-
-	install -d ${D}/opt/lora
-	install -d ${D}/opt/lora/gateway-utils-usb
-	install -m 0755 util_pkt_logger/util_pkt_logger ${D}/opt/lora/gateway-utils-usb/util_pkt_logger-usb
-	install -m 0755 util_band_survey/util_band_survey ${D}/opt/lora/gateway-utils-usb/util_band_survey-usb
-	install -m 0755 util_spi_stress/util_spi_stress ${D}/opt/lora/gateway-utils-usb/util_spi_stress-usb
-	install -m 0755 util_tx_test/util_tx_test ${D}/opt/lora/gateway-utils-usb/util_tx_test-usb
-}
-
-PACKAGES += "${PN}-utils ${PN}-utils-dbg"
-
-FILES_${PN}-utils = "/opt/lora/gateway-utils-usb/*"
-FILES_${PN}-utils-dbg = "/opt/lora/.debug"
-FILES_${PN}-dev = "${includedir}/lora-usb ${libdir}/lora-usb/library.cfg"
-FILES_${PN}-staticdev = "${libdir}/lora-usb/libloragw.a"
-
-# disable this on purpose for dev purposes
-do_rm_work() {
-	echo "skipping"
-}
-
diff --git a/recipes-connectivity/lora/lora-gateway/library_4.0.cfg b/recipes-connectivity/lora/lora-gateway/library_4.0.cfg
deleted file mode 100644
index 4126bf3..0000000
--- a/recipes-connectivity/lora/lora-gateway/library_4.0.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# That file will be included in the Makefile files that have hardware dependencies
-
-### Debug options ###
-# Set the DEBUG_* to 1 to activate debug mode in individual modules.
-# Warning: that makes the module *very verbose*, do not use for production
-
-DEBUG_AUX= 0
-DEBUG_SPI= 0 
-DEBUG_REG= 0 
-DEBUG_HAL= 0
-DEBUG_LBT= 0
-DEBUG_GPS= 0
-
diff --git a/recipes-connectivity/lora/lora-gateway/ln-lora-spi-dev.sh b/recipes-connectivity/lora/lora-gateway/ln-lora-spi-dev.sh
deleted file mode 100644
index c350fff..0000000
--- a/recipes-connectivity/lora/lora-gateway/ln-lora-spi-dev.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-port1=/sys/devices/platform/mts-io/ap1                       
-port2=/sys/devices/platform/mts-io/ap2
-
-lora_hw=$(mts-io-sysfs show lora/hw-version 2> /dev/null)
-
-if [ -d $port1 ] && [[ $(cat $port1/hw-version) = $lora_hw ]]; then
-    ln -sf /dev/spidev32766.2 /dev/spidev0.0
-elif [ -d $port2 ] && [[ $(cat $port2/hw-version) = $lora_hw ]]; then
-    ln -sf /dev/spidev32765.2 /dev/spidev0.0
-fi
diff --git a/recipes-connectivity/lora/lora-gateway/lora-gateway-add-fpga-version-28-31-33.patch b/recipes-connectivity/lora/lora-gateway/lora-gateway-add-fpga-version-28-31-33.patch
deleted file mode 100644
index 7e73263..0000000
--- a/recipes-connectivity/lora/lora-gateway/lora-gateway-add-fpga-version-28-31-33.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/libloragw/src/loragw_reg.c b/libloragw/src/loragw_reg.c
-index 7e396bc..478f46a 100644
---- a/libloragw/src/loragw_reg.c
-+++ b/libloragw/src/loragw_reg.c
-@@ -48,7 +48,7 @@ Maintainer: Sylvain Miermont
- #define PAGE_ADDR        0x00
- #define PAGE_MASK        0x03
- 
--const uint8_t FPGA_VERSION[] = { 31, 33 }; /* several versions could be supported */
-+const uint8_t FPGA_VERSION[] = { 28, 31, 33 }; /* several versions could be supported */
- 
- /*
- auto generated register mapping for C code : 11-Jul-2013 13:20:40
-@@ -415,6 +415,16 @@ bool check_fpga_version(uint8_t version) {
-     return false;
- }
- 
-+uint8_t read_fpga_version() {
-+       uint8_t u = 0;
-+       uint8_t spi_stat = lgw_spi_r(lgw_spi_target, LGW_SPI_MUX_MODE1, LGW_SPI_MUX_TARGET_FPGA, loregs[LGW_VERSION].addr, &u);
-+        if (spi_stat != LGW_SPI_SUCCESS) {
-+            DEBUG_MSG("ERROR READING VERSION REGISTER\n");
-+            return LGW_REG_ERROR;
-+        }
-+       return u;
-+}
-+
- /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
- 
- int reg_w_align32(void *spi_target, uint8_t spi_mux_mode, uint8_t spi_mux_target, struct lgw_reg_s r, int32_t reg_value) {
diff --git a/recipes-connectivity/lora/lora-gateway/lora-gateway-add-fpga-version-28.patch b/recipes-connectivity/lora/lora-gateway/lora-gateway-add-fpga-version-28.patch
deleted file mode 100644
index c5f47dd..0000000
--- a/recipes-connectivity/lora/lora-gateway/lora-gateway-add-fpga-version-28.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/libloragw/src/loragw_reg.c b/libloragw/src/loragw_reg.c
-index 7fe0f67..dc90d93 100644
---- a/libloragw/src/loragw_reg.c
-+++ b/libloragw/src/loragw_reg.c
-@@ -48,7 +48,7 @@ Maintainer: Sylvain Miermont
- #define PAGE_ADDR        0x00
- #define PAGE_MASK        0x03
- 
--const uint8_t FPGA_VERSION[] = { 27 }; /* several versions could be supported */
-+const uint8_t FPGA_VERSION[] = { 27, 28 }; /* several versions could be supported */
- 
- /*
- auto generated register mapping for C code : 11-Jul-2013 13:20:40
diff --git a/recipes-connectivity/lora/lora-gateway/lora-gateway-add-spi-path-function.patch b/recipes-connectivity/lora/lora-gateway/lora-gateway-add-spi-path-function.patch
deleted file mode 100644
index fa5e68c..0000000
--- a/recipes-connectivity/lora/lora-gateway/lora-gateway-add-spi-path-function.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/libloragw/inc/loragw_spi.h b/libloragw/inc/loragw_spi.h
-index fef1f48..74ef251 100644
---- a/libloragw/inc/loragw_spi.h
-+++ b/libloragw/inc/loragw_spi.h
-@@ -46,6 +46,14 @@ Maintainer: Sylvain Miermont
- /* -------------------------------------------------------------------------- */
- /* --- PUBLIC FUNCTIONS PROTOTYPES ------------------------------------------ */
- 
-+/* set SPI device */
-+/**
-+@brief LoRa concentrator SPI path configuration for spidev
-+@param path pointer to spidev device
-+@return LGW_SPI_SUCCESS if path is valid, LGW_SPI_ERROR if not
-+*/
-+int lgw_spi_set_path(const char *path);
-+
- /**
- @brief LoRa concentrator SPI setup (configure I/O and peripherals)
- @param spi_target_ptr pointer on a generic pointer to SPI target (implementation dependant)
-diff --git a/libloragw/src/loragw_spi.native.c b/libloragw/src/loragw_spi.native.c
-index c01ed1c..3472133 100644
---- a/libloragw/src/loragw_spi.native.c
-+++ b/libloragw/src/loragw_spi.native.c
-@@ -56,10 +56,24 @@ Maintainer: Sylvain Miermont
- #define SPI_SPEED       8000000
- #define SPI_DEV_PATH    "/dev/spidev0.0"
- //#define SPI_DEV_PATH    "/dev/spidev32766.0"
-+char* spi_dev_path = SPI_DEV_PATH;
- 
- /* -------------------------------------------------------------------------- */
- /* --- PUBLIC FUNCTIONS DEFINITION ------------------------------------------ */
- 
-+/* set SPI device */
-+int lgw_spi_set_path(const char *path) {
-+    if (path) {
-+        spi_dev_path = path;
-+        return LGW_SPI_SUCCESS;
-+    }
-+    else {
-+        return LGW_SPI_ERROR;
-+    }
-+}
-+
-+
-+
- /* SPI initialization and configuration */
- int lgw_spi_open(void **spi_target_ptr) {
-     int *spi_device = NULL;
-@@ -78,7 +92,7 @@ int lgw_spi_open(void **spi_target_ptr) {
-     }
- 
-     /* open SPI device */
--    dev = open(SPI_DEV_PATH, O_RDWR);
-+    dev = open(spi_dev_path, O_RDWR);
-     if (dev < 0) {
-         DEBUG_PRINTF("ERROR: failed to open SPI device %s\n", SPI_DEV_PATH);
-         return LGW_SPI_ERROR;
diff --git a/recipes-connectivity/lora/lora-gateway/lora-gateway-change-util-tx-continuous-clksrc.patch b/recipes-connectivity/lora/lora-gateway/lora-gateway-change-util-tx-continuous-clksrc.patch
deleted file mode 100644
index bdc05ad..0000000
--- a/recipes-connectivity/lora/lora-gateway/lora-gateway-change-util-tx-continuous-clksrc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/util_tx_continuous/src/util_tx_continuous.c b/util_tx_continuous/src/util_tx_continuous.c
-index 31f45ac..f9cf033 100644
---- a/util_tx_continuous/src/util_tx_continuous.c
-+++ b/util_tx_continuous/src/util_tx_continuous.c
-@@ -297,7 +297,7 @@ int main(int argc, char **argv)
-     /* Board config */
-     memset(&boardconf, 0, sizeof(boardconf));
-     boardconf.lorawan_public = true;
--    boardconf.clksrc = 1; /* Radio B is source by default */
-+    boardconf.clksrc = 0; /* Radio B is source by default */
-     lgw_board_setconf(boardconf);
- 
-     /* RF config */
diff --git a/recipes-connectivity/lora/lora-gateway/lora-gateway-gpsd.patch b/recipes-connectivity/lora/lora-gateway/lora-gateway-gpsd.patch
deleted file mode 100644
index 08d566c..0000000
--- a/recipes-connectivity/lora/lora-gateway/lora-gateway-gpsd.patch
+++ /dev/null
@@ -1,636 +0,0 @@
-diff --git a/libloragw/Makefile b/libloragw/Makefile
-index 53c33d9..4575bdc 100644
---- a/libloragw/Makefile
-+++ b/libloragw/Makefile
-@@ -10,14 +10,14 @@ CROSS_COMPILE ?=
- CC := $(CROSS_COMPILE)gcc
- AR := $(CROSS_COMPILE)ar
- 
--CFLAGS := -O2 -Wall -Wextra -std=c99 -Iinc -I.
-+CFLAGS := -O2 -Wall -Wextra -std=c99 -Iinc -I. -isystem =/usr/include/gps
- 
- OBJDIR = obj
- INCLUDES = $(wildcard inc/*.h)
- 
- ### linking options
- 
--LIBS := -lloragw -lrt -lm
-+LIBS := -lloragw -lrt -lm -lgps
- 
- ### general build targets
- 
-diff --git a/libloragw/inc/loragw_gps.h b/libloragw/inc/loragw_gps.h
-index 6dbd30b..59b2d37 100644
---- a/libloragw/inc/loragw_gps.h
-+++ b/libloragw/inc/loragw_gps.h
-@@ -27,9 +27,11 @@ Maintainer: Michael Coracin
- #include <time.h>       /* time library */
- #include <termios.h>    /* speed_t */
- #include <unistd.h>     /* ssize_t */
-+#include <gpsd.h>
-+#include <gpsdclient.h>
-+#include <errno.h>      /* error messages */
- 
- #include "config.h"     /* library configuration options (dynamically generated) */
--
- /* -------------------------------------------------------------------------- */
- /* --- PUBLIC TYPES --------------------------------------------------------- */
- 
-@@ -83,6 +85,7 @@ enum gps_msg {
-     UBX_NAV_TIMEUTC  /*!> UTC Time Solution */
- };
- 
-+// struct gps_data_t gpsdata;
- /* -------------------------------------------------------------------------- */
- /* --- PUBLIC CONSTANTS ----------------------------------------------------- */
- 
-@@ -99,21 +102,19 @@ enum gps_msg {
- /**
- @brief Configure a GPS module
- 
--@param tty_path path to the TTY connected to the GPS
--@param gps_familly parameter (eg. ubx6 for uBlox gen.6)
--@param target_brate target baudrate for communication (0 keeps default target baudrate)
--@param fd_ptr pointer to a variable to receive file descriptor on GPS tty
--@return success if the function was able to connect and configure a GPS module
-+@param gpsdata handler for gpsd data
-+@param source source for setup of gpsd
-+@return success if the function was able to connect and configure a GPSD stream
- */
--int lgw_gps_enable(char* tty_path, char* gps_familly, speed_t target_brate, int* fd_ptr);
-+int lgw_gps_enable(struct gps_data_t *gpsdata, struct fixsource_t *source);
- 
- /**
- @brief Restore GPS serial configuration and close serial device
- 
--@param fd file descriptor on GPS tty
-+@param gpsdata handler for gpsd data
- @return success if the function was able to complete
- */
--int lgw_gps_disable(int fd);
-+int lgw_gps_disable(struct gps_data_t *gpsdata);
- 
- /**
- @brief Parse messages coming from the GPS system (or other GNSS)
-diff --git a/libloragw/src/loragw_gps.c b/libloragw/src/loragw_gps.c
-index c0e0ded..f4774be 100644
---- a/libloragw/src/loragw_gps.c
-+++ b/libloragw/src/loragw_gps.c
-@@ -84,6 +84,7 @@ static double gps_mlo = 0.0; /* minutes of longitude */
- static char gps_olo = 0; /* orientation (E-W) of longitude */
- static short gps_alt = 0; /* altitude */
- static bool gps_pos_ok = false;
-+static bool gps_lock_ok = false;
- 
- static char gps_mod = 'N'; /* GPS mode (N no fix, A autonomous, D differential) */
- static short gps_sat = 0; /* number of satellites used for fix */
-@@ -251,109 +252,22 @@ int str_chop(char *s, int buff_size, char separator, int *idx_ary, int max_idx)
- /* -------------------------------------------------------------------------- */
- /* --- PUBLIC FUNCTIONS DEFINITION ------------------------------------------ */
- 
--int lgw_gps_enable(char *tty_path, char *gps_family, speed_t target_brate, int *fd_ptr) {
--    int i;
--    struct termios ttyopt; /* serial port options */
--    int gps_tty_dev; /* file descriptor to the serial port of the GNSS module */
--    uint8_t ubx_cmd_timegps[UBX_MSG_NAVTIMEGPS_LEN] = {
--                    0xB5, 0x62, /* UBX Sync Chars */
--                    0x06, 0x01, /* CFG-MSG Class/ID */
--                    0x08, 0x00, /* Payload length */
--                    0x01, 0x20, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, /* Enable NAV-TIMEGPS output on serial */
--                    0x32, 0x94 }; /* Checksum */
--    ssize_t num_written;
-+int lgw_gps_enable(struct gps_data_t *gpsdata, struct fixsource_t *source) {
- 
--    /* check input parameters */
--    CHECK_NULL(tty_path);
--    CHECK_NULL(fd_ptr);
-+    unsigned int flags;
-+    fd_set fds;
-+    flags = WATCH_ENABLE;
-+    flags |= WATCH_RAW;
-+    flags |= WATCH_NMEA;
-+    gpsd_source_spec(NULL, source);
- 
--    /* open TTY device */
--    gps_tty_dev = open(tty_path, O_RDWR | O_NOCTTY);
--    if (gps_tty_dev <= 0) {
--        DEBUG_MSG("ERROR: TTY PORT FAIL TO OPEN, CHECK PATH AND ACCESS RIGHTS\n");
-+    if (gps_open(source->server, source->port, gpsdata) != 0) {
-+        DEBUG_MSG("gpspipe: could not connect to gpsd %s:%s, %s(%d)\n",
-+              source->server, source->port, gps_errstr(errno), errno);
-         return LGW_GPS_ERROR;
-     }
--    *fd_ptr = gps_tty_dev;
--
--    /* manage the different GPS modules families */
--    if (gps_family == NULL) {
--        DEBUG_MSG("WARNING: this version of GPS module may not be supported\n");
--    } else if (strncmp(gps_family, "ubx7", 4) != 0) {
--        /* The current implementation relies on proprietary messages from U-Blox */
--        /* GPS modules (UBX, NAV-TIMEGPS...) and has only be tested with a u-blox 7. */
--        /* Those messages allow to get NATIVE GPS time (no leap seconds) required */
--        /* for class-B handling and GPS synchronization */
--        /* see lgw_parse_ubx() function for details */
--        DEBUG_MSG("WARNING: this version of GPS module may not be supported\n");
--    }
- 
--    /* manage the target bitrate */
--    if (target_brate != 0) {
--        DEBUG_MSG("WARNING: target_brate parameter ignored for now\n"); // TODO
--    }
--
--    /* get actual serial port configuration */
--    i = tcgetattr(gps_tty_dev, &ttyopt);
--    if (i != 0) {
--        DEBUG_MSG("ERROR: IMPOSSIBLE TO GET TTY PORT CONFIGURATION\n");
--        return LGW_GPS_ERROR;
--    }
--
--    /* Save current serial port configuration for restoring later */
--    memcpy(&ttyopt_restore, &ttyopt, sizeof ttyopt);
--
--    /* update baudrates */
--    cfsetispeed(&ttyopt, DEFAULT_BAUDRATE);
--    cfsetospeed(&ttyopt, DEFAULT_BAUDRATE);
--
--    /* update terminal parameters */
--    /* The following configuration should allow to:
--            - Get ASCII NMEA messages
--            - Get UBX binary messages
--            - Send UBX binary commands
--        Note: as binary data have to be read/written, we need to disable
--              various character processing to avoid loosing data */
--    /* Control Modes */
--    ttyopt.c_cflag |= CLOCAL;  /* local connection, no modem control */
--    ttyopt.c_cflag |= CREAD;   /* enable receiving characters */
--    ttyopt.c_cflag |= CS8;     /* 8 bit frames */
--    ttyopt.c_cflag &= ~PARENB; /* no parity */
--    ttyopt.c_cflag &= ~CSTOPB; /* one stop bit */
--    /* Input Modes */
--    ttyopt.c_iflag |= IGNPAR;  /* ignore bytes with parity errors */
--    ttyopt.c_iflag &= ~ICRNL;  /* do not map CR to NL on input*/
--    ttyopt.c_iflag &= ~IGNCR;  /* do not ignore carriage return on input */
--    ttyopt.c_iflag &= ~IXON;   /* disable Start/Stop output control */
--    ttyopt.c_iflag &= ~IXOFF;  /* do not send Start/Stop characters */
--    /* Output Modes */
--    ttyopt.c_oflag = 0;        /* disable everything on output as we only write binary */
--    /* Local Modes */
--    ttyopt.c_lflag &= ~ICANON; /* disable canonical input - cannot use with binary input */
--    ttyopt.c_lflag &= ~ISIG;   /* disable check for INTR, QUIT, SUSP special characters */
--    ttyopt.c_lflag &= ~IEXTEN; /* disable any special control character */
--    ttyopt.c_lflag &= ~ECHO;   /* do not echo back every character typed */
--    ttyopt.c_lflag &= ~ECHOE;  /* does not erase the last character in current line */
--    ttyopt.c_lflag &= ~ECHOK;  /* do not echo NL after KILL character */
--
--    /* settings for non-canonical mode
--       read will block for until the lesser of VMIN or requested chars have been received */
--    ttyopt.c_cc[VMIN]  = LGW_GPS_MIN_MSG_SIZE;
--    ttyopt.c_cc[VTIME] = 0;
--
--    /* set new serial ports parameters */
--    i = tcsetattr(gps_tty_dev, TCSANOW, &ttyopt);
--    if (i != 0){
--        DEBUG_MSG("ERROR: IMPOSSIBLE TO UPDATE TTY PORT CONFIGURATION\n");
--        return LGW_GPS_ERROR;
--    }
--    tcflush(gps_tty_dev, TCIOFLUSH);
--
--    /* Send UBX CFG NAV-TIMEGPS message to tell GPS module to output native GPS time */
--    /* This is a binary message, serial port has to be properly configured to handle this */
--    num_written = write (gps_tty_dev, ubx_cmd_timegps, UBX_MSG_NAVTIMEGPS_LEN);
--    if (num_written != UBX_MSG_NAVTIMEGPS_LEN) {
--        DEBUG_MSG("ERROR: Failed to write on serial port (written=%d)\n", (int) num_written);
--    }
-+    (void)gps_stream(gpsdata, flags, source->device);
- 
-     /* get timezone info */
-     tzset();
-@@ -368,20 +282,13 @@ int lgw_gps_enable(char *tty_path, char *gps_family, speed_t target_brate, int *
- 
- /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
- 
--int lgw_gps_disable(int fd) {
-+int lgw_gps_disable(struct gps_data_t *gpsdata) {
-     int i;
- 
--    /* restore serial ports parameters */
--    i = tcsetattr(fd, TCSANOW, &ttyopt_restore);
--    if (i != 0){
--        DEBUG_MSG("ERROR: IMPOSSIBLE TO RESTORE TTY PORT CONFIGURATION\n");
--        return LGW_GPS_ERROR;
--    }
--    tcflush(fd, TCIOFLUSH);
--
--    i = close(fd);
--    if (i <= 0) {
--        DEBUG_MSG("ERROR: TTY PORT FAIL TO CLOSE\n");
-+    /* ends the session */
-+    i = gps_close(gpsdata);
-+    if (i != 0) {
-+        DEBUG_MSG("ERROR: GPSD FAILED TO CLOSE\n");
-         return LGW_GPS_ERROR;
-     }
- 
-@@ -457,7 +364,8 @@ enum gps_msg lgw_parse_ubx(const char *serial_buff, size_t buff_size, size_t *ms
-                         gps_week =  (uint8_t)serial_buff[14];
-                         gps_week |= (uint8_t)serial_buff[15] << 8; /* GPS week number */
- 
--                        gps_time_ok = true;
-+
-+
- #if 0
-                         /* For debug */
-                         {
-@@ -472,11 +380,24 @@ enum gps_msg lgw_parse_ubx(const char *serial_buff, size_t buff_size, size_t *ms
-                             printf("  GPS time = %02d:%02d:%02d\n", ubx_gps_hou, ubx_gps_min, ubx_gps_sec);
-                         }
- #endif
--                    } else { /* valid */
-+                        if (gps_lock_ok)
-+                           gps_time_ok = true;
-+
-+                        return UBX_NAV_TIMEGPS;
-+                    } else {
-                         gps_time_ok = false;
-+                        return INVALID;
-+		    }
-+                } else if ((serial_buff[2] == 0x01) && (serial_buff[3] == 0x04)) {
-+                    if (serial_buff[10] == 0x0F && serial_buff[11] == 0x27
-+                       && serial_buff[10] == 0x0F && serial_buff[11] == 0x27
-+                       && serial_buff[10] == 0x0F && serial_buff[11] == 0x27
-+                       && serial_buff[10] == 0x0F && serial_buff[11] == 0x27) {
-+			gps_time_ok = false;
-+			gps_lock_ok = false;
-                     }
- 
--                    return UBX_NAV_TIMEGPS;
-+                    return UBX_NAV_TIMEUTC;
-                 } else if ((serial_buff[2] == 0x05) && (serial_buff[3] == 0x00)) {
-                     DEBUG_MSG("NOTE: UBX ACK-NAK received\n");
-                     return IGNORED;
-@@ -526,7 +447,7 @@ enum gps_msg lgw_parse_nmea(const char *serial_buff, int buff_size) {
-     } else if (!validate_nmea_checksum(serial_buff, buff_size)) {
-         DEBUG_MSG("Warning: invalid NMEA sentence (bad checksum)\n");
-         return INVALID;
--    } else if (match_label(serial_buff, "$G?RMC", 6, '?')) {
-+    } else if (match_label(serial_buff, "G?RMC", 5, '?')) {
-         /*
-         NMEA sentence format: $xxRMC,time,status,lat,NS,long,EW,spd,cog,date,mv,mvEW,posMode*cs<CR><LF>
-         Valid fix: $GPRMC,083559.34,A,4717.11437,N,00833.91522,E,0.004,77.52,091202,,,A*00
-@@ -535,33 +456,32 @@ enum gps_msg lgw_parse_nmea(const char *serial_buff, int buff_size) {
-         memcpy(parser_buf, serial_buff, buff_size);
-         parser_buf[buff_size] = '\0';
-         nb_fields = str_chop(parser_buf, buff_size, ',', str_index, ARRAY_SIZE(str_index));
--        if (nb_fields != 13) {
-+        if (nb_fields != 12) {
-             DEBUG_MSG("Warning: invalid RMC sentence (number of fields)\n");
-             return IGNORED;
-         }
-         /* parse GPS status */
--        gps_mod = *(parser_buf + str_index[12]); /* get first character, no need to bother with sscanf */
-+        gps_mod = *(parser_buf + str_index[2]); /* get first character, no need to bother with sscanf */
-         if ((gps_mod != 'N') && (gps_mod != 'A') && (gps_mod != 'D')) {
-             gps_mod = 'N';
-         }
-         /* parse complete time */
-         i = sscanf(parser_buf + str_index[1], "%2hd%2hd%2hd%4f", &gps_hou, &gps_min, &gps_sec, &gps_fra);
-         j = sscanf(parser_buf + str_index[9], "%2hd%2hd%2hd", &gps_day, &gps_mon, &gps_yea);
--        if ((i == 4) && (j == 3)) {
-+        if ((i == 3) && (j == 3)) {
-             if ((gps_mod == 'A') || (gps_mod == 'D')) {
--                gps_time_ok = true;
-+                gps_lock_ok = true;
-                 DEBUG_MSG("Note: Valid RMC sentence, GPS locked, date: 20%02d-%02d-%02dT%02d:%02d:%06.3fZ\n", gps_yea, gps_mon, gps_day, gps_hou, gps_min, gps_fra + (float)gps_sec);
-             } else {
--                gps_time_ok = false;
-+                gps_lock_ok = false;
-                 DEBUG_MSG("Note: Valid RMC sentence, no satellite fix, estimated date: 20%02d-%02d-%02dT%02d:%02d:%06.3fZ\n", gps_yea, gps_mon, gps_day, gps_hou, gps_min, gps_fra + (float)gps_sec);
-             }
-         } else {
-             /* could not get a valid hour AND date */
--            gps_time_ok = false;
-             DEBUG_MSG("Note: Valid RMC sentence, mode %c, no date\n", gps_mod);
-         }
-         return NMEA_RMC;
--    } else if (match_label(serial_buff, "$G?GGA", 6, '?')) {
-+    } else if (match_label(serial_buff, "G?GGA", 5, '?')) {
-         /*
-         NMEA sentence format: $xxGGA,time,lat,NS,long,EW,quality,numSV,HDOP,alt,M,sep,M,diffAge,diffStation*cs<CR><LF>
-         Valid fix: $GPGGA,092725.00,4717.11399,N,00833.91590,E,1,08,1.01,499.6,M,48.0,M,,*5B
-@@ -587,6 +507,8 @@ enum gps_msg lgw_parse_nmea(const char *serial_buff, int buff_size) {
-         } else {
-             /* could not get a valid latitude, longitude AND altitude */
-             gps_pos_ok = false;
-+            gps_time_ok = false;
-+            gps_lock_ok = false;
-             DEBUG_MSG("Note: Valid GGA sentence, %d sat, no coordinates\n", gps_sat);
-         }
-         return NMEA_GGA;
-@@ -662,72 +580,60 @@ int lgw_gps_get(struct timespec *utc, struct timespec *gps_time, struct coord_s
- /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
- 
- int lgw_gps_sync(struct tref *ref, uint32_t count_us, struct timespec utc, struct timespec gps_time) {
-+    bool update = false;
-     double cnt_diff; /* internal concentrator time difference (in seconds) */
-     double utc_diff; /* UTC time difference (in seconds) */
--    double slope; /* time slope between new reference and old reference (for sanity check) */
--
--    bool aber_n0; /* is the update value for synchronization aberrant or not ? */
--    static bool aber_min1 = false; /* keep track of whether value at sync N-1 was aberrant or not  */
--    static bool aber_min2 = false; /* keep track of whether value at sync N-2 was aberrant or not  */
-+    double slope = 1.0; /* time slope between new reference and old reference (for sanity check) */
-+    static bool calibrating = true;
- 
-     CHECK_NULL(ref);
- 
-     /* calculate the slope */
- 
--    cnt_diff = (double)(count_us - ref->count_us) / (double)(TS_CPS); /* uncorrected by xtal_err */
--    utc_diff = (double)(utc.tv_sec - (ref->utc).tv_sec) + (1E-9 * (double)(utc.tv_nsec - (ref->utc).tv_nsec));
-+    if (ref->systime != 0) {
-+
-+        cnt_diff = (double)(count_us - ref->count_us) / (double)(TS_CPS); /* uncorrected by xtal_err */
-+        utc_diff = (double)(utc.tv_sec - (ref->utc).tv_sec) + (1E-9 * (double)(utc.tv_nsec - (ref->utc).tv_nsec));
- 
--    /* detect aberrant points by measuring if slope limits are exceeded */
--    if (utc_diff != 0) { // prevent divide by zero
--        slope = cnt_diff/utc_diff;
--        if ((slope > PLUS_10PPM) || (slope < MINUS_10PPM)) {
--            DEBUG_MSG("Warning: correction range exceeded\n");
--            aber_n0 = true;
-+        if (cnt_diff != 0 && utc_diff != 0) { // prevent divide by zero
-+            slope = cnt_diff/utc_diff;
-         } else {
--            aber_n0 = false;
-+           slope = 0.0;
-+        }
-+
-+        if (gps_lock_ok && gps_time_ok && cnt_diff > 1.5) {
-+           update = true;
-+       } 
-+
-+        update = (slope >= MINUS_10PPM && slope <= PLUS_10PPM);
-+
-+        if (!calibrating && utc_diff < 10.0) { 
-+            return LGW_GPS_ERROR;
-         }
-+
-+        if (calibrating && !update && utc_diff > 1.5) {
-+           update = true;
-+        } else if (update) {
-+            calibrating = false;
-+        }
-+
-     } else {
--        DEBUG_MSG("Warning: aberrant UTC value for synchronization\n");
--        aber_n0 = true;
-+       update = true;
-+        slope = 0.0;
-     }
- 
--    /* watch if the 3 latest sync point were aberrant or not */
--    if (aber_n0 == false) {
--        /* value no aberrant -> sync with smoothed slope */
--        ref->systime = time(NULL);
-+    if (update || calibrating) {
-+        ref->systime = time(NULL); 
-         ref->count_us = count_us;
-         ref->utc.tv_sec = utc.tv_sec;
-         ref->utc.tv_nsec = utc.tv_nsec;
-         ref->gps.tv_sec = gps_time.tv_sec;
-         ref->gps.tv_nsec = gps_time.tv_nsec;
-         ref->xtal_err = slope;
--        aber_min2 = aber_min1;
--        aber_min1 = aber_n0;
-         return LGW_GPS_SUCCESS;
--    } else if (aber_n0 && aber_min1 && aber_min2) {
--        /* 3 successive aberrant values -> sync reset (keep xtal_err) */
--        ref->systime = time(NULL);
--        ref->count_us = count_us;
--        ref->utc.tv_sec = utc.tv_sec;
--        ref->utc.tv_nsec = utc.tv_nsec;
--        ref->gps.tv_sec = gps_time.tv_sec;
--        ref->gps.tv_nsec = gps_time.tv_nsec;
--        /* reset xtal_err only if the present value is out of range */
--        if ((ref->xtal_err > PLUS_10PPM) || (ref->xtal_err < MINUS_10PPM)) {
--            ref->xtal_err = 1.0;
--        }
--        DEBUG_MSG("Warning: 3 successive aberrant sync attempts, sync reset\n");
--        aber_min2 = aber_min1;
--        aber_min1 = aber_n0;
--        return LGW_GPS_SUCCESS;
--    } else {
--        /* only 1 or 2 successive aberrant values -> ignore and return an error */
--        aber_min2 = aber_min1;
--        aber_min1 = aber_n0;
--        return LGW_GPS_ERROR;
-     }
- 
--    return LGW_GPS_SUCCESS;
-+    return LGW_GPS_ERROR;
- }
- 
- /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ 
-diff --git a/libloragw/tst/test_loragw_gps.c b/libloragw/tst/test_loragw_gps.c
-index a4164a3..e4b1546 100644
---- a/libloragw/tst/test_loragw_gps.c
-+++ b/libloragw/tst/test_loragw_gps.c
-@@ -31,6 +31,8 @@ Maintainer: Michael Coracin
- #include <signal.h>     /* sigaction */
- #include <stdlib.h>     /* exit */
- #include <unistd.h>     /* read */
-+#include <gps.h>
-+#include <gpsd.h>
- 
- #include "loragw_hal.h"
- #include "loragw_gps.h"
-@@ -41,7 +43,8 @@ Maintainer: Michael Coracin
- 
- static int exit_sig = 0; /* 1 -> application terminates cleanly (shut down hardware, close open files, etc) */
- static int quit_sig = 0; /* 1 -> application terminates without shutting down the hardware */
--
-+static struct gps_data_t gpsdata;
-+static struct fixsource_t source;
- struct tref ppm_ref;
- 
- /* -------------------------------------------------------------------------- */
-@@ -149,6 +152,10 @@ int main()
-     /* NMEA/UBX variables */
-     enum gps_msg latest_msg; /* keep track of latest NMEA/UBX message parsed */
- 
-+    fd_set fds;
-+    char delim[4] = "$";
-+    char *token[254];
-+
-     /* configure signal handling */
-     sigemptyset(&sigact.sa_mask);
-     sigact.sa_flags = 0;
-@@ -162,7 +169,7 @@ int main()
-     printf("*** Library version information ***\n%s\n***\n", lgw_version_info());
- 
-     /* Open and configure GPS */
--    i = lgw_gps_enable("/dev/ttyAMA0", "ubx7", 0, &gps_tty_dev);
-+    i = lgw_gps_enable(&gpsdata, &source); 
-     if (i != LGW_GPS_SUCCESS) {
-         printf("ERROR: IMPOSSIBLE TO ENABLE GPS\n");
-         exit(EXIT_FAILURE);
-@@ -192,92 +199,87 @@ int main()
- 
-     /* loop until user action */
-     while ((quit_sig != 1) && (exit_sig != 1)) {
--        size_t rd_idx = 0;
--        size_t frame_end_idx = 0;
--
--        /* blocking non-canonical read on serial port */
--        ssize_t nb_char = read(gps_tty_dev, serial_buff + wr_idx, LGW_GPS_MIN_MSG_SIZE);
--        if (nb_char <= 0) {
--            printf("WARNING: [gps] read() returned value %d\n", nb_char);
-+        int r = 0;
-+        struct timeval tv;
-+        tv.tv_sec = 0;
-+        tv.tv_usec = 100000;
-+        FD_ZERO(&fds);
-+        FD_SET(gpsdata.gps_fd, &fds);
-+        errno = 0;
-+        r = select(gpsdata.gps_fd+1, &fds, NULL, NULL, &tv);
-+        if (r == -1 && errno != EINTR) {
-+            printf("gpspipe: select error %s(%d)\n", strerror(errno), errno);
-+            exit(EXIT_FAILURE);
-+        } else if (r == 0)
-             continue;
--        }
--        wr_idx += (size_t)nb_char;
- 
--        /*******************************************
--         * Scan buffer for UBX/NMEA sync chars and *
--         * attempt to decode frame if one is found *
--         *******************************************/
--        while (rd_idx < wr_idx) {
-+        /* reading directly from the socket avoids decode overhead */
-+        errno = 0;
-+        r = (int)read(gpsdata.gps_fd, serial_buff, sizeof(serial_buff));
-+        if (r > 0) {
-+            int i = 0;
-             size_t frame_size = 0;
--
--            /* Scan buffer for UBX sync char */
--            if (serial_buff[rd_idx] == LGW_GPS_UBX_SYNC_CHAR) {
--
--                /***********************
--                 * Found UBX sync char *
--                 ***********************/
--                latest_msg = lgw_parse_ubx(&serial_buff[rd_idx], (wr_idx - rd_idx), &frame_size);
--
--                if (frame_size > 0) {
--                    if (latest_msg == INCOMPLETE) {
--                        /* UBX header found but frame appears to be missing bytes */
--                        frame_size = 0;
--                    } else if (latest_msg == INVALID) {
--                        /* message header received but message appears to be corrupted */
--                        printf("WARNING: [gps] could not get a valid message from GPS (no time)\n");
--                        frame_size = 0;
--                    } else if (latest_msg == UBX_NAV_TIMEGPS) {
--                        printf("\n~~ UBX NAV-TIMEGPS sentence, triggering synchronization attempt ~~\n");
--                        gps_process_sync();
-+            for (i = 0; i < r; i++) {
-+                if (serial_buff[i] == (char)LGW_GPS_UBX_SYNC_CHAR) {
-+                    /***********************
-+                     * Found UBX sync char *
-+                     ***********************/
-+                    size_t ubx_size = (uint8_t)serial_buff[i+4];
-+                    ubx_size |= (uint8_t)serial_buff[i+5] << 8;
-+                    ubx_size += 8;
-+                    if (ubx_size < 27){
-+                        latest_msg = lgw_parse_ubx(&serial_buff[i], ubx_size , &frame_size);
-                     }
--                }
--            } else if(serial_buff[rd_idx] == LGW_GPS_NMEA_SYNC_CHAR) {
--                /************************
--                 * Found NMEA sync char *
--                 ************************/
--                /* scan for NMEA end marker (LF = 0x0a) */
--                char* nmea_end_ptr = memchr(&serial_buff[rd_idx],(int)0x0a, (wr_idx - rd_idx));
--
--                if (nmea_end_ptr) {
--                    /* found end marker */
--                    frame_size = nmea_end_ptr - &serial_buff[rd_idx] + 1;
--                    latest_msg = lgw_parse_nmea(&serial_buff[rd_idx], frame_size);
--
--                    if(latest_msg == INVALID || latest_msg == UNKNOWN) {
--                        /* checksum failed */
--                        frame_size = 0;
--                    } else if (latest_msg == NMEA_RMC) { /* Get location from RMC frames */
--                        gps_process_coords();
-+                    if (frame_size > 0) {
-+                        if(latest_msg == INVALID || latest_msg == UNKNOWN) {
-+                            /* checksum failed */
-+                            frame_size = 0;
-+                        } else if (latest_msg == UBX_NAV_TIMEGPS) {
-+                            gps_process_sync();
-+                        }
-+                    }
-+                } else if((serial_buff[i] == LGW_GPS_NMEA_SYNC_CHAR) && (serial_buff[i+1] == 0x47) && (serial_buff[i+2] == 0x50)){
-+                    /************************
-+                     * Found NMEA sync char *
-+                     ************************/
-+                    int k, l= 0;
-+                    token[0] = strtok(serial_buff, delim);
-+
-+                    while (token[l] != NULL) {
-+                        l++;
-+                        token[l] = strtok(NULL, delim); 
-                     }
-+                    for (k=0; k<=l-1; k++) {
-+                        if ((strlen(token[k]) > 66) && (strlen(token[k]) < 74)){
-+                            lgw_parse_nmea(token[k], strlen(token[k]));
-+                            if(latest_msg == INVALID || latest_msg == UNKNOWN) {
-+                                /* checksum failed */
-+                                frame_size = 0;
-+                            } else if (latest_msg == NMEA_RMC) { 
-+                                /* Get location from RMC frames */
-+                                gps_process_coords();
-+                            }
-+                        }
-+                    }               
-                 }
-             }
--
--            if (frame_size > 0) {
--                /* At this point message is a checksum verified frame
--                   we're processed or ignored. Remove frame from buffer */
--                rd_idx += frame_size;
--                frame_end_idx = rd_idx;
-+        } else {
-+            if (r == -1) {
-+                if (errno == EAGAIN)
-+                    continue;
-+                else {
-+                    printf(stderr, "gpspipe: read error %s(%d)\n", strerror(errno), errno);
-+                    exit(EXIT_FAILURE);
-+                }
-             } else {
--                rd_idx++;
-+                exit(EXIT_SUCCESS);
-             }
--        } /* ...for(rd_idx = 0... */
--
--        if (frame_end_idx) {
--          /* Frames have been processed. Remove bytes to end of last processed frame */
--          memcpy(serial_buff,&serial_buff[frame_end_idx],wr_idx - frame_end_idx);
--          wr_idx -= frame_end_idx;
--        } /* ...for(rd_idx = 0... */
--
--        /* Prevent buffer overflow */
--        if ((sizeof(serial_buff) - wr_idx) < LGW_GPS_MIN_MSG_SIZE) {
--            memcpy(serial_buff,&serial_buff[LGW_GPS_MIN_MSG_SIZE],wr_idx - LGW_GPS_MIN_MSG_SIZE);
--            wr_idx -= LGW_GPS_MIN_MSG_SIZE;
-         }
-     }
- 
-     /* clean up before leaving */
-     if (exit_sig == 1) {
--        lgw_gps_disable(gps_tty_dev);
-+        lgw_gps_disable(&gpsdata);
-         lgw_stop();
-     }
- 
diff --git a/recipes-connectivity/lora/lora-gateway/lora-gateway-semtech-sf12.patch b/recipes-connectivity/lora/lora-gateway/lora-gateway-semtech-sf12.patch
deleted file mode 100644
index 7ea09d2..0000000
--- a/recipes-connectivity/lora/lora-gateway/lora-gateway-semtech-sf12.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-t a/libloragw/src/loragw_hal.c b/libloragw/src/loragw_hal.c
-index 7271eac..e5770df 100644
---- a/libloragw/src/loragw_hal.c
-+++ b/libloragw/src/loragw_hal.c
-@@ -305,6 +305,11 @@ void lgw_constant_adjust(void) {
-     // lgw_reg_w(LGW_MBWSSF_TRACKING_INTEGRAL,0); /* default 0 */
-     // lgw_reg_w(LGW_MBWSSF_AGC_FREEZE_ON_DETECT,1); /* default 1 */
- 
-+    /* Improvement of reference clock frequency error tolerance */
-+    lgw_reg_w(LGW_ADJUST_MODEM_START_OFFSET_RDX4, 1); /* default 0 */
-+    lgw_reg_w(LGW_ADJUST_MODEM_START_OFFSET_SF12_RDX4, 4094); /* default 4092 */
-+    lgw_reg_w(LGW_CORR_MAC_GAIN, 7); /* default 5 */
-+
-     /* FSK datapath setup */
-     lgw_reg_w(LGW_FSK_RX_INVERT,1); /* default 0 */
-     lgw_reg_w(LGW_FSK_MODEM_INVERT_IQ,1); /* default 0 */
diff --git a/recipes-connectivity/lora/lora-gateway/lora-gateway-spectral-scan-skip-fpga-reset.patch b/recipes-connectivity/lora/lora-gateway/lora-gateway-spectral-scan-skip-fpga-reset.patch
deleted file mode 100644
index 0b53fd0..0000000
--- a/recipes-connectivity/lora/lora-gateway/lora-gateway-spectral-scan-skip-fpga-reset.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/util_spectral_scan/src/util_spectral_scan.c b/util_spectral_scan/src/util_spectral_scan.c
-index d2aecda..cbc8377 100644
---- a/util_spectral_scan/src/util_spectral_scan.c
-+++ b/util_spectral_scan/src/util_spectral_scan.c
-@@ -30,6 +30,7 @@ Maintainer: Michael Coracin
- #include <stdlib.h>     /* EXIT atoi */
- #include <unistd.h>     /* getopt */
- #include <string.h>
-+#include <signal.h>
- 
- #include "loragw_aux.h"
- #include "loragw_reg.h"
-@@ -66,11 +67,22 @@ Maintainer: Michael Coracin
- /* -------------------------------------------------------------------------- */
- /* --- GLOBAL VARIABLES ----------------------------------------------------- */
- 
-+bool shutdown_signal_recv = false;
-+
-+void signalHandler() {
-+    shutdown_signal_recv = true;
-+}
-+
-+
- /* -------------------------------------------------------------------------- */
- /* --- MAIN FUNCTION -------------------------------------------------------- */
- 
- int main( int argc, char ** argv )
- {
-+
-+    signal(SIGINT, signalHandler);
-+    signal(SIGTERM, signalHandler);
-+
-     int i, j, k; /* loop and temporary variables */
-     int x; /* return code for functions */
-     int32_t reg_val;
-@@ -200,6 +212,10 @@ int main( int argc, char ** argv )
-         }
-     }
- 
-+    if (shutdown_signal_recv) {
-+       return 0;
-+    }
-+
-     /* Start message */
-     printf("+++ Start spectral scan of LoRa gateway channels +++\n");
- 
-@@ -264,7 +280,7 @@ int main( int argc, char ** argv )
-             printf("ERROR: Failed to disconnect from FPGA\n");
-             return EXIT_FAILURE;
-         }
--        x = lgw_connect(false, LGW_DEFAULT_NOTCH_FREQ); /* FPGA reset/configure */
-+        x = lgw_connect(true, LGW_DEFAULT_NOTCH_FREQ); /* FPGA reset/configure */
-         if(x != 0) {
-             printf("ERROR: Failed to connect to FPGA\n");
-             return EXIT_FAILURE;
-@@ -324,6 +340,9 @@ int main( int argc, char ** argv )
-         do {
-             wait_ms(10);
-             lgw_fpga_reg_r(LGW_FPGA_STATUS, &reg_val);
-+            if (shutdown_signal_recv) {
-+                break;
-+            }
-         }
-         while((TAKE_N_BITS_FROM((uint8_t)reg_val, 0, 5)) != 1); /* Clear has started */
- 
-@@ -346,6 +365,9 @@ int main( int argc, char ** argv )
-         do {
-             wait_ms(1000);
-             lgw_fpga_reg_r(LGW_FPGA_STATUS, &reg_val);
-+            if (shutdown_signal_recv) {
-+                break;
-+            }
-         }
-         while((TAKE_N_BITS_FROM((uint8_t)reg_val, 5, 1)) != 1);
- 
-@@ -382,6 +404,10 @@ int main( int argc, char ** argv )
-         }
-         fprintf(log_file, "\n");
-         printf("\n");
-+
-+        if (shutdown_signal_recv) {
-+            break;
-+        }
-     }
-     fclose(log_file);
- 
diff --git a/recipes-connectivity/lora/lora-gateway/lora-gateway-v28-skip-IQ-invert.patch b/recipes-connectivity/lora/lora-gateway/lora-gateway-v28-skip-IQ-invert.patch
deleted file mode 100644
index 25065df..0000000
--- a/recipes-connectivity/lora/lora-gateway/lora-gateway-v28-skip-IQ-invert.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/libloragw/src/loragw_fpga.c b/libloragw/src/loragw_fpga.c
-index fa83a2a..7e667e3 100644
---- a/libloragw/src/loragw_fpga.c
-+++ b/libloragw/src/loragw_fpga.c
-@@ -144,11 +144,14 @@ int lgw_fpga_configure(uint32_t tx_notch_freq) {
-         return LGW_REG_ERROR;
-     }
- 
--    /* Required for Semtech AP2 reference design */
--    x  = lgw_fpga_reg_w(LGW_FPGA_CTRL_INVERT_IQ, 1);
--    if (x != LGW_REG_SUCCESS) {
--        DEBUG_MSG("ERROR: Failed to configure FPGA polarity\n");
--        return LGW_REG_ERROR;
-+
-+    if (read_fpga_version() > 28) {
-+        /* Required for Semtech AP2 reference design and AP1.5 > v28 */
-+        x  = lgw_fpga_reg_w(LGW_FPGA_CTRL_INVERT_IQ, 1);
-+        if (x != LGW_REG_SUCCESS) {
-+            DEBUG_MSG("ERROR: Failed to configure FPGA polarity\n");
-+            return LGW_REG_ERROR;
-+        }
-     }
- 
-     /* Configure TX notch filter */
diff --git a/recipes-connectivity/lora/lora-gateway_5.0.1.bb b/recipes-connectivity/lora/lora-gateway_5.0.1.bb
deleted file mode 100644
index faec985..0000000
--- a/recipes-connectivity/lora/lora-gateway_5.0.1.bb
+++ /dev/null
@@ -1,77 +0,0 @@
-DESCRIPTION = "LoRa Gateway library"
-HOMEPAGE = "https://github.com/Lora-net/lora_gateway"
-PRIORITY = "optional"
-SECTION = "console/utils"
-# Semtech license is a modified BSD-style license
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a2bdef95625509f821ba00460e3ae0eb"
-DEPENDS = "libgps24"
-RDEPENDS_${PN} = "libgps24"
-PR = "r12"
-
-SRCREV = "v${PV}"
-
-SRC_URI = "git://github.com/Lora-net/lora_gateway.git;protocol=git \
-           file://lora-gateway-add-fpga-version-28-31-33.patch \
-           file://library_4.0.cfg \
-           file://lora-gateway-add-spi-path-function.patch \
-           file://ln-lora-spi-dev.sh \
-           file://lora-gateway-change-util-tx-continuous-clksrc.patch \
-           file://lora-gateway-v28-skip-IQ-invert.patch \
-           file://lora-gateway-spectral-scan-skip-fpga-reset.patch \
-           file://lora-gateway-gpsd.patch \
-          "
-
-SRC_URI[md5sum] = "9e06a3733a9fea39a3d61f77b412badf"
-SRC_URI[sha256sum] = "28fbfe098013908794b32e51d1fed4427f20dd6c8adbbca78df2e1800f5c84dc"
-
-S = "${WORKDIR}/git"
-
-CFLAGS += "-Iinc -I. -idirafter ${STAGING_DIR_TARGET}/usr/include/gps"
-
-do_configure_append() {
-    # copy over custom library_4.0.cfg
-    cp ${WORKDIR}/library_4.0.cfg ${S}/libloragw/library.cfg
-}
-
-do_compile() {
-    oe_runmake
-}
-
-do_install() {
-	install -d ${D}${includedir}/lora
-	install -d ${D}${libdir}/lora
-	install -m 0644 libloragw/libloragw.a ${D}${libdir}/lora
-	install -m 0644 libloragw/library.cfg ${D}${libdir}/lora
-	install -m 0644 libloragw/inc/* ${D}${includedir}/lora
-	install -m 0644 libloragw/readme.md ${D}${libdir}/lora/lora-gw-readme.md
-
-	install -d ${D}/opt/lora/
-
-	install -d ${D}/opt/lora/gateway-utils
-	install -m 0755 libloragw/test_* ${D}/opt/lora/gateway-utils/
-	install -m 0755 util_pkt_logger/util_pkt_logger ${D}/opt/lora/gateway-utils/
-	install -m 0755 util_spectral_scan/util_spectral_scan ${D}/opt/lora/gateway-utils/
-	install -m 0755 util_spi_stress/util_spi_stress ${D}/opt/lora/gateway-utils/
-	install -m 0755 util_tx_test/util_tx_test ${D}/opt/lora/gateway-utils/
-	install -m 0755 util_tx_continuous/util_tx_continuous ${D}/opt/lora/gateway-utils/
-	install -m 0755 util_lbt_test/util_lbt_test ${D}/opt/lora/gateway-utils/
-}
-
-do_install_append_mtcdt() {
-	install -m 0755 ${WORKDIR}/ln-lora-spi-dev.sh ${D}/opt/lora/
-}
-
-PACKAGES += "${PN}-utils ${PN}-utils-dbg"
-
-FILES_${PN} = "${libdir}/lora/lora-gw-readme.md"
-FILES_${PN}-utils = "/opt/lora/gateway-utils/* /opt/lora/ln-lora-spi-dev.sh"
-FILES_${PN}-utils-dbg = "/opt/lora/gateway-utils/.debug /opt/lora/ln-lora-spi-dev.sh"
-FILES_${PN}-dev = "${includedir}/lora ${libdir}/lora/library.cfg"
-FILES_${PN}-staticdev = "${libdir}/lora/libloragw.a"
-
-# disable this on purpose for dev purposes
-do_rm_work() {
-	echo "skipping"
-}
-
diff --git a/recipes-connectivity/lora/lora-logging.bb b/recipes-connectivity/lora/lora-logging.bb
deleted file mode 100644
index 4691458..0000000
--- a/recipes-connectivity/lora/lora-logging.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DECRIPTION = "MultiTech LoRa Logging"
-PRIORITY = "optional"
-SECTION = "console/utils"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-DEPENDS = ""
-PR = "r4"
-RDEPENDS_${PN} += "logrotate bash"
-
-SRC_URI = "file://lora-logging.logrotate.conf \
-          "
-
-do_install() {
-    install -d ${D}${sysconfdir}/logrotate.d
-    install -m 0644 ${WORKDIR}/lora-logging.logrotate.conf ${D}${sysconfdir}/logrotate.d/lora-logging.conf
-}
-
diff --git a/recipes-connectivity/lora/lora-logging/LICENSE b/recipes-connectivity/lora/lora-logging/LICENSE
deleted file mode 100644
index 6f3f3d7..0000000
--- a/recipes-connectivity/lora/lora-logging/LICENSE
+++ /dev/null
@@ -1,265 +0,0 @@
-IMPORTANT – READ BEFORE OPERATING OR INSTALLING THE MULTI-TECH PRODUCT OR SOFTWARE

-

-MULTI-TECH SYSTEMS, INC.

-END USER LICENSE AGREEMENT

-PLEASE READ THIS END USER LICENSE AGREEMENT (“AGREEMENT”) CAREFULLY BEFORE USING THE MULTI-TECH PRODUCT, INSTALLING OR ACCESSING THE SOFTWARE, OR DOWNLOADING ANY SOFTWARE UPDATES FOR USE WITH THE MULTI-TECH PRODUCT. BY USING THE MULTI-TECH PRODUCT, INSTALLING OR ACCESSING THE SOFTWARE OR DOWNLOADING SOFTWARE UPDATES FOR THE MULTI-TECH PRODUCT, YOU AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. IF YOU DO NOT AGREE TO THE TERMS OF THIS AGREEMENT, DO NOT USE THE MULTI-TECH PRODUCT, INSTALL OR ACCESS THE SOFTWARE, OR DOWNLOAD THE SOFTWARE UPDATES. INSTEAD, PLEASE CONTACT MULTI-TECH’S CUSTOMER SERVICE DEPARTMENT AT customerservice@multitech.com. 

-

-1. DEFINITIONS. The following terms are defined as follows: (a) ”Documentation” means any user guides, data sheets, manuals, specifications, or other written description of the Software provided by Multi-Tech; (b) “Multi-Tech” means, collectively, Multi-Tech Systems, Inc., its directors, officers, employees, representatives, agents, licensors, and affiliated entities; (c) “Software” means, collectively, (i) the software provided by Multi-Tech, (ii) the software pre-installed on any Multi-Tech product, and (iii) any Documentation; and (d) “You” means you, an individual, if you are accessing the Software on your behalf, or if you are accessing the Software on behalf of your employer or a third party, “You” means the legal entity of the employer or third party as applicable. 

-

-2. ACCEPTANCE. You accept the terms of this Agreement either by: (a) clicking “I Accept” when offered by Multi-Tech; or (b) using the Multi-Tech product, installing or accessing the Software or downloading Software updates. You acknowledge and agree that You have read and understood this Agreement, have had an opportunity to discuss this Agreement with Your legal and other advisors, and agree to be bound by the terms and conditions of this Agreement. 

-

-3. LICENSE. The Software is licensed, and is not sold. Subject to the terms of this Agreement, You are granted a limited, non-transferable, non-exclusive license that permits You to use the Software with the Multi-Tech product for internal business or personal use. This License does not grant to You any rights to re-license or sublicense or otherwise resell or re-distribute the Software. This License does not grant to You any rights to obtain future Software updates (e.g., upgrades, fixes, etc.). If future Software updates are obtained by You, whether through a version release, Multi-Tech technical support, or another Multi-Tech authorized method, such Software updates are subject to the terms of this Agreement. If applicable, any previous version of the Software must be destroyed or returned to Multi-Tech within 90 days of receipt of the Software updates. 

-

-4. RESTRICTIONS. This Agreement does not authorize You to: (a) sell, lease, copy, assign, license, sublicense, translate, distribute, or otherwise transfer, in whole or in part, the Software; (b) modify, distribute, copy, reproduce, or publish, in whole or in part, the Documentation; (c) use the Software on a timesharing basis to operate a service bureau facility or providing hosting of the Software for the benefit of third parties; (d) decompile, disassemble, reverse engineer or otherwise attempt to derive source code from the Software, except as, and then only to the extent, required by applicable law or an applicable open source license; (e) modify or create derivative works of the Software; or (f) create, develop, license, install, use or deploy any software or services to circumvent, enable, modify or provide access, permissions or rights which violate the technical restrictions in the Software. You acknowledge and agree that the Software and Documentation is subject to U.S. export control laws, including the U.S. Export Administration Act and its associated regulations, and may be subject to export or import regulations in other countries. You agree to strictly comply with all such regulations and acknowledge that You are responsible for obtaining any applicable licenses to export, re-export or import the Software and Documentation.

-

-5. OWNERSHIP; CONFIDENTIALITY. You agree that the Software contains trade secret information, copyrights, trademarks, and other intellectual property rights that are owned by Multi-Tech Systems, Inc. or its licensors. Multi-Tech retains all right, title and interest in and to the Software. All rights not expressly granted herein are reserved. You acknowledge and agree that the Software was developed at considerable time and expense by Multi-Tech and is confidential to and a trade secret of Multi-Tech. You agree to maintain the Software in strict confidence and not disclose the Software or provide access thereto to any other third party.

-

-6. THIRD PARTY SOFTWARE. The Software may contain software from sources other than Multi-Tech Systems, Inc., including without limitation, third party proprietary software and free and open source software. To the extent the Software includes free and open source software, it is subject to the applicable free and open source software license. Multi-Tech Systems, Inc. makes available information related to the free and open source software at www.multitech.com/licensing.go or upon written request. 

-

-7. DISCLAIMER OF WARRANTY. EXCEPT AS SET FORTH IN THE MULTI-TECH STANDARD WARRANTY THAT ACCOMPANIES THE MULTI-TECH PRODUCT, ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES OF THE SOFTWARE, SUCH AS THE IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT, OR OTHERWISE ARISING FROM A COURSE OF DEALING, USAGE, OR TRADE PRACTICE, ARE HEREBY EXCLUDED TO THE EXTENT ALLOWED BY APPLICABLE LAW. 

-

-8. LIMITATION OF LIABILITY. TO THE FULLEST EXTENT ALLOWABLE BY APPLICABLE LAW, Multi-Tech IS NOT LIABLE TO YOU FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE, OR CONSEQUENTIAL DAMAGES, INCLUDING WITHOUT LIMITATION, LOST PROFITS, LOST REVENUE AND BUSINESS INTERRUPTION, ARISING OUT OF THE SOFTWARE, WHETHER BASED ON CONTRACT, TORT, OR OTHER THEORY AND REGARDLESS OF WHETHER SUCH PERSON OR ENTITY SHALL BE ADVISED OR HAVE REASON TO KNOW OF THE POSSIBILITY OF SUCH DAMAGES. IF Multi-Tech IS EVER DEEMED LIABLE TO YOU, ITS AGGREGATE LIABILITY, WHETHER BASED IN TORT, CONTRACT, STATUTE OR OTHERWISE, IS LIMITED TO THE NET AMOUNT PAID BY YOU FOR THE Multi-Tech PRODUCT.

-

-9. TERMINATION. Multi-Tech may, upon written notice to You, immediately terminate this Agreement and the warranty period set forth in the Multi-Tech Standard Warranty if You breach the terms set forth in this Agreement.

-

-10. GENERAL. This Agreement: (a) contains the complete and exclusive agreement regarding its subject matter, (b) supersedes all prior or contemporaneous written or oral agreements, representations, promises, and understandings related thereto (except those previously referenced third party license agreements), (c) may be modified, supplemented or amended by Multi-Tech with or without notice (which modification, supplement or amendment may be made available with Software updates or future purchases of Multi-Tech products), (d) is between sophisticated parties, and so the rule of construing ambiguities against the drafter will not apply, (e) will be governed by Minnesota law, without regard to its choice of law provisions, and (f) is binding upon the parties and their successors, will not benefit or create any right or cause of action for any other person or entity other than the parties, except Multi-Tech’s third party licensors. No waiver of this Agreement is effective by Multi-Tech unless in writing signed by a duly authorized representative. If any provision of this Agreement is held to be invalid, it shall be interpreted so as to best advance the spirit of this Agreement and Multi-Tech’s intent. All disputes arising from this Agreement shall be heard in the exclusive jurisdiction of the state courts of Minnesota, U.S.A. and You agree to submit to the personal jurisdiction of such courts. You acknowledge that You are age thirteen or older, and by accepting this Agreement, You agree that You are fully authorized, able and competent to enter into this Agreement.

-

-   Multi-Tech Systems, Inc. 

-   2205 Woodale Drive

-   Mounds View, Minnesota 55112

-   customerservice@multitech.com 

-   20130910

-

------------------------------------------------------------------------------------------

-                              Open Source Licenses

------------------------------------------------------------------------------------------

-

------------------------------------------

-        crc64 implementation 

------------------------------------------

-

-/* Redis uses the CRC64 variant with "Jones" coefficients and init value of 0.

- *

- * Specification of this CRC64 variant follows:

- * Name: crc-64-jones

- * Width: 64 bites

- * Poly: 0xad93d23594c935a9

- * Reflected In: True

- * Xor_In: 0xffffffffffffffff

- * Reflected_Out: True

- * Xor_Out: 0x0

- * Check("123456789"): 0xe9c6d914c4b8d9ca

- *

- * Copyright (c) 2012, Salvatore Sanfilippo <antirez at gmail dot com>

- * All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *

- *   * Redistributions of source code must retain the above copyright notice,

- *     this list of conditions and the following disclaimer.

- *   * Redistributions in binary form must reproduce the above copyright

- *     notice, this list of conditions and the following disclaimer in the

- *     documentation and/or other materials provided with the distribution.

- *   * Neither the name of Redis nor the names of its contributors may be used

- *     to endorse or promote products derived from this software without

- *     specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE

- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

- * POSSIBILITY OF SUCH DAMAGE. */

-

------------------------------------------

-       mosquitto implementation

------------------------------------------

-

-Copyright (c) 2010-2013 Roger Light <roger@atchoo.org>

-

-All rights reserved. This program and the accompanying materials

-are made available under the terms of the Eclipse Public License v1.0

-and Eclipse Distribution License v1.0 which accompany this distribution.

- 

-The Eclipse Public License is available at

-   http://www.eclipse.org/legal/epl-v10.html

-and the Eclipse Distribution License is available at

-  http://www.eclipse.org/org/documents/edl-v10.php.

- 

-Contributors:

-   Roger Light - initial implementation and documentation.

-

------------------------------------------

-         aes implementation

------------------------------------------

-

-/*

- ---------------------------------------------------------------------------

- Copyright (c) 1998-2008, Brian Gladman, Worcester, UK. All rights reserved.

-

- LICENSE TERMS

-

- The redistribution and use of this software (with or without changes)

- is allowed without the payment of fees or royalties provided that:

-

- 1. source code distributions include the above copyright notice, this

- list of conditions and the following disclaimer;

-

- 2. binary distributions include the above copyright notice, this list

- of conditions and the following disclaimer in their documentation;

-

- 3. the name of the copyright holder is not used to endorse products

- built using this software without specific written permission.

-

- DISCLAIMER

-

- This software is provided 'as is' with no explicit or implied warranties

- in respect of its properties, including, but not limited to, correctness

- and/or fitness for purpose.

- ---------------------------------------------------------------------------

- Issue 09/09/2006

-

- This is an AES implementation that uses only 8-bit byte operations on the

- cipher state (there are options to use 32-bit types if available).

-

- The combination of mix columns and byte substitution used here is based on

- that developed by Karl Malbrain. His contribution is acknowledged.

- */

-

------------------------------------------

-       cmac implementation

------------------------------------------

-

-/**************************************************************************

- Copyright (C) 2009 Lander Casado, Philippas Tsigas

-

- All rights reserved.

-

- Permission is hereby granted, free of charge, to any person obtaining

- a copy of this software and associated documentation files 

- (the "Software"), to deal with the Software without restriction, including

- without limitation the rights to use, copy, modify, merge, publish, 

- distribute, sublicense, and/or sell copies of the Software, and to

- permit persons to whom the Software is furnished to do so, subject to

- the following conditions: 

-

- Redistributions of source code must retain the above copyright notice, 

- this list of conditions and the following disclaimers. Redistributions in

- binary form must reproduce the above copyright notice, this list of

- conditions and the following disclaimers in the documentation and/or 

- other materials provided with the distribution.

-

- In no event shall the authors or copyright holders be liable for any special,

- incidental, indirect or consequential damages of any kind, or any damages 

- whatsoever resulting from loss of use, data or profits, whether or not 

- advised of the possibility of damage, and on any theory of liability, 

- arising out of or in connection with the use or performance of this software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 

- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 

- DEALINGS WITH THE SOFTWARE

-

- *****************************************************************************/

-

-

----------------------------------------------------

-        picosha2 implementation

----------------------------------------------------

-

-MIT License

-

-Copyright (c) 2017 okdshin

-

-Permission is hereby granted, free of charge, to any person obtaining a copy

-of this software and associated documentation files (the "Software"), to deal

-in the Software without restriction, including without limitation the rights

-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-copies of the Software, and to permit persons to whom the Software is

-furnished to do so, subject to the following conditions:

-

-The above copyright notice and this permission notice shall be included in all

-copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-SOFTWARE.

-

-

------------------------------------------------------------------

-RapidJSON

------------------------------------------------------------------

-

-Tencent is pleased to support the open source community by making RapidJSON available. 

- 

-Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.  All rights reserved.

-

-If you have downloaded a copy of the RapidJSON binary from Tencent, please note that the RapidJSON binary is licensed under the MIT License.

-If you have downloaded a copy of the RapidJSON source code from Tencent, please note that RapidJSON source code is licensed under the MIT License, except for the third-party components listed below which are subject to different license terms.  Your integration of RapidJSON into your own projects may require compliance with the MIT License, as well as the other licenses applicable to the third-party components included within RapidJSON. To avoid the problematic JSON license in your own projects, it's sufficient to exclude the bin/jsonchecker/ directory, as it's the only code under the JSON license.

-A copy of the MIT License is included in this file.

-

-Other dependencies and licenses:

-

-Open Source Software Licensed Under the BSD License:

---------------------------------------------------------------------

-

-The msinttypes r29 

-Copyright (c) 2006-2013 Alexander Chemeris 

-All rights reserved.

-

-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

-

-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 

-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

-* Neither the name of  copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

-

-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-Open Source Software Licensed Under the JSON License:

---------------------------------------------------------------------

-

-json.org 

-Copyright (c) 2002 JSON.org

-All Rights Reserved.

-

-JSON_checker

-Copyright (c) 2002 JSON.org

-All Rights Reserved.

-

-  

-Terms of the JSON License:

----------------------------------------------------

-

-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

-

-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

-

-The Software shall be used for Good, not Evil.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-

-

-Terms of the MIT License:

---------------------------------------------------------------------

-

-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

-

-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-

-

-

diff --git a/recipes-connectivity/lora/lora-logging/lora-logging.logrotate.conf b/recipes-connectivity/lora/lora-logging/lora-logging.logrotate.conf
deleted file mode 100644
index 6fc191c..0000000
--- a/recipes-connectivity/lora/lora-logging/lora-logging.logrotate.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-/var/log/lora-*.log {
-    size 512k
-    rotate 4
-    compress
-    copytruncate
-    missingok
-    postrotate
-        set -e;
-        /usr/bin/killall -HUP lora-network-server || true;
-    endscript
-}
diff --git a/recipes-connectivity/lora/lora-network-server/lora-network-server.default b/recipes-connectivity/lora/lora-network-server/lora-network-server.default
deleted file mode 100644
index be7dcd5..0000000
--- a/recipes-connectivity/lora/lora-network-server/lora-network-server.default
+++ /dev/null
@@ -1,2 +0,0 @@
-# set to "yes" or "no" to control starting on boot
-ENABLED="yes"
diff --git a/recipes-connectivity/lora/lora-network-server/lora-network-server.init b/recipes-connectivity/lora/lora-network-server/lora-network-server.init
deleted file mode 100755
index 61b6e2b..0000000
--- a/recipes-connectivity/lora/lora-network-server/lora-network-server.init
+++ /dev/null
@@ -1,287 +0,0 @@
-#!/bin/bash
-
-
-NAME="lora-network-server"
-LOCK="/var/lock/$NAME"
-ENABLED="yes"
-
-
-[ -f /etc/default/$NAME ] && source /etc/default/$NAME
-
-
-run_dir=/var/run/lora
-conf_dir=/var/config/lora
-conf_file=$conf_dir/lora-network-server.conf
-
-net_server=/opt/lora/lora-network-server
-net_server_log=/var/log/lora-network-server.log
-net_server_pidfile=$run_dir/$NAME.pid
-
-pkt_fwd=$run_dir/1/lora_pkt_fwd
-pkt_fwd_log=/var/log/lora-pkt-fwd-1.log
-pkt_fwd_pidfile=$run_dir/lora-pkt-fwd-1.pid
-
-pkt_fwd_2=$run_dir/2/lora_pkt_fwd
-pkt_fwd_2_log=/var/log/lora-pkt-fwd-2.log
-pkt_fwd_2_pidfile=$run_dir/lora-pkt-fwd-2.pid
-
-port1=/sys/devices/platform/mts-io/ap1
-port2=/sys/devices/platform/mts-io/ap2
-
-lora_1_0_hw="MTAC-LORA-1.0"
-lora_1_5_h_hw="MTAC-LORA-1.5"
-lora_2_1_hw="MTAC-LORA-2.1"
-
-lora_mtac_id="MTAC-LORA"
-
-lora_mtcap_id="MTCAP-LORA"
-lora_mtcap_id868="MTCAP-LORA-868"
-lora_mtcap_id915="MTCAP-LORA-915"
-
-lora_mtac_g_id="MTAC-LORA-G"
-lora_mtac_g16_id868="MTAC-LORA-G16-868"
-lora_mtac_g16_id915="MTAC-LORA-G16-915"
-lora_mtac_g64_id868="MTAC-LORA-G64-868"
-lora_mtac_g64_id915="MTAC-LORA-G64-915"
-
-pkt_fwd_options=""
-dual_cards_installed=false
-gps_path="/dev/gps0"
-
-read_lora_hw_info() {
-    # product-id of first lora card
-    lora_id=$(mts-io-sysfs show lora/product-id 2> /dev/null)
-    lora_eui=$(mts-io-sysfs show lora/eui 2> /dev/null)
-    # remove all colons
-    lora_eui_raw=${lora_eui//:}
-    lora_hw=$(mts-io-sysfs show lora/hw-version 2> /dev/null)
-    if [ -d $port2 ] && [[ $(cat $port2/hw-version) =~ "LORA-1.5" ]]; then
-        # product-id of first lora card
-        lora_2_id=$(mts-io-sysfs show lora-2/product-id 2> /dev/null)
-        lora_2_hw=$(mts-io-sysfs show lora-2/hw-version 2> /dev/null)
-        lora_2_eui=$(mts-io-sysfs show lora-2/eui 2> /dev/null)
-        # remove all colons
-        lora_2_eui_raw=${lora_2_eui//:}
-    fi
-
-    if [ -d $port1 ] && [[ $(cat $port1/hw-version) =~ "LORA-1.5" ]] && [ -d $port2 ] && [[ $(cat $port2/hw-version) =~ "LORA-1.5" ]]; then
-        dual_cards_installed=true
-    fi
-}
-
-hardware_found() {
-    if [[ "$lora_id" =~ "$lora_mtac_g_id" ]]; then
-        setup_mtcdt_2_1
-    elif [[ "$lora_id" =~ "$lora_mtac_id" ]]; then
-        setup_mtcdt
-    elif [[ "$lora_id" =~ "$lora_mtcap_id" ]]; then
-        setup_mtcap
-    else
-        return 1
-    fi
-}
-
-setup_mtcdt_2_1() {
-    ln -sf /dev/spidev32766.2 /dev/spidev0.0
-
-    if [[ "$lora_id" = "$lora_mtac_g16_id868" ]]; then
-        GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_EU868
-    elif [[ "$lora_id" = "$lora_mtac_g16_id915" ]]; then
-        GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_US915
-    elif [[ "$lora_id" = "$lora_mtac_g16_id868" ]]; then
-        GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_2_1_test_single_antenna_64ch_8x8_EU868
-    elif [[ "$lora_id" = "$lora_mtac_g64_id915" ]]; then
-        GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_64ch_US915
-    else
-        return 1
-    fi
-
-    set +e
-    diff $GLOBAL_CONF /opt/lora/global_conf.json 1>/dev/null
-    if [ $? -ne 0 ]; then
-        cp $GLOBAL_CONF /opt/lora/global_conf.json
-    fi
-    set -e
-
-    ln -sf /opt/lora/pkt_forwarder $pkt_fwd
-
-    pkt_fwd_options=" -g"
-}
-
-setup_mtcdt() {
-    if [ -d $port1 ] && [[ $(cat $port1/hw-version) = $lora_hw ]]; then
-        ln -sf /dev/spidev32766.2 /dev/spidev0.0
-    elif [ -d $port2 ] && [[ $(cat $port2/hw-version) = $lora_hw ]]; then
-        ln -sf /dev/spidev32765.2 /dev/spidev0.0
-    fi
-    GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_1_0
-    if [ "$lora_hw" = "$lora_1_0_hw" ] && [[ ! "$lora_id" =~ .*-SPI ]]; then
-        ln -sf /opt/lora/basic_pkt_fwd-usb $pkt_fwd
-    else
-        if [ "$lora_hw" = "$lora_1_5_h_hw" ]; then
-            GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_1_5
-        fi
-        ln -sf /opt/lora/lora_pkt_fwd $pkt_fwd
-        ln -sf /opt/lora/lora_pkt_fwd $pkt_fwd_2
-    fi
-
-    # ignore error of diff command
-    set +e
-    diff $GLOBAL_CONF /opt/lora/global_conf.json 1>/dev/null
-    if [ $? -ne 0 ]; then
-        cp $GLOBAL_CONF /opt/lora/global_conf.json
-    fi
-    set -e
-
-    return 0
-}
-
-setup_mtcap() {
-    hw=$(mts-io-sysfs show hw-version 2> /dev/null)
-
-    if [ "$lora_id" = "$lora_mtcap_id868" ]; then
-        if [ "$hw" = "MTCAP-0.2" ]; then
-            GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP2_LORA_1_5.EU868
-        else
-            GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP_LORA_1_5.EU868
-        fi
-    elif [ "$lora_id" = "$lora_mtcap_id915" ]; then
-        if [ "$hw" = "MTCAP-0.2" ]; then
-            GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP2_LORA_1_5.US915
-        else
-            GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP_LORA_1_5.US915
-        fi
-    else
-        return 1
-    fi
-
-    ln -sf /opt/lora/lora_pkt_fwd $pkt_fwd
-
-    set +e
-    diff $GLOBAL_CONF /opt/lora/global_conf.json 1>/dev/null
-    if [ $? -ne 0 ]; then
-        cp $GLOBAL_CONF /opt/lora/global_conf.json
-    fi
-    set -e
-
-    return 0
-}
-
-do_start() {
-    # create run directory
-    mkdir -p $run_dir/1
-    mkdir -p $run_dir/2
-
-    read_lora_hw_info
-
-    if ! [ -f $conf_file ]; then
-        echo "$0: $conf_file missing"
-        exit 1
-    fi
-
-    if hardware_found; then
-        echo "Found $lora_id with $lora_hw hardware"
-        mts-io-sysfs store lora/reset 0
-        if [ "$dual_cards_installed" == true ]; then
-           mts-io-sysfs store lora-2/reset 0
-        fi
-        sleep 0.25
-        mts-io-sysfs store lora/reset 1
-        if [ "$dual_cards_installed" == true ]; then
-           mts-io-sysfs store lora-2/reset 1
-        fi
-        sleep 0.25
-    else
-        echo "$0: Lora hardware not detected"
-        # Use MAC Address for lora eui
-        lora_eui=$(mts-io-sysfs show mac-eth)
-        lora_eui=${lora_eui:0:8}":FF:FF"${lora_eui:8:16}
-        lora_hw=$lora_mtcap_id915
-        lora_id=$lora_1_5_h_hw
-        no_lora_hw=true
-    fi
-
-    if [ "$dual_cards_installed" == "true" ]; then
-        lora_2_args="--lora-hw-2 $lora_2_hw --lora-prod-2 $lora_2_id --lora-eui-2 $lora_2_eui"
-    fi
-
-    echo -n "Starting $NAME: "
-    # start network server
-    start-stop-daemon --start --background --make-pidfile \
-        --pidfile $net_server_pidfile --startas /bin/bash -- -c "exec $angel $net_server \
-        -c $conf_file --lora-eui $lora_eui --lora-hw-1 $lora_hw --lora-prod-1 $lora_id $lora_2_args \
-        --lora-path $run_dir \
-        --noconsole 2>&1"
-
-    if [ "$no_lora_hw" != "true" ]; then
-        # start packet forwarder
-        sleep 4
-        /usr/sbin/start-stop-daemon --chdir $run_dir/1 --start --background --make-pidfile \
-            --pidfile $pkt_fwd_pidfile --startas /bin/bash \
-            -- -c "exec $angel $pkt_fwd $pkt_fwd_options 2>&1"
-
-        if [ "$dual_cards_installed" == "true" ]; then
-            /usr/sbin/start-stop-daemon --chdir $run_dir/2 --start --background --make-pidfile \
-                --pidfile $pkt_fwd_2_pidfile --startas /bin/bash \
-                -- -c "exec $angel $pkt_fwd_2 $pkt_fwd_options 2>&1"
-        fi
-    fi
-
-    renice -n -20 -p $(pgrep lora-network-se)
-    renice -n -20 -p $(pgrep $(basename $pkt_fwd))
-
-
-    echo "OK"
-}
-
-
-do_stop() {
-    echo -n "Stopping $NAME: "
-    start-stop-daemon --stop --quiet --oknodo --pidfile $net_server_pidfile --retry TERM/60/KILL/5
-    start-stop-daemon --stop --quiet --oknodo --pidfile $pkt_fwd_pidfile --retry 5
-    rm -f $net_server_pidfile $pkt_fwd_pidfile
-    echo "OK"
-}
-
-
-if [ "$ENABLED" != "yes" ]; then
-    echo "$NAME: disabled in /etc/default"
-    exit
-fi
-
-force_stop() {                                  
-    do_stop                                     
-    rm -fr $LOCK        
-}                               
-        
-function try_lock() {                           
-    if mkdir $LOCK; then
-        trap "rm -fr $LOCK" EXIT
-    else
-        echo "Lora Network Server lock not acquired, resource in use"
-        exit 1
-    fi
-}
-
-case "$1" in
-    "start")
-    try_lock
-    do_start
-        ;;
-    "stop")
-    force_stop
-        ;;
-    "restart")
-    ## Stop the service and regardless of whether it was
-        ## running or not, start it again.
-        try_lock
-        do_stop
-        do_start
-        ;;
-    *)
-        ## If no parameters are given, print which are avaiable.
-        echo "Usage: $0 {start|stop|restart}"
-        exit 1
-    ;;
-esac
-
diff --git a/recipes-connectivity/lora/lora-network-server_2.3.9.bb b/recipes-connectivity/lora/lora-network-server_2.3.9.bb
deleted file mode 100644
index 7e63635..0000000
--- a/recipes-connectivity/lora/lora-network-server_2.3.9.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-DESCRIPTION = "MultiTech LoRa Network Server"
-PRIORITY = "optional"
-SECTION = "console/utils"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2b9a30a3082ddccd2c695a4dbeeab80d"
-DEPENDS = "jsoncpp libmts mosquitto sqlite3 curl gnutls"
-RDEPENDS_${PN} += "lora-packet-forwarder logrotate bash lora-logging jsoncpp"
-PR = "r0"
-CONFFILES_${PN} += "${sysconfdir}/default/lora-network-server ${sysconfdir}/init.d/lora-network-server"
-
-SRC_URI = "http://multitech.net/downloads/lora-network-server_${PV}.tar.gz \
-           file://lora-network-server.init \
-           file://lora-network-server.default \
-          "
-
-SRC_URI[md5sum] = "88110a6a04b7c8ed02ee30102ba31e49"
-SRC_URI[sha256sum] = "a2f0305b0eb48d55a53b1dc358bde4618688ccf952c79f5d9d2e2d7474f28042"
-
-# binaries are already stripped, so suppress warning
-INSANE_SKIP_${PN} = "already-stripped"
-
-S = "${WORKDIR}"
-
-LORA_DIR = "/opt/lora"
-
-do_compile() {
-}
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "lora-network-server"
-INITSCRIPT_PARAMS = "defaults 80 30"
-
-do_install() {
-    install -d ${D}${LORA_DIR}
-    install -m 0755 lora-network-server-arm926ejste-mlinux-5.2 ${D}${LORA_DIR}/lora-network-server
-    install -m 0755 lora-v21-keygen-arm926ejste-mlinux-5.2 ${D}${LORA_DIR}/lora-v21-keygen
-    install -m 0644 config/lora-network-server.conf.sample ${D}${LORA_DIR}/lora-network-server.conf.sample
-    install -m 0644 config/lora-network-server.conf.full ${D}${LORA_DIR}/lora-network-server.conf.full
-
-    install -d ${D}${sysconfdir}/default
-    install -m 0644 ${WORKDIR}/lora-network-server.default ${D}${sysconfdir}/default/lora-network-server
-    install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/lora-network-server.init ${D}${sysconfdir}/init.d/lora-network-server
-}
-
-FILES_${PN} += "${LORA_DIR}"
-FILES_${PN}-dbg += "${LORA_DIR}/.debug"
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_full_diversity_EU868 b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_full_diversity_EU868
deleted file mode 100644
index 9b45d1d..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_full_diversity_EU868
+++ /dev/null
@@ -1,152 +0,0 @@
-{
-    "SX1301_array_conf":[
-    {
-        "board_type": "MASTER",
-        "board_rx_freq": 866500000, /* radio RX central frequency in Hz */
-        "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */
-        "full_duplex": false, /* radio mode */
-        "rf_chain_conf":[
-        {
-            /* RX */
-            "rx_enable": true,
-            "rssi_offset": -202.5,
-            "rssi_offset_coeff_a": 20,
-            "rssi_offset_coeff_b": 2925,
-            /* TX */
-            "tx_enable": true,
-            "tx_freq_min": 863000000,
-            "tx_freq_max": 870000000,
-            "tx_lut":[
-                { "rf_power":  2, "fpga_dig_gain": 4, "ad9361_atten": 125, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  5, "fpga_dig_gain": 4, "ad9361_atten": 112, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  7, "fpga_dig_gain": 4, "ad9361_atten": 105, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  9, "fpga_dig_gain": 4, "ad9361_atten":  98, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 },
-                { "rf_power": 11, "fpga_dig_gain": 4, "ad9361_atten":  90, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 },
-                { "rf_power": 12, "fpga_dig_gain": 4, "ad9361_atten":  86, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 },
-                { "rf_power": 13, "fpga_dig_gain": 4, "ad9361_atten":  83, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 },
-                { "rf_power": 14, "fpga_dig_gain": 4, "ad9361_atten":  77, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 },
-                { "rf_power": 16, "fpga_dig_gain": 4, "ad9361_atten":  68, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 },
-                { "rf_power": 18, "fpga_dig_gain": 4, "ad9361_atten":  59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 },
-                { "rf_power": 20, "fpga_dig_gain": 4, "ad9361_atten":  51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 },
-                { "rf_power": 22, "fpga_dig_gain": 4, "ad9361_atten":  44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 },
-                { "rf_power": 24, "fpga_dig_gain": 4, "ad9361_atten":  34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 },
-                { "rf_power": 25, "fpga_dig_gain": 4, "ad9361_atten":  30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 },
-                { "rf_power": 26, "fpga_dig_gain": 4, "ad9361_atten":  24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 },
-                { "rf_power": 27, "fpga_dig_gain": 4, "ad9361_atten":  20, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }]
-        },{
-            /* RX */
-            "rx_enable": true,
-            "rssi_offset": -202.5,
-            "rssi_offset_coeff_a": 20,
-            "rssi_offset_coeff_b": 2925,
-            /* TX */
-            "tx_enable": true,
-            "tx_freq_min": 863000000,
-            "tx_freq_max": 870000000,
-            "tx_lut":[
-                { "rf_power":  2, "fpga_dig_gain": 4, "ad9361_atten": 125, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  5, "fpga_dig_gain": 4, "ad9361_atten": 112, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  7, "fpga_dig_gain": 4, "ad9361_atten": 105, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  9, "fpga_dig_gain": 4, "ad9361_atten":  98, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 },
-                { "rf_power": 11, "fpga_dig_gain": 4, "ad9361_atten":  90, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 },
-                { "rf_power": 12, "fpga_dig_gain": 4, "ad9361_atten":  86, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 },
-                { "rf_power": 13, "fpga_dig_gain": 4, "ad9361_atten":  83, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 },
-                { "rf_power": 14, "fpga_dig_gain": 4, "ad9361_atten":  77, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 },
-                { "rf_power": 16, "fpga_dig_gain": 4, "ad9361_atten":  68, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 },
-                { "rf_power": 18, "fpga_dig_gain": 4, "ad9361_atten":  59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 },
-                { "rf_power": 20, "fpga_dig_gain": 4, "ad9361_atten":  51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 },
-                { "rf_power": 22, "fpga_dig_gain": 4, "ad9361_atten":  44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 },
-                { "rf_power": 24, "fpga_dig_gain": 4, "ad9361_atten":  34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 },
-                { "rf_power": 25, "fpga_dig_gain": 4, "ad9361_atten":  30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 },
-                { "rf_power": 26, "fpga_dig_gain": 4, "ad9361_atten":  24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 },
-                { "rf_power": 27, "fpga_dig_gain": 4, "ad9361_atten":  20, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }]
-        }],
-        "SX1301_conf":[
-        {
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 1,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        }],
-        "lbt_conf":{
-            "enable": false,
-            "rssi_target": -80, /* dBm */
-            "rssi_shift": 142,
-            "chan_cfg":[ /* 16 channels maximum */
-                { "freq_hz": 867100000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867300000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867500000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867700000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867900000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 868100000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 868300000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 868500000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 869525000, "scan_time_us": 5000, "transmit_time_ms": 4000 }
-            ]
-        },
-        "FSK_sync": "C194C1",
-        "loramac_public": true,
-        "nb_dsp": 1,
-        "dsp_stat_interval": 10,
-        "aes_key": "ABCDEF0123456789ABCDEF0123456789",
-        "calibration_temperature_celsius_room": 22,
-        "calibration_temperature_code_ad9361": 77,
-        "fts_version": 1,
-        "fts_match_crc_error": false
-    }],
-    "gateway_conf": {
-        "gateway_ID": "00AEAEFFFE000000",
-        /* change with default server address/ports */
-        "server_address": "127.0.0.1",
-        "serv_port_up": 1780,
-        "serv_port_down": 1782,
-        /* adjust the following parameters for your network */
-        "keepalive_interval": 10,
-        "stat_interval": 30,
-        "push_timeout_ms": 100,
-        /* forward only valid packets */
-        "forward_crc_valid": true,
-        "forward_crc_error": false,
-        "forward_crc_disabled": false,
-        /* link testing mote */
-        "link_mote": "00CC01AF",
-        /* Beaconing parameters */
-        "beacon_conf":{
-            "period": 128,
-            "freq_hz": 869525000,
-            "datarate": 9,
-            "bw_hz": 125000,
-            "power": 14,
-            "infodesc": 0
-        }
-    },
-    "gps_conf": {
-        "gw_latitude": 0,
-        "gw_longitude": 0,
-        "gw_altitude": 0,
-        "fixed_altitude": false
-    }
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_full_diversity_JP920 b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_full_diversity_JP920
deleted file mode 100644
index 2229cb9..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_full_diversity_JP920
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-    "SX1301_array_conf":[
-    {
-        "board_type": "MASTER",
-        "board_rx_freq": 921900000, /* radio RX central frequency in Hz */
-        "board_rx_bw": 4000000, /* radio RX bandwidth in Hz */
-        "full_duplex": false, /* radio mode */
-        "rf_chain_conf":[
-        {
-            /* RX */
-            "rx_enable": true,
-            "rssi_offset": -202.5,
-            "rssi_offset_coeff_a": 20,
-            "rssi_offset_coeff_b": 2925,
-            /* TX */
-            "tx_enable": true,
-            "tx_freq_min": 920800000,
-            "tx_freq_max": 923400000,
-            "tx_lut":[
-                { "rf_power":  2, "fpga_dig_gain": 5, "ad9361_atten": 135, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  5, "fpga_dig_gain": 5, "ad9361_atten": 122, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  7, "fpga_dig_gain": 5, "ad9361_atten": 115, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  9, "fpga_dig_gain": 5, "ad9361_atten": 108, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 },
-                { "rf_power": 11, "fpga_dig_gain": 5, "ad9361_atten": 100, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 },
-                { "rf_power": 12, "fpga_dig_gain": 5, "ad9361_atten":  96, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 },
-                { "rf_power": 13, "fpga_dig_gain": 5, "ad9361_atten":  93, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 },
-                { "rf_power": 14, "fpga_dig_gain": 5, "ad9361_atten":  87, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 },
-                { "rf_power": 16, "fpga_dig_gain": 5, "ad9361_atten":  78, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 },
-                { "rf_power": 18, "fpga_dig_gain": 5, "ad9361_atten":  69, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 },
-                { "rf_power": 20, "fpga_dig_gain": 5, "ad9361_atten":  61, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 },
-                { "rf_power": 22, "fpga_dig_gain": 5, "ad9361_atten":  54, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 },
-                { "rf_power": 24, "fpga_dig_gain": 5, "ad9361_atten":  44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 },
-                { "rf_power": 25, "fpga_dig_gain": 5, "ad9361_atten":  40, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 },
-                { "rf_power": 26, "fpga_dig_gain": 5, "ad9361_atten":  34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 },
-                { "rf_power": 27, "fpga_dig_gain": 5, "ad9361_atten":  30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }]
-        },{
-            /* RX */
-            "rx_enable": true,
-            "rssi_offset": -202.5,
-            "rssi_offset_coeff_a": 20,
-            "rssi_offset_coeff_b": 2925,
-            /* TX */
-            "tx_enable": true,
-            "tx_freq_min": 920800000,
-            "tx_freq_max": 923400000,
-            "tx_lut":[
-                { "rf_power":  2, "fpga_dig_gain": 5, "ad9361_atten": 135, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  5, "fpga_dig_gain": 5, "ad9361_atten": 122, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  7, "fpga_dig_gain": 5, "ad9361_atten": 115, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  9, "fpga_dig_gain": 5, "ad9361_atten": 108, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 },
-                { "rf_power": 11, "fpga_dig_gain": 5, "ad9361_atten": 100, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 },
-                { "rf_power": 12, "fpga_dig_gain": 5, "ad9361_atten":  96, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 },
-                { "rf_power": 13, "fpga_dig_gain": 5, "ad9361_atten":  93, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 },
-                { "rf_power": 14, "fpga_dig_gain": 5, "ad9361_atten":  87, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 },
-                { "rf_power": 16, "fpga_dig_gain": 5, "ad9361_atten":  78, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 },
-                { "rf_power": 18, "fpga_dig_gain": 5, "ad9361_atten":  69, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 },
-                { "rf_power": 20, "fpga_dig_gain": 5, "ad9361_atten":  61, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 },
-                { "rf_power": 22, "fpga_dig_gain": 5, "ad9361_atten":  54, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 },
-                { "rf_power": 24, "fpga_dig_gain": 5, "ad9361_atten":  44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 },
-                { "rf_power": 25, "fpga_dig_gain": 5, "ad9361_atten":  40, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 },
-                { "rf_power": 26, "fpga_dig_gain": 5, "ad9361_atten":  34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 },
-                { "rf_power": 27, "fpga_dig_gain": 5, "ad9361_atten":  30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }]
-        }],
-        "SX1301_conf":[
-        {
-            "chip_enable": true,
-            "chip_center_freq": 922700000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 922000000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 922200000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 922400000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 922600000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 922800000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 923000000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 923200000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 923400000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 923200000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 923700000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 922700000,
-            "chip_rf_chain": 1,
-            "chan_multiSF_0": { "chan_rx_freq": 922000000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 922200000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 922400000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 922600000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 922800000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 923000000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 923200000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 923400000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 923200000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 923700000, "bandwidth": 125000, "bit_rate": 50000 }
-        }],
-        "lbt_conf":{
-            "enable": true,
-            "rssi_target": -80, /* dBm */
-            "rssi_shift": 142,
-            "chan_cfg":[ /* 16 channels maximum */
-                { "freq_hz": 920800000, "scan_time_us": 5000, "transmit_time_ms": 4000 },
-                { "freq_hz": 921000000, "scan_time_us": 5000, "transmit_time_ms": 4000 },
-                { "freq_hz": 921200000, "scan_time_us": 5000, "transmit_time_ms": 4000 },
-                { "freq_hz": 921400000, "scan_time_us": 5000, "transmit_time_ms": 4000 },
-                { "freq_hz": 921600000, "scan_time_us": 5000, "transmit_time_ms": 4000 },
-                { "freq_hz": 921800000, "scan_time_us": 5000, "transmit_time_ms": 4000 },
-                { "freq_hz": 923200000, "scan_time_us": 5000, "transmit_time_ms": 4000 },
-                { "freq_hz": 923400000, "scan_time_us": 5000, "transmit_time_ms": 4000 }
-            ]
-        },
-        "FSK_sync": "C194C1",
-        "loramac_public": true,
-        "nb_dsp": 1,
-        "dsp_stat_interval": 10,
-        "aes_key": "ABCDEF0123456789ABCDEF0123456789",
-        "calibration_temperature_celsius_room": 22,
-        "calibration_temperature_code_ad9361": 77,
-        "fts_version": 1,
-        "fts_match_crc_error": false
-    }],
-    "gateway_conf": {
-        "gateway_ID": "00AEAEFFFE000000",
-        /* change with default server address/ports */
-        "server_address": "127.0.0.1",
-        "serv_port_up": 1780,
-        "serv_port_down": 1782,
-        /* adjust the following parameters for your network */
-        "keepalive_interval": 10,
-        "stat_interval": 30,
-        "push_timeout_ms": 100,
-        /* forward only valid packets */
-        "forward_crc_valid": true,
-        "forward_crc_error": false,
-        "forward_crc_disabled": false,
-        /* link testing mote */
-        "link_mote": "00CC01AF",
-        /* Beaconing parameters */
-        "beacon_conf":{
-            "period": 128,
-            "freq_hz": 923400000,
-            "datarate": 9,
-            "bw_hz": 125000,
-            "power": 14,
-            "infodesc": 0
-        }
-    },
-    "gps_conf": {
-        "gw_latitude": 0,
-        "gw_longitude": 0,
-        "gw_altitude": 0,
-        "fixed_altitude": false
-    }
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_partial_diversity_EU868 b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_partial_diversity_EU868
deleted file mode 100644
index d7ac24d..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_partial_diversity_EU868
+++ /dev/null
@@ -1,152 +0,0 @@
-{
-    "SX1301_array_conf":[
-    {
-        "board_type": "MASTER",
-        "board_rx_freq": 866500000, /* radio RX central frequency in Hz */
-        "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */
-        "full_duplex": false, /* radio mode */
-        "rf_chain_conf":[
-        {
-            /* RX */
-            "rx_enable": true,
-            "rssi_offset": -202.5,
-            "rssi_offset_coeff_a": 20,
-            "rssi_offset_coeff_b": 2925,
-            /* TX */
-            "tx_enable": true,
-            "tx_freq_min": 863000000,
-            "tx_freq_max": 870000000,
-            "tx_lut":[
-                { "rf_power":  2, "fpga_dig_gain": 4, "ad9361_atten": 125, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  5, "fpga_dig_gain": 4, "ad9361_atten": 112, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  7, "fpga_dig_gain": 4, "ad9361_atten": 105, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  9, "fpga_dig_gain": 4, "ad9361_atten":  98, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 },
-                { "rf_power": 11, "fpga_dig_gain": 4, "ad9361_atten":  90, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 },
-                { "rf_power": 12, "fpga_dig_gain": 4, "ad9361_atten":  86, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 },
-                { "rf_power": 13, "fpga_dig_gain": 4, "ad9361_atten":  83, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 },
-                { "rf_power": 14, "fpga_dig_gain": 4, "ad9361_atten":  77, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 },
-                { "rf_power": 16, "fpga_dig_gain": 4, "ad9361_atten":  68, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 },
-                { "rf_power": 18, "fpga_dig_gain": 4, "ad9361_atten":  59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 },
-                { "rf_power": 20, "fpga_dig_gain": 4, "ad9361_atten":  51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 },
-                { "rf_power": 22, "fpga_dig_gain": 4, "ad9361_atten":  44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 },
-                { "rf_power": 24, "fpga_dig_gain": 4, "ad9361_atten":  34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 },
-                { "rf_power": 25, "fpga_dig_gain": 4, "ad9361_atten":  30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 },
-                { "rf_power": 26, "fpga_dig_gain": 4, "ad9361_atten":  24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 },
-                { "rf_power": 27, "fpga_dig_gain": 4, "ad9361_atten":  20, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }]
-        },{
-            /* RX */
-            "rx_enable": true,
-            "rssi_offset": -202.5,
-            "rssi_offset_coeff_a": 20,
-            "rssi_offset_coeff_b": 2925,
-            /* TX */
-            "tx_enable": true,
-            "tx_freq_min": 863000000,
-            "tx_freq_max": 870000000,
-            "tx_lut":[
-                { "rf_power":  2, "fpga_dig_gain": 4, "ad9361_atten": 125, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  5, "fpga_dig_gain": 4, "ad9361_atten": 112, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  7, "fpga_dig_gain": 4, "ad9361_atten": 105, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  9, "fpga_dig_gain": 4, "ad9361_atten":  98, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 },
-                { "rf_power": 11, "fpga_dig_gain": 4, "ad9361_atten":  90, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 },
-                { "rf_power": 12, "fpga_dig_gain": 4, "ad9361_atten":  86, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 },
-                { "rf_power": 13, "fpga_dig_gain": 4, "ad9361_atten":  83, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 },
-                { "rf_power": 14, "fpga_dig_gain": 4, "ad9361_atten":  77, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 },
-                { "rf_power": 16, "fpga_dig_gain": 4, "ad9361_atten":  68, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 },
-                { "rf_power": 18, "fpga_dig_gain": 4, "ad9361_atten":  59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 },
-                { "rf_power": 20, "fpga_dig_gain": 4, "ad9361_atten":  51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 },
-                { "rf_power": 22, "fpga_dig_gain": 4, "ad9361_atten":  44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 },
-                { "rf_power": 24, "fpga_dig_gain": 4, "ad9361_atten":  34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 },
-                { "rf_power": 25, "fpga_dig_gain": 4, "ad9361_atten":  30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 },
-                { "rf_power": 26, "fpga_dig_gain": 4, "ad9361_atten":  24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 },
-                { "rf_power": 27, "fpga_dig_gain": 4, "ad9361_atten":  20, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }]
-        }],
-        "SX1301_conf":[
-        {
-            "chip_enable": true,
-            "chip_center_freq": 867000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 866500000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 866700000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 866900000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 867300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 867800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 1,
-            "chan_multiSF_0": { "chan_rx_freq": 869100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 869300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868700000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        }],
-        "lbt_conf":{
-            "enable": false,
-            "rssi_target": -80, /* dBm */
-            "rssi_shift": 142,
-            "chan_cfg":[ /* 16 channels maximum */
-                { "freq_hz": 867100000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867300000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867500000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867700000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867900000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 868100000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 868300000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 868500000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 869525000, "scan_time_us": 5000, "transmit_time_ms": 4000 }
-            ]
-        },
-        "FSK_sync": "C194C1",
-        "loramac_public": true,
-        "nb_dsp": 1,
-        "dsp_stat_interval": 10,
-        "aes_key": "ABCDEF0123456789ABCDEF0123456789",
-        "calibration_temperature_celsius_room": 22,
-        "calibration_temperature_code_ad9361": 77,
-        "fts_version": 1,
-        "fts_match_crc_error": false
-    }],
-    "gateway_conf": {
-        "gateway_ID": "00AEAEFFFE000000",
-        /* change with default server address/ports */
-        "server_address": "127.0.0.1",
-        "serv_port_up": 1780,
-        "serv_port_down": 1782,
-        /* adjust the following parameters for your network */
-        "keepalive_interval": 10,
-        "stat_interval": 30,
-        "push_timeout_ms": 100,
-        /* forward only valid packets */
-        "forward_crc_valid": true,
-        "forward_crc_error": false,
-        "forward_crc_disabled": false,
-        /* link testing mote */
-        "link_mote": "00CC01AF",
-        /* Beaconing parameters */
-        "beacon_conf":{
-            "period": 128,
-            "freq_hz": 869525000,
-            "datarate": 9,
-            "bw_hz": 125000,
-            "power": 14,
-            "infodesc": 0
-        }
-    },
-    "gps_conf": {
-        "gw_latitude": 0,
-        "gw_longitude": 0,
-        "gw_altitude": 0,
-        "fixed_altitude": false
-    }
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_EU868 b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_EU868
deleted file mode 100644
index 9c7f2b4..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_EU868
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-    "SX1301_array_conf":[
-    {
-        "board_type": "MASTER",
-        "board_rx_freq": 866500000, /* radio RX central frequency in Hz */
-        "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */
-        "full_duplex": false, /* radio mode */
-        "rf_chain_conf":[
-        {
-            /* RX */
-            "rx_enable": true,
-            "rssi_offset": -202.5,
-            "rssi_offset_coeff_a": 20,
-            "rssi_offset_coeff_b": 2925,
-            /* TX */
-            "tx_enable": true,
-            "tx_freq_min": 863000000,
-            "tx_freq_max": 870000000,
-            "tx_lut":[
-                { "rf_power":  2, "fpga_dig_gain": 4, "ad9361_atten": 125, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  5, "fpga_dig_gain": 4, "ad9361_atten": 112, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  7, "fpga_dig_gain": 4, "ad9361_atten": 105, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  9, "fpga_dig_gain": 4, "ad9361_atten":  98, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 },
-                { "rf_power": 11, "fpga_dig_gain": 4, "ad9361_atten":  90, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 },
-                { "rf_power": 12, "fpga_dig_gain": 4, "ad9361_atten":  86, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 },
-                { "rf_power": 13, "fpga_dig_gain": 4, "ad9361_atten":  83, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 },
-                { "rf_power": 14, "fpga_dig_gain": 4, "ad9361_atten":  77, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 },
-                { "rf_power": 16, "fpga_dig_gain": 4, "ad9361_atten":  68, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 },
-                { "rf_power": 18, "fpga_dig_gain": 4, "ad9361_atten":  59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 },
-                { "rf_power": 20, "fpga_dig_gain": 4, "ad9361_atten":  51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 },
-                { "rf_power": 22, "fpga_dig_gain": 4, "ad9361_atten":  44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 },
-                { "rf_power": 24, "fpga_dig_gain": 4, "ad9361_atten":  34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 },
-                { "rf_power": 25, "fpga_dig_gain": 4, "ad9361_atten":  30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 },
-                { "rf_power": 26, "fpga_dig_gain": 4, "ad9361_atten":  24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 },
-                { "rf_power": 27, "fpga_dig_gain": 4, "ad9361_atten":  20, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }]
-        }],
-        "SX1301_conf":[
-        {
-            "chip_enable": true,
-            "chip_center_freq": 865600000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 864900000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 865100000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 865300000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 865500000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 865700000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 865900000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 866100000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 866300000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 866100000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 866600000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868700000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868900000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 869100000, "bandwidth": 125000, "bit_rate": 50000 }
-        }],
-        "lbt_conf":{
-            "enable": false,
-            "rssi_target": -80, /* dBm */
-            "rssi_shift": 142,
-            "chan_cfg":[ /* 16 channels maximum */
-                { "freq_hz": 867100000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867300000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867500000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867700000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867900000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 868100000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 868300000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 868500000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 869525000, "scan_time_us": 5000, "transmit_time_ms": 4000 }
-            ]
-        },
-        "FSK_sync": "C194C1",
-        "loramac_public": true,
-        "nb_dsp": 1,
-        "dsp_stat_interval": 10,
-        "aes_key": "ABCDEF0123456789ABCDEF0123456789",
-        "calibration_temperature_celsius_room": 22,
-        "calibration_temperature_code_ad9361": 77,
-        "fts_version": 1,
-        "fts_match_crc_error": false
-    }],
-    "gateway_conf": {
-        "gateway_ID": "00AEAEFFFE000000",
-        /* change with default server address/ports */
-        "server_address": "127.0.0.1",
-        "serv_port_up": 1780,
-        "serv_port_down": 1782,
-        /* adjust the following parameters for your network */
-        "keepalive_interval": 10,
-        "stat_interval": 30,
-        "push_timeout_ms": 100,
-        /* forward only valid packets */
-        "forward_crc_valid": true,
-        "forward_crc_error": false,
-        "forward_crc_disabled": false,
-        /* link testing mote */
-        "link_mote": "00CC01AF",
-        /* Beaconing parameters */
-        "beacon_conf":{
-            "period": 128,
-            "freq_hz": 869525000,
-            "datarate": 9,
-            "bw_hz": 125000,
-            "power": 14,
-            "infodesc": 0
-        }
-    },
-    "gps_conf": {
-        "gw_latitude": 0,
-        "gw_longitude": 0,
-        "gw_altitude": 0,
-        "fixed_altitude": false
-    }
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_US915 b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_US915
deleted file mode 100644
index d6f1123..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_US915
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-    "SX1301_array_conf":[
-    {
-        "board_type": "MASTER",
-        "board_rx_freq": 908600000, /* radio RX central frequency in Hz */
-        "board_rx_bw": 13000000, /* radio RX bandwidth in Hz */
-        "full_duplex": false, /* radio mode */
-        "rf_chain_conf":[
-        {
-            /* RX */
-            "rx_enable": true,
-            "rssi_offset": -202.5,
-            "rssi_offset_coeff_a": 20,
-            "rssi_offset_coeff_b": 2925,
-            /* TX */
-            "tx_enable": true,
-            "tx_freq_min": 923300000,
-            "tx_freq_max": 927500000,
-            "tx_lut":[
-                { "rf_power":  9, "fpga_dig_gain": 5, "ad9361_atten": 104, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -23, "ad9361_tcomp_coeff_b": 3177 },
-                { "rf_power": 11, "fpga_dig_gain": 5, "ad9361_atten":  96, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -21, "ad9361_tcomp_coeff_b": 2888 },
-                { "rf_power": 12, "fpga_dig_gain": 5, "ad9361_atten":  93, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -20, "ad9361_tcomp_coeff_b": 2683 },
-                { "rf_power": 13, "fpga_dig_gain": 5, "ad9361_atten":  88, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -20, "ad9361_tcomp_coeff_b": 2530 },
-                { "rf_power": 14, "fpga_dig_gain": 5, "ad9361_atten":  84, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 2367 },
-                { "rf_power": 16, "fpga_dig_gain": 5, "ad9361_atten":  75, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 1943 },
-                { "rf_power": 18, "fpga_dig_gain": 5, "ad9361_atten":  67, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 1537 },
-                { "rf_power": 20, "fpga_dig_gain": 5, "ad9361_atten":  59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 1135 },
-                { "rf_power": 22, "fpga_dig_gain": 5, "ad9361_atten":  51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": 714 },
-                { "rf_power": 24, "fpga_dig_gain": 5, "ad9361_atten":  42, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": 262 },
-                { "rf_power": 25, "fpga_dig_gain": 5, "ad9361_atten":  38, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -6 },
-                { "rf_power": 26, "fpga_dig_gain": 5, "ad9361_atten":  33, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -8, "ad9361_tcomp_coeff_b": -193 },
-                { "rf_power": 27, "fpga_dig_gain": 5, "ad9361_atten":  29, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -356 },
-                { "rf_power": 28, "fpga_dig_gain": 5, "ad9361_atten":  24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -6, "ad9361_tcomp_coeff_b": -470 },
-                { "rf_power": 29, "fpga_dig_gain": 5, "ad9361_atten":  18, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -6, "ad9361_tcomp_coeff_b": -534 },
-                { "rf_power": 30, "fpga_dig_gain": 5, "ad9361_atten":  11, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -4, "ad9361_tcomp_coeff_b": -589 }]
-        }],
-        "SX1301_conf":[
-        {
-            "chip_enable": true,
-            "chip_center_freq": 907800000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 907100000 , "spread_factor": "7-10" },
-            "chan_multiSF_1": { "chan_rx_freq": 907300000 , "spread_factor": "7-10" },
-            "chan_multiSF_2": { "chan_rx_freq": 907500000 , "spread_factor": "7-10" },
-            "chan_multiSF_3": { "chan_rx_freq": 907700000 , "spread_factor": "7-10" },
-            "chan_multiSF_4": { "chan_rx_freq": 907900000 , "spread_factor": "7-10" },
-            "chan_multiSF_5": { "chan_rx_freq": 908100000 , "spread_factor": "7-10" },
-            "chan_multiSF_6": { "chan_rx_freq": 908300000 , "spread_factor": "7-10" },
-            "chan_multiSF_7": { "chan_rx_freq": 908500000 , "spread_factor": "7-10" },
-            "chan_LoRa_std" : { "chan_rx_freq": 907800000 , "bandwidth": 500000, "spread_factor": 8 },
-            "chan_FSK"      : { "chan_rx_freq": 907800000 , "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 909400000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 908700000 , "spread_factor": "7-10" },
-            "chan_multiSF_1": { "chan_rx_freq": 908900000 , "spread_factor": "7-10" },
-            "chan_multiSF_2": { "chan_rx_freq": 909100000 , "spread_factor": "7-10" },
-            "chan_multiSF_3": { "chan_rx_freq": 909300000 , "spread_factor": "7-10" },
-            "chan_multiSF_4": { "chan_rx_freq": 909500000 , "spread_factor": "7-10" },
-            "chan_multiSF_5": { "chan_rx_freq": 909700000 , "spread_factor": "7-10" },
-            "chan_multiSF_6": { "chan_rx_freq": 909900000 , "spread_factor": "7-10" },
-            "chan_multiSF_7": { "chan_rx_freq": 910100000 , "spread_factor": "7-10" },
-            "chan_LoRa_std" : { "chan_rx_freq": 909400000 , "bandwidth": 500000, "spread_factor": 8 },
-            "chan_FSK"      : { "chan_rx_freq": 909400000 , "bandwidth": 125000, "bit_rate": 50000 }
-        }],
-        "FSK_sync": "C194C1",
-        "loramac_public": true,
-        "nb_dsp": 1,
-        "dsp_stat_interval": 10,
-        "aes_key": "ABCDEF0123456789ABCDEF0123456789",
-        "calibration_temperature_celsius_room": 22,
-        "calibration_temperature_code_ad9361": 77,
-        "fts_version": 1,
-        "fts_match_crc_error": false
-    }],
-    "gateway_conf": {
-        "gateway_ID": "00AEAEFFFE000000",
-        /* change with default server address/ports */
-        "server_address": "127.0.0.1",
-        "serv_port_up": 1780,
-        "serv_port_down": 1782,
-        /* adjust the following parameters for your network */
-        "keepalive_interval": 10,
-        "stat_interval": 30,
-        "push_timeout_ms": 100,
-        /* forward only valid packets */
-        "forward_crc_valid": true,
-        "forward_crc_error": false,
-        "forward_crc_disabled": false,
-        /* link testing mote */
-        "link_mote": "00CC01AF",
-        /* Beaconing parameters */
-        "beacon_conf":{
-            "period": 128,
-            "freq_hz": 923300000,
-            "freq_nb": 8,
-            "freq_step": 600000,
-            "datarate": 12,
-            "bw_hz": 500000,
-            "power": 14,
-            "infodesc": 0
-        }
-    },
-    "gps_conf": {
-        "gw_latitude": 0,
-        "gw_longitude": 0,
-        "gw_altitude": 0,
-        "fixed_altitude": false
-    }
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_64ch_US915 b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_64ch_US915
deleted file mode 100644
index 9133313..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_64ch_US915
+++ /dev/null
@@ -1,211 +0,0 @@
-{
-    "SX1301_array_conf":[
-    {
-        "board_type": "MASTER",
-        "board_rx_freq": 908600000, /* radio RX central frequency in Hz */
-        "board_rx_bw": 13000000, /* radio RX bandwidth in Hz */
-        "full_duplex": false, /* radio mode */
-        "rf_chain_conf":[
-        {
-            /* RX */
-            "rx_enable": true,
-            "rssi_offset": -202.5,
-            "rssi_offset_coeff_a": 20,
-            "rssi_offset_coeff_b": 2925,
-            /* TX */
-            "tx_enable": true,
-            "tx_freq_min": 923300000,
-            "tx_freq_max": 927500000,
-            "tx_lut":[
-                { "rf_power":  9, "fpga_dig_gain": 5, "ad9361_atten": 104, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -23, "ad9361_tcomp_coeff_b": 3177 },
-                { "rf_power": 11, "fpga_dig_gain": 5, "ad9361_atten":  96, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -21, "ad9361_tcomp_coeff_b": 2888 },
-                { "rf_power": 12, "fpga_dig_gain": 5, "ad9361_atten":  93, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -20, "ad9361_tcomp_coeff_b": 2683 },
-                { "rf_power": 13, "fpga_dig_gain": 5, "ad9361_atten":  88, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -20, "ad9361_tcomp_coeff_b": 2530 },
-                { "rf_power": 14, "fpga_dig_gain": 5, "ad9361_atten":  84, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 2367 },
-                { "rf_power": 16, "fpga_dig_gain": 5, "ad9361_atten":  75, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 1943 },
-                { "rf_power": 18, "fpga_dig_gain": 5, "ad9361_atten":  67, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 1537 },
-                { "rf_power": 20, "fpga_dig_gain": 5, "ad9361_atten":  59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 1135 },
-                { "rf_power": 22, "fpga_dig_gain": 5, "ad9361_atten":  51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": 714 },
-                { "rf_power": 24, "fpga_dig_gain": 5, "ad9361_atten":  42, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": 262 },
-                { "rf_power": 25, "fpga_dig_gain": 5, "ad9361_atten":  38, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -6 },
-                { "rf_power": 26, "fpga_dig_gain": 5, "ad9361_atten":  33, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -8, "ad9361_tcomp_coeff_b": -193 },
-                { "rf_power": 27, "fpga_dig_gain": 5, "ad9361_atten":  29, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -356 },
-                { "rf_power": 28, "fpga_dig_gain": 5, "ad9361_atten":  24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -6, "ad9361_tcomp_coeff_b": -470 },
-                { "rf_power": 29, "fpga_dig_gain": 5, "ad9361_atten":  18, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -6, "ad9361_tcomp_coeff_b": -534 },
-                { "rf_power": 30, "fpga_dig_gain": 5, "ad9361_atten":  11, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -4, "ad9361_tcomp_coeff_b": -589 }]
-        }],
-        "SX1301_conf":[
-        {
-            "chip_enable": true,
-            "chip_center_freq": 903000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 902300000, "spread_factor": "7-10" },
-            "chan_multiSF_1": { "chan_rx_freq": 902500000, "spread_factor": "7-10" },
-            "chan_multiSF_2": { "chan_rx_freq": 902700000, "spread_factor": "7-10" },
-            "chan_multiSF_3": { "chan_rx_freq": 902900000, "spread_factor": "7-10" },
-            "chan_multiSF_4": { "chan_rx_freq": 903100000, "spread_factor": "7-10" },
-            "chan_multiSF_5": { "chan_rx_freq": 903300000, "spread_factor": "7-10" },
-            "chan_multiSF_6": { "chan_rx_freq": 903500000, "spread_factor": "7-10" },
-            "chan_multiSF_7": { "chan_rx_freq": 903700000, "spread_factor": "7-10" },
-            "chan_LoRa_std" : { "chan_rx_freq": 903000000, "bandwidth": 500000, "spread_factor": 8 },
-            "chan_FSK"      : { "chan_rx_freq": 903000000, "bandwidth": 250000, "bit_rate": 100000 }
-
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 904600000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 903900000, "spread_factor": "7-10" },
-            "chan_multiSF_1": { "chan_rx_freq": 904100000, "spread_factor": "7-10" },
-            "chan_multiSF_2": { "chan_rx_freq": 904300000, "spread_factor": "7-10" },
-            "chan_multiSF_3": { "chan_rx_freq": 904500000, "spread_factor": "7-10" },
-            "chan_multiSF_4": { "chan_rx_freq": 904700000, "spread_factor": "7-10" },
-            "chan_multiSF_5": { "chan_rx_freq": 904900000, "spread_factor": "7-10" },
-            "chan_multiSF_6": { "chan_rx_freq": 905100000, "spread_factor": "7-10" },
-            "chan_multiSF_7": { "chan_rx_freq": 905300000, "spread_factor": "7-10" },
-            "chan_LoRa_std" : { "chan_rx_freq": 904600000, "bandwidth": 500000, "spread_factor": 8 },
-            "chan_FSK"      : { "chan_rx_freq": 904600000, "bandwidth": 250000, "bit_rate": 100000 }
-
-        }],
-        "FSK_sync": "C194C1",
-        "loramac_public": true,
-        "nb_dsp": 1,
-        "dsp_stat_interval": 10,
-        "aes_key": "ABCDEF0123456789ABCDEF0123456789",
-        "calibration_temperature_celsius_room": 22,
-        "calibration_temperature_code_ad9361": 77,
-        "fts_version": 1,
-        "fts_match_crc_error": false
-    },
-    {
-        "board_type": "SLAVE",
-        "board_rx_freq": 908600000, /* radio RX central frequency in Hz */
-        "board_rx_bw": 13000000, /* radio RX bandwidth in Hz */
-        "SX1301_conf":[
-        {
-            "chip_enable": true,
-            "chip_center_freq": 906200000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 905500000, "spread_factor": "7-10" },
-            "chan_multiSF_1": { "chan_rx_freq": 905700000, "spread_factor": "7-10" },
-            "chan_multiSF_2": { "chan_rx_freq": 905900000, "spread_factor": "7-10" },
-            "chan_multiSF_3": { "chan_rx_freq": 906100000, "spread_factor": "7-10" },
-            "chan_multiSF_4": { "chan_rx_freq": 906300000, "spread_factor": "7-10" },
-            "chan_multiSF_5": { "chan_rx_freq": 906500000, "spread_factor": "7-10" },
-            "chan_multiSF_6": { "chan_rx_freq": 906700000, "spread_factor": "7-10" },
-            "chan_multiSF_7": { "chan_rx_freq": 906900000, "spread_factor": "7-10" },
-            "chan_LoRa_std" : { "chan_rx_freq": 906200000, "bandwidth": 500000, "spread_factor": 8 },
-            "chan_FSK"      : { "chan_rx_freq": 906200000, "bandwidth": 250000, "bit_rate": 100000 }
-
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 907800000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 907100000, "spread_factor": "7-10" },
-            "chan_multiSF_1": { "chan_rx_freq": 907300000, "spread_factor": "7-10" },
-            "chan_multiSF_2": { "chan_rx_freq": 907500000, "spread_factor": "7-10" },
-            "chan_multiSF_3": { "chan_rx_freq": 907700000, "spread_factor": "7-10" },
-            "chan_multiSF_4": { "chan_rx_freq": 907900000, "spread_factor": "7-10" },
-            "chan_multiSF_5": { "chan_rx_freq": 908100000, "spread_factor": "7-10" },
-            "chan_multiSF_6": { "chan_rx_freq": 908300000, "spread_factor": "7-10" },
-            "chan_multiSF_7": { "chan_rx_freq": 908500000, "spread_factor": "7-10" },
-            "chan_LoRa_std" : { "chan_rx_freq": 907800000, "bandwidth": 500000, "spread_factor": 8 },
-            "chan_FSK"      : { "chan_rx_freq": 907800000, "bandwidth": 250000, "bit_rate": 100000 }
-
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 909400000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 908700000, "spread_factor": "7-10" },
-            "chan_multiSF_1": { "chan_rx_freq": 908900000, "spread_factor": "7-10" },
-            "chan_multiSF_2": { "chan_rx_freq": 909100000, "spread_factor": "7-10" },
-            "chan_multiSF_3": { "chan_rx_freq": 909300000, "spread_factor": "7-10" },
-            "chan_multiSF_4": { "chan_rx_freq": 909500000, "spread_factor": "7-10" },
-            "chan_multiSF_5": { "chan_rx_freq": 909700000, "spread_factor": "7-10" },
-            "chan_multiSF_6": { "chan_rx_freq": 909900000, "spread_factor": "7-10" },
-            "chan_multiSF_7": { "chan_rx_freq": 910100000, "spread_factor": "7-10" },
-            "chan_LoRa_std" : { "chan_rx_freq": 909400000, "bandwidth": 500000, "spread_factor": 8 },
-            "chan_FSK"      : { "chan_rx_freq": 909400000, "bandwidth": 250000, "bit_rate": 100000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 911000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 910300000, "spread_factor": "7-10" },
-            "chan_multiSF_1": { "chan_rx_freq": 910500000, "spread_factor": "7-10" },
-            "chan_multiSF_2": { "chan_rx_freq": 910700000, "spread_factor": "7-10" },
-            "chan_multiSF_3": { "chan_rx_freq": 910900000, "spread_factor": "7-10" },
-            "chan_multiSF_4": { "chan_rx_freq": 911100000, "spread_factor": "7-10" },
-            "chan_multiSF_5": { "chan_rx_freq": 911300000, "spread_factor": "7-10" },
-            "chan_multiSF_6": { "chan_rx_freq": 911500000, "spread_factor": "7-10" },
-            "chan_multiSF_7": { "chan_rx_freq": 911700000, "spread_factor": "7-10" },
-            "chan_LoRa_std" : { "chan_rx_freq": 911000000, "bandwidth": 500000, "spread_factor": 8 },
-            "chan_FSK"      : { "chan_rx_freq": 911000000, "bandwidth": 250000, "bit_rate": 100000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 912600000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 911900000, "spread_factor": "7-10" },
-            "chan_multiSF_1": { "chan_rx_freq": 912100000, "spread_factor": "7-10" },
-            "chan_multiSF_2": { "chan_rx_freq": 912300000, "spread_factor": "7-10" },
-            "chan_multiSF_3": { "chan_rx_freq": 912500000, "spread_factor": "7-10" },
-            "chan_multiSF_4": { "chan_rx_freq": 912700000, "spread_factor": "7-10" },
-            "chan_multiSF_5": { "chan_rx_freq": 912900000, "spread_factor": "7-10" },
-            "chan_multiSF_6": { "chan_rx_freq": 913100000, "spread_factor": "7-10" },
-            "chan_multiSF_7": { "chan_rx_freq": 913300000, "spread_factor": "7-10" },
-            "chan_LoRa_std" : { "chan_rx_freq": 912600000, "bandwidth": 500000, "spread_factor": 8 },
-            "chan_FSK"      : { "chan_rx_freq": 912600000, "bandwidth": 250000, "bit_rate": 100000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 914200000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 913500000, "spread_factor": "7-10" },
-            "chan_multiSF_1": { "chan_rx_freq": 913700000, "spread_factor": "7-10" },
-            "chan_multiSF_2": { "chan_rx_freq": 913900000, "spread_factor": "7-10" },
-            "chan_multiSF_3": { "chan_rx_freq": 914100000, "spread_factor": "7-10" },
-            "chan_multiSF_4": { "chan_rx_freq": 914300000, "spread_factor": "7-10" },
-            "chan_multiSF_5": { "chan_rx_freq": 914500000, "spread_factor": "7-10" },
-            "chan_multiSF_6": { "chan_rx_freq": 914700000, "spread_factor": "7-10" },
-            "chan_multiSF_7": { "chan_rx_freq": 914900000, "spread_factor": "7-10" },
-            "chan_LoRa_std" : { "chan_rx_freq": 914200000, "bandwidth": 500000, "spread_factor": 8 },
-            "chan_FSK"      : { "chan_rx_freq": 914200000, "bandwidth": 250000, "bit_rate": 100000 }
-        }],
-        "FSK_sync": "C194C1",
-        "loramac_public": true,
-        "nb_dsp": 0,
-        "dsp_stat_interval": 10,
-        "aes_key": "ABCDEF0123456789ABCDEF0123456789"
-    }],
-    "gateway_conf": {
-        "gateway_ID": "00AEAEFFFE000000",
-        /* change with default server address/ports */
-        "server_address": "127.0.0.1",
-        "serv_port_up": 1780,
-        "serv_port_down": 1782,
-        /* adjust the following parameters for your network */
-        "keepalive_interval": 10,
-        "stat_interval": 30,
-        "push_timeout_ms": 100,
-        /* forward only valid packets */
-        "forward_crc_valid": true,
-        "forward_crc_error": false,
-        "forward_crc_disabled": false,
-        /* link testing mote */
-        "link_mote": "00CC01AF",
-        /* Beaconing parameters */
-        "beacon_conf":{
-            "period": 128,
-            "freq_hz": 923300000,
-            "freq_nb": 8,
-            "freq_step": 600000,
-            "datarate": 12,
-            "bw_hz": 500000,
-            "power": 14,
-            "infodesc": 0
-        }
-    },
-    "gps_conf": {
-        "gw_latitude": 0,
-        "gw_longitude": 0,
-        "gw_altitude": 0,
-        "fixed_altitude": false
-    }
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_full_duplex_64ch_US915 b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_full_duplex_64ch_US915
deleted file mode 100644
index 0aaf4bf..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_full_duplex_64ch_US915
+++ /dev/null
@@ -1,216 +0,0 @@
-{
-    "SX1301_array_conf":[
-    {
-        "board_type": "MASTER",
-        "board_rx_freq": 908600000, /* radio RX central frequency in Hz */
-        "board_rx_bw": 13000000, /* radio RX bandwidth in Hz */
-        "full_duplex": true, /* radio mode */
-        "rf_chain_conf":[
-        {
-            /* RX */
-            "rx_enable": true,
-            "rssi_offset": -202.5,
-            "rssi_offset_coeff_a": 20,
-            "rssi_offset_coeff_b": 2925,
-            /* TX */
-            "tx_enable": false
-        },{
-            /* RX */
-            "rx_enable": false,
-            /* TX */
-            "tx_enable": true,
-            "tx_freq_min": 923300000,
-            "tx_freq_max": 927500000,
-            "tx_lut":[
-                { "rf_power":  9, "fpga_dig_gain": 5, "ad9361_atten": 104, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -23, "ad9361_tcomp_coeff_b": 3177 },
-                { "rf_power": 11, "fpga_dig_gain": 5, "ad9361_atten":  96, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -21, "ad9361_tcomp_coeff_b": 2888 },
-                { "rf_power": 12, "fpga_dig_gain": 5, "ad9361_atten":  93, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -20, "ad9361_tcomp_coeff_b": 2683 },
-                { "rf_power": 13, "fpga_dig_gain": 5, "ad9361_atten":  88, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -20, "ad9361_tcomp_coeff_b": 2530 },
-                { "rf_power": 14, "fpga_dig_gain": 5, "ad9361_atten":  84, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 2367 },
-                { "rf_power": 16, "fpga_dig_gain": 5, "ad9361_atten":  75, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 1943 },
-                { "rf_power": 18, "fpga_dig_gain": 5, "ad9361_atten":  67, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 1537 },
-                { "rf_power": 20, "fpga_dig_gain": 5, "ad9361_atten":  59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 1135 },
-                { "rf_power": 22, "fpga_dig_gain": 5, "ad9361_atten":  51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": 714 },
-                { "rf_power": 24, "fpga_dig_gain": 5, "ad9361_atten":  42, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": 262 },
-                { "rf_power": 25, "fpga_dig_gain": 5, "ad9361_atten":  38, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -6 },
-                { "rf_power": 26, "fpga_dig_gain": 5, "ad9361_atten":  33, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -8, "ad9361_tcomp_coeff_b": -193 },
-                { "rf_power": 27, "fpga_dig_gain": 5, "ad9361_atten":  29, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -356 },
-                { "rf_power": 28, "fpga_dig_gain": 5, "ad9361_atten":  24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -6, "ad9361_tcomp_coeff_b": -470 },
-                { "rf_power": 29, "fpga_dig_gain": 5, "ad9361_atten":  18, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -6, "ad9361_tcomp_coeff_b": -534 },
-                { "rf_power": 30, "fpga_dig_gain": 5, "ad9361_atten":  11, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -4, "ad9361_tcomp_coeff_b": -589 }]
-        }],
-        "SX1301_conf":[
-        {
-            "chip_enable": true,
-            "chip_center_freq": 903000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 902300000, "spread_factor": "7-10" },
-            "chan_multiSF_1": { "chan_rx_freq": 902500000, "spread_factor": "7-10" },
-            "chan_multiSF_2": { "chan_rx_freq": 902700000, "spread_factor": "7-10" },
-            "chan_multiSF_3": { "chan_rx_freq": 902900000, "spread_factor": "7-10" },
-            "chan_multiSF_4": { "chan_rx_freq": 903100000, "spread_factor": "7-10" },
-            "chan_multiSF_5": { "chan_rx_freq": 903300000, "spread_factor": "7-10" },
-            "chan_multiSF_6": { "chan_rx_freq": 903500000, "spread_factor": "7-10" },
-            "chan_multiSF_7": { "chan_rx_freq": 903700000, "spread_factor": "7-10" },
-            "chan_LoRa_std" : { "chan_rx_freq": 903000000, "bandwidth": 500000, "spread_factor": 8 },
-            "chan_FSK"      : { "chan_rx_freq": 903000000, "bandwidth": 250000, "bit_rate": 100000 }
-
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 904600000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 903900000, "spread_factor": "7-10" },
-            "chan_multiSF_1": { "chan_rx_freq": 904100000, "spread_factor": "7-10" },
-            "chan_multiSF_2": { "chan_rx_freq": 904300000, "spread_factor": "7-10" },
-            "chan_multiSF_3": { "chan_rx_freq": 904500000, "spread_factor": "7-10" },
-            "chan_multiSF_4": { "chan_rx_freq": 904700000, "spread_factor": "7-10" },
-            "chan_multiSF_5": { "chan_rx_freq": 904900000, "spread_factor": "7-10" },
-            "chan_multiSF_6": { "chan_rx_freq": 905100000, "spread_factor": "7-10" },
-            "chan_multiSF_7": { "chan_rx_freq": 905300000, "spread_factor": "7-10" },
-            "chan_LoRa_std" : { "chan_rx_freq": 904600000, "bandwidth": 500000, "spread_factor": 8 },
-            "chan_FSK"      : { "chan_rx_freq": 904600000, "bandwidth": 250000, "bit_rate": 100000 }
-
-        }],
-        "FSK_sync": "C194C1",
-        "loramac_public": true,
-        "nb_dsp": 1,
-        "dsp_stat_interval": 10,
-        "aes_key": "ABCDEF0123456789ABCDEF0123456789",
-        "calibration_temperature_celsius_room": 22,
-        "calibration_temperature_code_ad9361": 77,
-        "fts_version": 1,
-        "fts_match_crc_error": false
-    },
-    {
-        "board_type": "SLAVE",
-        "board_rx_freq": 908600000, /* radio RX central frequency in Hz */
-        "board_rx_bw": 13000000, /* radio RX bandwidth in Hz */
-        "SX1301_conf":[
-        {
-            "chip_enable": true,
-            "chip_center_freq": 906200000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 905500000, "spread_factor": "7-10" },
-            "chan_multiSF_1": { "chan_rx_freq": 905700000, "spread_factor": "7-10" },
-            "chan_multiSF_2": { "chan_rx_freq": 905900000, "spread_factor": "7-10" },
-            "chan_multiSF_3": { "chan_rx_freq": 906100000, "spread_factor": "7-10" },
-            "chan_multiSF_4": { "chan_rx_freq": 906300000, "spread_factor": "7-10" },
-            "chan_multiSF_5": { "chan_rx_freq": 906500000, "spread_factor": "7-10" },
-            "chan_multiSF_6": { "chan_rx_freq": 906700000, "spread_factor": "7-10" },
-            "chan_multiSF_7": { "chan_rx_freq": 906900000, "spread_factor": "7-10" },
-            "chan_LoRa_std" : { "chan_rx_freq": 906200000, "bandwidth": 500000, "spread_factor": 8 },
-            "chan_FSK"      : { "chan_rx_freq": 906200000, "bandwidth": 250000, "bit_rate": 100000 }
-
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 907800000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 907100000, "spread_factor": "7-10" },
-            "chan_multiSF_1": { "chan_rx_freq": 907300000, "spread_factor": "7-10" },
-            "chan_multiSF_2": { "chan_rx_freq": 907500000, "spread_factor": "7-10" },
-            "chan_multiSF_3": { "chan_rx_freq": 907700000, "spread_factor": "7-10" },
-            "chan_multiSF_4": { "chan_rx_freq": 907900000, "spread_factor": "7-10" },
-            "chan_multiSF_5": { "chan_rx_freq": 908100000, "spread_factor": "7-10" },
-            "chan_multiSF_6": { "chan_rx_freq": 908300000, "spread_factor": "7-10" },
-            "chan_multiSF_7": { "chan_rx_freq": 908500000, "spread_factor": "7-10" },
-            "chan_LoRa_std" : { "chan_rx_freq": 907800000, "bandwidth": 500000, "spread_factor": 8 },
-            "chan_FSK"      : { "chan_rx_freq": 907800000, "bandwidth": 250000, "bit_rate": 100000 }
-
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 909400000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 908700000, "spread_factor": "7-10" },
-            "chan_multiSF_1": { "chan_rx_freq": 908900000, "spread_factor": "7-10" },
-            "chan_multiSF_2": { "chan_rx_freq": 909100000, "spread_factor": "7-10" },
-            "chan_multiSF_3": { "chan_rx_freq": 909300000, "spread_factor": "7-10" },
-            "chan_multiSF_4": { "chan_rx_freq": 909500000, "spread_factor": "7-10" },
-            "chan_multiSF_5": { "chan_rx_freq": 909700000, "spread_factor": "7-10" },
-            "chan_multiSF_6": { "chan_rx_freq": 909900000, "spread_factor": "7-10" },
-            "chan_multiSF_7": { "chan_rx_freq": 910100000, "spread_factor": "7-10" },
-            "chan_LoRa_std" : { "chan_rx_freq": 909400000, "bandwidth": 500000, "spread_factor": 8 },
-            "chan_FSK"      : { "chan_rx_freq": 909400000, "bandwidth": 250000, "bit_rate": 100000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 911000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 910300000, "spread_factor": "7-10" },
-            "chan_multiSF_1": { "chan_rx_freq": 910500000, "spread_factor": "7-10" },
-            "chan_multiSF_2": { "chan_rx_freq": 910700000, "spread_factor": "7-10" },
-            "chan_multiSF_3": { "chan_rx_freq": 910900000, "spread_factor": "7-10" },
-            "chan_multiSF_4": { "chan_rx_freq": 911100000, "spread_factor": "7-10" },
-            "chan_multiSF_5": { "chan_rx_freq": 911300000, "spread_factor": "7-10" },
-            "chan_multiSF_6": { "chan_rx_freq": 911500000, "spread_factor": "7-10" },
-            "chan_multiSF_7": { "chan_rx_freq": 911700000, "spread_factor": "7-10" },
-            "chan_LoRa_std" : { "chan_rx_freq": 911000000, "bandwidth": 500000, "spread_factor": 8 },
-            "chan_FSK"      : { "chan_rx_freq": 911000000, "bandwidth": 250000, "bit_rate": 100000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 912600000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 911900000, "spread_factor": "7-10" },
-            "chan_multiSF_1": { "chan_rx_freq": 912100000, "spread_factor": "7-10" },
-            "chan_multiSF_2": { "chan_rx_freq": 912300000, "spread_factor": "7-10" },
-            "chan_multiSF_3": { "chan_rx_freq": 912500000, "spread_factor": "7-10" },
-            "chan_multiSF_4": { "chan_rx_freq": 912700000, "spread_factor": "7-10" },
-            "chan_multiSF_5": { "chan_rx_freq": 912900000, "spread_factor": "7-10" },
-            "chan_multiSF_6": { "chan_rx_freq": 913100000, "spread_factor": "7-10" },
-            "chan_multiSF_7": { "chan_rx_freq": 913300000, "spread_factor": "7-10" },
-            "chan_LoRa_std" : { "chan_rx_freq": 912600000, "bandwidth": 500000, "spread_factor": 8 },
-            "chan_FSK"      : { "chan_rx_freq": 912600000, "bandwidth": 250000, "bit_rate": 100000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 914200000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 913500000, "spread_factor": "7-10" },
-            "chan_multiSF_1": { "chan_rx_freq": 913700000, "spread_factor": "7-10" },
-            "chan_multiSF_2": { "chan_rx_freq": 913900000, "spread_factor": "7-10" },
-            "chan_multiSF_3": { "chan_rx_freq": 914100000, "spread_factor": "7-10" },
-            "chan_multiSF_4": { "chan_rx_freq": 914300000, "spread_factor": "7-10" },
-            "chan_multiSF_5": { "chan_rx_freq": 914500000, "spread_factor": "7-10" },
-            "chan_multiSF_6": { "chan_rx_freq": 914700000, "spread_factor": "7-10" },
-            "chan_multiSF_7": { "chan_rx_freq": 914900000, "spread_factor": "7-10" },
-            "chan_LoRa_std" : { "chan_rx_freq": 914200000, "bandwidth": 500000, "spread_factor": 8 },
-            "chan_FSK"      : { "chan_rx_freq": 914200000, "bandwidth": 250000, "bit_rate": 100000 }
-        }],
-        "FSK_sync": "C194C1",
-        "loramac_public": true,
-        "nb_dsp": 0,
-        "dsp_stat_interval": 10,
-        "aes_key": "ABCDEF0123456789ABCDEF0123456789"
-    }],
-    "gateway_conf": {
-        "gateway_ID": "00AEAEFFFE000000",
-        /* change with default server address/ports */
-        "server_address": "127.0.0.1",
-        "serv_port_up": 1780,
-        "serv_port_down": 1782,
-        /* adjust the following parameters for your network */
-        "keepalive_interval": 10,
-        "stat_interval": 30,
-        "push_timeout_ms": 100,
-        /* forward only valid packets */
-        "forward_crc_valid": true,
-        "forward_crc_error": false,
-        "forward_crc_disabled": false,
-        /* link testing mote */
-        "link_mote": "00CC01AF",
-        /* Beaconing parameters */
-        "beacon_conf":{
-            "period": 128,
-            "freq_hz": 923300000,
-            "freq_nb": 8,
-            "freq_step": 600000,
-            "datarate": 12,
-            "bw_hz": 500000,
-            "power": 14,
-            "infodesc": 0
-        }
-    },
-    "gps_conf": {
-        "gw_latitude": 0,
-        "gw_longitude": 0,
-        "gw_altitude": 0,
-        "fixed_altitude": false
-    }
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_dual_antenna_56ch_partial_diversity_EU868 b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_dual_antenna_56ch_partial_diversity_EU868
deleted file mode 100644
index 1f4a589..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_dual_antenna_56ch_partial_diversity_EU868
+++ /dev/null
@@ -1,237 +0,0 @@
-{
-    "SX1301_array_conf":[
-    {
-        "board_type": "MASTER",
-        "board_rx_freq": 866500000, /* radio RX central frequency in Hz */
-        "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */
-        "full_duplex": false, /* radio mode */
-        "rf_chain_conf":[
-        {
-            /* RX */
-            "rx_enable": true,
-            "rssi_offset": -202.5,
-            "rssi_offset_coeff_a": 20,
-            "rssi_offset_coeff_b": 2925,
-            /* TX */
-            "tx_enable": true,
-            "tx_freq_min": 863000000,
-            "tx_freq_max": 870000000,
-            "tx_lut":[
-                { "rf_power":  2, "fpga_dig_gain": 4, "ad9361_atten": 125, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  5, "fpga_dig_gain": 4, "ad9361_atten": 112, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  7, "fpga_dig_gain": 4, "ad9361_atten": 105, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  9, "fpga_dig_gain": 4, "ad9361_atten":  98, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 },
-                { "rf_power": 11, "fpga_dig_gain": 4, "ad9361_atten":  90, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 },
-                { "rf_power": 12, "fpga_dig_gain": 4, "ad9361_atten":  86, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 },
-                { "rf_power": 13, "fpga_dig_gain": 4, "ad9361_atten":  83, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 },
-                { "rf_power": 14, "fpga_dig_gain": 4, "ad9361_atten":  77, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 },
-                { "rf_power": 16, "fpga_dig_gain": 4, "ad9361_atten":  68, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 },
-                { "rf_power": 18, "fpga_dig_gain": 4, "ad9361_atten":  59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 },
-                { "rf_power": 20, "fpga_dig_gain": 4, "ad9361_atten":  51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 },
-                { "rf_power": 22, "fpga_dig_gain": 4, "ad9361_atten":  44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 },
-                { "rf_power": 24, "fpga_dig_gain": 4, "ad9361_atten":  34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 },
-                { "rf_power": 25, "fpga_dig_gain": 4, "ad9361_atten":  30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 },
-                { "rf_power": 26, "fpga_dig_gain": 4, "ad9361_atten":  24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 },
-                { "rf_power": 27, "fpga_dig_gain": 4, "ad9361_atten":  20, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }]
-        },{
-            /* RX */
-            "rx_enable": true,
-            "rssi_offset": -202.5,
-            "rssi_offset_coeff_a": 20,
-            "rssi_offset_coeff_b": 2925,
-            /* TX */
-            "tx_enable": true,
-            "tx_freq_min": 863000000,
-            "tx_freq_max": 870000000,
-            "tx_lut":[
-                { "rf_power":  2, "fpga_dig_gain": 4, "ad9361_atten": 125, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  5, "fpga_dig_gain": 4, "ad9361_atten": 112, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  7, "fpga_dig_gain": 4, "ad9361_atten": 105, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  9, "fpga_dig_gain": 4, "ad9361_atten":  98, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 },
-                { "rf_power": 11, "fpga_dig_gain": 4, "ad9361_atten":  90, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 },
-                { "rf_power": 12, "fpga_dig_gain": 4, "ad9361_atten":  86, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 },
-                { "rf_power": 13, "fpga_dig_gain": 4, "ad9361_atten":  83, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 },
-                { "rf_power": 14, "fpga_dig_gain": 4, "ad9361_atten":  77, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 },
-                { "rf_power": 16, "fpga_dig_gain": 4, "ad9361_atten":  68, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 },
-                { "rf_power": 18, "fpga_dig_gain": 4, "ad9361_atten":  59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 },
-                { "rf_power": 20, "fpga_dig_gain": 4, "ad9361_atten":  51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 },
-                { "rf_power": 22, "fpga_dig_gain": 4, "ad9361_atten":  44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 },
-                { "rf_power": 24, "fpga_dig_gain": 4, "ad9361_atten":  34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 },
-                { "rf_power": 25, "fpga_dig_gain": 4, "ad9361_atten":  30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 },
-                { "rf_power": 26, "fpga_dig_gain": 4, "ad9361_atten":  24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 },
-                { "rf_power": 27, "fpga_dig_gain": 4, "ad9361_atten":  20, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }]
-        }],
-        "SX1301_conf":[
-        {
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 1,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        }],
-        "lbt_conf":{
-            "enable": false,
-            "rssi_target": -80, /* dBm */
-            "rssi_shift": 142,
-            "chan_cfg":[ /* 16 channels maximum */
-                { "freq_hz": 867100000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867300000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867500000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867700000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867900000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 868100000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 868300000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 868500000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 869525000, "scan_time_us": 5000, "transmit_time_ms": 4000 }
-            ]
-        },
-        "FSK_sync": "C194C1",
-        "loramac_public": true,
-        "nb_dsp": 1,
-        "dsp_stat_interval": 10,
-        "aes_key": "ABCDEF0123456789ABCDEF0123456789",
-        "calibration_temperature_celsius_room": 22,
-        "calibration_temperature_code_ad9361": 77,
-        "fts_version": 1,
-        "fts_match_crc_error": false
-    },
-    {
-        "board_type": "SLAVE",
-        "board_rx_freq": 866500000, /* radio RX central frequency in Hz */
-        "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */
-        "SX1301_conf":[
-        {
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        }],
-        "FSK_sync": "C194C1",
-        "loramac_public": true,
-        "nb_dsp": 0,
-        "dsp_stat_interval": 10,
-        "aes_key": "ABCDEF0123456789ABCDEF0123456789"
-    }],
-    "gateway_conf": {
-        "gateway_ID": "00AEAEFFFE000000",
-        /* change with default server address/ports */
-        "server_address": "127.0.0.1",
-        "serv_port_up": 1780,
-        "serv_port_down": 1782,
-        /* adjust the following parameters for your network */
-        "keepalive_interval": 10,
-        "stat_interval": 30,
-        "push_timeout_ms": 100,
-        /* forward only valid packets */
-        "forward_crc_valid": true,
-        "forward_crc_error": false,
-        "forward_crc_disabled": false,
-        /* link testing mote */
-        "link_mote": "00CC01AF"
-    },
-    "gps_conf": {
-        "fixed_altitude": false,
-        "gw_altitude": 0
-    }
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_single_antenna_16ch_16x1_EU868 b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_single_antenna_16ch_16x1_EU868
deleted file mode 100644
index 85ddc66..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_single_antenna_16ch_16x1_EU868
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "SX1301_array_conf":[
-    {
-        "board_type": "MASTER",
-        "board_rx_freq": 866500000, /* radio RX central frequency in Hz */
-        "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */
-        "full_duplex": false, /* radio mode */
-        "rf_chain_conf":[
-        {
-            /* RX */
-            "rx_enable": true,
-            "rssi_offset": -202.5,
-            "rssi_offset_coeff_a": 20,
-            "rssi_offset_coeff_b": 2925,
-            /* TX */
-            "tx_enable": true,
-            "tx_freq_min": 863000000,
-            "tx_freq_max": 870000000,
-            "tx_lut":[
-                { "rf_power":  2, "fpga_dig_gain": 4, "ad9361_atten": 125, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  5, "fpga_dig_gain": 4, "ad9361_atten": 112, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  7, "fpga_dig_gain": 4, "ad9361_atten": 105, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  9, "fpga_dig_gain": 4, "ad9361_atten":  98, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 },
-                { "rf_power": 11, "fpga_dig_gain": 4, "ad9361_atten":  90, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 },
-                { "rf_power": 12, "fpga_dig_gain": 4, "ad9361_atten":  86, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 },
-                { "rf_power": 13, "fpga_dig_gain": 4, "ad9361_atten":  83, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 },
-                { "rf_power": 14, "fpga_dig_gain": 4, "ad9361_atten":  77, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 },
-                { "rf_power": 16, "fpga_dig_gain": 4, "ad9361_atten":  68, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 },
-                { "rf_power": 18, "fpga_dig_gain": 4, "ad9361_atten":  59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 },
-                { "rf_power": 20, "fpga_dig_gain": 4, "ad9361_atten":  51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 },
-                { "rf_power": 22, "fpga_dig_gain": 4, "ad9361_atten":  44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 },
-                { "rf_power": 24, "fpga_dig_gain": 4, "ad9361_atten":  34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 },
-                { "rf_power": 25, "fpga_dig_gain": 4, "ad9361_atten":  30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 },
-                { "rf_power": 26, "fpga_dig_gain": 4, "ad9361_atten":  24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 },
-                { "rf_power": 27, "fpga_dig_gain": 4, "ad9361_atten":  20, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }]
-        }],
-        "SX1301_conf":[
-        {
-            "chip_enable": true,
-            "chip_center_freq": 866000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 866100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 866100000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 866100000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 866100000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 866100000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 866100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 866100000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 866100000, "spread_factor": "7-12" }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 866000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 866100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 866100000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 866100000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 866100000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 866100000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 866100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 866100000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 866100000, "spread_factor": "7-12" }
-        }],
-        "lbt_conf":{
-            "enable": false,
-            "rssi_target": -80, /* dBm */
-            "rssi_shift": 142,
-            "chan_cfg":[ /* 16 channels maximum */
-                { "freq_hz": 867100000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867300000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867500000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867700000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867900000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 868100000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 868300000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 868500000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 869525000, "scan_time_us": 5000, "transmit_time_ms": 4000 }
-            ]
-        },
-        "FSK_sync": "C194C1",
-        "loramac_public": true,
-        "nb_dsp": 1,
-        "dsp_stat_interval": 10,
-        "aes_key": "ABCDEF0123456789ABCDEF0123456789",
-        "calibration_temperature_celsius_room": 22,
-        "calibration_temperature_code_ad9361": 77,
-        "fts_version": 1,
-        "fts_match_crc_error": false
-    }],
-    "gateway_conf": {
-        "gateway_ID": "00AEAEFFFE000000",
-        /* change with default server address/ports */
-        "server_address": "127.0.0.1",
-        "serv_port_up": 1780,
-        "serv_port_down": 1782,
-        /* adjust the following parameters for your network */
-        "keepalive_interval": 10,
-        "stat_interval": 30,
-        "push_timeout_ms": 100,
-        /* forward only valid packets */
-        "forward_crc_valid": true,
-        "forward_crc_error": false,
-        "forward_crc_disabled": false,
-        /* link testing mote */
-        "link_mote": "00CC01AF",
-        /* Beaconing parameters */
-        "beacon_conf":{
-            "period": 128,
-            "freq_hz": 869525000,
-            "datarate": 9,
-            "bw_hz": 125000,
-            "power": 14,
-            "infodesc": 0
-        }
-    },
-    "gps_conf": {
-        "gw_latitude": 0,
-        "gw_longitude": 0,
-        "gw_altitude": 0,
-        "fixed_altitude": false
-    }
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_single_antenna_64ch_64x1_EU868 b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_single_antenna_64ch_64x1_EU868
deleted file mode 100644
index 9e83240..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_single_antenna_64ch_64x1_EU868
+++ /dev/null
@@ -1,210 +0,0 @@
-{
-    "SX1301_array_conf":[
-    {
-        "board_type": "MASTER",
-        "board_rx_freq": 866500000, /* radio RX central frequency in Hz */
-        "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */
-        "full_duplex": false, /* radio mode */
-        "rf_chain_conf":[
-        {
-            /* RX */
-            "rx_enable": true,
-            "rssi_offset": -202.5,
-            "rssi_offset_coeff_a": 20,
-            "rssi_offset_coeff_b": 2925,
-            /* TX */
-            "tx_enable": true,
-            "tx_freq_min": 863000000,
-            "tx_freq_max": 870000000,
-            "tx_lut":[
-                { "rf_power":  2, "fpga_dig_gain": 4, "ad9361_atten": 125, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  5, "fpga_dig_gain": 4, "ad9361_atten": 112, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  7, "fpga_dig_gain": 4, "ad9361_atten": 105, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  9, "fpga_dig_gain": 4, "ad9361_atten":  98, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 },
-                { "rf_power": 11, "fpga_dig_gain": 4, "ad9361_atten":  90, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 },
-                { "rf_power": 12, "fpga_dig_gain": 4, "ad9361_atten":  86, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 },
-                { "rf_power": 13, "fpga_dig_gain": 4, "ad9361_atten":  83, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 },
-                { "rf_power": 14, "fpga_dig_gain": 4, "ad9361_atten":  77, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 },
-                { "rf_power": 16, "fpga_dig_gain": 4, "ad9361_atten":  68, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 },
-                { "rf_power": 18, "fpga_dig_gain": 4, "ad9361_atten":  59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 },
-                { "rf_power": 20, "fpga_dig_gain": 4, "ad9361_atten":  51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 },
-                { "rf_power": 22, "fpga_dig_gain": 4, "ad9361_atten":  44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 },
-                { "rf_power": 24, "fpga_dig_gain": 4, "ad9361_atten":  34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 },
-                { "rf_power": 25, "fpga_dig_gain": 4, "ad9361_atten":  30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 },
-                { "rf_power": 26, "fpga_dig_gain": 4, "ad9361_atten":  24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 },
-                { "rf_power": 27, "fpga_dig_gain": 4, "ad9361_atten":  20, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }]
-        }],
-        "SX1301_conf":[
-        {
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        }],
-        "lbt_conf":{
-            "enable": false,
-            "rssi_target": -80, /* dBm */
-            "rssi_shift": 142,
-            "chan_cfg":[ /* 16 channels maximum */
-                { "freq_hz": 867100000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867300000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867500000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867700000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867900000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 868100000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 868300000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 868500000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 869525000, "scan_time_us": 5000, "transmit_time_ms": 4000 }
-            ]
-        },
-        "FSK_sync": "C194C1",
-        "loramac_public": true,
-        "nb_dsp": 1,
-        "dsp_stat_interval": 10,
-        "aes_key": "55E7068263527C56B38E5977990CB0C2",
-        "calibration_temperature_celsius_room": 22,
-        "calibration_temperature_code_ad9361": 77,
-        "fts_version": 1,
-        "fts_match_crc_error": false
-    },
-    {
-        "board_type": "SLAVE",
-        "board_rx_freq": 866500000, /* radio RX central frequency in Hz */
-        "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */
-        "SX1301_conf":[
-        {
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        }],
-        "FSK_sync": "C194C1",
-        "loramac_public": true,
-        "nb_dsp": 3,
-        "dsp_stat_interval": 10,
-        "aes_key": "ABCDEF0123456789ABCDEF0123456789"
-    }],
-    "gateway_conf": {
-        "gateway_ID": "00AEAEFFFE000000",
-        /* change with default server address/ports */
-        "server_address": "127.0.0.1",
-        "serv_port_up": 1780,
-        "serv_port_down": 1782,
-        /* adjust the following parameters for your network */
-        "keepalive_interval": 10,
-        "stat_interval": 30,
-        "push_timeout_ms": 100,
-        /* forward only valid packets */
-        "forward_crc_valid": true,
-        "forward_crc_error": false,
-        "forward_crc_disabled": false,
-        /* link testing mote */
-        "link_mote": "00CC01AF"
-    },
-    "gps_conf": {
-        "fixed_altitude": false,
-        "gw_altitude": 0
-    }
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_single_antenna_64ch_8x8_EU868 b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_single_antenna_64ch_8x8_EU868
deleted file mode 100644
index c3732eb..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/global_conf.json.MTAC_LORA_2_1_test_single_antenna_64ch_8x8_EU868
+++ /dev/null
@@ -1,210 +0,0 @@
-{
-    "SX1301_array_conf":[
-    {
-        "board_type": "MASTER",
-        "board_rx_freq": 866500000, /* radio RX central frequency in Hz */
-        "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */
-        "full_duplex": false, /* radio mode */
-        "rf_chain_conf":[
-        {
-            /* RX */
-            "rx_enable": true,
-            "rssi_offset": -202.5,
-            "rssi_offset_coeff_a": 20,
-            "rssi_offset_coeff_b": 2925,
-            /* TX */
-            "tx_enable": true,
-            "tx_freq_min": 863000000,
-            "tx_freq_max": 870000000,
-            "tx_lut":[
-                { "rf_power":  2, "fpga_dig_gain": 4, "ad9361_atten": 125, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  5, "fpga_dig_gain": 4, "ad9361_atten": 112, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  7, "fpga_dig_gain": 4, "ad9361_atten": 105, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -19, "ad9361_tcomp_coeff_b": 752 },
-                { "rf_power":  9, "fpga_dig_gain": 4, "ad9361_atten":  98, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -18, "ad9361_tcomp_coeff_b": 573 },
-                { "rf_power": 11, "fpga_dig_gain": 4, "ad9361_atten":  90, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -17, "ad9361_tcomp_coeff_b": 477 },
-                { "rf_power": 12, "fpga_dig_gain": 4, "ad9361_atten":  86, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 264 },
-                { "rf_power": 13, "fpga_dig_gain": 4, "ad9361_atten":  83, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -16, "ad9361_tcomp_coeff_b": 179 },
-                { "rf_power": 14, "fpga_dig_gain": 4, "ad9361_atten":  77, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -15, "ad9361_tcomp_coeff_b": 0 },
-                { "rf_power": 16, "fpga_dig_gain": 4, "ad9361_atten":  68, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -14, "ad9361_tcomp_coeff_b": -141 },
-                { "rf_power": 18, "fpga_dig_gain": 4, "ad9361_atten":  59, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -550 },
-                { "rf_power": 20, "fpga_dig_gain": 4, "ad9361_atten":  51, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -13, "ad9361_tcomp_coeff_b": -718 },
-                { "rf_power": 22, "fpga_dig_gain": 4, "ad9361_atten":  44, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1195 },
-                { "rf_power": 24, "fpga_dig_gain": 4, "ad9361_atten":  34, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -11, "ad9361_tcomp_coeff_b": -1268 },
-                { "rf_power": 25, "fpga_dig_gain": 4, "ad9361_atten":  30, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1662 },
-                { "rf_power": 26, "fpga_dig_gain": 4, "ad9361_atten":  24, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -9, "ad9361_tcomp_coeff_b": -1865 },
-                { "rf_power": 27, "fpga_dig_gain": 4, "ad9361_atten":  20, "ad9361_auxdac_vref": 3, "ad9361_auxdac_word": 770, "ad9361_tcomp_coeff_a": -7, "ad9361_tcomp_coeff_b": -2102 }]
-        }],
-        "SX1301_conf":[
-        {
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        }],
-        "lbt_conf":{
-            "enable": false,
-            "rssi_target": -80, /* dBm */
-            "rssi_shift": 142,
-            "chan_cfg":[ /* 16 channels maximum */
-                { "freq_hz": 867100000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867300000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867500000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867700000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 867900000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 868100000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 868300000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 868500000, "scan_time_us": 128, "transmit_time_ms": 400 },
-                { "freq_hz": 869525000, "scan_time_us": 5000, "transmit_time_ms": 4000 }
-            ]
-        },
-        "FSK_sync": "C194C1",
-        "loramac_public": true,
-        "nb_dsp": 1,
-        "dsp_stat_interval": 10,
-        "aes_key": "ABCDEF0123456789ABCDEF0123456789",
-        "calibration_temperature_celsius_room": 22,
-        "calibration_temperature_code_ad9361": 77,
-        "fts_version": 1,
-        "fts_match_crc_error": false
-    },
-    {
-        "board_type": "SLAVE",
-        "board_rx_freq": 866500000, /* radio RX central frequency in Hz */
-        "board_rx_bw": 7000000, /* radio RX bandwidth in Hz */
-        "SX1301_conf":[
-        {
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        },{
-            "chip_enable": true,
-            "chip_center_freq": 868000000,
-            "chip_rf_chain": 0,
-            "chan_multiSF_0": { "chan_rx_freq": 867100000, "spread_factor": "7-12" },
-            "chan_multiSF_1": { "chan_rx_freq": 867300000, "spread_factor": "7-12" },
-            "chan_multiSF_2": { "chan_rx_freq": 867500000, "spread_factor": "7-12" },
-            "chan_multiSF_3": { "chan_rx_freq": 867700000, "spread_factor": "7-12" },
-            "chan_multiSF_4": { "chan_rx_freq": 867900000, "spread_factor": "7-12" },
-            "chan_multiSF_5": { "chan_rx_freq": 868100000, "spread_factor": "7-12" },
-            "chan_multiSF_6": { "chan_rx_freq": 868300000, "spread_factor": "7-12" },
-            "chan_multiSF_7": { "chan_rx_freq": 868500000, "spread_factor": "7-12" },
-            "chan_LoRa_std" : { "chan_rx_freq": 868300000, "bandwidth": 250000, "spread_factor": 7 },
-            "chan_FSK"      : { "chan_rx_freq": 868800000, "bandwidth": 125000, "bit_rate": 50000 }
-        }],
-        "FSK_sync": "C194C1",
-        "loramac_public": true,
-        "nb_dsp": 3,
-        "dsp_stat_interval": 10,
-        "aes_key": "ABCDEF0123456789ABCDEF0123456789"
-    }],
-    "gateway_conf": {
-        "gateway_ID": "00AEAEFFFE000000",
-        /* change with default server address/ports */
-        "server_address": "127.0.0.1",
-        "serv_port_up": 1780,
-        "serv_port_down": 1782,
-        /* adjust the following parameters for your network */
-        "keepalive_interval": 10,
-        "stat_interval": 30,
-        "push_timeout_ms": 100,
-        /* forward only valid packets */
-        "forward_crc_valid": true,
-        "forward_crc_error": false,
-        "forward_crc_disabled": false,
-        /* link testing mote */
-        "link_mote": "00CC01AF"
-    },
-    "gps_conf": {
-        "fixed_altitude": false,
-        "gw_altitude": 0
-    }
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation_5.1.0.bb b/recipes-connectivity/lora/lora-packet-forwarder-geolocation_5.1.0.bb
deleted file mode 100644
index fa5232a..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation_5.1.0.bb
+++ /dev/null
@@ -1,58 +0,0 @@
-DESCRIPTION = "LoRa Packet Forwarder Geolocation"
-PRIORITY = "optional"
-SECTION = "console/utils"
-# Semtech license is a modified BSD-style license
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://mlinux4/LICENSE.TXT;md5=86776875df1423114abfcec938f3e565"
-DEPENDS ?= "lora-gateway-geolocation logrotate lora-logging"
-RDEPENDS_${PN} += "bash"
-# Source revision
-PSR = "r4"
-# Recipe revision
-PR = "r6"
-
-SRCREV = "v${PV}"
-
-SRC_URI = "http://multitech.net/downloads/lora-packet-forwarder-geolocation_arm926ejste_${PV}-${PSR}.tar.gz \
-           file://global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_full_diversity_EU868 \            
-           file://global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_full_diversity_JP920 \
-           file://global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_partial_diversity_EU868 \
-           file://global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_EU868 \
-           file://global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_US915 \
-           file://global_conf.json.MTAC_LORA_2_1_loc_single_antenna_64ch_US915 \
-           file://global_conf.json.MTAC_LORA_2_1_loc_single_antenna_full_duplex_64ch_US915 \
-           file://global_conf.json.MTAC_LORA_2_1_test_dual_antenna_56ch_partial_diversity_EU868 \
-           file://global_conf.json.MTAC_LORA_2_1_test_single_antenna_16ch_16x1_EU868 \
-           file://global_conf.json.MTAC_LORA_2_1_test_single_antenna_64ch_64x1_EU868 \
-           file://global_conf.json.MTAC_LORA_2_1_test_single_antenna_64ch_8x8_EU868 \
-"
-SRC_URI[md5sum] = "542f02198a3258ca2ad4e549524e3ddc"
-SRC_URI[sha256sum] = "8176f5f55f96b7a72946cfb51743a8ea4f88a4033e54009e7bcf8f03077d248e"
-
-S = "${WORKDIR}"
-B = "${S}"
-
-LORA_DIR = "/opt/lora"
-
-export LGW_PATH = "${STAGING_LIBDIR}/lora"
-export LGW_INC = "${STAGING_INCDIR}/lora"
-
-do_compile() {
-}
-
-do_install() {
-  install -d ${D}${LORA_DIR}
-  install -m 755 mlinux4/pkt_forwarder ${D}${LORA_DIR}/
-  install -m 755 ${WORKDIR}/global_conf.json.MTAC_LORA_2_1* ${D}${LORA_DIR}/
-  install -d ${D}${LORA_DIR}/forwarder-utils-geo
-  install -m 755 mlinux4/forwarder-utils-geo/* ${D}${LORA_DIR}/forwarder-utils-geo/
-}
-
-
-FILES_${PN} += "${LORA_DIR}"
-FILES_${PN}-dbg += "${LORA_DIR}/.debug ${LORA_DIR}/forwarder-utils-geo/.debug"
-
-# disable this on purpose for dev purposes
-do_rm_work() {
-  echo "skipping"
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb/README.md b/recipes-connectivity/lora/lora-packet-forwarder-usb/README.md
deleted file mode 100644
index c927c60..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder-usb/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-(c) Senet, Inc 2016
-
-
-
-3rd Party Licenses
-------------------
-
-This software incorporates the lora_gateway software which requires the
-following statement to be included in its distribution.
-
-Copyright (c) 2013, SEMTECH S.A.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-  * Neither the name of the Semtech corporation nor the
-    names of its contributors may be used to endorse or promote products
-    derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL SEMTECH S.A. BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb/local_conf.json b/recipes-connectivity/lora/lora-packet-forwarder-usb/local_conf.json
deleted file mode 100644
index 3c2af80..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder-usb/local_conf.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "gateway_conf": {
-        "server_address": "localhost",
-        "serv_port_up": 1780,
-        "serv_port_down": 1782
-    }
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-add-no-header-option.patch b/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-add-no-header-option.patch
deleted file mode 100644
index fd2fa24..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-add-no-header-option.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 03c697f2bcf538407ca6a0821dbbb65ab7679aff Mon Sep 17 00:00:00 2001
-From: Jason Reiss <jreiss@multitech.com>
-Date: Thu, 16 Jul 2015 13:31:20 -0500
-Subject: [PATCH] feature: add option to send packets with no header
-
----
- basic_pkt_fwd/src/basic_pkt_fwd.c |    7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/basic_pkt_fwd/src/basic_pkt_fwd.c b/basic_pkt_fwd/src/basic_pkt_fwd.c
-index e20dfc1..2223b4a 100644
---- a/basic_pkt_fwd/src/basic_pkt_fwd.c
-+++ b/basic_pkt_fwd/src/basic_pkt_fwd.c
-@@ -1276,6 +1276,13 @@ void thread_down(void) {
- 			if (val != NULL) {
- 				txpkt.no_crc = (bool)json_value_get_boolean(val);
- 			}
-+
-+            /* Parse "No Header" flag (optional field) */
-+            val = json_object_get_value(txpk_obj,"nhdr");
-+            if (val != NULL) {
-+               txpkt.no_header = (bool)json_value_get_boolean(val);
-+            }
-+
- 			
- 			/* parse target frequency (mandatory) */
- 			val = json_object_get_value(txpk_obj,"freq");
- 			
-diff --git a/gps_pkt_fwd/src/gps_pkt_fwd.c b/gps_pkt_fwd/src/gps_pkt_fwd.c
-index 79f7584..d073540 100644
---- a/gps_pkt_fwd/src/gps_pkt_fwd.c
-+++ b/gps_pkt_fwd/src/gps_pkt_fwd.c
-@@ -1534,6 +1534,12 @@ void thread_down(void) {
- 				txpkt.no_crc = (bool)json_value_get_boolean(val);
- 			}
- 			
-+			/* Parse "No Header" flag (optional field) */
-+            val = json_object_get_value(txpk_obj,"nhdr");
-+            if (val != NULL) {
-+                txpkt.no_header = (bool)json_value_get_boolean(val);
-+            }
-+			
- 			/* parse target frequency (mandatory) */
- 			val = json_object_get_value(txpk_obj,"freq");
- 			if (val == NULL) {
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-add-queue.patch b/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-add-queue.patch
deleted file mode 100644
index cd9a727..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-add-queue.patch
+++ /dev/null
@@ -1,316 +0,0 @@
-From fdf5d6669d5132da9016840dfe2c1c99f525e4bc Mon Sep 17 00:00:00 2001
-From: Jason Reiss <jreiss@multitech.com>
-Date: Tue, 29 Sep 2015 12:01:12 -0500
-Subject: [PATCH] add-queue to pkt-fwd
-
----
- basic_pkt_fwd/src/basic_pkt_fwd.c |   93 +++++++++++++++++++++++++++++++++++--
- 1 file changed, 88 insertions(+), 5 deletions(-)
-
-diff --git a/basic_pkt_fwd/src/basic_pkt_fwd.c b/basic_pkt_fwd/src/basic_pkt_fwd.c
-index e20dfc1..4d0bb35 100644
---- a/basic_pkt_fwd/src/basic_pkt_fwd.c
-+++ b/basic_pkt_fwd/src/basic_pkt_fwd.c
-@@ -162,8 +162,19 @@ static int parse_gateway_configuration(const char * conf_file);
- 
- static double difftimespec(struct timespec end, struct timespec beginning);
- 
-+typedef struct tx_queue_s {
-+    struct lgw_pkt_tx_s pkt;
-+    struct tx_queue_s* next;
-+} tx_queue_s;
-+   
-+    
-+struct tx_queue_s* tx_queue = NULL;
-+struct tx_queue_s* tx_queue_end = NULL;
-+    
-+    
- /* threads */
- void thread_up(void);
-+void thread_queue(void);
- void thread_down(void);
- 
- /* -------------------------------------------------------------------------- */
-@@ -479,6 +490,7 @@ int main(void)
- 	
- 	/* threads */
- 	pthread_t thrid_up;
-+	pthread_t thrid_queue;
- 	pthread_t thrid_down;
- 	
- 	/* network socket creation */
-@@ -649,6 +661,11 @@ int main(void)
- 		MSG("ERROR: [main] impossible to create downstream thread\n");
- 		exit(EXIT_FAILURE);
- 	}
-+	i = pthread_create( &thrid_queue, NULL, (void * (*)(void *))thread_queue, NULL);
-+	if (i != 0) {
-+		MSG("ERROR: [main] impossible to create queue thread\n");
-+		exit(EXIT_FAILURE);
-+	}
- 	
- 	/* configure signal handling */
- 	sigemptyset(&sigact.sa_mask);
-@@ -744,6 +761,7 @@ int main(void)
- 	
- 	/* wait for upstream thread to finish (1 fetch cycle max) */
- 	pthread_join(thrid_up, NULL);
-+	pthread_cancel(thrid_queue);
- 	pthread_cancel(thrid_down); /* don't wait for downstream thread */
- 	
- 	/* if an exit signal was received, try to quit properly */
-@@ -1121,9 +1139,9 @@ void thread_up(void) {
- }
- 
- /* -------------------------------------------------------------------------- */
--/* --- THREAD 2: POLLING SERVER AND EMITTING PACKETS ------------------------ */
-+/* --- THREAD 2: POLLING SERVER AND QUEUEING PACKETS ------------------------ */
- 
--void thread_down(void) {
-+void thread_queue(void) {
- 	int i; /* loop variables */
- 	
- 	/* configuration and metadata for an outbound packet */
-@@ -1462,11 +1480,48 @@ void thread_down(void) {
- 			meas_dw_dgram_rcv += 1; /* count only datagrams with no JSON errors */
- 			meas_dw_network_byte += msg_len; /* meas_dw_network_byte */
- 			meas_dw_payload_byte += txpkt.size;
-+			pthread_mutex_unlock(&mx_meas_dw);
-+
-+			pthread_mutex_lock(&mx_concent); /* may have to wait for a fetch to finish */
-+            if (tx_queue == NULL) {
-+                tx_queue = malloc(sizeof(tx_queue_s));
-+                tx_queue_end = tx_queue;
-+                tx_queue->pkt = txpkt;
-+                tx_queue->next = NULL;
-+            } else {
-+                struct tx_queue_s* item = malloc(sizeof(tx_queue_s));
-+                item->next = NULL;
-+                item->pkt = txpkt;
-+                tx_queue_end->next = item;
-+                tx_queue_end = item;
-+            }
-+			pthread_mutex_unlock(&mx_concent);
-+        }
-+        wait_ms(1);
-+    }
-+	MSG("\nINFO: End of queue thread\n");
-+}
-+
-+/* -------------------------------------------------------------------------- */
-+/* --- THREAD 3: POLLING QUEUE AND EMITTING PACKETS ------------------------ */
-+
-+void thread_down(void) {
-+	MSG("\nINFO: Start of downstream thread\n");
- 			
-+	struct lgw_pkt_tx_s txpkt;
-+
-+	while (!exit_sig && !quit_sig) {
-+		pthread_mutex_lock(&mx_concent); /* may have to wait for a fetch to finish */
-+        if (tx_queue != NULL) {
-+            struct tx_queue_s* del = tx_queue;
-+            txpkt = tx_queue->pkt;
-+            tx_queue = tx_queue->next;
-+            free(del);
- 			/* transfer data and metadata to the concentrator, and schedule TX */
--			pthread_mutex_lock(&mx_concent); /* may have to wait for a fetch to finish */
--			i = lgw_send(txpkt);
-+            int	i = lgw_send(txpkt);
- 			pthread_mutex_unlock(&mx_concent); /* free concentrator ASAP */
-+
-+			pthread_mutex_lock(&mx_meas_dw);
- 			if (i == LGW_HAL_ERROR) {
- 				meas_nb_tx_fail += 1;
- 				pthread_mutex_unlock(&mx_meas_dw);
-@@ -1476,7 +1531,35 @@ void thread_down(void) {
- 				meas_nb_tx_ok += 1;
- 				pthread_mutex_unlock(&mx_meas_dw);
- 			}
--		}
-+			
-+            uint8_t tx_status_var = TX_STATUS_UNKNOWN;
-+            // wait for 200 ms and ensure packet is transmitted
-+            for (i=0; (i < 20) && (tx_status_var != TX_EMITTING); ++i) {
-+                wait_ms(10);
-+                pthread_mutex_lock(&mx_concent);
-+                lgw_status(TX_STATUS, &tx_status_var);
-+                pthread_mutex_unlock(&mx_concent);
-+            }   
-+            if (tx_status_var != TX_EMITTING) {
-+               MSG("WARNING: [down] packet was scheduled but failed to TX\n");
-+            } else {
-+                // if packet is transmitting then wait for end of TX or timeout after 4 seconds
-+                for (i=0; (i < 400) && (tx_status_var != TX_FREE); ++i) {
-+                   wait_ms(10);
-+                   pthread_mutex_lock(&mx_concent);
-+                   lgw_status(TX_STATUS, &tx_status_var);
-+                   pthread_mutex_unlock(&mx_concent);
-+                }   
-+
-+                if (tx_status_var != TX_FREE) {
-+                    MSG("WARNING: [down] timedout waiting for end of TX\n");
-+                }
-+            }
-+			
-+		} else {
-+			pthread_mutex_unlock(&mx_concent); /* free concentrator ASAP */
-+        }
-+        wait_ms(1);
- 	}
- 	MSG("\nINFO: End of downstream thread\n");
- }
-
-iff --git a/gps_pkt_fwd/src/gps_pkt_fwd.c b/gps_pkt_fwd/src/gps_pkt_fwd.c
-index 79f7584..3d1cbf8 100644
---- a/gps_pkt_fwd/src/gps_pkt_fwd.c
-+++ b/gps_pkt_fwd/src/gps_pkt_fwd.c
-@@ -192,8 +192,18 @@ static int parse_gateway_configuration(const char * conf_file);
- 
- static double difftimespec(struct timespec end, struct timespec beginning);
- 
-+typedef struct tx_queue_s {
-+    struct lgw_pkt_tx_s pkt;
-+    struct tx_queue_s* next;
-+} tx_queue_s;
-+   
-+    
-+struct tx_queue_s* tx_queue = NULL;
-+struct tx_queue_s* tx_queue_end = NULL;
-+
- /* threads */
- void thread_up(void);
-+void thread_queue(void);
- void thread_down(void);
- void thread_gps(void);
- void thread_valid(void);
-@@ -546,6 +556,7 @@ int main(void)
- 	
- 	/* threads */
- 	pthread_t thrid_up;
-+	pthread_t thrid_queue;
- 	pthread_t thrid_down;
- 	pthread_t thrid_gps;
- 	pthread_t thrid_valid;
-@@ -739,6 +750,12 @@ int main(void)
- 		exit(EXIT_FAILURE);
- 	}
- 	
-+    i = pthread_create( &thrid_queue, NULL, (void * (*)(void *))thread_queue, NULL);
-+	if (i != 0) {
-+		MSG("ERROR: [main] impossible to create queue thread\n");
-+		exit(EXIT_FAILURE);
-+	}
-+	
- 	/* spawn thread to manage GPS */
- 	if (gps_enabled == true) {
- 		i = pthread_create( &thrid_gps, NULL, (void * (*)(void *))thread_gps, NULL);
-@@ -891,6 +908,7 @@ int main(void)
- 	
- 	/* wait for upstream thread to finish (1 fetch cycle max) */
- 	pthread_join(thrid_up, NULL);
-+	pthread_cancel(thrid_queue);
- 	pthread_cancel(thrid_down); /* don't wait for downstream thread */
- 	pthread_cancel(thrid_gps); /* don't wait for GPS thread */
- 	pthread_cancel(thrid_valid); /* don't wait for validation thread */
-@@ -1325,9 +1343,9 @@ void thread_up(void) {
- }
- 
- /* -------------------------------------------------------------------------- */
--/* --- THREAD 2: POLLING SERVER AND EMITTING PACKETS ------------------------ */
-+/* --- THREAD 2: POLLING SERVER AND QUEUE PACKETS ------------------------ */
- 
--void thread_down(void) {
-+void thread_queue(void) {
- 	int i; /* loop variables */
- 	
- 	/* configuration and metadata for an outbound packet */
-@@ -1719,11 +1737,49 @@ void thread_down(void) {
- 			meas_dw_dgram_rcv += 1; /* count only datagrams with no JSON errors */
- 			meas_dw_network_byte += msg_len; /* meas_dw_network_byte */
- 			meas_dw_payload_byte += txpkt.size;
-+			pthread_mutex_unlock(&mx_meas_dw);
-+
-+			pthread_mutex_lock(&mx_concent); /* may have to wait for a fetch to finish */
-+            if (tx_queue == NULL) {
-+                tx_queue = malloc(sizeof(tx_queue_s));
-+                tx_queue_end = tx_queue;
-+                tx_queue->pkt = txpkt;
-+                tx_queue->next = NULL;
-+            } else {
-+                struct tx_queue_s* item = malloc(sizeof(tx_queue_s));
-+                item->next = NULL;
-+                item->pkt = txpkt;
-+                tx_queue_end->next = item;
-+                tx_queue_end = item;
-+            }
-+			pthread_mutex_unlock(&mx_concent);
-+        }
-+        wait_ms(1);
-+    }
-+	MSG("\nINFO: End of queue thread\n");
-+}
-+
-+/* -------------------------------------------------------------------------- */
-+/* --- THREAD 3: POLLING QUEUE AND EMITTING PACKETS ------------------------ */
-+
-+void thread_down(void) {
-+	MSG("\nINFO: Start of downstream thread\n");
- 			
-+	struct lgw_pkt_tx_s txpkt;
-+
-+	while (!exit_sig && !quit_sig) {
-+		pthread_mutex_lock(&mx_concent); /* may have to wait for a fetch to finish */
-+        if (tx_queue != NULL) {
-+            struct tx_queue_s* del = tx_queue;
-+            txpkt = tx_queue->pkt;
-+            tx_queue = tx_queue->next;
-+            free(del);
-+		
- 			/* transfer data and metadata to the concentrator, and schedule TX */
--			pthread_mutex_lock(&mx_concent); /* may have to wait for a fetch to finish */
--			i = lgw_send(txpkt);
-+			int i = lgw_send(txpkt);
- 			pthread_mutex_unlock(&mx_concent); /* free concentrator ASAP */
-+			
-+			pthread_mutex_lock(&mx_meas_dw);
- 			if (i == LGW_HAL_ERROR) {
- 				meas_nb_tx_fail += 1;
- 				pthread_mutex_unlock(&mx_meas_dw);
-@@ -1733,7 +1789,35 @@ void thread_down(void) {
- 				meas_nb_tx_ok += 1;
- 				pthread_mutex_unlock(&mx_meas_dw);
- 			}
--		}
-+			
-+            uint8_t tx_status_var = TX_STATUS_UNKNOWN;
-+            // wait for 200 ms and ensure packet is transmitted
-+            for (i=0; (i < 20) && (tx_status_var != TX_EMITTING); ++i) {
-+                wait_ms(10);
-+                pthread_mutex_lock(&mx_concent);
-+                lgw_status(TX_STATUS, &tx_status_var);
-+                pthread_mutex_unlock(&mx_concent);
-+            }   
-+            if (tx_status_var != TX_EMITTING) {
-+               MSG("WARNING: [down] packet was scheduled but failed to TX\n");
-+            } else {
-+                // if packet is transmitting then wait for end of TX or timeout after 4 seconds
-+                for (i=0; (i < 400) && (tx_status_var != TX_FREE); ++i) {
-+                   wait_ms(10);
-+                   pthread_mutex_lock(&mx_concent);
-+                   lgw_status(TX_STATUS, &tx_status_var);
-+                   pthread_mutex_unlock(&mx_concent);
-+                }   
-+
-+                if (tx_status_var != TX_FREE) {
-+                    MSG("WARNING: [down] timedout waiting for end of TX\n");
-+                }
-+            }
-+			
-+		} else {
-+			pthread_mutex_unlock(&mx_concent); /* free concentrator ASAP */
-+        }
-+        wait_ms(1);
- 	}
- 	MSG("\nINFO: End of downstream thread\n");
- }
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-fixb64.patch b/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-fixb64.patch
deleted file mode 100644
index dc0df42..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-fixb64.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: git/basic_pkt_fwd/src/base64.c
-===================================================================
---- git.orig/basic_pkt_fwd/src/base64.c	2015-03-31 16:00:39.479058735 -0500
-+++ git/basic_pkt_fwd/src/base64.c	2015-03-31 16:02:18.529580540 -0500
-@@ -263,7 +263,7 @@
- 			DEBUG("ERROR: INVALID UNPADDED BASE64 STRING\n");
- 			return -1;
- 		case 2: /* 2 chars in last block, must add 2 padding char */
--			if (max_len > (ret + 2 + 1)) {
-+			if (max_len >= (ret + 2 + 1)) {
- 				out[ret] = code_pad;
- 				out[ret+1] = code_pad;
- 				out[ret+2] = 0;
-@@ -273,7 +273,7 @@
- 				return -1;
- 			}
- 		case 3: /* 3 chars in last block, must add 1 padding char */
--			if (max_len > (ret + 1 + 1)) {
-+			if (max_len >= (ret + 1 + 1)) {
- 				out[ret] = code_pad;
- 				out[ret+1] = 0;
- 				return ret+1;
-Index: git/beacon_pkt_fwd/src/base64.c
-===================================================================
---- git.orig/beacon_pkt_fwd/src/base64.c	2015-03-31 16:00:39.479058735 -0500
-+++ git/beacon_pkt_fwd/src/base64.c	2015-03-31 16:03:26.040561508 -0500
-@@ -263,7 +263,7 @@
- 			DEBUG("ERROR: INVALID UNPADDED BASE64 STRING\n");
- 			return -1;
- 		case 2: /* 2 chars in last block, must add 2 padding char */
--			if (max_len > (ret + 2 + 1)) {
-+			if (max_len >= (ret + 2 + 1)) {
- 				out[ret] = code_pad;
- 				out[ret+1] = code_pad;
- 				out[ret+2] = 0;
-@@ -273,7 +273,7 @@
- 				return -1;
- 			}
- 		case 3: /* 3 chars in last block, must add 1 padding char */
--			if (max_len > (ret + 1 + 1)) {
-+			if (max_len >= (ret + 1 + 1)) {
- 				out[ret] = code_pad;
- 				out[ret+1] = 0;
- 				return ret+1;
-Index: git/gps_pkt_fwd/src/base64.c
-===================================================================
---- git.orig/gps_pkt_fwd/src/base64.c	2015-03-31 16:02:59.344965478 -0500
-+++ git/gps_pkt_fwd/src/base64.c	2015-03-31 16:03:13.208755845 -0500
-@@ -263,7 +263,7 @@
- 			DEBUG("ERROR: INVALID UNPADDED BASE64 STRING\n");
- 			return -1;
- 		case 2: /* 2 chars in last block, must add 2 padding char */
--			if (max_len > (ret + 2 + 1)) {
-+			if (max_len >= (ret + 2 + 1)) {
- 				out[ret] = code_pad;
- 				out[ret+1] = code_pad;
- 				out[ret+2] = 0;
-@@ -273,7 +273,7 @@
- 				return -1;
- 			}
- 		case 3: /* 3 chars in last block, must add 1 padding char */
--			if (max_len > (ret + 1 + 1)) {
-+			if (max_len >= (ret + 1 + 1)) {
- 				out[ret] = code_pad;
- 				out[ret+1] = 0;
- 				return ret+1;
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-mts-enhancements.patch b/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-mts-enhancements.patch
deleted file mode 100644
index e1da462..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-mts-enhancements.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-Index: git/basic_pkt_fwd/src/basic_pkt_fwd.c
-===================================================================
---- git.orig/basic_pkt_fwd/src/basic_pkt_fwd.c	2015-04-01 15:14:12.192933389 -0500
-+++ git/basic_pkt_fwd/src/basic_pkt_fwd.c	2015-04-01 15:36:38.731731561 -0500
-@@ -42,6 +42,8 @@
- #include <netdb.h>		/* gai_strerror */
- 
- #include <pthread.h>
-+#include <getopt.h>
-+#include <linux/limits.h>
- 
- #include "parson.h"
- #include "base64.h"
-@@ -472,19 +474,65 @@
- 	return x;
- }
- 
-+void usage(char *proc_name) {
-+	fprintf(stderr, "Usage: %s [-c config_dir] [-l logfile]\n", proc_name);
-+	exit(1);
-+}
-+
-+
-+static char *short_options = "c:l:h";
-+static struct option long_options[] = {
-+    {"config-dir", 1, 0, 'c'},
-+    {"logfile", 1, 0, 'l'},
-+    {"help", 0, 0, 'h'},
-+    {0, 0, 0, 0},
-+};
-+
- /* -------------------------------------------------------------------------- */
- /* --- MAIN FUNCTION -------------------------------------------------------- */
- 
--int main(void)
-+int main(int argc, char *argv[])
- {
- 	struct sigaction sigact; /* SIGQUIT&SIGINT&SIGTERM signal handling */
- 	int i; /* loop variable and temporary variable for return value */
- 	
- 	/* configuration file related */
--	char *global_cfg_path= "global_conf.json"; /* contain global (typ. network-wide) configuration */
--	char *local_cfg_path = "local_conf.json"; /* contain node specific configuration, overwrite global parameters for parameters that are defined in both */
--	char *debug_cfg_path = "debug_conf.json"; /* if present, all other configuration files are ignored */
--	
-+	char *global_cfg_name = "global_conf.json"; /* contain global (typ. network-wide) configuration */
-+	char *local_cfg_name = "local_conf.json"; /* contain node specific configuration, overwrite global parameters for parameters that are defined in both */
-+	char *debug_cfg_name = "debug_conf.json"; /* if present, all other configuration files are ignored */
-+
-+	int opt_ind = 0;
-+	char cfg_dir[PATH_MAX] = {0};
-+	char global_cfg_path[PATH_MAX] = {0};
-+	char local_cfg_path[PATH_MAX] = {0};
-+	char debug_cfg_path[PATH_MAX] = {0};
-+	char *logfile_path = NULL;
-+	char *proc_name = argv[0];
-+
-+	while((i = getopt_long(argc, argv, short_options, long_options, &opt_ind)) >= 0) {
-+		switch(i) {
-+		case 0:
-+			break;
-+		case 'c':
-+			strncpy(cfg_dir, optarg, sizeof(cfg_dir)-2);
-+			strcat(cfg_dir, "/");
-+			break;
-+		case 'l':
-+			logfile_path = optarg;
-+			break;
-+		case 'h':
-+			usage(proc_name);
-+			break;
-+		default:
-+			usage(proc_name);
-+			break;
-+        }
-+	}
-+
-+	snprintf(global_cfg_path, sizeof(global_cfg_path),  "%s%s", cfg_dir, global_cfg_name);
-+	snprintf(local_cfg_path, sizeof(local_cfg_path),  "%s%s", cfg_dir, local_cfg_name);
-+	snprintf(debug_cfg_path, sizeof(debug_cfg_path),  "%s%s", cfg_dir, debug_cfg_name);
-+
- 	/* threads */
- 	pthread_t thrid_up;
- 	pthread_t thrid_down;
-@@ -522,6 +570,22 @@
- 	float rx_nocrc_ratio;
- 	float up_ack_ratio;
- 	float dw_ack_ratio;
-+
-+	/* redirect stdout, stderr to logfile if specified */
-+	int logfile_fd;
-+	FILE *logfile = NULL;
-+	if (logfile_path) {
-+		logfile = fopen(logfile_path, "w");
-+		if (logfile) {
-+			logfile_fd = fileno(logfile);
-+			dup2(logfile_fd, STDOUT_FILENO);
-+			dup2(logfile_fd, STDERR_FILENO);
-+		}
-+		else {
-+			printf("Error opening log file %s\n", logfile_path);
-+			exit(1);
-+		}
-+	}
- 	
- 	/* display version informations */
- 	MSG("*** Basic Packet Forwarder for Lora Gateway ***\nVersion: " VERSION_STRING "\n");
-diff --git a/gps_pkt_fwd/src/gps_pkt_fwd.c b/gps_pkt_fwd/src/gps_pkt_fwd.c
-index 79f7584..3f2f91c 100644
---- a/gps_pkt_fwd/src/gps_pkt_fwd.c
-+++ b/gps_pkt_fwd/src/gps_pkt_fwd.c
-@@ -44,6 +44,8 @@ Maintainer: Sylvain Miermont
- #include <netdb.h>		/* gai_strerror */
- 
- #include <pthread.h>
-+#include <getopt.h>
-+#include <linux/limits.h>
- 
- #include "parson.h"
- #include "base64.h"
-@@ -531,19 +533,65 @@ static double difftimespec(struct timespec end, struct timespec beginning) {
- 	return x;
- }
- 
-+void usage(char *proc_name) {
-+	fprintf(stderr, "Usage: %s [-c config_dir] [-l logfile]\n", proc_name);
-+	exit(1);
-+}
-+
-+
-+static char *short_options = "c:l:h";
-+static struct option long_options[] = {
-+    {"config-dir", 1, 0, 'c'},
-+    {"logfile", 1, 0, 'l'},
-+    {"help", 0, 0, 'h'},
-+    {0, 0, 0, 0},
-+};
-+
- /* -------------------------------------------------------------------------- */
- /* --- MAIN FUNCTION -------------------------------------------------------- */
- 
--int main(void)
-+int main(int argc, char *argv[])
- {
- 	struct sigaction sigact; /* SIGQUIT&SIGINT&SIGTERM signal handling */
- 	int i; /* loop variable and temporary variable for return value */
- 	
- 	/* configuration file related */
--	char *global_cfg_path= "global_conf.json"; /* contain global (typ. network-wide) configuration */
--	char *local_cfg_path = "local_conf.json"; /* contain node specific configuration, overwrite global parameters for parameters that are defined in both */
--	char *debug_cfg_path = "debug_conf.json"; /* if present, all other configuration files are ignored */
--	
-+	char *global_cfg_name = "global_conf.json"; /* contain global (typ. network-wide) configuration */
-+	char *local_cfg_name = "local_conf.json"; /* contain node specific configuration, overwrite global parameters for parameters that are defined in both */
-+	char *debug_cfg_name = "debug_conf.json"; /* if present, all other configuration files are ignored */
-+
-+	int opt_ind = 0;
-+	char cfg_dir[PATH_MAX] = {0};
-+	char global_cfg_path[PATH_MAX] = {0};
-+	char local_cfg_path[PATH_MAX] = {0};
-+	char debug_cfg_path[PATH_MAX] = {0};
-+	char *logfile_path = NULL;
-+	char *proc_name = argv[0];
-+
-+	while((i = getopt_long(argc, argv, short_options, long_options, &opt_ind)) >= 0) {
-+		switch(i) {
-+		case 0:
-+			break;
-+		case 'c':
-+			strncpy(cfg_dir, optarg, sizeof(cfg_dir)-2);
-+			strcat(cfg_dir, "/");
-+			break;
-+		case 'l':
-+			logfile_path = optarg;
-+			break;
-+		case 'h':
-+			usage(proc_name);
-+			break;
-+		default:
-+			usage(proc_name);
-+			break;
-+        }
-+	}
-+
-+	snprintf(global_cfg_path, sizeof(global_cfg_path),  "%s%s", cfg_dir, global_cfg_name);
-+	snprintf(local_cfg_path, sizeof(local_cfg_path),  "%s%s", cfg_dir, local_cfg_name);
-+	snprintf(debug_cfg_path, sizeof(debug_cfg_path),  "%s%s", cfg_dir, debug_cfg_name);
-+
- 	/* threads */
- 	pthread_t thrid_up;
- 	pthread_t thrid_down;
-@@ -589,6 +637,22 @@ int main(void)
- 	float up_ack_ratio;
- 	float dw_ack_ratio;
- 	
-+	/* redirect stdout, stderr to logfile if specified */
-+	int logfile_fd;
-+	FILE *logfile = NULL;
-+	if (logfile_path) {
-+		logfile = fopen(logfile_path, "w");
-+		if (logfile) {
-+			logfile_fd = fileno(logfile);
-+			dup2(logfile_fd, STDOUT_FILENO);
-+			dup2(logfile_fd, STDERR_FILENO);
-+		}
-+		else {
-+			printf("Error opening log file %s\n", logfile_path);
-+			exit(1);
-+		}
-+	}
-+		
- 	/* display version informations */
- 	MSG("*** GPS Packet Forwarder for Lora Gateway ***\nVersion: " VERSION_STRING "\n");
- 	MSG("*** Lora concentrator HAL library version info ***\n%s\n***\n", lgw_version_info());
-Index: git/beacon_pkt_fwd/src/beacon_pkt_fwd.c
-===================================================================
---- git.orig/beacon_pkt_fwd/src/beacon_pkt_fwd.c	2015-04-01 15:14:12.156933956 -0500
-+++ git/beacon_pkt_fwd/src/beacon_pkt_fwd.c	2015-04-01 15:14:12.284931938 -0500
-@@ -45,6 +45,8 @@
- #include <netdb.h>		/* gai_strerror */
- 
- #include <pthread.h>
-+#include <getopt.h>
-+#include <linux/limits.h>
- 
- #include "parson.h"
- #include "base64.h"
-@@ -618,19 +620,65 @@
- 	return x;
- }
- 
-+void usage(char *proc_name) {
-+	fprintf(stderr, "Usage: %s [-c config_dir] [-l logfile]\n", proc_name);
-+	exit(1);
-+}
-+
-+
-+static char *short_options = "c:h";
-+static struct option long_options[] = {
-+    {"config-dir", 1, 0, 'c'},
-+    {"logfile", 1, 0, 'l'},
-+    {"help", 0, 0, 'h'},
-+    {0, 0, 0, 0},
-+};
-+
- /* -------------------------------------------------------------------------- */
- /* --- MAIN FUNCTION -------------------------------------------------------- */
- 
--int main(void)
-+int main(int argc, char *argv[])
- {
- 	struct sigaction sigact; /* SIGQUIT&SIGINT&SIGTERM signal handling */
- 	int i; /* loop variable and temporary variable for return value */
- 	
- 	/* configuration file related */
--	char *global_cfg_path= "global_conf.json"; /* contain global (typ. network-wide) configuration */
--	char *local_cfg_path = "local_conf.json"; /* contain node specific configuration, overwrite global parameters for parameters that are defined in both */
--	char *debug_cfg_path = "debug_conf.json"; /* if present, all other configuration files are ignored */
--	
-+	char *global_cfg_name = "global_conf.json"; /* contain global (typ. network-wide) configuration */
-+	char *local_cfg_name = "local_conf.json"; /* contain node specific configuration, overwrite global parameters for parameters that are defined in both */
-+	char *debug_cfg_name = "debug_conf.json"; /* if present, all other configuration files are ignored */
-+
-+	int opt_ind = 0;
-+	char cfg_dir[PATH_MAX] = {0};
-+	char global_cfg_path[PATH_MAX] = {0};
-+	char local_cfg_path[PATH_MAX] = {0};
-+	char debug_cfg_path[PATH_MAX] = {0};
-+	char *logfile_path = NULL;
-+	char *proc_name = argv[0];
-+
-+	while((i = getopt_long(argc, argv, short_options, long_options, &opt_ind)) >= 0) {
-+		switch(i) {
-+		case 0:
-+			break;
-+		case 'c':
-+			strncpy(cfg_dir, optarg, sizeof(cfg_dir)-2);
-+			strcat(cfg_dir, "/");
-+			break;
-+		case 'l':
-+			logfile_path = optarg;
-+			break;
-+		case 'h':
-+			usage(proc_name);
-+			break;
-+		default:
-+			usage(proc_name);
-+			break;
-+        }
-+	}
-+
-+	snprintf(global_cfg_path, sizeof(global_cfg_path),  "%s%s", cfg_dir, global_cfg_name);
-+	snprintf(local_cfg_path, sizeof(local_cfg_path),  "%s%s", cfg_dir, local_cfg_name);
-+	snprintf(debug_cfg_path, sizeof(debug_cfg_path),  "%s%s", cfg_dir, debug_cfg_name);
-+
- 	/* threads */
- 	pthread_t thrid_up;
- 	pthread_t thrid_down;
-@@ -767,6 +715,22 @@
- 	float rx_nocrc_ratio;
- 	float up_ack_ratio;
- 	float dw_ack_ratio;
-+
-+	/* redirect stdout, stderr to logfile if specified */
-+	int logfile_fd;
-+	FILE *logfile = NULL;
-+	if (logfile_path) {
-+		logfile = fopen(logfile_path, "w");
-+		if (logfile) {
-+			logfile_fd = fileno(logfile);
-+			dup2(logfile_fd, STDOUT_FILENO);
-+			dup2(logfile_fd, STDERR_FILENO);
-+		}
-+		else {
-+			printf("Error opening log file %s\n", logfile_path);
-+			exit(1);
-+		}
-+	}
- 	
- 	/* display version informations */
- 	MSG("*** Beacon Packet Forwarder for Lora Gateway ***\nVersion: " VERSION_STRING "\n");
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-set-spi-path.patch b/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-set-spi-path.patch
deleted file mode 100644
index 01ce509..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-set-spi-path.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-Index: git/basic_pkt_fwd/src/basic_pkt_fwd.c
-===================================================================
---- git.orig/basic_pkt_fwd/src/basic_pkt_fwd.c	2015-01-07 14:38:10.016886785 -0600
-+++ git/basic_pkt_fwd/src/basic_pkt_fwd.c	2015-01-07 14:49:57.823412026 -0600
-@@ -106,6 +106,7 @@
- /* network configuration variables */
- static uint64_t lgwm = 0; /* Lora gateway MAC address */
- static char serv_addr[64] = STR(DEFAULT_SERVER); /* address of the server (host name or IPv4/IPv6) */
-+static char spi_device_path[64] = {0} ; /* custom SPI device path */
- static char serv_port_up[8] = STR(DEFAULT_PORT_UP); /* server port for upstream traffic */
- static char serv_port_down[8] = STR(DEFAULT_PORT_DW); /* server port for downstream traffic */
- static int keepalive_time = DEFAULT_KEEPALIVE; /* send a PULL_DATA request every X seconds, negative = disabled */
-@@ -393,6 +394,13 @@
- 		strncpy(serv_addr, str, sizeof serv_addr);
- 		MSG("INFO: server hostname or IP address is configured to \"%s\"\n", serv_addr);
- 	}
-+
-+	/* spi device path (optional) */
-+	str = json_object_get_string(conf_obj, "spi_device");
-+	if (str != NULL) {
-+		strncpy(spi_device_path, str, sizeof(spi_device_path)-1);
-+		MSG("INFO: SPI device is configured to \"%s\"\n", spi_device_path);
-+	}
- 	
- 	/* get up and down ports (optional) */
- 	val = json_object_get_value(conf_obj, "serv_port_up");
-@@ -629,6 +637,10 @@
- 		exit(EXIT_FAILURE);
- 	}
- 	freeaddrinfo(result);
-+
-+	/* set custom SPI device path if configured */
-+	if (strlen(spi_device_path) > 0)
-+		lgw_spi_set_path(spi_device_path);
- 	
- 	/* starting the concentrator */
- 	i = lgw_start();
-Index: git/beacon_pkt_fwd/src/beacon_pkt_fwd.c
-===================================================================
---- git.orig/beacon_pkt_fwd/src/beacon_pkt_fwd.c	2015-01-05 11:29:12.946020392 -0600
-+++ git/beacon_pkt_fwd/src/beacon_pkt_fwd.c	2015-01-07 14:57:00.338533303 -0600
-@@ -115,6 +115,7 @@
- /* network configuration variables */
- static uint64_t lgwm = 0; /* Lora gateway MAC address */
- static char serv_addr[64] = STR(DEFAULT_SERVER); /* address of the server (host name or IPv4/IPv6) */
-+static char spi_device_path[64] = {0} ; /* custom SPI device path */
- static char serv_port_up[8] = STR(DEFAULT_PORT_UP); /* server port for upstream traffic */
- static char serv_port_down[8] = STR(DEFAULT_PORT_DW); /* server port for downstream traffic */
- static int keepalive_time = DEFAULT_KEEPALIVE; /* send a PULL_DATA request every X seconds, negative = disabled */
-@@ -440,6 +441,13 @@
- 		strncpy(serv_addr, str, sizeof serv_addr);
- 		MSG("INFO: server hostname or IP address is configured to \"%s\"\n", serv_addr);
- 	}
-+
-+	/* spi device path (optional) */
-+	str = json_object_get_string(conf_obj, "spi_device");
-+	if (str != NULL) {
-+		strncpy(spi_device_path, str, sizeof(spi_device_path)-1);
-+		MSG("INFO: SPI device is configured to \"%s\"\n", spi_device_path);
-+	}
- 	
- 	/* get up and down ports (optional) */
- 	val = json_object_get_value(conf_obj, "serv_port_up");
-@@ -774,6 +782,10 @@
- 		exit(EXIT_FAILURE);
- 	}
- 	freeaddrinfo(result);
-+
-+	/* set custom SPI device path if configured */
-+	if (strlen(spi_device_path) > 0)
-+		lgw_spi_set_path(spi_device_path);
- 	
- 	/* starting the concentrator */
- 	i = lgw_start();
-Index: git/gps_pkt_fwd/src/gps_pkt_fwd.c
-===================================================================
---- git.orig/gps_pkt_fwd/src/gps_pkt_fwd.c	2015-01-05 11:29:12.946020392 -0600
-+++ git/gps_pkt_fwd/src/gps_pkt_fwd.c	2015-01-07 14:56:03.320278543 -0600
-@@ -110,6 +110,7 @@
- /* network configuration variables */
- static uint64_t lgwm = 0; /* Lora gateway MAC address */
- static char serv_addr[64] = STR(DEFAULT_SERVER); /* address of the server (host name or IPv4/IPv6) */
-+static char spi_device_path[64] = {0} ; /* custom SPI device path */
- static char serv_port_up[8] = STR(DEFAULT_PORT_UP); /* server port for upstream traffic */
- static char serv_port_down[8] = STR(DEFAULT_PORT_DW); /* server port for downstream traffic */
- static int keepalive_time = DEFAULT_KEEPALIVE; /* send a PULL_DATA request every X seconds, negative = disabled */
-@@ -424,6 +425,13 @@
- 		strncpy(serv_addr, str, sizeof serv_addr);
- 		MSG("INFO: server hostname or IP address is configured to \"%s\"\n", serv_addr);
- 	}
-+
-+	/* spi device path (optional) */
-+	str = json_object_get_string(conf_obj, "spi_device");
-+	if (str != NULL) {
-+		strncpy(spi_device_path, str, sizeof(spi_device_path)-1);
-+		MSG("INFO: SPI device is configured to \"%s\"\n", spi_device_path);
-+	}
- 	
- 	/* get up and down ports (optional) */
- 	val = json_object_get_value(conf_obj, "serv_port_up");
-@@ -717,6 +725,10 @@
- 		exit(EXIT_FAILURE);
- 	}
- 	freeaddrinfo(result);
-+
-+	/* set custom SPI device path if configured */
-+	if (strlen(spi_device_path) > 0)
-+		lgw_spi_set_path(spi_device_path);
- 	
- 	/* starting the concentrator */
- 	i = lgw_start();
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-skip-bad-packets.patch b/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-skip-bad-packets.patch
deleted file mode 100644
index eb9450f..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-skip-bad-packets.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Index: git/basic_pkt_fwd/src/basic_pkt_fwd.c
-===================================================================
---- git.orig/basic_pkt_fwd/src/basic_pkt_fwd.c	2014-12-16 17:03:32.891297739 -0600
-+++ git/basic_pkt_fwd/src/basic_pkt_fwd.c	2014-12-18 10:49:22.379916372 -0600
-@@ -928,7 +928,8 @@
- 					MSG("ERROR: [up] received packet with unknown status\n");
- 					memcpy((void *)(buff_up + buff_index), (void *)",\"stat\":?", 9);
- 					buff_index += 9;
--					exit(EXIT_FAILURE);
-+					continue; // skip packet
-+					//exit(EXIT_FAILURE);
- 			}
- 			
- 			/* Packet modulation, 13-14 useful chars */
-@@ -966,7 +967,8 @@
- 						MSG("ERROR: [up] lora packet with unknown datarate\n");
- 						memcpy((void *)(buff_up + buff_index), (void *)",\"datr\":\"SF?", 12);
- 						buff_index += 12;
--						exit(EXIT_FAILURE);
-+						continue; // skip packet
-+						//exit(EXIT_FAILURE);
- 				}
- 				switch (p->bandwidth) {
- 					case BW_125KHZ:
-@@ -985,7 +987,8 @@
- 						MSG("ERROR: [up] lora packet with unknown bandwidth\n");
- 						memcpy((void *)(buff_up + buff_index), (void *)"BW?\"", 4);
- 						buff_index += 4;
--						exit(EXIT_FAILURE);
-+						continue; // skip packet
-+						//exit(EXIT_FAILURE);
- 				}
- 				
- 				/* Packet ECC coding rate, 11-13 useful chars */
-@@ -1014,7 +1017,8 @@
- 						MSG("ERROR: [up] lora packet with unknown coderate\n");
- 						memcpy((void *)(buff_up + buff_index), (void *)",\"codr\":\"?\"", 11);
- 						buff_index += 11;
--						exit(EXIT_FAILURE);
-+						continue; // skip packet
-+						//exit(EXIT_FAILURE);
- 				}
- 				
- 				/* Lora SNR, 11-13 useful chars */
-@@ -1039,7 +1043,8 @@
- 				}
- 			} else {
- 				MSG("ERROR: [up] received packet with unknown modulation\n");
--				exit(EXIT_FAILURE);
-+				continue; // skip packet
-+				//exit(EXIT_FAILURE);
- 			}
- 			
- 			/* Packet RSSI, payload size, 18-23 useful chars */
- 			
-diff --git a/gps_pkt_fwd/src/gps_pkt_fwd.c b/gps_pkt_fwd/src/gps_pkt_fwd.c
-index 79f7584..933de29 100644
---- a/gps_pkt_fwd/src/gps_pkt_fwd.c
-+++ b/gps_pkt_fwd/src/gps_pkt_fwd.c
-@@ -1107,7 +1107,8 @@ void thread_up(void) {
- 					MSG("ERROR: [up] received packet with unknown status\n");
- 					memcpy((void *)(buff_up + buff_index), (void *)",\"stat\":?", 9);
- 					buff_index += 9;
--					exit(EXIT_FAILURE);
-+					continue; // skip packet
-+					//exit(EXIT_FAILURE);
- 			}
- 			
- 			/* Packet modulation, 13-14 useful chars */
-@@ -1145,7 +1146,8 @@ void thread_up(void) {
- 						MSG("ERROR: [up] lora packet with unknown datarate\n");
- 						memcpy((void *)(buff_up + buff_index), (void *)",\"datr\":\"SF?", 12);
- 						buff_index += 12;
--						exit(EXIT_FAILURE);
-+						continue; // skip packet
-+						//exit(EXIT_FAILURE);
- 				}
- 				switch (p->bandwidth) {
- 					case BW_125KHZ:
-@@ -1164,7 +1166,8 @@ void thread_up(void) {
- 						MSG("ERROR: [up] lora packet with unknown bandwidth\n");
- 						memcpy((void *)(buff_up + buff_index), (void *)"BW?\"", 4);
- 						buff_index += 4;
--						exit(EXIT_FAILURE);
-+                        continue; // skip packet
-+						//exit(EXIT_FAILURE);
- 				}
- 				
- 				/* Packet ECC coding rate, 11-13 useful chars */
-@@ -1193,7 +1196,8 @@ void thread_up(void) {
- 						MSG("ERROR: [up] lora packet with unknown coderate\n");
- 						memcpy((void *)(buff_up + buff_index), (void *)",\"codr\":\"?\"", 11);
- 						buff_index += 11;
--						exit(EXIT_FAILURE);
-+						continue; // skip packet
-+						//exit(EXIT_FAILURE);
- 				}
- 				
- 				/* Lora SNR, 11-13 useful chars */
-@@ -1218,7 +1222,8 @@ void thread_up(void) {
- 				}
- 			} else {
- 				MSG("ERROR: [up] received packet with unknown modulation\n");
--				exit(EXIT_FAILURE);
-+				continue; // skip packet				
-+				//exit(EXIT_FAILURE);
- 			}
- 			
- 			/* Packet RSSI, payload size, 18-23 useful chars */
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-synch-word.patch b/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-synch-word.patch
deleted file mode 100644
index 2f04eb1..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder-usb/lora-packet-forwarder-synch-word.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-
-diff --git a/basic_pkt_fwd/src/basic_pkt_fwd.c b/basic_pkt_fwd/src/basic_pkt_fwd.c
-index 2223b4a..2db6e26 100644
---- a/basic_pkt_fwd/src/basic_pkt_fwd.c
-+++ b/basic_pkt_fwd/src/basic_pkt_fwd.c
-@@ -103,7 +104,8 @@ static bool fwd_error_pkt = false; /* packets with PAYLOAD CRC ERROR are NOT for
- static bool fwd_nocrc_pkt = false; /* packets with NO PAYLOAD CRC are NOT forwarded */
- 
- /* network configuration variables */
-+static uint8_t synch_word = 0x12;
- static uint64_t lgwm = 0; /* Lora gateway MAC address */
- static char serv_addr[64] = STR(DEFAULT_SERVER); /* address of the server (host name or IPv4/IPv6) */
- static char serv_port_up[8] = STR(DEFAULT_PORT_UP); /* server port for upstream traffic */
- static char serv_port_down[8] = STR(DEFAULT_PORT_DW); /* server port for downstream traffic */
-@@ -281,6 +282,11 @@ static int parse_SX1301_configuration(const char * conf_file) {
- 		MSG("INFO: %s does contain a JSON object named %s, parsing SX1301 parameters\n", conf_file, conf_obj_name);
- 	}
- 	
-+	val = json_object_get_value(conf_obj, "lorawan_public"); /* fetch value (if possible) */
-+	if (json_value_get_type(val) == JSONBoolean && (bool)json_value_get_boolean(val) == true) {
-+	    synch_word = 0x34;
-+	}
-+	
- 	/* set configuration for RF chains */
- 	for (i = 0; i < LGW_RF_CHAIN_NB; ++i) {
- 		memset(&rfconf, 0, sizeof rfconf); /* initialize configuration structure */
-@@ -404,7 +415,14 @@ static int parse_gateway_configuration(const char * conf_file) {
- 		snprintf(serv_port_down, sizeof serv_port_down, "%u", (uint16_t)json_value_get_number(val));
- 		MSG("INFO: downstream port is configured to \"%s\"\n", serv_port_down);
- 	}
--	
-+
-+	val = json_object_get_value(conf_obj, "synch_word");
-+	if (val != NULL) {
-+		synch_word = (uint8_t)json_value_get_number(val);
-+		MSG("INFO: synch word is configured to %02x\n", synch_word);
-+	}
-+
-+
- 	/* get keep-alive interval (in seconds) for downstream (optional) */
- 	val = json_object_get_value(conf_obj, "keepalive_interval");
- 	if (val != NULL) {
-@@ -637,7 +721,9 @@ int main(void)
- 		MSG("ERROR: [main] failed to start the concentrator\n");
- 		exit(EXIT_FAILURE);
- 	}
--	
-+
-+    lgw_conf_lora_synch_word(synch_word);
-+
- 	/* spawn threads to manage upstream and downstream */
- 	i = pthread_create( &thrid_up, NULL, (void * (*)(void *))thread_up, NULL);
- 	if (i != 0) {
-diff --git a/gps_pkt_fwd/src/gps_pkt_fwd.c b/gps_pkt_fwd/src/gps_pkt_fwd.c
-index 79f7584..8addbc0 100644
---- a/gps_pkt_fwd/src/gps_pkt_fwd.c
-+++ b/gps_pkt_fwd/src/gps_pkt_fwd.c
-@@ -108,6 +108,7 @@ static bool fwd_error_pkt = false; /* packets with PAYLOAD CRC ERROR are NOT for
- static bool fwd_nocrc_pkt = false; /* packets with NO PAYLOAD CRC are NOT forwarded */
- 
- /* network configuration variables */
-+static uint8_t synch_word = 0x12;
- static uint64_t lgwm = 0; /* Lora gateway MAC address */
- static char serv_addr[64] = STR(DEFAULT_SERVER); /* address of the server (host name or IPv4/IPv6) */
- static char serv_port_up[8] = STR(DEFAULT_PORT_UP); /* server port for upstream traffic */
-@@ -237,6 +238,11 @@ static int parse_SX1301_configuration(const char * conf_file) {
- 		MSG("INFO: %s does contain a JSON object named %s, parsing SX1301 parameters\n", conf_file, conf_obj_name);
- 	}
- 	
-+	val = json_object_get_value(conf_obj, "lorawan_public"); /* fetch value (if possible) */
-+	if (json_value_get_type(val) == JSONBoolean && (bool)json_value_get_boolean(val) == true) {
-+	    synch_word = 0x34;
-+	}
-+	
- 	/* set configuration for RF chains */
- 	for (i = 0; i < LGW_RF_CHAIN_NB; ++i) {
- 		memset(&rfconf, 0, sizeof rfconf); /* initialize configuration structure */
-@@ -437,6 +443,12 @@ static int parse_gateway_configuration(const char * conf_file) {
- 		MSG("INFO: downstream port is configured to \"%s\"\n", serv_port_down);
- 	}
- 	
-+	val = json_object_get_value(conf_obj, "synch_word");
-+	if (val != NULL) {
-+		synch_word = (uint8_t)json_value_get_number(val);
-+		MSG("INFO: synch word is configured to %02x\n", synch_word);
-+	}
-+	
- 	/* get keep-alive interval (in seconds) for downstream (optional) */
- 	val = json_object_get_value(conf_obj, "keepalive_interval");
- 	if (val != NULL) {
-@@ -727,6 +739,8 @@ int main(void)
- 		exit(EXIT_FAILURE);
- 	}
- 	
-+	lgw_conf_lora_synch_word(synch_word);
-+	
- 	/* spawn threads to manage upstream and downstream */
- 	i = pthread_create( &thrid_up, NULL, (void * (*)(void *))thread_up, NULL);
- 	if (i != 0) {
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb b/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb
deleted file mode 100644
index 5131a34..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb
+++ /dev/null
@@ -1,59 +0,0 @@
-DESCRIPTION = "LoRa Packet Forwarder"
-HOMEPAGE = "https://github.com/Lora-net"
-PRIORITY = "optional"
-SECTION = "console/utils"
-# Semtech license is a modified BSD-style license
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=22af7693d7b76ef0fc76161c4be76c45"
-DEPENDS = "lora-gateway-usb"
-PR = "r12"
-
-EXTRA_OEMAKE = " -e"
-
-# tag v1.4.1
-SRCREV = "0011a60759a7d81656a5393e97089daab1ff1a81"
-
-SRC_URI = "git://github.com/Lora-net/packet_forwarder.git;protocol=git \
-           file://lora-packet-forwarder-add-no-header-option.patch \
-           file://lora-packet-forwarder-set-spi-path.patch \
-           file://lora-packet-forwarder-fixb64.patch \
-           file://lora-packet-forwarder-mts-enhancements.patch \
-           file://lora-packet-forwarder-synch-word.patch \
-           file://lora-packet-forwarder-add-queue.patch \
-           file://README.md \
-"
-
-S = "${WORKDIR}/git"
-B = "${S}"
-
-LORA_DIR = "/opt/lora"
-
-export LGW_PATH = "${STAGING_LIBDIR}/lora-usb"
-export LGW_INC = "${STAGING_INCDIR}/lora-usb"
-
-CFLAGS += "-I${LGW_INC} -Iinc -I. -std=gnu11"
-
-do_compile() {
-	oe_runmake
-}
-
-do_install() {
-	install -d ${D}${LORA_DIR}
-	install -m 755 gps_pkt_fwd/gps_pkt_fwd ${D}${LORA_DIR}/gps_pkt_fwd-usb
-	install -m 755 basic_pkt_fwd/basic_pkt_fwd ${D}${LORA_DIR}/basic_pkt_fwd-usb
-	install -m 755 beacon_pkt_fwd/beacon_pkt_fwd ${D}${LORA_DIR}/beacon_pkt_fwd-usb
-	install -m 755 util_sink/util_sink ${D}${LORA_DIR}/util_sink-usb
-	install -m 755 util_ack/util_ack ${D}${LORA_DIR}/util_ack-usb
-
-
-#   skip util_tx_test since it conflicts with one in lora-gateway
-#	install -m 755 util_tx_test/util_tx_test ${D}${LORA_DIR}/
-}
-
-FILES_${PN} += "${LORA_DIR}"
-FILES_${PN}-dbg += "${LORA_DIR}/.debug"
-
-# disable this on purpose for dev purposes
-do_rm_work() {
-	echo "skipping"
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/README.md b/recipes-connectivity/lora/lora-packet-forwarder/README.md
deleted file mode 100644
index c927c60..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-(c) Senet, Inc 2016
-
-
-
-3rd Party Licenses
-------------------
-
-This software incorporates the lora_gateway software which requires the
-following statement to be included in its distribution.
-
-Copyright (c) 2013, SEMTECH S.A.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-  * Neither the name of the Semtech corporation nor the
-    names of its contributors may be used to endorse or promote products
-    derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL SEMTECH S.A. BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0
deleted file mode 100644
index f7c51d9..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0
+++ /dev/null
@@ -1,195 +0,0 @@
-{
-	"SX1301_conf": {
-		"antenna_gain": 0,
-		"chan_FSK": {
-			"bandwidth": 125000,
-			"datarate": 50000,
-			"enable": true,
-			"if": 300000,
-			"radio": 1
-		},
-		"chan_Lora_std": {
-			"bandwidth": 250000,
-			"enable": true,
-			"if": -200000,
-			"radio": 1,
-			"spread_factor": 7
-		},
-		"chan_multiSF_0": {
-			"enable": true,
-			"if": -400000,
-			"radio": 1
-		},
-		"chan_multiSF_1": {
-			"enable": true,
-			"if": -200000,
-			"radio": 1
-		},
-		"chan_multiSF_2": {
-			"enable": true,
-			"if": 0,
-			"radio": 1
-		},
-		"chan_multiSF_3": {
-			"enable": true,
-			"if": -400000,
-			"radio": 0
-		},
-		"chan_multiSF_4": {
-			"enable": true,
-			"if": -200000,
-			"radio": 0
-		},
-		"chan_multiSF_5": {
-			"enable": true,
-			"if": 0,
-			"radio": 0
-		},
-		"chan_multiSF_6": {
-			"enable": true,
-			"if": 200000,
-			"radio": 0
-		},
-		"chan_multiSF_7": {
-			"enable": true,
-			"if": 400000,
-			"radio": 0
-		},
-		"clksrc": 0,
-		"lbt_cfg": {
-			"enable": false,
-			"nb_channel": 1,
-			"rssi_target": 160,
-			"scan_time_us": 5000,
-			"start_freq": 869525000,
-			"tx_delay_1ch_us": 4000000,
-			"tx_delay_2ch_us": 4000000
-		},
-		"lorawan_public": true,
-		"radio_0": {
-			"enable": true,
-			"freq": 867500000,
-			"rssi_offset": -165,
-			"tx_enable": true,
-			"tx_freq_max": 870000000,
-			"tx_freq_min": 863000000,
-			"type": "SX1257"
-		},
-		"radio_1": {
-			"enable": true,
-			"freq": 868500000,
-			"rssi_offset": -165,
-			"tx_enable": false,
-			"type": "SX1257"
-		},
-		"tx_lut_0": {
-			"dig_gain": 3,
-			"mix_gain": 8,
-			"pa_gain": 0,
-			"rf_power": -6
-		},
-		"tx_lut_1": {
-			"dig_gain": 3,
-			"mix_gain": 10,
-			"pa_gain": 0,
-			"rf_power": -3
-		},
-		"tx_lut_10": {
-			"dig_gain": 3,
-			"mix_gain": 11,
-			"pa_gain": 2,
-			"rf_power": 16
-		},
-		"tx_lut_11": {
-			"dig_gain": 3,
-			"mix_gain": 10,
-			"pa_gain": 3,
-			"rf_power": 20
-		},
-		"tx_lut_12": {
-			"dig_gain": 3,
-			"mix_gain": 11,
-			"pa_gain": 3,
-			"rf_power": 23
-		},
-		"tx_lut_13": {
-			"dig_gain": 3,
-			"mix_gain": 12,
-			"pa_gain": 3,
-			"rf_power": 24
-		},
-		"tx_lut_14": {
-			"dig_gain": 3,
-			"mix_gain": 13,
-			"pa_gain": 3,
-			"rf_power": 25
-		},
-		"tx_lut_15": {
-			"dig_gain": 3,
-			"mix_gain": 15,
-			"pa_gain": 3,
-			"rf_power": 26
-		},
-		"tx_lut_2": {
-			"dig_gain": 3,
-			"mix_gain": 12,
-			"pa_gain": 0,
-			"rf_power": 0
-		},
-		"tx_lut_3": {
-			"dig_gain": 3,
-			"mix_gain": 8,
-			"pa_gain": 1,
-			"rf_power": 3
-		},
-		"tx_lut_4": {
-			"dig_gain": 3,
-			"mix_gain": 10,
-			"pa_gain": 1,
-			"rf_power": 6
-		},
-		"tx_lut_5": {
-			"dig_gain": 3,
-			"mix_gain": 12,
-			"pa_gain": 1,
-			"rf_power": 10
-		},
-		"tx_lut_6": {
-			"dig_gain": 3,
-			"mix_gain": 12,
-			"pa_gain": 1,
-			"rf_power": 11
-		},
-		"tx_lut_7": {
-			"dig_gain": 3,
-			"mix_gain": 9,
-			"pa_gain": 2,
-			"rf_power": 12
-		},
-		"tx_lut_8": {
-			"dig_gain": 3,
-			"mix_gain": 15,
-			"pa_gain": 1,
-			"rf_power": 13
-		},
-		"tx_lut_9": {
-			"dig_gain": 3,
-			"mix_gain": 10,
-			"pa_gain": 2,
-			"rf_power": 14
-		}
-	},
-	"gateway_conf": {
-		"forward_crc_disabled": false,
-		"forward_crc_error": false,
-		"forward_crc_valid": true,
-		"gateway_ID": "<WILL-BE-REPLACED-WITH-LORA-EUI>",
-		"keepalive_interval": 10,
-		"push_timeout_ms": 100,
-		"serv_port_down": 1680,
-		"serv_port_up": 1680,
-		"server_address": "localhost",
-		"stat_interval": 30,
-		"autoquit_threshold": 60 
-	}
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0
deleted file mode 100644
index a690d3c..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-	"SX1301_conf": {
-		"lorawan_public": true,
-		"antenna_gain": 0,
-		"clksrc": 0,
-		"radio_0": {
-			"enable": true,
-			"freq": 902700000,
-			"rssi_offset": -165,
-			"tx_enable": true,
-			"tx_freq_max": 928000000,
-			"tx_freq_min": 902000000,
-			"type": "SX1257"
-		},
-		"radio_1": {
-			"enable": true,
-			"freq": 903500000,
-			"rssi_offset": -165,
-			"tx_enable": false,
-			"type": "SX1257"
-		},
-		"chan_FSK": {
-			"enable": false,
-			"radio": 0
-		},
-		"chan_Lora_std": {
-			"bandwidth": 500000,
-			"enable": true,
-			"if": 300000,
-			"radio": 0,
-			"spread_factor": 8
-		},
-		"chan_multiSF_0": {
-			"enable": true,
-			"if": -400000,
-			"radio": 0
-		},
-		"chan_multiSF_1": {
-			"enable": true,
-			"if": -200000,
-			"radio": 0
-		},
-		"chan_multiSF_2": {
-			"enable": true,
-			"if": 0,
-			"radio": 0
-		},
-		"chan_multiSF_3": {
-			"enable": true,
-			"if": 200000,
-			"radio": 0
-		},
-		"chan_multiSF_4": {
-			"enable": true,
-			"if": -400000,
-			"radio": 1
-		},
-		"chan_multiSF_5": {
-			"enable": true,
-			"if": -200000,
-			"radio": 1
-		},
-		"chan_multiSF_6": {
-			"enable": true,
-			"if": 0,
-			"radio": 1
-		},
-		"chan_multiSF_7": {
-			"enable": true,
-			"if": 200000,
-			"radio": 1
-		},
-		"lbt_cfg": {
-			"enable": false,
-			"nb_channel": 1,
-			"rssi_target": 160,
-			"scan_time_us": 5000,
-			"start_freq": 869525000,
-			"tx_delay_1ch_us": 4000000,
-			"tx_delay_2ch_us": 4000000
-		},
-        "tx_lut_0": {                           
-            "pa_gain": 0,               
-            "mix_gain": 8,                                   
-            "rf_power": -6,             
-            "dig_gain": 3               
-        },                              
-        "tx_lut_1": {                   
-            "pa_gain": 0,                                    
-            "mix_gain": 10,             
-            "rf_power": -3,             
-            "dig_gain": 3               
-        },                              
-        "tx_lut_2": {                   
-            "pa_gain": 0,               
-            "mix_gain": 12,             
-            "rf_power": 0,              
-            "dig_gain": 3               
-        },                              
-        "tx_lut_3": {                   
-            "pa_gain": 1,                      
-            "mix_gain": 8,              
-            "rf_power": 3,              
-            "dig_gain": 3                                    
-        },                              
-        "tx_lut_4": {                   
-            "pa_gain": 1,               
-            "mix_gain": 10,             
-            "rf_power": 6,                                   
-            "dig_gain": 3               
-        },                              
-        "tx_lut_5": {                   
-            "pa_gain": 1,               
-            "mix_gain": 12,                                  
-            "rf_power": 10,             
-            "dig_gain": 3               
-        },                              
-        "tx_lut_6": {                    
-            "pa_gain": 1,                                    
-            "mix_gain": 12,              
-            "rf_power": 11,             
-            "dig_gain": 3               
-        },     
-        "tx_lut_7": {                   
-            "pa_gain": 2,                                    
-            "mix_gain": 9,                                       
-            "rf_power": 12,             
-            "dig_gain": 3               
-        },                                                            
-        "tx_lut_8": {                   
-            "pa_gain": 1,               
-            "mix_gain": 15,             
-            "rf_power": 13,             
-            "dig_gain": 3               
-        },                                           
-        "tx_lut_9": {                                        
-            "pa_gain": 2,               
-            "mix_gain": 10,              
-            "rf_power": 14,              
-            "dig_gain": 3                
-        },                                                
-        "tx_lut_10": {                   
-            "pa_gain": 2,               
-            "mix_gain": 11,              
-            "rf_power": 16,              
-            "dig_gain": 3                
-        },                               
-        "tx_lut_11": {                         
-            "pa_gain": 3,               
-            "mix_gain": 10,                                  
-            "rf_power": 20,              
-            "dig_gain": 3                
-        },                               
-        "tx_lut_12": {                   
-            "pa_gain": 3,                                    
-            "mix_gain": 11,              
-            "rf_power": 23,              
-            "dig_gain": 3                
-        },                               
-        "tx_lut_13": {                   
-            "pa_gain": 3,               
-            "mix_gain": 12,              
-            "rf_power": 24,              
-            "dig_gain": 3                
-        },                               
-        "tx_lut_14": {                                       
-            "pa_gain": 3,               
-            "mix_gain": 13,              
-            "rf_power": 25,              
-            "dig_gain": 3                
-        },                                                   
-        "tx_lut_15": {                                        
-            "pa_gain": 3,                                     
-            "mix_gain": 15,                                   
-            "rf_power": 26,                                   
-            "dig_gain": 3                
-        } 
-	},
-	"gateway_conf": {
-		"forward_crc_disabled": false,
-		"forward_crc_error": false,
-		"forward_crc_valid": true,
-		"gateway_ID": "<WILL-BE-REPLACED-WITH-LORA-EUI>",
-		"keepalive_interval": 12,
-		"push_timeout_ms": 120,
-		"serv_port_down": 1780,
-		"serv_port_up": 1780,
-		"server_address": "us01-iot.semtech.com",
-		"stat_interval": 20,
-		"synch_word": 52,
-                "autoquit_threshold": 60
-	}
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.AS923-LBT.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.AS923-LBT.basic.clksrc0
deleted file mode 100644
index 42ca846..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.AS923-LBT.basic.clksrc0
+++ /dev/null
@@ -1,227 +0,0 @@
-{
-	"SX1301_conf": {
-		"antenna_gain": 0,
-		"chan_FSK": {
-			"bandwidth": 125000,
-			"datarate": 50000,
-			"enable": true,
-			"freq_deviation": 25000,
-			"if": 300000,
-			"radio": 0
-		},
-		"chan_Lora_std": {
-			"bandwidth": 250000,
-			"enable": true,
-			"if": -200000,
-			"radio": 0,
-			"spread_factor": 7
-		},
-		"chan_multiSF_0": {
-			"enable": true,
-			"if": -400000,
-			"radio": 0
-		},
-		"chan_multiSF_1": {
-			"enable": true,
-			"if": -200000,
-			"radio": 0
-		},
-		"chan_multiSF_2": {
-			"enable": true,
-			"if": 0,
-			"radio": 0
-		},
-		"chan_multiSF_3": {
-			"enable": true,
-			"if": -400000,
-			"radio": 1
-		},
-		"chan_multiSF_4": {
-			"enable": true,
-			"if": -200000,
-			"radio": 1
-		},
-		"chan_multiSF_5": {
-			"enable": true,
-			"if": 0,
-			"radio": 1
-		},
-		"chan_multiSF_6": {
-			"enable": true,
-			"if": 200000,
-			"radio": 1
-		},
-		"chan_multiSF_7": {
-			"enable": true,
-			"if": 400000,
-			"radio": 1
-		},
-		"clksrc": 0,
-		"lbt_cfg": {
-			"chan_cfg": [
-				{
-					"freq_hz": 923200000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 923400000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 923600000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922200000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922400000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922600000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922800000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 923000000,
-					"scan_time_us": 5000
-				}
-			],
-			"enable": true,
-			"rssi_target": -80,
-			"sx127x_rssi_offset": -4
-		},
-		"lorawan_public": true,
-		"radio_0": {
-			"enable": true,
-			"freq": 923600000,
-			"rssi_offset": -162,
-			"tx_enable": true,
-			"tx_freq_max": 928000000,
-			"tx_freq_min": 920000000,
-			"type": "SX1257"
-		},
-		"radio_1": {
-			"enable": true,
-			"freq": 922600000,
-			"rssi_offset": -162,
-			"tx_enable": false,
-			"type": "SX1257"
-		},
-		"tx_lut_0": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 0,
-			"rf_power": -6
-		},
-		"tx_lut_1": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 0,
-			"rf_power": -3
-		},
-		"tx_lut_2": {
-			"dig_gain": 0,
-			"mix_gain": 9,
-			"pa_gain": 1,
-			"rf_power": 0
-		},
-		"tx_lut_3": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 1,
-			"rf_power": 3
-		},
-		"tx_lut_4": {
-			"dig_gain": 0,
-			"mix_gain": 12,
-			"pa_gain": 1,
-			"rf_power": 6
-		},
-		"tx_lut_5": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 2,
-			"rf_power": 10
-		},
-		"tx_lut_6": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 2,
-			"rf_power": 11
-		},
-		"tx_lut_7": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 2,
-			"rf_power": 12
-		},
-		"tx_lut_8": {
-			"dig_gain": 2,
-			"mix_gain": 12,
-			"pa_gain": 2,
-			"rf_power": 13
-		},
-		"tx_lut_9": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 2,
-			"rf_power": 14
-		},
-		"tx_lut_10": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 2,
-			"rf_power": 16
-		},
-		"tx_lut_11": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 3,
-			"rf_power": 20
-		},
-		"tx_lut_12": {
-			"dig_gain": 0,
-			"mix_gain": 12,
-			"pa_gain": 3,
-			"rf_power": 23
-		},
-		"tx_lut_13": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 3,
-			"rf_power": 25
-		},
-		"tx_lut_14": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 3,
-			"rf_power": 26
-		},
-		"tx_lut_15": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 3,
-			"rf_power": 27
-		}
-	},
-	"gateway_conf": {
-		"gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
-		"server_address": "52.3.215.147",
-		"serv_port_up": 20000,
-		"serv_port_down": 20000,
-		"forward_crc_disabled": false,
-		"forward_crc_error": true,
-		"forward_crc_valid": true,
-		"keepalive_interval": 10,
-		"push_timeout_ms": 120,
-		"stat_interval": 20,
-		"synch_word": 52,
-                "autoquit_threshold": 60
-	}
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.AS923.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.AS923.basic.clksrc0
deleted file mode 100644
index ecb265b..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.AS923.basic.clksrc0
+++ /dev/null
@@ -1,195 +0,0 @@
-{
-	"SX1301_conf": {
-		"antenna_gain": 0,
-		"chan_FSK": {
-			"bandwidth": 125000,
-			"datarate": 50000,
-			"enable": true,
-			"freq_deviation": 25000,
-			"if": 300000,
-			"radio": 0
-		},
-		"chan_Lora_std": {
-			"bandwidth": 250000,
-			"enable": true,
-			"if": -200000,
-			"radio": 0,
-			"spread_factor": 7
-		},
-		"chan_multiSF_0": {
-			"enable": true,
-			"if": -400000,
-			"radio": 0
-		},
-		"chan_multiSF_1": {
-			"enable": true,
-			"if": -200000,
-			"radio": 0
-		},
-		"chan_multiSF_2": {
-			"enable": true,
-			"if": 0,
-			"radio": 0
-		},
-		"chan_multiSF_3": {
-			"enable": true,
-			"if": -400000,
-			"radio": 1
-		},
-		"chan_multiSF_4": {
-			"enable": true,
-			"if": -200000,
-			"radio": 1
-		},
-		"chan_multiSF_5": {
-			"enable": true,
-			"if": 0,
-			"radio": 1
-		},
-		"chan_multiSF_6": {
-			"enable": true,
-			"if": 200000,
-			"radio": 1
-		},
-		"chan_multiSF_7": {
-			"enable": true,
-			"if": 400000,
-			"radio": 1
-		},
-		"clksrc": 0,
-		"lbt_cfg": {
-			"chan_cfg": [
-			],
-			"enable": false,
-			"rssi_target": -80,
-			"sx127x_rssi_offset": -4
-		},
-		"lorawan_public": true,
-		"radio_0": {
-			"enable": true,
-			"freq": 923600000,
-			"rssi_offset": -162,
-			"tx_enable": true,
-			"tx_freq_max": 928000000,
-			"tx_freq_min": 920000000,
-			"type": "SX1257"
-		},
-		"radio_1": {
-			"enable": true,
-			"freq": 922600000,
-			"rssi_offset": -162,
-			"tx_enable": false,
-			"type": "SX1257"
-		},
-		"tx_lut_0": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 0,
-			"rf_power": -6
-		},
-		"tx_lut_1": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 0,
-			"rf_power": -3
-		},
-		"tx_lut_2": {
-			"dig_gain": 0,
-			"mix_gain": 9,
-			"pa_gain": 1,
-			"rf_power": 0
-		},
-		"tx_lut_3": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 1,
-			"rf_power": 3
-		},
-		"tx_lut_4": {
-			"dig_gain": 0,
-			"mix_gain": 12,
-			"pa_gain": 1,
-			"rf_power": 6
-		},
-		"tx_lut_5": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 2,
-			"rf_power": 10
-		},
-		"tx_lut_6": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 2,
-			"rf_power": 11
-		},
-		"tx_lut_7": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 2,
-			"rf_power": 12
-		},
-		"tx_lut_8": {
-			"dig_gain": 2,
-			"mix_gain": 12,
-			"pa_gain": 2,
-			"rf_power": 13
-		},
-		"tx_lut_9": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 2,
-			"rf_power": 14
-		},
-		"tx_lut_10": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 2,
-			"rf_power": 16
-		},
-		"tx_lut_11": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 3,
-			"rf_power": 20
-		},
-		"tx_lut_12": {
-			"dig_gain": 0,
-			"mix_gain": 12,
-			"pa_gain": 3,
-			"rf_power": 23
-		},
-		"tx_lut_13": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 3,
-			"rf_power": 25
-		},
-		"tx_lut_14": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 3,
-			"rf_power": 26
-		},
-		"tx_lut_15": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 3,
-			"rf_power": 27
-		}
-	},
-	"gateway_conf": {
-		"gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
-		"server_address": "52.3.215.147",
-		"serv_port_up": 20000,
-		"serv_port_down": 20000,
-		"forward_crc_disabled": false,
-		"forward_crc_error": true,
-		"forward_crc_valid": true,
-		"keepalive_interval": 10,
-		"push_timeout_ms": 120,
-		"stat_interval": 20,
-		"synch_word": 52,
-                "autoquit_threshold": 60
-	}
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.AU915.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.AU915.basic.clksrc0
deleted file mode 100644
index e759b96..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.AU915.basic.clksrc0
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-	"SX1301_conf": {
-		"lorawan_public": true,
-		"antenna_gain": 0,
-		"clksrc": 0,
-		"radio_0": {
-			"enable": true,
-			"freq": 915600000,
-			"rssi_offset": -162,
-			"tx_enable": true,
-			"tx_freq_max": 928000000,
-			"tx_freq_min": 902000000,
-			"type": "SX1257"
-		},
-		"radio_1": {
-			"enable": true,
-			"freq": 916400000,
-			"rssi_offset": -162,
-			"tx_enable": false,
-			"type": "SX1257"
-		},
-		"chan_FSK": {
-			"enable": false,
-			"radio": 0
-		},
-		"chan_Lora_std": {
-			"bandwidth": 500000,
-			"enable": true,
-			"if": 300000,
-			"radio": 0,
-			"spread_factor": 8
-		},
-		"chan_multiSF_0": {
-			"enable": true,
-			"if": -400000,
-			"radio": 0
-		},
-		"chan_multiSF_1": {
-			"enable": true,
-			"if": -200000,
-			"radio": 0
-		},
-		"chan_multiSF_2": {
-			"enable": true,
-			"if": 0,
-			"radio": 0
-		},
-		"chan_multiSF_3": {
-			"enable": true,
-			"if": 200000,
-			"radio": 0
-		},
-		"chan_multiSF_4": {
-			"enable": true,
-			"if": -400000,
-			"radio": 1
-		},
-		"chan_multiSF_5": {
-			"enable": true,
-			"if": -200000,
-			"radio": 1
-		},
-		"chan_multiSF_6": {
-			"enable": true,
-			"if": 0,
-			"radio": 1
-		},
-		"chan_multiSF_7": {
-			"enable": true,
-			"if": 200000,
-			"radio": 1
-		},
-		"lbt_cfg": {
-			"enable": false,
-			"nb_channel": 1,
-			"rssi_target": 160,
-			"scan_time_us": 5000,
-			"start_freq": 869525000,
-			"tx_delay_1ch_us": 4000000,
-			"tx_delay_2ch_us": 4000000
-		},
-		"tx_lut_0": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 0,
-			"rf_power": -6
-		},
-		"tx_lut_1": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 0,
-			"rf_power": -3
-		},
-		"tx_lut_2": {
-			"dig_gain": 0,
-			"mix_gain": 9,
-			"pa_gain": 1,
-			"rf_power": 0
-		},
-		"tx_lut_3": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 1,
-			"rf_power": 3
-		},
-		"tx_lut_4": {
-			"dig_gain": 0,
-			"mix_gain": 12,
-			"pa_gain": 1,
-			"rf_power": 6
-		},
-		"tx_lut_5": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 2,
-			"rf_power": 10
-		},
-		"tx_lut_6": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 2,
-			"rf_power": 11
-		},
-		"tx_lut_7": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 2,
-			"rf_power": 12
-		},
-		"tx_lut_8": {
-			"dig_gain": 2,
-			"mix_gain": 12,
-			"pa_gain": 2,
-			"rf_power": 13
-		},
-		"tx_lut_9": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 2,
-			"rf_power": 14
-		},
-		"tx_lut_10": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 2,
-			"rf_power": 16
-		},
-		"tx_lut_11": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 3,
-			"rf_power": 20
-		},
-		"tx_lut_12": {
-			"dig_gain": 0,
-			"mix_gain": 12,
-			"pa_gain": 3,
-			"rf_power": 23
-		},
-		"tx_lut_13": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 3,
-			"rf_power": 25
-		},
-		"tx_lut_14": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 3,
-			"rf_power": 26
-		},
-		"tx_lut_15": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 3,
-			"rf_power": 27
-		}
-	},
-	"gateway_conf": {
-		"forward_crc_disabled": false,
-		"forward_crc_error": false,
-		"forward_crc_valid": true,
-		"gateway_ID": "<WILL-BE-REPLACED-WITH-LORA-EUI>",
-		"keepalive_interval": 12,
-		"push_timeout_ms": 120,
-		"serv_port_down": 20000,
-		"serv_port_up": 20000,
-		"server_address": "52.3.215.147",
-		"stat_interval": 20,
-		"synch_word": 52,
-                "autoquit_threshold": 60
-	}
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0
deleted file mode 100644
index 36554fa..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0
+++ /dev/null
@@ -1,190 +0,0 @@
-{
-	"SX1301_conf": {
-		"antenna_gain": 0,
-		"chan_FSK": {
-			"bandwidth": 125000,
-			"datarate": 50000,
-			"enable": true,
-			"if": 300000,
-			"radio": 1
-		},
-		"chan_Lora_std": {
-			"bandwidth": 250000,
-			"enable": true,
-			"if": -200000,
-			"radio": 1,
-			"spread_factor": 7
-		},
-		"chan_multiSF_0": {
-			"enable": true,
-			"if": -400000,
-			"radio": 1
-		},
-		"chan_multiSF_1": {
-			"enable": true,
-			"if": -200000,
-			"radio": 1
-		},
-		"chan_multiSF_2": {
-			"enable": true,
-			"if": 0,
-			"radio": 1
-		},
-		"chan_multiSF_3": {
-			"enable": true,
-			"if": -400000,
-			"radio": 0
-		},
-		"chan_multiSF_4": {
-			"enable": true,
-			"if": -200000,
-			"radio": 0
-		},
-		"chan_multiSF_5": {
-			"enable": true,
-			"if": 0,
-			"radio": 0
-		},
-		"chan_multiSF_6": {
-			"enable": true,
-			"if": 200000,
-			"radio": 0
-		},
-		"chan_multiSF_7": {
-			"enable": true,
-			"if": 400000,
-			"radio": 0
-		},
-		"clksrc": 0,
-		"lbt_cfg": {
-			"enable": false,
-			"rssi_target": 160
-		},
-		"lorawan_public": true,
-		"radio_0": {
-			"enable": true,
-			"freq": 867500000,
-			"rssi_offset": -162,
-			"tx_enable": true,
-			"tx_freq_max": 870000000,
-			"tx_freq_min": 863000000,
-			"type": "SX1257"
-		},
-		"radio_1": {
-			"enable": true,
-			"freq": 868500000,
-			"rssi_offset": -162,
-			"tx_enable": false,
-			"type": "SX1257"
-		},
-		"tx_lut_0": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 0,
-			"rf_power": -6
-		},
-		"tx_lut_1": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 0,
-			"rf_power": -3
-		},
-		"tx_lut_2": {
-			"dig_gain": 0,
-			"mix_gain": 9,
-			"pa_gain": 1,
-			"rf_power": 0
-		},
-		"tx_lut_3": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 1,
-			"rf_power": 3
-		},
-		"tx_lut_4": {
-			"dig_gain": 0,
-			"mix_gain": 12,
-			"pa_gain": 1,
-			"rf_power": 6
-		},
-		"tx_lut_5": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 2,
-			"rf_power": 10
-		},
-		"tx_lut_6": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 2,
-			"rf_power": 11
-		},
-		"tx_lut_7": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 2,
-			"rf_power": 12
-		},
-		"tx_lut_8": {
-			"dig_gain": 2,
-			"mix_gain": 12,
-			"pa_gain": 2,
-			"rf_power": 13
-		},
-		"tx_lut_9": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 2,
-			"rf_power": 14
-		},
-		"tx_lut_10": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 2,
-			"rf_power": 16
-		},
-		"tx_lut_11": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 3,
-			"rf_power": 20
-		},
-		"tx_lut_12": {
-			"dig_gain": 0,
-			"mix_gain": 12,
-			"pa_gain": 3,
-			"rf_power": 23
-		},
-		"tx_lut_13": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 3,
-			"rf_power": 25
-		},
-		"tx_lut_14": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 3,
-			"rf_power": 26
-		},
-		"tx_lut_15": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 3,
-			"rf_power": 27
-		}
-	},
-	"gateway_conf": {
-		"forward_crc_disabled": false,
-		"forward_crc_error": true,
-		"forward_crc_valid": true,
-		"gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
-		"keepalive_interval": 10,
-		"push_timeout_ms": 100,
-		"serv_port_down": 20000,
-		"serv_port_up": 20000,
-		"server_address": "52.3.215.147",
-		"stat_interval": 30,
-                "autoquit_threshold": 60
-	}
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.IN865.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.IN865.basic.clksrc0
deleted file mode 100644
index cd4253f..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.IN865.basic.clksrc0
+++ /dev/null
@@ -1,196 +0,0 @@
-{
-	"SX1301_conf": {
-		"antenna_gain": 0,
-		"chan_FSK": {
-			"bandwidth": 125000,
-			"datarate": 50000,
-			"enable": true,
-			"freq_deviation": 25000,
-			"if": 300000,
-			"radio": 1
-		},
-		"chan_Lora_std": {
-			"bandwidth": 250000,
-			"enable": true,
-			"if": 0,
-			"radio": 0,
-			"spread_factor": 7
-		},
-		"chan_multiSF_": {
-			"radio": null
-		},
-		"chan_multiSF_0": {
-			"enable": true,
-			"if": -137500,
-			"radio": 0
-		},
-		"chan_multiSF_1": {
-			"enable": true,
-			"if": 202500,
-			"radio": 0
-		},
-		"chan_multiSF_2": {
-			"enable": true,
-			"if": 32500,
-			"radio": 0
-		},
-		"chan_multiSF_3": {
-			"enable": true,
-			"if": -400000,
-			"radio": 1
-		},
-		"chan_multiSF_4": {
-			"enable": true,
-			"if": -200000,
-			"radio": 1
-		},
-		"chan_multiSF_5": {
-			"enable": true,
-			"if": 0,
-			"radio": 1
-		},
-		"chan_multiSF_6": {
-			"enable": true,
-			"if": 200000,
-			"radio": 1
-		},
-		"chan_multiSF_7": {
-			"enable": true,
-			"if": 400000,
-			"radio": 1
-		},
-		"clksrc": 0,
-		"lbt_cfg": {
-			"enable": false,
-			"rssi_target": 160
-		},
-		"lorawan_public": true,
-		"radio_0": {
-			"enable": true,
-			"freq": 865200000,
-			"rssi_offset": -162,
-			"tx_enable": true,
-			"tx_freq_max": 867000000,
-			"tx_freq_min": 865000000,
-			"tx_notch_freq": 129000,
-			"type": "SX1257"
-		},
-		"radio_1": {
-			"enable": true,
-			"freq": 866385000,
-			"rssi_offset": -162,
-			"tx_enable": false,
-			"type": "SX1257"
-		},
-		"tx_lut_0": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 0,
-			"rf_power": -6
-		},
-		"tx_lut_1": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 0,
-			"rf_power": -3
-		},
-		"tx_lut_2": {
-			"dig_gain": 0,
-			"mix_gain": 9,
-			"pa_gain": 1,
-			"rf_power": 0
-		},
-		"tx_lut_3": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 1,
-			"rf_power": 3
-		},
-		"tx_lut_4": {
-			"dig_gain": 0,
-			"mix_gain": 12,
-			"pa_gain": 1,
-			"rf_power": 6
-		},
-		"tx_lut_5": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 2,
-			"rf_power": 10
-		},
-		"tx_lut_6": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 2,
-			"rf_power": 11
-		},
-		"tx_lut_7": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 2,
-			"rf_power": 12
-		},
-		"tx_lut_8": {
-			"dig_gain": 2,
-			"mix_gain": 12,
-			"pa_gain": 2,
-			"rf_power": 13
-		},
-		"tx_lut_9": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 2,
-			"rf_power": 14
-		},
-		"tx_lut_10": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 2,
-			"rf_power": 16
-		},
-		"tx_lut_11": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 3,
-			"rf_power": 20
-		},
-		"tx_lut_12": {
-			"dig_gain": 0,
-			"mix_gain": 12,
-			"pa_gain": 3,
-			"rf_power": 23
-		},
-		"tx_lut_13": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 3,
-			"rf_power": 25
-		},
-		"tx_lut_14": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 3,
-			"rf_power": 26
-		},
-		"tx_lut_15": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 3,
-			"rf_power": 27
-		}
-	},
-	"gateway_conf": {
-		"gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
-		"server_address": "52.3.215.147",
-		"serv_port_up": 20000,
-		"serv_port_down": 20000,
-		"forward_crc_disabled": false,
-		"forward_crc_error": true,
-		"forward_crc_valid": true,
-		"keepalive_interval": 10,
-		"push_timeout_ms": 120,
-		"stat_interval": 20,
-		"synch_word": 52,
-                "autoquit_threshold": 60
-	}
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.KR920-LBT.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.KR920-LBT.basic.clksrc0
deleted file mode 100644
index d405a57..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.KR920-LBT.basic.clksrc0
+++ /dev/null
@@ -1,226 +0,0 @@
-{
-	"SX1301_conf": {
-		"antenna_gain": 0,
-		"chan_FSK": {
-			"bandwidth": 125000,
-			"datarate": 50000,
-			"enable": false,
-			"if": 300000,
-			"radio": 0
-		},
-		"chan_Lora_std": {
-			"bandwidth": 250000,
-			"enable": false,
-			"if": -200000,
-			"radio": 0,
-			"spread_factor": 7
-		},
-		"chan_multiSF_0": {
-			"enable": true,
-			"if": -400000,
-			"radio": 0
-		},
-		"chan_multiSF_1": {
-			"enable": true,
-			"if": -200000,
-			"radio": 0
-		},
-		"chan_multiSF_2": {
-			"enable": true,
-			"if": 0,
-			"radio": 0
-		},
-		"chan_multiSF_3": {
-			"enable": true,
-			"if": -400000,
-			"radio": 1
-		},
-		"chan_multiSF_4": {
-			"enable": true,
-			"if": -200000,
-			"radio": 1
-		},
-		"chan_multiSF_5": {
-			"enable": true,
-			"if": 0,
-			"radio": 1
-		},
-		"chan_multiSF_6": {
-			"enable": true,
-			"if": 200000,
-			"radio": 1
-		},
-		"chan_multiSF_7": {
-			"enable": true,
-			"if": 400000,
-			"radio": 1
-		},
-		"clksrc": 0,
-		"lbt_cfg": {
-			"chan_cfg": [
-				{
-					"freq_hz": 922100000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922300000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922500000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922700000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922900000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 923100000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 923300000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 921900000,
-					"scan_time_us": 5000
-				}
-			],
-			"enable": true,
-			"rssi_target": -65,
-			"sx127x_rssi_offset": -4
-		},
-		"lorawan_public": true,
-		"radio_0": {
-			"enable": true,
-			"freq": 922500000,
-			"rssi_offset": -162,
-			"tx_enable": true,
-			"tx_freq_max": 923300000,
-			"tx_freq_min": 920900000,
-			"type": "SX1257"
-		},
-		"radio_1": {
-			"enable": true,
-			"freq": 922900000,
-			"rssi_offset": -162,
-			"tx_enable": false,
-			"type": "SX1257"
-		},
-		"tx_lut_0": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 0,
-			"rf_power": -6
-		},
-		"tx_lut_1": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 0,
-			"rf_power": -3
-		},
-		"tx_lut_2": {
-			"dig_gain": 0,
-			"mix_gain": 9,
-			"pa_gain": 1,
-			"rf_power": 0
-		},
-		"tx_lut_3": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 1,
-			"rf_power": 3
-		},
-		"tx_lut_4": {
-			"dig_gain": 0,
-			"mix_gain": 12,
-			"pa_gain": 1,
-			"rf_power": 6
-		},
-		"tx_lut_5": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 2,
-			"rf_power": 10
-		},
-		"tx_lut_6": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 2,
-			"rf_power": 11
-		},
-		"tx_lut_7": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 2,
-			"rf_power": 12
-		},
-		"tx_lut_8": {
-			"dig_gain": 2,
-			"mix_gain": 12,
-			"pa_gain": 2,
-			"rf_power": 13
-		},
-		"tx_lut_9": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 2,
-			"rf_power": 14
-		},
-		"tx_lut_10": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 2,
-			"rf_power": 16
-		},
-		"tx_lut_11": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 3,
-			"rf_power": 20
-		},
-		"tx_lut_12": {
-			"dig_gain": 0,
-			"mix_gain": 12,
-			"pa_gain": 3,
-			"rf_power": 23
-		},
-		"tx_lut_13": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 3,
-			"rf_power": 25
-		},
-		"tx_lut_14": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 3,
-			"rf_power": 26
-		},
-		"tx_lut_15": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 3,
-			"rf_power": 27
-		}
-	},
-	"gateway_conf": {
-		"gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
-		"server_address": "52.3.215.147",
-		"serv_port_up": 20000,
-		"serv_port_down": 20000,
-		"forward_crc_disabled": false,
-		"forward_crc_error": true,
-		"forward_crc_valid": true,
-		"keepalive_interval": 10,
-		"push_timeout_ms": 120,
-		"stat_interval": 20,
-		"synch_word": 52,
-                "autoquit_threshold": 60
-	}
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.RU864.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.RU864.basic.clksrc0
deleted file mode 100644
index eb8e06b..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.RU864.basic.clksrc0
+++ /dev/null
@@ -1,191 +0,0 @@
-{
-	"SX1301_conf": {
-		"antenna_gain": 0,
-		"chan_FSK": {
-			"bandwidth": 125000,
-			"datarate": 50000,
-			"freq_deviation": 25000,
-			"enable": true,
-			"if": 0,
-			"radio": 0
-		},
-		"chan_Lora_std": {
-			"bandwidth": 250000,
-			"enable": true,
-			"if": -200000,
-			"radio": 0,
-			"spread_factor": 7
-		},
-		"chan_multiSF_0": {
-			"enable": true,
-			"if": -400000,
-			"radio": 0
-		},
-		"chan_multiSF_1": {
-			"enable": true,
-			"if": -200000,
-			"radio": 0
-		},
-		"chan_multiSF_2": {
-			"enable": true,
-			"if": 0,
-			"radio": 0
-		},
-		"chan_multiSF_3": {
-			"enable": true,
-			"if": -400000,
-			"radio": 1
-		},
-		"chan_multiSF_4": {
-			"enable": true,
-			"if": -200000,
-			"radio": 1
-		},
-		"chan_multiSF_5": {
-			"enable": true,
-			"if": 0,
-			"radio": 1
-		},
-		"chan_multiSF_6": {
-			"enable": true,
-			"if": 200000,
-			"radio": 1
-		},
-		"chan_multiSF_7": {
-			"enable": false,
-			"if": 400000,
-			"radio": 0
-		},
-		"clksrc": 0,
-		"lbt_cfg": {
-			"enable": false,
-			"rssi_target": 160
-		},
-		"lorawan_public": true,
-		"radio_0": {
-			"enable": true,
-			"freq": 869100000,
-			"rssi_offset": -162,
-			"tx_enable": true,
-			"tx_freq_max": 870000000,
-			"tx_freq_min": 864000000,
-			"type": "SX1257"
-		},
-		"radio_1": {
-			"enable": true,
-			"freq": 868100000,
-			"rssi_offset": -162,
-			"tx_enable": false,
-			"type": "SX1257"
-		},
-		"tx_lut_0": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 0,
-			"rf_power": -6
-		},
-		"tx_lut_1": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 0,
-			"rf_power": -3
-		},
-		"tx_lut_2": {
-			"dig_gain": 0,
-			"mix_gain": 9,
-			"pa_gain": 1,
-			"rf_power": 0
-		},
-		"tx_lut_3": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 1,
-			"rf_power": 3
-		},
-		"tx_lut_4": {
-			"dig_gain": 0,
-			"mix_gain": 12,
-			"pa_gain": 1,
-			"rf_power": 6
-		},
-		"tx_lut_5": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 2,
-			"rf_power": 10
-		},
-		"tx_lut_6": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 2,
-			"rf_power": 11
-		},
-		"tx_lut_7": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 2,
-			"rf_power": 12
-		},
-		"tx_lut_8": {
-			"dig_gain": 2,
-			"mix_gain": 12,
-			"pa_gain": 2,
-			"rf_power": 13
-		},
-		"tx_lut_9": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 2,
-			"rf_power": 14
-		},
-		"tx_lut_10": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 2,
-			"rf_power": 16
-		},
-		"tx_lut_11": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 3,
-			"rf_power": 20
-		},
-		"tx_lut_12": {
-			"dig_gain": 0,
-			"mix_gain": 12,
-			"pa_gain": 3,
-			"rf_power": 23
-		},
-		"tx_lut_13": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 3,
-			"rf_power": 25
-		},
-		"tx_lut_14": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 3,
-			"rf_power": 26
-		},
-		"tx_lut_15": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 3,
-			"rf_power": 27
-		}
-	},
-	"gateway_conf": {
-		"forward_crc_disabled": false,
-		"forward_crc_error": true,
-		"forward_crc_valid": true,
-		"gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
-		"keepalive_interval": 10,
-		"push_timeout_ms": 100,
-		"serv_port_down": 20000,
-		"serv_port_up": 20000,
-		"server_address": "52.3.215.147",
-		"stat_interval": 30,
-                "autoquit_threshold": 60
-	}
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0
deleted file mode 100644
index 3d7b70f..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-	"SX1301_conf": {
-		"lorawan_public": true,
-		"antenna_gain": 0,
-		"clksrc": 0,
-		"radio_0": {
-			"enable": true,
-			"freq": 902700000,
-			"rssi_offset": -162,
-			"tx_enable": true,
-			"tx_freq_max": 928000000,
-			"tx_freq_min": 902000000,
-			"type": "SX1257"
-		},
-		"radio_1": {
-			"enable": true,
-			"freq": 903500000,
-			"rssi_offset": -162,
-			"tx_enable": false,
-			"type": "SX1257"
-		},
-		"chan_FSK": {
-			"enable": false,
-			"radio": 0
-		},
-		"chan_Lora_std": {
-			"bandwidth": 500000,
-			"enable": true,
-			"if": 300000,
-			"radio": 0,
-			"spread_factor": 8
-		},
-		"chan_multiSF_0": {
-			"enable": true,
-			"if": -400000,
-			"radio": 0
-		},
-		"chan_multiSF_1": {
-			"enable": true,
-			"if": -200000,
-			"radio": 0
-		},
-		"chan_multiSF_2": {
-			"enable": true,
-			"if": 0,
-			"radio": 0
-		},
-		"chan_multiSF_3": {
-			"enable": true,
-			"if": 200000,
-			"radio": 0
-		},
-		"chan_multiSF_4": {
-			"enable": true,
-			"if": -400000,
-			"radio": 1
-		},
-		"chan_multiSF_5": {
-			"enable": true,
-			"if": -200000,
-			"radio": 1
-		},
-		"chan_multiSF_6": {
-			"enable": true,
-			"if": 0,
-			"radio": 1
-		},
-		"chan_multiSF_7": {
-			"enable": true,
-			"if": 200000,
-			"radio": 1
-		},
-		"lbt_cfg": {
-			"enable": false,
-			"nb_channel": 1,
-			"rssi_target": 160,
-			"scan_time_us": 5000,
-			"start_freq": 869525000,
-			"tx_delay_1ch_us": 4000000,
-			"tx_delay_2ch_us": 4000000
-		},
-		"tx_lut_0": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 0,
-			"rf_power": -6
-		},
-		"tx_lut_1": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 0,
-			"rf_power": -3
-		},
-		"tx_lut_2": {
-			"dig_gain": 0,
-			"mix_gain": 9,
-			"pa_gain": 1,
-			"rf_power": 0
-		},
-		"tx_lut_3": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 1,
-			"rf_power": 3
-		},
-		"tx_lut_4": {
-			"dig_gain": 0,
-			"mix_gain": 12,
-			"pa_gain": 1,
-			"rf_power": 6
-		},
-		"tx_lut_5": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 2,
-			"rf_power": 10
-		},
-		"tx_lut_6": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 2,
-			"rf_power": 11
-		},
-		"tx_lut_7": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 2,
-			"rf_power": 12
-		},
-		"tx_lut_8": {
-			"dig_gain": 2,
-			"mix_gain": 12,
-			"pa_gain": 2,
-			"rf_power": 13
-		},
-		"tx_lut_9": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 2,
-			"rf_power": 14
-		},
-		"tx_lut_10": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 2,
-			"rf_power": 16
-		},
-		"tx_lut_11": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 3,
-			"rf_power": 20
-		},
-		"tx_lut_12": {
-			"dig_gain": 0,
-			"mix_gain": 12,
-			"pa_gain": 3,
-			"rf_power": 23
-		},
-		"tx_lut_13": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 3,
-			"rf_power": 25
-		},
-		"tx_lut_14": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 3,
-			"rf_power": 26
-		},
-		"tx_lut_15": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 3,
-			"rf_power": 27
-		}
-	},
-	"gateway_conf": {
-		"forward_crc_disabled": false,
-		"forward_crc_error": true,
-		"forward_crc_valid": true,
-		"gateway_ID": "<WILL-BE-REPLACED-WITH-LORA-EUI>",
-		"keepalive_interval": 12,
-		"push_timeout_ms": 120,
-		"serv_port_down": 20000,
-		"serv_port_up": 20000,
-		"server_address": "52.3.215.147",
-		"stat_interval": 20,
-		"synch_word": 52,
-                "autoquit_threshold": 60
-	}
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E286.EU868.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E286.EU868.basic.clksrc0
deleted file mode 100644
index fc14309..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E286.EU868.basic.clksrc0
+++ /dev/null
@@ -1,216 +0,0 @@
-{
-    "SX1301_conf": {
-        "lorawan_public": true,
-        "clksrc": 0, /* radio_1 provides clock to concentrator */
-        "antenna_gain": 0, /* antenna gain, in dBi */
-        "radio_0": {
-            "enable": true,
-            "type": "SX1257",
-            "freq": 867500000,
-            "rssi_offset": -166.0,
-            "tx_enable": true,
-            "tx_freq_min": 863000000,
-            "tx_freq_max": 870000000
-        },
-        "radio_1": {
-            "enable": true,
-            "type": "SX1257",
-            "freq": 868500000,
-            "rssi_offset": -166.0,
-            "tx_enable": false
-        },
-        "chan_multiSF_0": {
-            /* Lora MAC channel, 125kHz, all SF, 868.1 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": -400000
-        },
-        "chan_multiSF_1": {
-            /* Lora MAC channel, 125kHz, all SF, 868.3 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": -200000
-        },
-        "chan_multiSF_2": {
-            /* Lora MAC channel, 125kHz, all SF, 868.5 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": 0
-        },
-        "chan_multiSF_3": {
-            /* Lora MAC channel, 125kHz, all SF, 867.1 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": -400000
-        },
-        "chan_multiSF_4": {
-            /* Lora MAC channel, 125kHz, all SF, 867.3 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": -200000
-        },
-        "chan_multiSF_5": {
-            /* Lora MAC channel, 125kHz, all SF, 867.5 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": 0
-        },
-        "chan_multiSF_6": {
-            /* Lora MAC channel, 125kHz, all SF, 867.7 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": 200000
-        },
-        "chan_multiSF_7": {
-            /* Lora MAC channel, 125kHz, all SF, 867.9 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": 400000
-        },
-        "chan_Lora_std": {
-            /* Lora MAC channel, 250kHz, SF7, 868.3 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": -200000,
-            "bandwidth": 250000,
-            "spread_factor": 7
-        },
-        "chan_FSK": {
-            /* FSK 50kbps channel, 868.8 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": 300000,
-            "bandwidth": 125000,
-            "datarate": 50000
-        },
-        "tx_lut_0": {
-            /* TX gain table, index 0 */
-            "pa_gain": 0,
-            "mix_gain": 8,
-            "rf_power": -6,
-            "dig_gain": 0
-        },
-        "tx_lut_1": {
-            /* TX gain table, index 1 */
-            "pa_gain": 0,
-            "mix_gain": 10,
-            "rf_power": -3,
-            "dig_gain": 0
-        },
-        "tx_lut_2": {
-            /* TX gain table, index 2 */
-            "pa_gain": 0,
-            "mix_gain": 12,
-            "rf_power": 0,
-            "dig_gain": 0
-        },
-        "tx_lut_3": {
-            /* TX gain table, index 3 */
-            "pa_gain": 1,
-            "mix_gain": 8,
-            "rf_power": 3,
-            "dig_gain": 0
-        },
-        "tx_lut_4": {
-            /* TX gain table, index 4 */
-            "pa_gain": 1,
-            "mix_gain": 10,
-            "rf_power": 6,
-            "dig_gain": 0
-        },
-        "tx_lut_5": {
-            /* TX gain table, index 5 */
-            "pa_gain": 1,
-            "mix_gain": 12,
-            "rf_power": 10,
-            "dig_gain": 0
-        },
-        "tx_lut_6": {
-            /* TX gain table, index 6 */
-            "pa_gain": 1,
-            "mix_gain": 13,
-            "rf_power": 11,
-            "dig_gain": 0
-        },
-        "tx_lut_7": {
-            /* TX gain table, index 7 */
-            "pa_gain": 2,
-            "mix_gain": 9,
-            "rf_power": 12,
-            "dig_gain": 0
-        },
-        "tx_lut_8": {
-            /* TX gain table, index 8 */
-            "pa_gain": 1,
-            "mix_gain": 15,
-            "rf_power": 13,
-            "dig_gain": 0
-        },
-        "tx_lut_9": {
-            /* TX gain table, index 9 */
-            "pa_gain": 2,
-            "mix_gain": 10,
-            "rf_power": 14,
-            "dig_gain": 0
-        },
-        "tx_lut_10": {
-            /* TX gain table, index 10 */
-            "pa_gain": 2,
-            "mix_gain": 11,
-            "rf_power": 16,
-            "dig_gain": 0
-        },
-        "tx_lut_11": {
-            /* TX gain table, index 11 */
-            "pa_gain": 3,
-            "mix_gain": 9,
-            "rf_power": 20,
-            "dig_gain": 0
-        },
-        "tx_lut_12": {
-            /* TX gain table, index 12 */
-            "pa_gain": 3,
-            "mix_gain": 10,
-            "rf_power": 23,
-            "dig_gain": 0
-        },
-        "tx_lut_13": {
-            /* TX gain table, index 13 */
-            "pa_gain": 3,
-            "mix_gain": 11,
-            "rf_power": 25,
-            "dig_gain": 0
-        },
-        "tx_lut_14": {
-            /* TX gain table, index 14 */
-            "pa_gain": 3,
-            "mix_gain": 12,
-            "rf_power": 26,
-            "dig_gain": 0
-        },
-        "tx_lut_15": {
-            /* TX gain table, index 15 */
-            "pa_gain": 3,
-            "mix_gain": 14,
-            "rf_power": 27,
-            "dig_gain": 0
-        }
-    },
-
-    "gateway_conf": {
-        "gateway_ID": "AA555A0000000000",
-        /* change with default server address/ports, or overwrite in local_conf.json */
-        "server_address": "localhost",
-        "serv_port_up": 1680,
-        "serv_port_down": 1680,
-        /* adjust the following parameters for your network */
-        "keepalive_interval": 10,
-        "stat_interval": 30,
-        "push_timeout_ms": 100,
-        /* forward only valid packets */
-        "forward_crc_valid": true,
-        "forward_crc_error": false,
-        "forward_crc_disabled": false
-    }
-}
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E286.EU868.basic.clksrc1 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E286.EU868.basic.clksrc1
deleted file mode 100644
index e60f583..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E286.EU868.basic.clksrc1
+++ /dev/null
@@ -1,216 +0,0 @@
-{
-    "SX1301_conf": {
-        "lorawan_public": true,
-        "clksrc": 1, /* radio_1 provides clock to concentrator */
-        "antenna_gain": 0, /* antenna gain, in dBi */
-        "radio_0": {
-            "enable": true,
-            "type": "SX1257",
-            "freq": 867500000,
-            "rssi_offset": -166.0,
-            "tx_enable": true,
-            "tx_freq_min": 863000000,
-            "tx_freq_max": 870000000
-        },
-        "radio_1": {
-            "enable": true,
-            "type": "SX1257",
-            "freq": 868500000,
-            "rssi_offset": -166.0,
-            "tx_enable": false
-        },
-        "chan_multiSF_0": {
-            /* Lora MAC channel, 125kHz, all SF, 868.1 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": -400000
-        },
-        "chan_multiSF_1": {
-            /* Lora MAC channel, 125kHz, all SF, 868.3 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": -200000
-        },
-        "chan_multiSF_2": {
-            /* Lora MAC channel, 125kHz, all SF, 868.5 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": 0
-        },
-        "chan_multiSF_3": {
-            /* Lora MAC channel, 125kHz, all SF, 867.1 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": -400000
-        },
-        "chan_multiSF_4": {
-            /* Lora MAC channel, 125kHz, all SF, 867.3 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": -200000
-        },
-        "chan_multiSF_5": {
-            /* Lora MAC channel, 125kHz, all SF, 867.5 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": 0
-        },
-        "chan_multiSF_6": {
-            /* Lora MAC channel, 125kHz, all SF, 867.7 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": 200000
-        },
-        "chan_multiSF_7": {
-            /* Lora MAC channel, 125kHz, all SF, 867.9 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": 400000
-        },
-        "chan_Lora_std": {
-            /* Lora MAC channel, 250kHz, SF7, 868.3 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": -200000,
-            "bandwidth": 250000,
-            "spread_factor": 7
-        },
-        "chan_FSK": {
-            /* FSK 50kbps channel, 868.8 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": 300000,
-            "bandwidth": 125000,
-            "datarate": 50000
-        },
-        "tx_lut_0": {
-            /* TX gain table, index 0 */
-            "pa_gain": 0,
-            "mix_gain": 8,
-            "rf_power": -6,
-            "dig_gain": 0
-        },
-        "tx_lut_1": {
-            /* TX gain table, index 1 */
-            "pa_gain": 0,
-            "mix_gain": 10,
-            "rf_power": -3,
-            "dig_gain": 0
-        },
-        "tx_lut_2": {
-            /* TX gain table, index 2 */
-            "pa_gain": 0,
-            "mix_gain": 12,
-            "rf_power": 0,
-            "dig_gain": 0
-        },
-        "tx_lut_3": {
-            /* TX gain table, index 3 */
-            "pa_gain": 1,
-            "mix_gain": 8,
-            "rf_power": 3,
-            "dig_gain": 0
-        },
-        "tx_lut_4": {
-            /* TX gain table, index 4 */
-            "pa_gain": 1,
-            "mix_gain": 10,
-            "rf_power": 6,
-            "dig_gain": 0
-        },
-        "tx_lut_5": {
-            /* TX gain table, index 5 */
-            "pa_gain": 1,
-            "mix_gain": 12,
-            "rf_power": 10,
-            "dig_gain": 0
-        },
-        "tx_lut_6": {
-            /* TX gain table, index 6 */
-            "pa_gain": 1,
-            "mix_gain": 13,
-            "rf_power": 11,
-            "dig_gain": 0
-        },
-        "tx_lut_7": {
-            /* TX gain table, index 7 */
-            "pa_gain": 2,
-            "mix_gain": 9,
-            "rf_power": 12,
-            "dig_gain": 0
-        },
-        "tx_lut_8": {
-            /* TX gain table, index 8 */
-            "pa_gain": 1,
-            "mix_gain": 15,
-            "rf_power": 13,
-            "dig_gain": 0
-        },
-        "tx_lut_9": {
-            /* TX gain table, index 9 */
-            "pa_gain": 2,
-            "mix_gain": 10,
-            "rf_power": 14,
-            "dig_gain": 0
-        },
-        "tx_lut_10": {
-            /* TX gain table, index 10 */
-            "pa_gain": 2,
-            "mix_gain": 11,
-            "rf_power": 16,
-            "dig_gain": 0
-        },
-        "tx_lut_11": {
-            /* TX gain table, index 11 */
-            "pa_gain": 3,
-            "mix_gain": 9,
-            "rf_power": 20,
-            "dig_gain": 0
-        },
-        "tx_lut_12": {
-            /* TX gain table, index 12 */
-            "pa_gain": 3,
-            "mix_gain": 10,
-            "rf_power": 23,
-            "dig_gain": 0
-        },
-        "tx_lut_13": {
-            /* TX gain table, index 13 */
-            "pa_gain": 3,
-            "mix_gain": 11,
-            "rf_power": 25,
-            "dig_gain": 0
-        },
-        "tx_lut_14": {
-            /* TX gain table, index 14 */
-            "pa_gain": 3,
-            "mix_gain": 12,
-            "rf_power": 26,
-            "dig_gain": 0
-        },
-        "tx_lut_15": {
-            /* TX gain table, index 15 */
-            "pa_gain": 3,
-            "mix_gain": 14,
-            "rf_power": 27,
-            "dig_gain": 0
-        }
-    },
-
-    "gateway_conf": {
-        "gateway_ID": "AA555A0000000000",
-        /* change with default server address/ports, or overwrite in local_conf.json */
-        "server_address": "localhost",
-        "serv_port_up": 1680,
-        "serv_port_down": 1680,
-        /* adjust the following parameters for your network */
-        "keepalive_interval": 10,
-        "stat_interval": 30,
-        "push_timeout_ms": 100,
-        /* forward only valid packets */
-        "forward_crc_valid": true,
-        "forward_crc_error": false,
-        "forward_crc_disabled": false
-    }
-}
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E336.EU868.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E336.EU868.basic.clksrc0
deleted file mode 100644
index fe81952..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E336.EU868.basic.clksrc0
+++ /dev/null
@@ -1,225 +0,0 @@
-{
-    "SX1301_conf": {
-        "lorawan_public": true,
-        "clksrc": 0, /* radio_1 provides clock to concentrator */
-        "lbt_cfg": {
-            "enable": false,
-            "rssi_target": 160, /* rssi in dBm = -lbt_rssi_target/2 */
-            "nb_channel": 1,
-            "start_freq": 869525000,
-            "scan_time_us": 5000,
-            "tx_delay_1ch_us": 4000000,
-            "tx_delay_2ch_us": 4000000
-        },
-        "antenna_gain": 0, /* antenna gain, in dBi */
-        "radio_0": {
-            "enable": true,
-            "type": "SX1257",
-            "freq": 867500000,
-            "rssi_offset": -165.0,
-            "tx_enable": true,
-            "tx_freq_min": 863000000,
-            "tx_freq_max": 870000000
-        },
-        "radio_1": {
-            "enable": true,
-            "type": "SX1257",
-            "freq": 868500000,
-            "rssi_offset": -165.0,
-            "tx_enable": false
-        },
-        "chan_multiSF_0": {
-            /* Lora MAC channel, 125kHz, all SF, 868.1 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": -400000
-        },
-        "chan_multiSF_1": {
-            /* Lora MAC channel, 125kHz, all SF, 868.3 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": -200000
-        },
-        "chan_multiSF_2": {
-            /* Lora MAC channel, 125kHz, all SF, 868.5 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": 0
-        },
-        "chan_multiSF_3": {
-            /* Lora MAC channel, 125kHz, all SF, 867.1 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": -400000
-        },
-        "chan_multiSF_4": {
-            /* Lora MAC channel, 125kHz, all SF, 867.3 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": -200000
-        },
-        "chan_multiSF_5": {
-            /* Lora MAC channel, 125kHz, all SF, 867.5 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": 0
-        },
-        "chan_multiSF_6": {
-            /* Lora MAC channel, 125kHz, all SF, 867.7 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": 200000
-        },
-        "chan_multiSF_7": {
-            /* Lora MAC channel, 125kHz, all SF, 867.9 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": 400000
-        },
-        "chan_Lora_std": {
-            /* Lora MAC channel, 250kHz, SF7, 868.3 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": -200000,
-            "bandwidth": 250000,
-            "spread_factor": 7
-        },
-        "chan_FSK": {
-            /* FSK 50kbps channel, 868.8 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": 300000,
-            "bandwidth": 125000,
-            "datarate": 50000
-        },
-        "tx_lut_0": {
-            /* TX gain table, index 0 */
-            "pa_gain": 0,
-            "mix_gain": 8,
-            "rf_power": -6,
-            "dig_gain": 3
-        },
-        "tx_lut_1": {
-            /* TX gain table, index 1 */
-            "pa_gain": 0,
-            "mix_gain": 10,
-            "rf_power": -3,
-            "dig_gain": 3
-        },
-        "tx_lut_2": {
-            /* TX gain table, index 2 */
-            "pa_gain": 0,
-            "mix_gain": 10,
-            "rf_power": 0,
-            "dig_gain": 1
-        },
-        "tx_lut_3": {
-            /* TX gain table, index 3 */
-            "pa_gain": 0,
-            "mix_gain": 14,
-            "rf_power": 3,
-            "dig_gain": 2
-        },
-        "tx_lut_4": {
-            /* TX gain table, index 4 */
-            "pa_gain": 1,
-            "mix_gain": 10,
-            "rf_power": 6,
-            "dig_gain": 3
-        },
-        "tx_lut_5": {
-            /* TX gain table, index 5 */
-            "pa_gain": 1,
-            "mix_gain": 12,
-            "rf_power": 10,
-            "dig_gain": 2
-        },
-        "tx_lut_6": {
-            /* TX gain table, index 6 */
-            "pa_gain": 1,
-            "mix_gain": 12,
-            "rf_power": 11,
-            "dig_gain": 1
-        },
-        "tx_lut_7": {
-            /* TX gain table, index 7 */
-            "pa_gain": 1,
-            "mix_gain": 12,
-            "rf_power": 12,
-            "dig_gain": 0
-        },
-        "tx_lut_8": {
-            /* TX gain table, index 8 */
-            "pa_gain": 1,
-            "mix_gain": 14,
-            "rf_power": 13,
-            "dig_gain": 2
-        },
-        "tx_lut_9": {
-            /* TX gain table, index 9 */
-            "pa_gain": 1,
-            "mix_gain": 13,
-            "rf_power": 14,
-            "dig_gain": 0
-        },
-        "tx_lut_10": {
-            /* TX gain table, index 10 */
-            "pa_gain": 2,
-            "mix_gain": 9,
-            "rf_power": 16,
-            "dig_gain": 2
-        },
-        "tx_lut_11": {
-            /* TX gain table, index 11 */
-            "pa_gain": 2,
-            "mix_gain": 11,
-            "rf_power": 20,
-            "dig_gain": 1
-        },
-        "tx_lut_12": {
-            /* TX gain table, index 12 */
-            "pa_gain": 2,
-            "mix_gain": 13,
-            "rf_power": 23,
-            "dig_gain": 1
-        },
-        "tx_lut_13": {
-            /* TX gain table, index 13 */
-            "pa_gain": 2,
-            "mix_gain": 15,
-            "rf_power": 25,
-            "dig_gain": 2
-        },
-        "tx_lut_14": {
-            /* TX gain table, index 14 */
-            "pa_gain": 3,
-            "mix_gain": 10,
-            "rf_power": 26,
-            "dig_gain": 2
-        },
-        "tx_lut_15": {
-            /* TX gain table, index 15 */
-            "pa_gain": 3,
-            "mix_gain": 10,
-            "rf_power": 27,
-            "dig_gain": 1
-        }
-    },
-
-    "gateway_conf": {
-        "gateway_ID": "AA555A0000000000",
-        /* change with default server address/ports, or overwrite in local_conf.json */
-        "server_address": "localhost",
-        "serv_port_up": 1680,
-        "serv_port_down": 1680,
-        /* adjust the following parameters for your network */
-        "keepalive_interval": 10,
-        "stat_interval": 30,
-        "push_timeout_ms": 100,
-        /* forward only valid packets */
-        "forward_crc_valid": true,
-        "forward_crc_error": false,
-        "forward_crc_disabled": false
-    }
-}
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E336.EU868.basic.clksrc1 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E336.EU868.basic.clksrc1
deleted file mode 100644
index a975861..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.PCB_E336.EU868.basic.clksrc1
+++ /dev/null
@@ -1,225 +0,0 @@
-{
-    "SX1301_conf": {
-        "lorawan_public": true,
-        "clksrc": 1, /* radio_1 provides clock to concentrator */
-        "lbt_cfg": {
-            "enable": false,
-            "rssi_target": 160, /* rssi in dBm = -lbt_rssi_target/2 */
-            "nb_channel": 1,
-            "start_freq": 869525000,
-            "scan_time_us": 5000,
-            "tx_delay_1ch_us": 4000000,
-            "tx_delay_2ch_us": 4000000
-        },
-        "antenna_gain": 0, /* antenna gain, in dBi */
-        "radio_0": {
-            "enable": true,
-            "type": "SX1257",
-            "freq": 867500000,
-            "rssi_offset": -165.0,
-            "tx_enable": true,
-            "tx_freq_min": 863000000,
-            "tx_freq_max": 870000000
-        },
-        "radio_1": {
-            "enable": true,
-            "type": "SX1257",
-            "freq": 868500000,
-            "rssi_offset": -165.0,
-            "tx_enable": false
-        },
-        "chan_multiSF_0": {
-            /* Lora MAC channel, 125kHz, all SF, 868.1 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": -400000
-        },
-        "chan_multiSF_1": {
-            /* Lora MAC channel, 125kHz, all SF, 868.3 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": -200000
-        },
-        "chan_multiSF_2": {
-            /* Lora MAC channel, 125kHz, all SF, 868.5 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": 0
-        },
-        "chan_multiSF_3": {
-            /* Lora MAC channel, 125kHz, all SF, 867.1 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": -400000
-        },
-        "chan_multiSF_4": {
-            /* Lora MAC channel, 125kHz, all SF, 867.3 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": -200000
-        },
-        "chan_multiSF_5": {
-            /* Lora MAC channel, 125kHz, all SF, 867.5 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": 0
-        },
-        "chan_multiSF_6": {
-            /* Lora MAC channel, 125kHz, all SF, 867.7 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": 200000
-        },
-        "chan_multiSF_7": {
-            /* Lora MAC channel, 125kHz, all SF, 867.9 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": 400000
-        },
-        "chan_Lora_std": {
-            /* Lora MAC channel, 250kHz, SF7, 868.3 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": -200000,
-            "bandwidth": 250000,
-            "spread_factor": 7
-        },
-        "chan_FSK": {
-            /* FSK 50kbps channel, 868.8 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": 300000,
-            "bandwidth": 125000,
-            "datarate": 50000
-        },
-        "tx_lut_0": {
-            /* TX gain table, index 0 */
-            "pa_gain": 0,
-            "mix_gain": 8,
-            "rf_power": -6,
-            "dig_gain": 3
-        },
-        "tx_lut_1": {
-            /* TX gain table, index 1 */
-            "pa_gain": 0,
-            "mix_gain": 10,
-            "rf_power": -3,
-            "dig_gain": 3
-        },
-        "tx_lut_2": {
-            /* TX gain table, index 2 */
-            "pa_gain": 0,
-            "mix_gain": 10,
-            "rf_power": 0,
-            "dig_gain": 1
-        },
-        "tx_lut_3": {
-            /* TX gain table, index 3 */
-            "pa_gain": 0,
-            "mix_gain": 14,
-            "rf_power": 3,
-            "dig_gain": 2
-        },
-        "tx_lut_4": {
-            /* TX gain table, index 4 */
-            "pa_gain": 1,
-            "mix_gain": 10,
-            "rf_power": 6,
-            "dig_gain": 3
-        },
-        "tx_lut_5": {
-            /* TX gain table, index 5 */
-            "pa_gain": 1,
-            "mix_gain": 12,
-            "rf_power": 10,
-            "dig_gain": 2
-        },
-        "tx_lut_6": {
-            /* TX gain table, index 6 */
-            "pa_gain": 1,
-            "mix_gain": 12,
-            "rf_power": 11,
-            "dig_gain": 1
-        },
-        "tx_lut_7": {
-            /* TX gain table, index 7 */
-            "pa_gain": 1,
-            "mix_gain": 12,
-            "rf_power": 12,
-            "dig_gain": 0
-        },
-        "tx_lut_8": {
-            /* TX gain table, index 8 */
-            "pa_gain": 1,
-            "mix_gain": 14,
-            "rf_power": 13,
-            "dig_gain": 2
-        },
-        "tx_lut_9": {
-            /* TX gain table, index 9 */
-            "pa_gain": 1,
-            "mix_gain": 13,
-            "rf_power": 14,
-            "dig_gain": 0
-        },
-        "tx_lut_10": {
-            /* TX gain table, index 10 */
-            "pa_gain": 2,
-            "mix_gain": 9,
-            "rf_power": 16,
-            "dig_gain": 2
-        },
-        "tx_lut_11": {
-            /* TX gain table, index 11 */
-            "pa_gain": 2,
-            "mix_gain": 11,
-            "rf_power": 20,
-            "dig_gain": 1
-        },
-        "tx_lut_12": {
-            /* TX gain table, index 12 */
-            "pa_gain": 2,
-            "mix_gain": 13,
-            "rf_power": 23,
-            "dig_gain": 1
-        },
-        "tx_lut_13": {
-            /* TX gain table, index 13 */
-            "pa_gain": 2,
-            "mix_gain": 15,
-            "rf_power": 25,
-            "dig_gain": 2
-        },
-        "tx_lut_14": {
-            /* TX gain table, index 14 */
-            "pa_gain": 3,
-            "mix_gain": 10,
-            "rf_power": 26,
-            "dig_gain": 2
-        },
-        "tx_lut_15": {
-            /* TX gain table, index 15 */
-            "pa_gain": 3,
-            "mix_gain": 10,
-            "rf_power": 27,
-            "dig_gain": 1
-        }
-    },
-
-    "gateway_conf": {
-        "gateway_ID": "AA555A0000000000",
-        /* change with default server address/ports, or overwrite in local_conf.json */
-        "server_address": "localhost",
-        "serv_port_up": 1680,
-        "serv_port_down": 1680,
-        /* adjust the following parameters for your network */
-        "keepalive_interval": 10,
-        "stat_interval": 30,
-        "push_timeout_ms": 100,
-        /* forward only valid packets */
-        "forward_crc_valid": true,
-        "forward_crc_error": false,
-        "forward_crc_disabled": false
-    }
-}
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.US902.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.US902.basic
deleted file mode 100644
index 3914956..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.US902.basic
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-    "SX1301_conf": {
-        "lorawan_public": true,
-        "clksrc": 1, /* radio_1 provides clock to concentrator */
-        "antenna_gain": 0, /* antenna gain, in dBi */
-        "radio_0": {
-            "enable": true,
-            "type": "SX1257",
-            "freq": 902700000,
-            "rssi_offset": -166.0,
-            "tx_enable": true,
-            "tx_freq_min": 902000000,
-            "tx_freq_max": 928000000
-        },
-        "radio_1": {
-            "enable": true,
-            "type": "SX1257",
-            "freq": 903400000,
-            "rssi_offset": -166.0,
-            "tx_enable": false
-        },
-        "chan_multiSF_0": {
-            /* Lora MAC channel, 125kHz, all SF, 902.3 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": -400000
-        },
-        "chan_multiSF_1": {
-            /* Lora MAC channel, 125kHz, all SF, 902.5 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": -200000
-        },
-        "chan_multiSF_2": {
-            /* Lora MAC channel, 125kHz, all SF, 902.7 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": 0
-        },
-        "chan_multiSF_3": {
-            /* Lora MAC channel, 125kHz, all SF, 902.9 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": 200000
-        },
-        "chan_multiSF_4": {
-            /* Lora MAC channel, 125kHz, all SF, 903.1 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": -300000
-        },
-        "chan_multiSF_5": {
-            /* Lora MAC channel, 125kHz, all SF, 903.3 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": -100000
-        },
-        "chan_multiSF_6": {
-            /* Lora MAC channel, 125kHz, all SF, 903.5 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": 100000
-        },
-        "chan_multiSF_7": {
-            /* Lora MAC channel, 125kHz, all SF, 903.7 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": 300000
-        },
-        "chan_Lora_std": {
-            /* Lora MAC channel, 500kHz, SF8, 903.0 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": 300000,
-            "bandwidth": 500000,
-            "spread_factor": 8
-        },
-        "chan_FSK": {
-            /* FSK 100kbps channel, 903.0 MHz */
-            "enable": false,
-            "radio": 0,
-            "if": 300000,
-            "bandwidth": 250000,
-            "datarate": 100000
-        }
-    },
-
-    "gateway_conf": {
-        "gateway_ID": "AA555A0000000000",
-        /* change with default server address/ports, or overwrite in local_conf.json */
-        "server_address": "localhost",
-        "serv_port_up": 1680,
-        "serv_port_down": 1680,
-        /* adjust the following parameters for your network */
-        "keepalive_interval": 10,
-        "stat_interval": 30,
-        "push_timeout_ms": 100,
-        /* forward only valid packets */
-        "forward_crc_valid": true,
-        "forward_crc_error": false,
-        "forward_crc_disabled": false
-    }
-}
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923-LBT.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923-LBT.basic
deleted file mode 100644
index 6c14d3c..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923-LBT.basic
+++ /dev/null
@@ -1,147 +0,0 @@
-{
-	"SX1301_conf": {
-		"antenna_gain": 0,
-		"chan_FSK": {
-			"bandwidth": 125000,
-			"datarate": 50000,
-			"enable": true,
-			"freq_deviation": 25000,
-			"if": 300000,
-			"radio": 0
-		},
-		"chan_Lora_std": {
-			"bandwidth": 250000,
-			"enable": true,
-			"if": -200000,
-			"radio": 0,
-			"spread_factor": 7
-		},
-		"chan_multiSF_0": {
-			"enable": true,
-			"if": -400000,
-			"radio": 0
-		},
-		"chan_multiSF_1": {
-			"enable": true,
-			"if": -200000,
-			"radio": 0
-		},
-		"chan_multiSF_2": {
-			"enable": true,
-			"if": 0,
-			"radio": 0
-		},
-		"chan_multiSF_3": {
-			"enable": true,
-			"if": -400000,
-			"radio": 1
-		},
-		"chan_multiSF_4": {
-			"enable": true,
-			"if": -200000,
-			"radio": 1
-		},
-		"chan_multiSF_5": {
-			"enable": true,
-			"if": 0,
-			"radio": 1
-		},
-		"chan_multiSF_6": {
-			"enable": true,
-			"if": 200000,
-			"radio": 1
-		},
-		"chan_multiSF_7": {
-			"enable": true,
-			"if": 400000,
-			"radio": 1
-		},
-		"clksrc": 0,
-		"lbt_cfg": {
-			"chan_cfg": [
-				{
-					"freq_hz": 923200000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 923400000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 923600000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922200000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922400000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922600000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922800000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 923000000,
-					"scan_time_us": 5000
-				}
-			],
-			"enable": true,
-			"rssi_target": -80,
-			"sx127x_rssi_offset": -4
-		},
-		"lorawan_public": true,
-		"radio_0": {
-			"enable": true,
-			"freq": 923600000,
-			"rssi_offset": -162,
-			"tx_enable": true,
-			"tx_freq_max": 928000000,
-			"tx_freq_min": 920000000,
-			"type": "SX1257"
-		},
-		"radio_1": {
-			"enable": true,
-			"freq": 922600000,
-			"rssi_offset": -162,
-			"tx_enable": false,
-			"type": "SX1257"
-		},
-                "tx_lut_0":{"dig_gain":2,"mix_gain":15,"pa_gain":1,"rf_power":10},
-                "tx_lut_1":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":11},
-                "tx_lut_2":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":12},
-                "tx_lut_3":{"dig_gain":0,"mix_gain":10,"pa_gain":2,"rf_power":13},
-                "tx_lut_4":{"dig_gain":3,"mix_gain":14,"pa_gain":2,"rf_power":14},
-                "tx_lut_5":{"dig_gain":1,"mix_gain":12,"pa_gain":2,"rf_power":15},
-                "tx_lut_6":{"dig_gain":0,"mix_gain":12,"pa_gain":2,"rf_power":16},
-                "tx_lut_7":{"dig_gain":2,"mix_gain":14,"pa_gain":2,"rf_power":17},
-                "tx_lut_8":{"dig_gain":2,"mix_gain":15,"pa_gain":2,"rf_power":18},
-                "tx_lut_9":{"dig_gain":1,"mix_gain":15,"pa_gain":2,"rf_power":19},
-                "tx_lut_10":{"dig_gain":0,"mix_gain":9,"pa_gain":3,"rf_power":20},
-                "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":21},
-                "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":22},
-                "tx_lut_13":{"dig_gain":0,"mix_gain":11,"pa_gain":3,"rf_power":23},
-                "tx_lut_14":{"dig_gain":2,"mix_gain":14,"pa_gain":3,"rf_power":24},
-                "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":25}
-	},
-	"gateway_conf": {
-		"gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
-		"server_address": "52.3.215.147",
-		"serv_port_up": 20000,
-		"serv_port_down": 20000,
-		"forward_crc_disabled": false,
-		"forward_crc_error": true,
-		"forward_crc_valid": true,
-		"keepalive_interval": 10,
-		"push_timeout_ms": 120,
-		"stat_interval": 20,
-		"synch_word": 52,
-                "autoquit_threshold": 60
-	}
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923.basic
deleted file mode 100644
index 3731a2d..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923.basic
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-	"SX1301_conf": {
-		"antenna_gain": 0,
-		"chan_FSK": {
-			"bandwidth": 125000,
-			"datarate": 50000,
-			"enable": true,
-			"freq_deviation": 25000,
-			"if": 300000,
-			"radio": 0
-		},
-		"chan_Lora_std": {
-			"bandwidth": 250000,
-			"enable": true,
-			"if": -200000,
-			"radio": 0,
-			"spread_factor": 7
-		},
-		"chan_multiSF_0": {
-			"enable": true,
-			"if": -400000,
-			"radio": 0
-		},
-		"chan_multiSF_1": {
-			"enable": true,
-			"if": -200000,
-			"radio": 0
-		},
-		"chan_multiSF_2": {
-			"enable": true,
-			"if": 0,
-			"radio": 0
-		},
-		"chan_multiSF_3": {
-			"enable": true,
-			"if": -400000,
-			"radio": 1
-		},
-		"chan_multiSF_4": {
-			"enable": true,
-			"if": -200000,
-			"radio": 1
-		},
-		"chan_multiSF_5": {
-			"enable": true,
-			"if": 0,
-			"radio": 1
-		},
-		"chan_multiSF_6": {
-			"enable": true,
-			"if": 200000,
-			"radio": 1
-		},
-		"chan_multiSF_7": {
-			"enable": true,
-			"if": 400000,
-			"radio": 1
-		},
-		"clksrc": 0,
-		"lbt_cfg": {
-			"chan_cfg": [
-			],
-			"enable": false,
-			"rssi_target": -80,
-			"sx127x_rssi_offset": -4
-		},
-		"lorawan_public": true,
-		"radio_0": {
-			"enable": true,
-			"freq": 923600000,
-			"rssi_offset": -162,
-			"tx_enable": true,
-			"tx_freq_max": 928000000,
-			"tx_freq_min": 920000000,
-			"type": "SX1257"
-		},
-		"radio_1": {
-			"enable": true,
-			"freq": 922600000,
-			"rssi_offset": -162,
-			"tx_enable": false,
-			"type": "SX1257"
-		},
-		"tx_lut_0":{"dig_gain":2,"mix_gain":15,"pa_gain":1,"rf_power":10},
-		"tx_lut_1":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":11},
-		"tx_lut_2":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":12},
-		"tx_lut_3":{"dig_gain":0,"mix_gain":10,"pa_gain":2,"rf_power":13},
-		"tx_lut_4":{"dig_gain":3,"mix_gain":14,"pa_gain":2,"rf_power":14},
-		"tx_lut_5":{"dig_gain":1,"mix_gain":12,"pa_gain":2,"rf_power":15},
-		"tx_lut_6":{"dig_gain":0,"mix_gain":12,"pa_gain":2,"rf_power":16},
-		"tx_lut_7":{"dig_gain":2,"mix_gain":14,"pa_gain":2,"rf_power":17},
-		"tx_lut_8":{"dig_gain":2,"mix_gain":15,"pa_gain":2,"rf_power":18},
-		"tx_lut_9":{"dig_gain":1,"mix_gain":15,"pa_gain":2,"rf_power":19},
-		"tx_lut_10":{"dig_gain":0,"mix_gain":9,"pa_gain":3,"rf_power":20},
-		"tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":21},
-		"tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":22},
-		"tx_lut_13":{"dig_gain":0,"mix_gain":11,"pa_gain":3,"rf_power":23},
-		"tx_lut_14":{"dig_gain":2,"mix_gain":14,"pa_gain":3,"rf_power":24},
-		"tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":25}
-	},
-	"gateway_conf": {
-		"gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
-		"server_address": "52.3.215.147",
-		"serv_port_up": 20000,
-		"serv_port_down": 20000,
-		"forward_crc_disabled": false,
-		"forward_crc_error": true,
-		"forward_crc_valid": true,
-		"keepalive_interval": 10,
-		"push_timeout_ms": 120,
-		"stat_interval": 20,
-		"synch_word": 52,
-                "autoquit_threshold": 60
-	}
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AU915.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AU915.basic
deleted file mode 100644
index c2a284e..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.AU915.basic
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-	"SX1301_conf": {
-		"lorawan_public": true,
-		"antenna_gain": 0,
-		"clksrc": 0,
-		"radio_0": {
-			"enable": true,
-			"freq": 915600000,
-			"rssi_offset": -162,
-			"tx_enable": true,
-			"tx_freq_max": 928000000,
-			"tx_freq_min": 902000000,
-			"type": "SX1257"
-		},
-		"radio_1": {
-			"enable": true,
-			"freq": 916400000,
-			"rssi_offset": -162,
-			"tx_enable": false,
-			"type": "SX1257"
-		},
-		"chan_FSK": {
-			"enable": false,
-			"radio": 0
-		},
-		"chan_Lora_std": {
-			"bandwidth": 500000,
-			"enable": true,
-			"if": 300000,
-			"radio": 0,
-			"spread_factor": 8
-		},
-		"chan_multiSF_0": {
-			"enable": true,
-			"if": -400000,
-			"radio": 0
-		},
-		"chan_multiSF_1": {
-			"enable": true,
-			"if": -200000,
-			"radio": 0
-		},
-		"chan_multiSF_2": {
-			"enable": true,
-			"if": 0,
-			"radio": 0
-		},
-		"chan_multiSF_3": {
-			"enable": true,
-			"if": 200000,
-			"radio": 0
-		},
-		"chan_multiSF_4": {
-			"enable": true,
-			"if": -400000,
-			"radio": 1
-		},
-		"chan_multiSF_5": {
-			"enable": true,
-			"if": -200000,
-			"radio": 1
-		},
-		"chan_multiSF_6": {
-			"enable": true,
-			"if": 0,
-			"radio": 1
-		},
-		"chan_multiSF_7": {
-			"enable": true,
-			"if": 200000,
-			"radio": 1
-		},
-		"lbt_cfg": {
-			"enable": false,
-			"nb_channel": 1,
-			"rssi_target": 160,
-			"scan_time_us": 5000,
-			"start_freq": 869525000,
-			"tx_delay_1ch_us": 4000000,
-			"tx_delay_2ch_us": 4000000
-		},
-                "tx_lut_0":{"dig_gain":2,"mix_gain":15,"pa_gain":1,"rf_power":10},
-                "tx_lut_1":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":11},
-                "tx_lut_2":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":12},
-                "tx_lut_3":{"dig_gain":0,"mix_gain":10,"pa_gain":2,"rf_power":13},
-                "tx_lut_4":{"dig_gain":3,"mix_gain":14,"pa_gain":2,"rf_power":14},
-                "tx_lut_5":{"dig_gain":1,"mix_gain":12,"pa_gain":2,"rf_power":15},
-                "tx_lut_6":{"dig_gain":0,"mix_gain":12,"pa_gain":2,"rf_power":16},
-                "tx_lut_7":{"dig_gain":2,"mix_gain":14,"pa_gain":2,"rf_power":17},
-                "tx_lut_8":{"dig_gain":2,"mix_gain":15,"pa_gain":2,"rf_power":18},
-                "tx_lut_9":{"dig_gain":1,"mix_gain":15,"pa_gain":2,"rf_power":19},
-                "tx_lut_10":{"dig_gain":0,"mix_gain":9,"pa_gain":3,"rf_power":20},
-                "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":21},
-                "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":22},
-                "tx_lut_13":{"dig_gain":0,"mix_gain":11,"pa_gain":3,"rf_power":23},
-                "tx_lut_14":{"dig_gain":2,"mix_gain":14,"pa_gain":3,"rf_power":24},
-                "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":25}
-	},
-	"gateway_conf": {
-		"forward_crc_disabled": false,
-		"forward_crc_error": true,
-		"forward_crc_valid": true,
-		"gateway_ID": "<WILL-BE-REPLACED-WITH-LORA-EUI>",
-		"keepalive_interval": 12,
-		"push_timeout_ms": 120,
-		"serv_port_down": 20000,
-		"serv_port_up": 20000,
-		"server_address": "52.3.215.147",
-		"stat_interval": 20,
-		"synch_word": 52,
-                "autoquit_threshold": 60
-	}
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.EU868.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.EU868.basic
deleted file mode 100644
index 710a228..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.EU868.basic
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-	 "SX1301_conf": {
-		  "lorawan_public": true,
-		  "clksrc": 0,
-		  "lbt_cfg": {
-				"enable": false,
-				"rssi_target": 160,
-				"nb_channel": 1,
-				"start_freq": 869525000,
-				"scan_time_us": 5000,
-				"tx_delay_1ch_us": 4000000,
-				"tx_delay_2ch_us": 4000000
-		  },
-		  "antenna_gain": 0,
-		  "radio_0": {
-				"enable": true,
-				"type": "SX1257",
-				"freq": 867500000,
-				"rssi_offset": -162,
-				"tx_enable": true,
-				"tx_freq_min": 863000000,
-				"tx_freq_max": 870000000
-		  },
-		  "radio_1": {
-				"enable": true,
-				"type": "SX1257",
-				"freq": 868500000,
-				"rssi_offset": -162,
-				"tx_enable": false
-		  },
-		  "chan_multiSF_0": {
-				"enable": true,
-				"radio": 1,
-				"if": -400000
-		  },
-		  "chan_multiSF_1": {
-				"enable": true,
-				"radio": 1,
-				"if": -200000
-		  },
-		  "chan_multiSF_2": {
-				"enable": true,
-				"radio": 1,
-				"if": 0
-		  },
-		  "chan_multiSF_3": {
-				"enable": true,
-				"radio": 0,
-				"if": -400000
-		  },
-		  "chan_multiSF_4": {
-				"enable": true,
-				"radio": 0,
-				"if": -200000
-		  },
-		  "chan_multiSF_5": {
-				"enable": true,
-				"radio": 0,
-				"if": 0
-		  },
-		  "chan_multiSF_6": {
-				"enable": true,
-				"radio": 0,
-				"if": 200000
-		  },
-		  "chan_multiSF_7": {
-				"enable": true,
-				"radio": 0,
-				"if": 400000
-		  },
-		  "chan_Lora_std": {
-				"enable": true,
-				"radio": 1,
-				"if": -200000,
-				"bandwidth": 250000,
-				"spread_factor": 7
-		  },
-		  "chan_FSK": {
-				"enable": true,
-				"radio": 1,
-				"if": 300000,
-				"bandwidth": 125000,
-				"datarate": 50000
-		  },
-                "tx_lut_0":{"dig_gain":1,"mix_gain":10,"pa_gain":1,"rf_power":4},
-                "tx_lut_1":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":11},
-                "tx_lut_2":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":12},
-                "tx_lut_3":{"dig_gain":0,"mix_gain":10,"pa_gain":2,"rf_power":13},
-                "tx_lut_4":{"dig_gain":3,"mix_gain":14,"pa_gain":2,"rf_power":14},
-                "tx_lut_5":{"dig_gain":1,"mix_gain":12,"pa_gain":2,"rf_power":15},
-                "tx_lut_6":{"dig_gain":0,"mix_gain":12,"pa_gain":2,"rf_power":16},
-                "tx_lut_7":{"dig_gain":2,"mix_gain":14,"pa_gain":2,"rf_power":17},
-                "tx_lut_8":{"dig_gain":2,"mix_gain":15,"pa_gain":2,"rf_power":18},
-                "tx_lut_9":{"dig_gain":1,"mix_gain":15,"pa_gain":2,"rf_power":19},
-                "tx_lut_10":{"dig_gain":0,"mix_gain":9,"pa_gain":3,"rf_power":20},
-                "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":21},
-                "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":22},
-                "tx_lut_13":{"dig_gain":0,"mix_gain":11,"pa_gain":3,"rf_power":23},
-                "tx_lut_14":{"dig_gain":2,"mix_gain":14,"pa_gain":3,"rf_power":24},
-                "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":25}
-	 },
-	 "gateway_conf": {
-		  "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
-		  "server_address": "52.3.215.147",
-		  "serv_port_up": 20000,
-		  "serv_port_down": 20000,
-		  "keepalive_interval": 10,
-		  "stat_interval": 30,
-		  "push_timeout_ms": 100,
-		  "forward_crc_valid": true,
-		  "forward_crc_error": true,
-		  "forward_crc_disabled": false,
-		"synch_word": 52,
-                "autoquit_threshold": 60
-	 }
-}
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.IN865.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.IN865.basic
deleted file mode 100644
index c45db75..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.IN865.basic
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-	"SX1301_conf": {
-		"antenna_gain": 0,
-		"chan_FSK": {
-			"bandwidth": 125000,
-			"datarate": 50000,
-			"enable": true,
-			"freq_deviation": 25000,
-			"if": 300000,
-			"radio": 1
-		},
-		"chan_Lora_std": {
-			"bandwidth": 250000,
-			"enable": true,
-			"if": 0,
-			"radio": 0,
-			"spread_factor": 7
-		},
-		"chan_multiSF_": {
-			"radio": null
-		},
-		"chan_multiSF_0": {
-			"enable": true,
-			"if": -137500,
-			"radio": 0
-		},
-		"chan_multiSF_1": {
-			"enable": true,
-			"if": 202500,
-			"radio": 0
-		},
-		"chan_multiSF_2": {
-			"enable": true,
-			"if": 32500,
-			"radio": 0
-		},
-		"chan_multiSF_3": {
-			"enable": true,
-			"if": -400000,
-			"radio": 1
-		},
-		"chan_multiSF_4": {
-			"enable": true,
-			"if": -200000,
-			"radio": 1
-		},
-		"chan_multiSF_5": {
-			"enable": true,
-			"if": 0,
-			"radio": 1
-		},
-		"chan_multiSF_6": {
-			"enable": true,
-			"if": 200000,
-			"radio": 1
-		},
-		"chan_multiSF_7": {
-			"enable": true,
-			"if": 400000,
-			"radio": 1
-		},
-		"clksrc": 0,
-		"lbt_cfg": {
-			"enable": false,
-			"rssi_target": 160
-		},
-		"lorawan_public": true,
-		"radio_0": {
-			"enable": true,
-			"freq": 865200000,
-			"rssi_offset": -162,
-			"tx_enable": true,
-			"tx_freq_max": 867000000,
-			"tx_freq_min": 865000000,
-			"tx_notch_freq": 129000,
-			"type": "SX1257"
-		},
-		"radio_1": {
-			"enable": true,
-			"freq": 866385000,
-			"rssi_offset": -162,
-			"tx_enable": false,
-			"type": "SX1257"
-		},
-                "tx_lut_0":{"dig_gain":2,"mix_gain":15,"pa_gain":1,"rf_power":10},
-                "tx_lut_1":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":11},
-                "tx_lut_2":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":12},
-                "tx_lut_3":{"dig_gain":0,"mix_gain":10,"pa_gain":2,"rf_power":13},
-                "tx_lut_4":{"dig_gain":3,"mix_gain":14,"pa_gain":2,"rf_power":14},
-                "tx_lut_5":{"dig_gain":1,"mix_gain":12,"pa_gain":2,"rf_power":15},
-                "tx_lut_6":{"dig_gain":0,"mix_gain":12,"pa_gain":2,"rf_power":16},
-                "tx_lut_7":{"dig_gain":2,"mix_gain":14,"pa_gain":2,"rf_power":17},
-                "tx_lut_8":{"dig_gain":2,"mix_gain":15,"pa_gain":2,"rf_power":18},
-                "tx_lut_9":{"dig_gain":1,"mix_gain":15,"pa_gain":2,"rf_power":19},
-                "tx_lut_10":{"dig_gain":0,"mix_gain":9,"pa_gain":3,"rf_power":20},
-                "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":21},
-                "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":22},
-                "tx_lut_13":{"dig_gain":0,"mix_gain":11,"pa_gain":3,"rf_power":23},
-                "tx_lut_14":{"dig_gain":2,"mix_gain":14,"pa_gain":3,"rf_power":24},
-                "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":25}
-	},
-	"gateway_conf": {
-		"gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
-		"server_address": "52.3.215.147",
-		"serv_port_up": 20000,
-		"serv_port_down": 20000,
-		"forward_crc_disabled": false,
-		"forward_crc_error": true,
-		"forward_crc_valid": true,
-		"keepalive_interval": 10,
-		"push_timeout_ms": 120,
-		"stat_interval": 20,
-		"synch_word": 52,
-                "autoquit_threshold": 60
-
-	}
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.KR920-LBT.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.KR920-LBT.basic
deleted file mode 100644
index 9daa32e..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.KR920-LBT.basic
+++ /dev/null
@@ -1,147 +0,0 @@
-{
-	"SX1301_conf": {
-		"antenna_gain": 0,
-		"chan_FSK": {
-			"bandwidth": 125000,
-			"datarate": 50000,
-			"enable": false,
-			"if": 300000,
-			"radio": 0
-		},
-		"chan_Lora_std": {
-			"bandwidth": 250000,
-			"enable": false,
-			"if": -200000,
-			"radio": 0,
-			"spread_factor": 7
-		},
-		"chan_multiSF_0": {
-			"enable": true,
-			"if": -400000,
-			"radio": 0
-		},
-		"chan_multiSF_1": {
-			"enable": true,
-			"if": -200000,
-			"radio": 0
-		},
-		"chan_multiSF_2": {
-			"enable": true,
-			"if": 0,
-			"radio": 0
-		},
-		"chan_multiSF_3": {
-			"enable": true,
-			"if": -400000,
-			"radio": 1
-		},
-		"chan_multiSF_4": {
-			"enable": true,
-			"if": -200000,
-			"radio": 1
-		},
-		"chan_multiSF_5": {
-			"enable": true,
-			"if": 0,
-			"radio": 1
-		},
-		"chan_multiSF_6": {
-			"enable": true,
-			"if": 200000,
-			"radio": 1
-		},
-		"chan_multiSF_7": {
-			"enable": true,
-			"if": 400000,
-			"radio": 1
-		},
-		"clksrc": 0,
-		"lbt_cfg": {
-			"chan_cfg": [
-				{
-					"freq_hz": 922100000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922300000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922500000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922700000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922900000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 923100000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 923300000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 921900000,
-					"scan_time_us": 5000
-				}
-			],
-			"enable": true,
-			"rssi_target": -65,
-			"sx127x_rssi_offset": -4
-		},
-		"lorawan_public": true,
-		"radio_0": {
-			"enable": true,
-			"freq": 922500000,
-			"rssi_offset": -162,
-			"tx_enable": true,
-			"tx_freq_max": 923300000,
-			"tx_freq_min": 920900000,
-			"type": "SX1257"
-		},
-		"radio_1": {
-			"enable": true,
-			"freq": 922900000,
-			"rssi_offset": -162,
-			"tx_enable": false,
-			"type": "SX1257"
-		},
-                "tx_lut_0":{"dig_gain":2,"mix_gain":15,"pa_gain":1,"rf_power":10},
-                "tx_lut_1":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":11},
-                "tx_lut_2":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":12},
-                "tx_lut_3":{"dig_gain":0,"mix_gain":10,"pa_gain":2,"rf_power":13},
-                "tx_lut_4":{"dig_gain":3,"mix_gain":14,"pa_gain":2,"rf_power":14},
-                "tx_lut_5":{"dig_gain":1,"mix_gain":12,"pa_gain":2,"rf_power":15},
-                "tx_lut_6":{"dig_gain":0,"mix_gain":12,"pa_gain":2,"rf_power":16},
-                "tx_lut_7":{"dig_gain":2,"mix_gain":14,"pa_gain":2,"rf_power":17},
-                "tx_lut_8":{"dig_gain":2,"mix_gain":15,"pa_gain":2,"rf_power":18},
-                "tx_lut_9":{"dig_gain":1,"mix_gain":15,"pa_gain":2,"rf_power":19},
-                "tx_lut_10":{"dig_gain":0,"mix_gain":9,"pa_gain":3,"rf_power":20},
-                "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":21},
-                "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":22},
-                "tx_lut_13":{"dig_gain":0,"mix_gain":11,"pa_gain":3,"rf_power":23},
-                "tx_lut_14":{"dig_gain":2,"mix_gain":14,"pa_gain":3,"rf_power":24},
-                "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":25}
-	},
-	"gateway_conf": {
-		"gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
-		"server_address": "52.3.215.147",
-		"serv_port_up": 20000,
-		"serv_port_down": 20000,
-		"forward_crc_disabled": false,
-		"forward_crc_error": true,
-		"forward_crc_valid": true,
-		"keepalive_interval": 10,
-		"push_timeout_ms": 120,
-		"stat_interval": 20,
-		"synch_word": 52,
-                "autoquit_threshold": 60
-
-	}
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.RU864.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.RU864.basic
deleted file mode 100644
index d185858..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.RU864.basic
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-	 "SX1301_conf": {
-		  "lorawan_public": true,
-		  "clksrc": 0,
-		  "lbt_cfg": {
-				"enable": false,
-				"rssi_target": 160,
-				"nb_channel": 1,
-				"start_freq": 869525000,
-				"scan_time_us": 5000,
-				"tx_delay_1ch_us": 4000000,
-				"tx_delay_2ch_us": 4000000
-		  },
-		  "antenna_gain": 0,
-		  "radio_0": {
-				"enable": true,
-				"type": "SX1257",
-				"freq": 869100000,
-				"rssi_offset": -162,
-				"tx_enable": true,
-				"tx_freq_min": 864000000,
-				"tx_freq_max": 870000000
-		  },
-		  "radio_1": {
-				"enable": true,
-				"type": "SX1257",
-				"freq": 868100000,
-				"rssi_offset": -162,
-				"tx_enable": false
-		  },
-		  "chan_multiSF_0": {
-				"enable": true,
-				"radio": 0,
-				"if": -400000
-		  },
-		  "chan_multiSF_1": {
-				"enable": true,
-				"radio": 0,
-				"if": -200000
-		  },
-		  "chan_multiSF_2": {
-				"enable": true,
-				"radio": 0,
-				"if": 0
-		  },
-		  "chan_multiSF_3": {
-				"enable": true,
-				"radio": 1,
-				"if": -400000
-		  },
-		  "chan_multiSF_4": {
-				"enable": true,
-				"radio": 1,
-				"if": -200000
-		  },
-		  "chan_multiSF_5": {
-				"enable": true,
-				"radio": 1,
-				"if": 0
-		  },
-		  "chan_multiSF_6": {
-				"enable": true,
-				"radio": 1,
-				"if": 200000
-		  },
-		  "chan_multiSF_7": {
-				"enable": true,
-				"radio": 1,
-				"if": 400000
-		  },
-		  "chan_Lora_std": {
-				"enable": true,
-				"radio": 0,
-				"if": -200000,
-				"bandwidth": 250000,
-				"spread_factor": 7
-		  },
-		  "chan_FSK": {
-				"enable": true,
-				"radio": 1,
-				"if": 0,
-				"bandwidth": 125000,
-				"datarate": 50000
-		  },
-                "tx_lut_0":{"dig_gain":2,"mix_gain":15,"pa_gain":1,"rf_power":10},
-                "tx_lut_1":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":11},
-                "tx_lut_2":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":12},
-                "tx_lut_3":{"dig_gain":0,"mix_gain":10,"pa_gain":2,"rf_power":13},
-                "tx_lut_4":{"dig_gain":3,"mix_gain":14,"pa_gain":2,"rf_power":14},
-                "tx_lut_5":{"dig_gain":1,"mix_gain":12,"pa_gain":2,"rf_power":15},
-                "tx_lut_6":{"dig_gain":0,"mix_gain":12,"pa_gain":2,"rf_power":16},
-                "tx_lut_7":{"dig_gain":2,"mix_gain":14,"pa_gain":2,"rf_power":17},
-                "tx_lut_8":{"dig_gain":2,"mix_gain":15,"pa_gain":2,"rf_power":18},
-                "tx_lut_9":{"dig_gain":1,"mix_gain":15,"pa_gain":2,"rf_power":19},
-                "tx_lut_10":{"dig_gain":0,"mix_gain":9,"pa_gain":3,"rf_power":20},
-                "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":21},
-                "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":22},
-                "tx_lut_13":{"dig_gain":0,"mix_gain":11,"pa_gain":3,"rf_power":23},
-                "tx_lut_14":{"dig_gain":2,"mix_gain":14,"pa_gain":3,"rf_power":24},
-                "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":25}
-	 },
-	 "gateway_conf": {
-		  "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
-		  "server_address": "52.3.215.147",
-		  "serv_port_up": 20000,
-		  "serv_port_down": 20000,
-		  "keepalive_interval": 10,
-		  "stat_interval": 30,
-		  "push_timeout_ms": 100,
-		  "forward_crc_valid": true,
-		  "forward_crc_error": true,
-		  "forward_crc_disabled": false,
-		"synch_word": 52,
-                "autoquit_threshold": 60
-	 }
-}
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic
deleted file mode 100644
index dd39ac7..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-	"SX1301_conf" : 
-	{
-		"antenna_gain" : 0,
-		"chan_FSK" : 
-		{
-			"bandwidth" : 125000,
-			"datarate" : 50000,
-			"enable" : false,
-			"if" : 300000,
-			"radio" : 0
-		},
-		"chan_Lora_std" : 
-		{
-			"bandwidth" : 500000,
-			"enable" : true,
-			"if" : 300000,
-			"radio" : 0,
-			"spread_factor" : 8
-		},
-		"chan_multiSF_0" : 
-		{
-			"enable" : true,
-			"if" : -400000,
-			"radio" : 0
-		},
-		"chan_multiSF_1" : 
-		{
-			"enable" : true,
-			"if" : -200000,
-			"radio" : 0
-		},
-		"chan_multiSF_2" : 
-		{
-			"enable" : true,
-			"if" : 0,
-			"radio" : 0
-		},
-		"chan_multiSF_3" : 
-		{
-			"enable" : true,
-			"if" : 200000,
-			"radio" : 0
-		},
-		"chan_multiSF_4" : 
-		{
-			"enable" : true,
-			"if" : -400000,
-			"radio" : 1
-		},
-		"chan_multiSF_5" : 
-		{
-			"enable" : true,
-			"if" : -200000,
-			"radio" : 1
-		},
-		"chan_multiSF_6" : 
-		{
-			"enable" : true,
-			"if" : 0,
-			"radio" : 1
-		},
-		"chan_multiSF_7" : 
-		{
-			"enable" : true,
-			"if" : 200000,
-			"radio" : 1
-		},
-		"clksrc" : 0,
-		"lbt_cfg" : 
-		{
-			"enable" : false,
-			"nb_channel" : 1,
-			"rssi_target" : 160,
-			"scan_time_us" : 5000,
-			"start_freq" : 869525000,
-			"tx_delay_1ch_us" : 4000000,
-			"tx_delay_2ch_us" : 4000000
-		},
-		"lorawan_public" : true,
-		"radio_0" : 
-		{
-			"enable" : true,
-			"freq" : 902700000,
-			"rssi_offset" : -162,
-			"tx_enable" : true,
-			"tx_freq_max" : 928000000,
-			"tx_freq_min" : 902000000,
-			"type" : "SX1257"
-		},
-		"radio_1" : 
-		{
-			"enable" : true,
-			"freq" : 903500000,
-			"rssi_offset" : -162,
-			"tx_enable" : false,
-			"type" : "SX1257"
-		},
-                "tx_lut_0":{"dig_gain":2,"mix_gain":15,"pa_gain":1,"rf_power":10},
-                "tx_lut_1":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":11},
-                "tx_lut_2":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":12},
-                "tx_lut_3":{"dig_gain":0,"mix_gain":10,"pa_gain":2,"rf_power":13},
-                "tx_lut_4":{"dig_gain":3,"mix_gain":14,"pa_gain":2,"rf_power":14},
-                "tx_lut_5":{"dig_gain":1,"mix_gain":12,"pa_gain":2,"rf_power":15},
-                "tx_lut_6":{"dig_gain":0,"mix_gain":12,"pa_gain":2,"rf_power":16},
-                "tx_lut_7":{"dig_gain":2,"mix_gain":14,"pa_gain":2,"rf_power":17},
-                "tx_lut_8":{"dig_gain":2,"mix_gain":15,"pa_gain":2,"rf_power":18},
-                "tx_lut_9":{"dig_gain":1,"mix_gain":15,"pa_gain":2,"rf_power":19},
-                "tx_lut_10":{"dig_gain":0,"mix_gain":9,"pa_gain":3,"rf_power":20},
-                "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":21},
-                "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":22},
-                "tx_lut_13":{"dig_gain":0,"mix_gain":11,"pa_gain":3,"rf_power":23},
-                "tx_lut_14":{"dig_gain":2,"mix_gain":14,"pa_gain":3,"rf_power":24},
-                "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":25}
-	},
-	"gateway_conf": {
-		"gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
-		"server_address": "52.3.215.147",
-		"serv_port_up": 20000,
-		"serv_port_down": 20000,
-		"keepalive_interval": 10,
-		"stat_interval": 30,
-		"push_timeout_ms": 100,
-		"forward_crc_valid": true,
-		"forward_crc_error": true,
-		"forward_crc_disabled": false,
-                "autoquit_threshold": 60
-
-	}
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.AS923 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.AS923
deleted file mode 100644
index fd3800b..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.AS923
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-	 "SX1301_conf": {
-        "antenna_gain": 0,
-		"chan_FSK": {
-			"bandwidth": 125000,
-			"datarate": 50000,
-			"enable": true,
-			"freq_deviation": 25000,
-			"if": 300000,
-			"radio": 0
-		},
-		"chan_Lora_std": {
-			"bandwidth": 250000,
-			"enable": true,
-			"if": -200000,
-			"radio": 0,
-			"spread_factor": 7
-		},
-		"chan_multiSF_0": {
-			"enable": true,
-			"if": -400000,
-			"radio": 0
-		},
-		"chan_multiSF_1": {
-			"enable": true,
-			"if": -200000,
-			"radio": 0
-		},
-		"chan_multiSF_2": {
-			"enable": true,
-			"if": 0,
-			"radio": 0
-		},
-		"chan_multiSF_3": {
-			"enable": true,
-			"if": -400000,
-			"radio": 1
-		},
-		"chan_multiSF_4": {
-			"enable": true,
-			"if": -200000,
-			"radio": 1
-		},
-		"chan_multiSF_5": {
-			"enable": true,
-			"if": 0,
-			"radio": 1
-		},
-		"chan_multiSF_6": {
-			"enable": true,
-			"if": 200000,
-			"radio": 1
-		},
-		"chan_multiSF_7": {
-			"enable": true,
-			"if": 400000,
-			"radio": 1
-		},
-		"clksrc": 0,
-		"lbt_cfg": {
-			"chan_cfg": [
-			],
-			"enable": false,
-			"rssi_target": -80,
-			"sx127x_rssi_offset": -4
-		},
-		"lorawan_public": true,
-		"radio_0": {
-			"enable": true,
-			"freq": 923600000,
-			"rssi_offset": -162,
-			"tx_enable": true,
-			"tx_freq_max": 928000000,
-			"tx_freq_min": 920000000,
-			"type": "SX1257"
-		},
-		"radio_1": {
-			"enable": true,
-			"freq": 922600000,
-			"rssi_offset": -162,
-			"tx_enable": false,
-			"type": "SX1257"
-		},
-          "tx_lut_0":{"dig_gain":0,"mix_gain":12,"pa_gain":1,"rf_power":10},
-          "tx_lut_1":{"dig_gain":3,"mix_gain":11,"pa_gain":2,"rf_power":11},
-          "tx_lut_2":{"dig_gain":0,"mix_gain":14,"pa_gain":1,"rf_power":12},
-          "tx_lut_3":{"dig_gain":0,"mix_gain":9,"pa_gain":2,"rf_power":13},
-          "tx_lut_4":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":14},
-          "tx_lut_5":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":15},
-          "tx_lut_6":{"dig_gain":0,"mix_gain":11,"pa_gain":2,"rf_power":16},
-          "tx_lut_7":{"dig_gain":3,"mix_gain":9,"pa_gain":3,"rf_power":17},
-          "tx_lut_8":{"dig_gain":1,"mix_gain":8,"pa_gain":3,"rf_power":20},
-          "tx_lut_9":{"dig_gain":0,"mix_gain":8,"pa_gain":3,"rf_power":21},
-          "tx_lut_10":{"dig_gain":2,"mix_gain":10,"pa_gain":3,"rf_power":23},
-          "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":24},
-          "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":25},
-          "tx_lut_13":{"dig_gain":2,"mix_gain":12,"pa_gain":3,"rf_power":26},
-          "tx_lut_14":{"dig_gain":0,"mix_gain":13,"pa_gain":3,"rf_power":28},
-          "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":29}
-	 },
-	 "gateway_conf": {
-		  "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
-		  "server_address": "52.3.215.147",
-		  "serv_port_up": 20000,
-		  "serv_port_down": 20000,
-		  "keepalive_interval": 10,
-		  "stat_interval": 30,
-		  "push_timeout_ms": 100,
-		  "forward_crc_valid": true,
-		  "forward_crc_error": true,
-		  "forward_crc_disabled": false,
-		  "synch_word": 52,
-          "autoquit_threshold": 60
-	 }
-}
-
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.AS923-LBT b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.AS923-LBT
deleted file mode 100644
index c5f9308..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.AS923-LBT
+++ /dev/null
@@ -1,149 +0,0 @@
-{
-	 "SX1301_conf": {
-"antenna_gain": 0,
-		"chan_FSK": {
-			"bandwidth": 125000,
-			"datarate": 50000,
-			"enable": true,
-			"freq_deviation": 25000,
-			"if": 300000,
-			"radio": 0
-		},
-		"chan_Lora_std": {
-			"bandwidth": 250000,
-			"enable": true,
-			"if": -200000,
-			"radio": 0,
-			"spread_factor": 7
-		},
-		"chan_multiSF_0": {
-			"enable": true,
-			"if": -400000,
-			"radio": 0
-		},
-		"chan_multiSF_1": {
-			"enable": true,
-			"if": -200000,
-			"radio": 0
-		},
-		"chan_multiSF_2": {
-			"enable": true,
-			"if": 0,
-			"radio": 0
-		},
-		"chan_multiSF_3": {
-			"enable": true,
-			"if": -400000,
-			"radio": 1
-		},
-		"chan_multiSF_4": {
-			"enable": true,
-			"if": -200000,
-			"radio": 1
-		},
-		"chan_multiSF_5": {
-			"enable": true,
-			"if": 0,
-			"radio": 1
-		},
-		"chan_multiSF_6": {
-			"enable": true,
-			"if": 200000,
-			"radio": 1
-		},
-		"chan_multiSF_7": {
-			"enable": true,
-			"if": 400000,
-			"radio": 1
-		},
-		"clksrc": 0,
-		"lbt_cfg": {
-			"chan_cfg": [
-				{
-					"freq_hz": 923200000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 923400000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 923600000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922200000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922400000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922600000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922800000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 923000000,
-					"scan_time_us": 5000
-				}
-			],
-			"enable": true,
-			"rssi_target": -80,
-			"sx127x_rssi_offset": -4
-		},
-		"lorawan_public": true,
-		"radio_0": {
-			"enable": true,
-			"freq": 923600000,
-			"rssi_offset": -162,
-			"tx_enable": true,
-			"tx_freq_max": 928000000,
-			"tx_freq_min": 920000000,
-			"type": "SX1257"
-		},
-		"radio_1": {
-			"enable": true,
-			"freq": 922600000,
-			"rssi_offset": -162,
-			"tx_enable": false,
-			"type": "SX1257"
-		},
-          "tx_lut_0":{"dig_gain":0,"mix_gain":12,"pa_gain":1,"rf_power":10},
-          "tx_lut_1":{"dig_gain":3,"mix_gain":11,"pa_gain":2,"rf_power":11},
-          "tx_lut_2":{"dig_gain":0,"mix_gain":14,"pa_gain":1,"rf_power":12},
-          "tx_lut_3":{"dig_gain":0,"mix_gain":9,"pa_gain":2,"rf_power":13},
-          "tx_lut_4":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":14},
-          "tx_lut_5":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":15},
-          "tx_lut_6":{"dig_gain":0,"mix_gain":11,"pa_gain":2,"rf_power":16},
-          "tx_lut_7":{"dig_gain":3,"mix_gain":9,"pa_gain":3,"rf_power":17},
-          "tx_lut_8":{"dig_gain":1,"mix_gain":8,"pa_gain":3,"rf_power":20},
-          "tx_lut_9":{"dig_gain":0,"mix_gain":8,"pa_gain":3,"rf_power":21},
-          "tx_lut_10":{"dig_gain":2,"mix_gain":10,"pa_gain":3,"rf_power":23},
-          "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":24},
-          "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":25},
-          "tx_lut_13":{"dig_gain":2,"mix_gain":12,"pa_gain":3,"rf_power":26},
-          "tx_lut_14":{"dig_gain":0,"mix_gain":13,"pa_gain":3,"rf_power":28},
-          "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":29}
-	 },
-	 "gateway_conf": {
-		  "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
-		  "server_address": "52.3.215.147",
-		  "serv_port_up": 20000,
-		  "serv_port_down": 20000,
-		  "keepalive_interval": 10,
-		  "stat_interval": 30,
-		  "push_timeout_ms": 100,
-		  "forward_crc_valid": true,
-		  "forward_crc_error": true,
-		  "forward_crc_disabled": false,
-		  "synch_word": 52,
-          "autoquit_threshold": 60
-	 }
-}
-
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.AU915 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.AU915
deleted file mode 100644
index ff8ec89..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.AU915
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-	 "SX1301_conf": {
-        "lorawan_public": true,
-		"antenna_gain": 0,
-		"clksrc": 0,
-		"radio_0": {
-			"enable": true,
-			"freq": 915600000,
-			"rssi_offset": -162,
-			"tx_enable": true,
-			"tx_freq_max": 928000000,
-			"tx_freq_min": 902000000,
-			"type": "SX1257"
-		},
-		"radio_1": {
-			"enable": true,
-			"freq": 916400000,
-			"rssi_offset": -162,
-			"tx_enable": false,
-			"type": "SX1257"
-		},
-		"chan_FSK": {
-			"enable": false,
-			"radio": 0
-		},
-		"chan_Lora_std": {
-			"bandwidth": 500000,
-			"enable": true,
-			"if": 300000,
-			"radio": 0,
-			"spread_factor": 8
-		},
-		"chan_multiSF_0": {
-			"enable": true,
-			"if": -400000,
-			"radio": 0
-		},
-		"chan_multiSF_1": {
-			"enable": true,
-			"if": -200000,
-			"radio": 0
-		},
-		"chan_multiSF_2": {
-			"enable": true,
-			"if": 0,
-			"radio": 0
-		},
-		"chan_multiSF_3": {
-			"enable": true,
-			"if": 200000,
-			"radio": 0
-		},
-		"chan_multiSF_4": {
-			"enable": true,
-			"if": -400000,
-			"radio": 1
-		},
-		"chan_multiSF_5": {
-			"enable": true,
-			"if": -200000,
-			"radio": 1
-		},
-		"chan_multiSF_6": {
-			"enable": true,
-			"if": 0,
-			"radio": 1
-		},
-		"chan_multiSF_7": {
-			"enable": true,
-			"if": 200000,
-			"radio": 1
-		},
-		"lbt_cfg": {
-			"enable": false,
-			"nb_channel": 1,
-			"rssi_target": 160,
-			"scan_time_us": 5000,
-			"start_freq": 869525000,
-			"tx_delay_1ch_us": 4000000,
-			"tx_delay_2ch_us": 4000000
-		},
-          "tx_lut_0":{"dig_gain":0,"mix_gain":12,"pa_gain":1,"rf_power":10},
-          "tx_lut_1":{"dig_gain":3,"mix_gain":11,"pa_gain":2,"rf_power":11},
-          "tx_lut_2":{"dig_gain":0,"mix_gain":14,"pa_gain":1,"rf_power":12},
-          "tx_lut_3":{"dig_gain":0,"mix_gain":9,"pa_gain":2,"rf_power":13},
-          "tx_lut_4":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":14},
-          "tx_lut_5":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":15},
-          "tx_lut_6":{"dig_gain":0,"mix_gain":11,"pa_gain":2,"rf_power":16},
-          "tx_lut_7":{"dig_gain":3,"mix_gain":9,"pa_gain":3,"rf_power":17},
-          "tx_lut_8":{"dig_gain":1,"mix_gain":8,"pa_gain":3,"rf_power":20},
-          "tx_lut_9":{"dig_gain":0,"mix_gain":8,"pa_gain":3,"rf_power":21},
-          "tx_lut_10":{"dig_gain":2,"mix_gain":10,"pa_gain":3,"rf_power":23},
-          "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":24},
-          "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":25},
-          "tx_lut_13":{"dig_gain":2,"mix_gain":12,"pa_gain":3,"rf_power":26},
-          "tx_lut_14":{"dig_gain":0,"mix_gain":13,"pa_gain":3,"rf_power":28},
-          "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":29}
-	 },
-	 "gateway_conf": {
-		  "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
-		  "server_address": "52.3.215.147",
-		  "serv_port_up": 20000,
-		  "serv_port_down": 20000,
-		  "keepalive_interval": 10,
-		  "stat_interval": 30,
-		  "push_timeout_ms": 100,
-		  "forward_crc_valid": true,
-		  "forward_crc_error": true,
-		  "forward_crc_disabled": false,
-		  "synch_word": 52,
-          "autoquit_threshold": 60
-	 }
-}
-
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.EU868 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.EU868
deleted file mode 100644
index ee56dd4..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.EU868
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-	 "SX1301_conf": {
-		  "lorawan_public": true,
-		  "clksrc": 0,
-		  "lbt_cfg": {
-				"enable": false,
-				"rssi_target": 160,
-				"nb_channel": 1,
-				"start_freq": 869525000,
-				"scan_time_us": 5000,
-				"tx_delay_1ch_us": 4000000,
-				"tx_delay_2ch_us": 4000000
-		  },
-		  "antenna_gain": 0,
-		  "radio_0": { "enable": true, "type": "SX1257", "freq": 867500000, "rssi_offset": -162, "tx_enable": true, "tx_freq_min": 863000000, "tx_freq_max": 870000000 },
-		  "radio_1": { "enable": true, "type": "SX1257", "freq": 868500000, "rssi_offset": -162, "tx_enable": false },
-		  "chan_multiSF_0": { "enable": true, "radio": 1, "if": -400000 },
-		  "chan_multiSF_1": { "enable": true, "radio": 1, "if": -200000 },
-		  "chan_multiSF_2": { "enable": true, "radio": 1, "if": 0 },
-		  "chan_multiSF_3": { "enable": true, "radio": 0, "if": -400000 },
-		  "chan_multiSF_4": { "enable": true, "radio": 0, "if": -200000 },
-		  "chan_multiSF_5": { "enable": true, "radio": 0, "if": 0 },
-		  "chan_multiSF_6": { "enable": true,"radio": 0, "if": 200000 },
-		  "chan_multiSF_7": { "enable": true, "radio": 0, "if": 400000 },
-		  "chan_Lora_std": { "enable": true, "radio": 1, "if": -200000, "bandwidth": 250000, "spread_factor": 7 },
-		  "chan_FSK": { "enable": true, "radio": 1,	"if": 300000, "bandwidth": 125000, "datarate": 50000 },
-          "tx_lut_0":{"dig_gain":0,"mix_gain":12,"pa_gain":1,"rf_power":10},
-          "tx_lut_1":{"dig_gain":3,"mix_gain":11,"pa_gain":2,"rf_power":11},
-          "tx_lut_2":{"dig_gain":0,"mix_gain":14,"pa_gain":1,"rf_power":12},
-          "tx_lut_3":{"dig_gain":0,"mix_gain":9,"pa_gain":2,"rf_power":13},
-          "tx_lut_4":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":14},
-          "tx_lut_5":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":15},
-          "tx_lut_6":{"dig_gain":0,"mix_gain":11,"pa_gain":2,"rf_power":16},
-          "tx_lut_7":{"dig_gain":3,"mix_gain":9,"pa_gain":3,"rf_power":17},
-          "tx_lut_8":{"dig_gain":1,"mix_gain":8,"pa_gain":3,"rf_power":20},
-          "tx_lut_9":{"dig_gain":0,"mix_gain":8,"pa_gain":3,"rf_power":21},
-          "tx_lut_10":{"dig_gain":2,"mix_gain":10,"pa_gain":3,"rf_power":23},
-          "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":24},
-          "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":25},
-          "tx_lut_13":{"dig_gain":2,"mix_gain":12,"pa_gain":3,"rf_power":26},
-          "tx_lut_14":{"dig_gain":0,"mix_gain":13,"pa_gain":3,"rf_power":28},
-          "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":29}
-	 },
-	 "gateway_conf": {
-		  "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
-		  "server_address": "52.3.215.147",
-		  "serv_port_up": 20000,
-		  "serv_port_down": 20000,
-		  "keepalive_interval": 10,
-		  "stat_interval": 30,
-		  "push_timeout_ms": 100,
-		  "forward_crc_valid": true,
-		  "forward_crc_error": true,
-		  "forward_crc_disabled": false,
-		  "synch_word": 52,
-          "autoquit_threshold": 60
-	 }
-}
-
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.IN865 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.IN865
deleted file mode 100644
index 4c91d78..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.IN865
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-	 "SX1301_conf": {
-        "antenna_gain": 0,
-		"chan_FSK": {
-			"bandwidth": 125000,
-			"datarate": 50000,
-			"enable": true,
-			"freq_deviation": 25000,
-			"if": 300000,
-			"radio": 1
-		},
-		"chan_Lora_std": {
-			"bandwidth": 250000,
-			"enable": true,
-			"if": 0,
-			"radio": 0,
-			"spread_factor": 7
-		},
-		"chan_multiSF_": {
-			"radio": null
-		},
-		"chan_multiSF_0": {
-			"enable": true,
-			"if": -137500,
-			"radio": 0
-		},
-		"chan_multiSF_1": {
-			"enable": true,
-			"if": 202500,
-			"radio": 0
-		},
-		"chan_multiSF_2": {
-			"enable": true,
-			"if": 32500,
-			"radio": 0
-		},
-		"chan_multiSF_3": {
-			"enable": true,
-			"if": -400000,
-			"radio": 1
-		},
-		"chan_multiSF_4": {
-			"enable": true,
-			"if": -200000,
-			"radio": 1
-		},
-		"chan_multiSF_5": {
-			"enable": true,
-			"if": 0,
-			"radio": 1
-		},
-		"chan_multiSF_6": {
-			"enable": true,
-			"if": 200000,
-			"radio": 1
-		},
-		"chan_multiSF_7": {
-			"enable": true,
-			"if": 400000,
-			"radio": 1
-		},
-		"clksrc": 0,
-		"lbt_cfg": {
-			"enable": false,
-			"rssi_target": 160
-		},
-		"lorawan_public": true,
-		"radio_0": {
-			"enable": true,
-			"freq": 865200000,
-			"rssi_offset": -162,
-			"tx_enable": true,
-			"tx_freq_max": 867000000,
-			"tx_freq_min": 865000000,
-			"tx_notch_freq": 129000,
-			"type": "SX1257"
-		},
-		"radio_1": {
-			"enable": true,
-			"freq": 866385000,
-			"rssi_offset": -162,
-			"tx_enable": false,
-			"type": "SX1257"
-		},
-          "tx_lut_0":{"dig_gain":0,"mix_gain":12,"pa_gain":1,"rf_power":10},
-          "tx_lut_1":{"dig_gain":3,"mix_gain":11,"pa_gain":2,"rf_power":11},
-          "tx_lut_2":{"dig_gain":0,"mix_gain":14,"pa_gain":1,"rf_power":12},
-          "tx_lut_3":{"dig_gain":0,"mix_gain":9,"pa_gain":2,"rf_power":13},
-          "tx_lut_4":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":14},
-          "tx_lut_5":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":15},
-          "tx_lut_6":{"dig_gain":0,"mix_gain":11,"pa_gain":2,"rf_power":16},
-          "tx_lut_7":{"dig_gain":3,"mix_gain":9,"pa_gain":3,"rf_power":17},
-          "tx_lut_8":{"dig_gain":1,"mix_gain":8,"pa_gain":3,"rf_power":20},
-          "tx_lut_9":{"dig_gain":0,"mix_gain":8,"pa_gain":3,"rf_power":21},
-          "tx_lut_10":{"dig_gain":2,"mix_gain":10,"pa_gain":3,"rf_power":23},
-          "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":24},
-          "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":25},
-          "tx_lut_13":{"dig_gain":2,"mix_gain":12,"pa_gain":3,"rf_power":26},
-          "tx_lut_14":{"dig_gain":0,"mix_gain":13,"pa_gain":3,"rf_power":28},
-          "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":29}
-	 },
-	 "gateway_conf": {
-		  "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
-		  "server_address": "52.3.215.147",
-		  "serv_port_up": 20000,
-		  "serv_port_down": 20000,
-		  "keepalive_interval": 10,
-		  "stat_interval": 30,
-		  "push_timeout_ms": 100,
-		  "forward_crc_valid": true,
-		  "forward_crc_error": true,
-		  "forward_crc_disabled": false,
-		  "synch_word": 52,
-          "autoquit_threshold": 60
-	 }
-}
-
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.KR920-LBT b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.KR920-LBT
deleted file mode 100644
index 397f7f7..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.KR920-LBT
+++ /dev/null
@@ -1,148 +0,0 @@
-{
-	 "SX1301_conf": {
-        "antenna_gain": 0,
-		"chan_FSK": {
-			"bandwidth": 125000,
-			"datarate": 50000,
-			"enable": false,
-			"if": 300000,
-			"radio": 0
-		},
-		"chan_Lora_std": {
-			"bandwidth": 250000,
-			"enable": false,
-			"if": -200000,
-			"radio": 0,
-			"spread_factor": 7
-		},
-		"chan_multiSF_0": {
-			"enable": true,
-			"if": -400000,
-			"radio": 0
-		},
-		"chan_multiSF_1": {
-			"enable": true,
-			"if": -200000,
-			"radio": 0
-		},
-		"chan_multiSF_2": {
-			"enable": true,
-			"if": 0,
-			"radio": 0
-		},
-		"chan_multiSF_3": {
-			"enable": true,
-			"if": -400000,
-			"radio": 1
-		},
-		"chan_multiSF_4": {
-			"enable": true,
-			"if": -200000,
-			"radio": 1
-		},
-		"chan_multiSF_5": {
-			"enable": true,
-			"if": 0,
-			"radio": 1
-		},
-		"chan_multiSF_6": {
-			"enable": true,
-			"if": 200000,
-			"radio": 1
-		},
-		"chan_multiSF_7": {
-			"enable": true,
-			"if": 400000,
-			"radio": 1
-		},
-		"clksrc": 0,
-		"lbt_cfg": {
-			"chan_cfg": [
-				{
-					"freq_hz": 922100000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922300000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922500000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922700000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 922900000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 923100000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 923300000,
-					"scan_time_us": 5000
-				},
-				{
-					"freq_hz": 921900000,
-					"scan_time_us": 5000
-				}
-			],
-			"enable": true,
-			"rssi_target": -65,
-			"sx127x_rssi_offset": -4
-		},
-		"lorawan_public": true,
-		"radio_0": {
-			"enable": true,
-			"freq": 922500000,
-			"rssi_offset": -162,
-			"tx_enable": true,
-			"tx_freq_max": 923300000,
-			"tx_freq_min": 920900000,
-			"type": "SX1257"
-		},
-		"radio_1": {
-			"enable": true,
-			"freq": 922900000,
-			"rssi_offset": -162,
-			"tx_enable": false,
-			"type": "SX1257"
-		},
-          "tx_lut_0":{"dig_gain":0,"mix_gain":12,"pa_gain":1,"rf_power":10},
-          "tx_lut_1":{"dig_gain":3,"mix_gain":11,"pa_gain":2,"rf_power":11},
-          "tx_lut_2":{"dig_gain":0,"mix_gain":14,"pa_gain":1,"rf_power":12},
-          "tx_lut_3":{"dig_gain":0,"mix_gain":9,"pa_gain":2,"rf_power":13},
-          "tx_lut_4":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":14},
-          "tx_lut_5":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":15},
-          "tx_lut_6":{"dig_gain":0,"mix_gain":11,"pa_gain":2,"rf_power":16},
-          "tx_lut_7":{"dig_gain":3,"mix_gain":9,"pa_gain":3,"rf_power":17},
-          "tx_lut_8":{"dig_gain":1,"mix_gain":8,"pa_gain":3,"rf_power":20},
-          "tx_lut_9":{"dig_gain":0,"mix_gain":8,"pa_gain":3,"rf_power":21},
-          "tx_lut_10":{"dig_gain":2,"mix_gain":10,"pa_gain":3,"rf_power":23},
-          "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":24},
-          "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":25},
-          "tx_lut_13":{"dig_gain":2,"mix_gain":12,"pa_gain":3,"rf_power":26},
-          "tx_lut_14":{"dig_gain":0,"mix_gain":13,"pa_gain":3,"rf_power":28},
-          "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":29}
-	 },
-	 "gateway_conf": {
-		  "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
-		  "server_address": "52.3.215.147",
-		  "serv_port_up": 20000,
-		  "serv_port_down": 20000,
-		  "keepalive_interval": 10,
-		  "stat_interval": 30,
-		  "push_timeout_ms": 100,
-		  "forward_crc_valid": true,
-		  "forward_crc_error": true,
-		  "forward_crc_disabled": false,
-		  "synch_word": 52,
-          "autoquit_threshold": 60
-	 }
-}
-
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.RU864 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.RU864
deleted file mode 100644
index 0bdf557..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.RU864
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-	 "SX1301_conf": {
-        "lorawan_public": true,
-		  "clksrc": 0,
-		  "lbt_cfg": {
-				"enable": false,
-				"rssi_target": 160,
-				"nb_channel": 1,
-				"start_freq": 869525000,
-				"scan_time_us": 5000,
-				"tx_delay_1ch_us": 4000000,
-				"tx_delay_2ch_us": 4000000
-		  },
-		  "antenna_gain": 0,
-		  "radio_0": {
-				"enable": true,
-				"type": "SX1257",
-				"freq": 869100000,
-				"rssi_offset": -162,
-				"tx_enable": true,
-				"tx_freq_min": 864000000,
-				"tx_freq_max": 870000000
-		  },
-		  "radio_1": {
-				"enable": true,
-				"type": "SX1257",
-				"freq": 868100000,
-				"rssi_offset": -162,
-				"tx_enable": false
-		  },
-		  "chan_multiSF_0": {
-				"enable": true,
-				"radio": 0,
-				"if": -400000
-		  },
-		  "chan_multiSF_1": {
-				"enable": true,
-				"radio": 0,
-				"if": -200000
-		  },
-		  "chan_multiSF_2": {
-				"enable": true,
-				"radio": 0,
-				"if": 0
-		  },
-		  "chan_multiSF_3": {
-				"enable": true,
-				"radio": 1,
-				"if": -400000
-		  },
-		  "chan_multiSF_4": {
-				"enable": true,
-				"radio": 1,
-				"if": -200000
-		  },
-		  "chan_multiSF_5": {
-				"enable": true,
-				"radio": 1,
-				"if": 0
-		  },
-		  "chan_multiSF_6": {
-				"enable": true,
-				"radio": 1,
-				"if": 200000
-		  },
-		  "chan_multiSF_7": {
-				"enable": true,
-				"radio": 1,
-				"if": 400000
-		  },
-		  "chan_Lora_std": {
-				"enable": true,
-				"radio": 0,
-				"if": -200000,
-				"bandwidth": 250000,
-				"spread_factor": 7
-		  },
-		  "chan_FSK": {
-				"enable": true,
-				"radio": 1,
-				"if": 0,
-				"bandwidth": 125000,
-				"datarate": 50000
-		  },
-          "tx_lut_0":{"dig_gain":0,"mix_gain":12,"pa_gain":1,"rf_power":10},
-          "tx_lut_1":{"dig_gain":3,"mix_gain":11,"pa_gain":2,"rf_power":11},
-          "tx_lut_2":{"dig_gain":0,"mix_gain":14,"pa_gain":1,"rf_power":12},
-          "tx_lut_3":{"dig_gain":0,"mix_gain":9,"pa_gain":2,"rf_power":13},
-          "tx_lut_4":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":14},
-          "tx_lut_5":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":15},
-          "tx_lut_6":{"dig_gain":0,"mix_gain":11,"pa_gain":2,"rf_power":16},
-          "tx_lut_7":{"dig_gain":3,"mix_gain":9,"pa_gain":3,"rf_power":17},
-          "tx_lut_8":{"dig_gain":1,"mix_gain":8,"pa_gain":3,"rf_power":20},
-          "tx_lut_9":{"dig_gain":0,"mix_gain":8,"pa_gain":3,"rf_power":21},
-          "tx_lut_10":{"dig_gain":2,"mix_gain":10,"pa_gain":3,"rf_power":23},
-          "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":24},
-          "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":25},
-          "tx_lut_13":{"dig_gain":2,"mix_gain":12,"pa_gain":3,"rf_power":26},
-          "tx_lut_14":{"dig_gain":0,"mix_gain":13,"pa_gain":3,"rf_power":28},
-          "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":29}
-	 },
-	 "gateway_conf": {
-		  "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
-		  "server_address": "52.3.215.147",
-		  "serv_port_up": 20000,
-		  "serv_port_down": 20000,
-		  "keepalive_interval": 10,
-		  "stat_interval": 30,
-		  "push_timeout_ms": 100,
-		  "forward_crc_valid": true,
-		  "forward_crc_error": true,
-		  "forward_crc_disabled": false,
-		  "synch_word": 52,
-          "autoquit_threshold": 60
-	 }
-}
-
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.US915 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.US915
deleted file mode 100644
index 223cc64..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.MTCAP2-LORA-1.5.US915
+++ /dev/null
@@ -1,131 +0,0 @@
-{
-	 "SX1301_conf": {
-"antenna_gain" : 0,
-		"chan_FSK" : 
-		{
-			"bandwidth" : 125000,
-			"datarate" : 50000,
-			"enable" : false,
-			"if" : 300000,
-			"radio" : 0
-		},
-		"chan_Lora_std" : 
-		{
-			"bandwidth" : 500000,
-			"enable" : true,
-			"if" : 300000,
-			"radio" : 0,
-			"spread_factor" : 8
-		},
-		"chan_multiSF_0" : 
-		{
-			"enable" : true,
-			"if" : -400000,
-			"radio" : 0
-		},
-		"chan_multiSF_1" : 
-		{
-			"enable" : true,
-			"if" : -200000,
-			"radio" : 0
-		},
-		"chan_multiSF_2" : 
-		{
-			"enable" : true,
-			"if" : 0,
-			"radio" : 0
-		},
-		"chan_multiSF_3" : 
-		{
-			"enable" : true,
-			"if" : 200000,
-			"radio" : 0
-		},
-		"chan_multiSF_4" : 
-		{
-			"enable" : true,
-			"if" : -400000,
-			"radio" : 1
-		},
-		"chan_multiSF_5" : 
-		{
-			"enable" : true,
-			"if" : -200000,
-			"radio" : 1
-		},
-		"chan_multiSF_6" : 
-		{
-			"enable" : true,
-			"if" : 0,
-			"radio" : 1
-		},
-		"chan_multiSF_7" : 
-		{
-			"enable" : true,
-			"if" : 200000,
-			"radio" : 1
-		},
-		"clksrc" : 0,
-		"lbt_cfg" : 
-		{
-			"enable" : false,
-			"nb_channel" : 1,
-			"rssi_target" : 160,
-			"scan_time_us" : 5000,
-			"start_freq" : 869525000,
-			"tx_delay_1ch_us" : 4000000,
-			"tx_delay_2ch_us" : 4000000
-		},
-		"lorawan_public" : true,
-		"radio_0" : 
-		{
-			"enable" : true,
-			"freq" : 902700000,
-			"rssi_offset" : -162,
-			"tx_enable" : true,
-			"tx_freq_max" : 928000000,
-			"tx_freq_min" : 902000000,
-			"type" : "SX1257"
-		},
-		"radio_1" : 
-		{
-			"enable" : true,
-			"freq" : 903500000,
-			"rssi_offset" : -162,
-			"tx_enable" : false,
-			"type" : "SX1257"
-		},
-          "tx_lut_0":{"dig_gain":0,"mix_gain":12,"pa_gain":1,"rf_power":10},
-          "tx_lut_1":{"dig_gain":3,"mix_gain":11,"pa_gain":2,"rf_power":11},
-          "tx_lut_2":{"dig_gain":0,"mix_gain":14,"pa_gain":1,"rf_power":12},
-          "tx_lut_3":{"dig_gain":0,"mix_gain":9,"pa_gain":2,"rf_power":13},
-          "tx_lut_4":{"dig_gain":2,"mix_gain":11,"pa_gain":2,"rf_power":14},
-          "tx_lut_5":{"dig_gain":3,"mix_gain":8,"pa_gain":3,"rf_power":15},
-          "tx_lut_6":{"dig_gain":0,"mix_gain":11,"pa_gain":2,"rf_power":16},
-          "tx_lut_7":{"dig_gain":3,"mix_gain":9,"pa_gain":3,"rf_power":17},
-          "tx_lut_8":{"dig_gain":1,"mix_gain":8,"pa_gain":3,"rf_power":20},
-          "tx_lut_9":{"dig_gain":0,"mix_gain":8,"pa_gain":3,"rf_power":21},
-          "tx_lut_10":{"dig_gain":2,"mix_gain":10,"pa_gain":3,"rf_power":23},
-          "tx_lut_11":{"dig_gain":1,"mix_gain":10,"pa_gain":3,"rf_power":24},
-          "tx_lut_12":{"dig_gain":0,"mix_gain":10,"pa_gain":3,"rf_power":25},
-          "tx_lut_13":{"dig_gain":2,"mix_gain":12,"pa_gain":3,"rf_power":26},
-          "tx_lut_14":{"dig_gain":0,"mix_gain":13,"pa_gain":3,"rf_power":28},
-          "tx_lut_15":{"dig_gain":0,"mix_gain":15,"pa_gain":3,"rf_power":29}
-	 },
-	 "gateway_conf": {
-		  "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
-		  "server_address": "52.3.215.147",
-		  "serv_port_up": 20000,
-		  "serv_port_down": 20000,
-		  "keepalive_interval": 10,
-		  "stat_interval": 30,
-		  "push_timeout_ms": 100,
-		  "forward_crc_valid": true,
-		  "forward_crc_error": true,
-		  "forward_crc_disabled": false,
-		  "synch_word": 52,
-          "autoquit_threshold": 60
-	 }
-}
-
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/local_conf.json b/recipes-connectivity/lora/lora-packet-forwarder/local_conf.json
deleted file mode 100644
index 6576072..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/local_conf.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "gateway_conf": {
-        "server_address": "iot.semtech.com",
-        "serv_port_up": 1680,
-        "serv_port_down": 1680
-    }
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-no-header-option.patch b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-no-header-option.patch
deleted file mode 100644
index 7f9851f..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-no-header-option.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/lora_pkt_fwd/src/lora_pkt_fwd.c b/lora_pkt_fwd/src/lora_pkt_fwd.c
-index 31a3743..c15b191 100644
---- a/lora_pkt_fwd/src/lora_pkt_fwd.c
-+++ b/lora_pkt_fwd/src/lora_pkt_fwd.c
-@@ -2143,6 +2143,12 @@ void thread_down(void) {
-                 txpkt.no_crc = (bool)json_value_get_boolean(val);
-             }
- 
-+            /* Parse "No Header" flag (optional field) */
-+            val = json_object_get_value(txpk_obj,"nhdr");
-+            if (val != NULL) {
-+                txpkt.no_header = (bool)json_value_get_boolean(val);
-+            }
-+
-             /* parse target frequency (mandatory) */
-             val = json_object_get_value(txpk_obj,"freq");
-             if (val == NULL) {
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-spi-dev-path.patch b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-spi-dev-path.patch
deleted file mode 100644
index 820bd4f..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-spi-dev-path.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/lora_pkt_fwd/src/lora_pkt_fwd.c b/lora_pkt_fwd/src/lora_pkt_fwd.c
-index 31a3743..a8c8f01 100644
---- a/lora_pkt_fwd/src/lora_pkt_fwd.c
-+++ b/lora_pkt_fwd/src/lora_pkt_fwd.c
-@@ -119,6 +119,7 @@ static bool fwd_nocrc_pkt = false; /* packets with NO PAYLOAD CRC are NOT forwar
- /* network configuration variables */
- static uint64_t lgwm = 0; /* Lora gateway MAC address */
- static char serv_addr[64] = STR(DEFAULT_SERVER); /* address of the server (host name or IPv4/IPv6) */
-+static char spi_device_path[64] = {0} ; /* custom SPI device path */
- static char serv_port_up[8] = STR(DEFAULT_PORT_UP); /* server port for upstream traffic */
- static char serv_port_down[8] = STR(DEFAULT_PORT_DW); /* server port for downstream traffic */
- static int keepalive_time = DEFAULT_KEEPALIVE; /* send a PULL_DATA request every X seconds, negative = disabled */
-@@ -645,6 +646,13 @@ static int parse_gateway_configuration(const char * conf_file) {
-         MSG("INFO: server hostname or IP address is configured to \"%s\"\n", serv_addr);
-     }
- 
-+    /* spi device path (optional) */
-+    str = json_object_get_string(conf_obj, "spi_device");
-+    if (str != NULL) {
-+        strncpy(spi_device_path, str, sizeof(spi_device_path)-1);
-+        MSG("INFO: SPI device is configured to \"%s\"\n", spi_device_path);
-+    }
-+
-     /* get up and down ports (optional) */
-     val = json_object_get_value(conf_obj, "serv_port_up");
-     if (val != NULL) {
-@@ -1092,6 +1100,11 @@ int main(void)
-     }
-     freeaddrinfo(result);
- 
-+    /* set custom SPI device path if configured */
-+    if (strlen(spi_device_path) > 0)
-+        lgw_spi_set_path(spi_device_path);
-+
-+
-     /* starting the concentrator */
-     i = lgw_start();
-     if (i == LGW_HAL_SUCCESS) {
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-beacon-rfu-fix.patch b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-beacon-rfu-fix.patch
deleted file mode 100644
index 80a7ae1..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-beacon-rfu-fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/lora_pkt_fwd/src/lora_pkt_fwd.c b/lora_pkt_fwd/src/lora_pkt_fwd.c
-index 801f28d..2772a8e 100644
---- a/lora_pkt_fwd/src/lora_pkt_fwd.c
-+++ b/lora_pkt_fwd/src/lora_pkt_fwd.c
-@@ -233,6 +233,8 @@ static struct lgw_tx_gain_lut_s txlut; /* TX gain table */
- static uint32_t tx_freq_min[LGW_RF_CHAIN_NB]; /* lowest frequency supported by TX chain */
- static uint32_t tx_freq_max[LGW_RF_CHAIN_NB]; /* highest frequency supported by TX chain */
- 
-+static uint32_t rx_rf_freq[LGW_RF_CHAIN_NB]; /* center frequency of the radio in Hz */
-+
- /* -------------------------------------------------------------------------- */
- /* --- PRIVATE FUNCTIONS DECLARATION ---------------------------------------- */
- 
-@@ -494,7 +496,7 @@ static int parse_SX1301_configuration(const char * conf_file) {
-             MSG("INFO: radio %i disabled\n", i);
-         } else  { /* radio enabled, will parse the other parameters */
-             snprintf(param_name, sizeof param_name, "radio_%i.freq", i);
--            rfconf.freq_hz = (uint32_t)json_object_dotget_number(conf_obj, param_name);
-+            rfconf.freq_hz = rx_rf_freq[i] = (uint32_t)json_object_dotget_number(conf_obj, param_name);
-             snprintf(param_name, sizeof param_name, "radio_%i.rssi_offset", i);
-             rfconf.rssi_offset = (float)json_object_dotget_number(conf_obj, param_name);
-             snprintf(param_name, sizeof param_name, "radio_%i.type", i);
-@@ -1995,8 +1997,15 @@ void thread_down(void) {
-             break;
-         case 12:
-             beacon_pkt.datarate = DR_LORA_SF12;
--            beacon_RFU1_size = 5;
--            beacon_RFU2_size = 3;
-+
-+            /* Check radio 0 center frequency to determine if US or AU region */
-+            if (rx_rf_freq[0] > 914900000U ) {
-+                beacon_RFU1_size = 3;
-+                beacon_RFU2_size = 1;
-+            } else {
-+                beacon_RFU1_size = 5;
-+                beacon_RFU2_size = 3;
-+            }
-             break;
-         default:
-             /* should not happen */
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-dedup-rx.patch b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-dedup-rx.patch
deleted file mode 100644
index c368033..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-dedup-rx.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --git a/lora_pkt_fwd/src/lora_pkt_fwd.c b/lora_pkt_fwd/src/lora_pkt_fwd.c
-index 801f28d..c35c64f 100644
---- a/lora_pkt_fwd/src/lora_pkt_fwd.c
-+++ b/lora_pkt_fwd/src/lora_pkt_fwd.c
-@@ -126,8 +126,9 @@ volatile bool quit_sig = false; /* 1 -> application terminates without shutting
- static bool fwd_valid_pkt = true; /* packets with PAYLOAD CRC OK are forwarded */
- static bool fwd_error_pkt = false; /* packets with PAYLOAD CRC ERROR are NOT forwarded */
- static bool fwd_nocrc_pkt = false; /* packets with NO PAYLOAD CRC are NOT forwarded */
-+static bool fwd_best_pkt = true; /* duplicate packets with low SNR are NOT forwarded */
- 
- /* network configuration variables */
- static uint64_t lgwm = 0; /* Lora gateway MAC address */
- static char serv_addr[64] = STR(DEFAULT_SERVER); /* address of the server (host name or IPv4/IPv6) */
- static char serv_port_up[8] = STR(DEFAULT_PORT_UP); /* server port for upstream traffic */
-@@ -731,6 +742,12 @@ static int parse_gateway_configuration(const char * conf_file) {
-     }
- 
-     /* packet filtering parameters */
-+    val = json_object_get_value(conf_obj, "best_packet_filter");
-+    if (json_value_get_type(val) == JSONBoolean) {
-+        fwd_best_pkt = (bool)json_value_get_boolean(val);
-+    }
-+    MSG("INFO: duplicate packets received with low SNR will%s be forwarded\n", (!fwd_best_pkt ? "" : " NOT"));
-+
-     val = json_object_get_value(conf_obj, "forward_crc_valid");
-     if (json_value_get_type(val) == JSONBoolean) {
-         fwd_valid_pkt = (bool)json_value_get_boolean(val);
-@@ -1536,6 +1562,38 @@ void thread_up(void) {
-         memcpy((void *)(buff_up + buff_index), (void *)"{\"rxpk\":[", 9);
-         buff_index += 9;
- 
-+        if (fwd_best_pkt && nb_pkt > 1) {
-+            uint32_t check_addr = 0;
-+            uint32_t check_mic = 0;
-+            uint16_t check_fcnt = 0;
-+            float check_snr = -30.0;
-+
-+            for (i=0; i < nb_pkt; ++i) {
-+                p = &rxpkt[i];
-+                if (p->size < 12)
-+                    continue;
-+
-+                memcpy(&check_addr, p->payload + 1, 4);
-+                memcpy(&check_fcnt, p->payload + 6, 2);
-+                memcpy(&check_mic, p->payload + p->size - 4, 4);
-+
-+                check_snr = p->snr;
-+
-+                for (j=0; j < nb_pkt; ++j) {
-+                    p = &rxpkt[j];
-+
-+                    if (p->size >= 12
-+                        && memcmp(&check_addr, p->payload + 1, 4) == 0
-+                        && memcmp(&check_fcnt, p->payload + 6, 2) == 0
-+                        && memcmp(&check_mic, p->payload + p->size - 4, 4) == 0
-+                        && p->snr < check_snr) {
-+                        // set status of duplicate packets rx'd on wrong channel
-+                        p->status = 1;
-+                    }
-+                }
-+           }
-+       }
-+
-         /* serialize Lora packets metadata and payload */
-         pkt_in_dgram = 0;
-         for (i=0; i < nb_pkt; ++i) {
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-duty-cycle.patch b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-duty-cycle.patch
deleted file mode 100644
index b1790e7..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-duty-cycle.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/lora_pkt_fwd/src/lora_pkt_fwd.c b/lora_pkt_fwd/src/lora_pkt_fwd.c
-index 801f28d..7b63b8f 100644
---- a/lora_pkt_fwd/src/lora_pkt_fwd.c
-+++ b/lora_pkt_fwd/src/lora_pkt_fwd.c
-@@ -134,6 +134,12 @@ static char serv_port_up[8] = STR(DEFAULT_PORT_UP); /* server port for upstream traffic */
- static char serv_port_down[8] = STR(DEFAULT_PORT_DW); /* server port for downstream traffic */
- static int keepalive_time = DEFAULT_KEEPALIVE; /* send a PULL_DATA request every X seconds, negative = disabled */
- 
-+static bool duty_cycle_enabled = true;
-+static uint32_t duty_cycle_time_avail = 0;
-+static uint32_t duty_cycle_period = 3600; // seconds in one hour
-+static double duty_cycle_ratio = 0.10; // 10%
-+static uint32_t duty_cycle_time_max = 3600 * 0.10 * 1000u; // max time-on-air in window 
-+
- /* statistics collection configuration variables */
- static unsigned stat_interval = DEFAULT_STAT; /* time interval (in sec) at which statistics are collected and displayed */
- 
-@@ -729,8 +746,32 @@ static int parse_gateway_configuration(const char * conf_file) {
-         push_timeout_half.tv_usec = 500 * (long int)json_value_get_number(val);
-         MSG("INFO: upstream PUSH_DATA time-out is configured to %u ms\n", (unsigned)(push_timeout_half.tv_usec / 500));
-     }
-+    
-+    /* duty-cycle limiting */
-+    val = json_object_get_value(conf_obj, "duty_cycle_enabled");
-+    if (json_value_get_type(val) == JSONBoolean) {
-+        duty_cycle_enabled = (bool)json_value_get_boolean(val);
-+    }
-+    MSG("INFO: duty cycle will%s be enforced\n", (duty_cycle_enabled ? "" : " NOT"));
-+
-+    if (duty_cycle_enabled) {
-+        val = json_object_get_value(conf_obj, "duty_cycle_period");
-+        if (val != NULL) {
-+            duty_cycle_period = (unsigned)json_value_get_number(val);
-+        }
-+        MSG("INFO: duty cycle period %u s\n", (duty_cycle_period));
-+
-+        val = json_object_get_value(conf_obj, "duty_cycle_ratio");
-+        if (val != NULL) {
-+            duty_cycle_ratio = (double)json_value_get_number(val);
-+        }
-+        MSG("INFO: duty cycle %f %%\n", (duty_cycle_ratio * 100));
-+
-+        duty_cycle_time_max = duty_cycle_period * 1000u * duty_cycle_ratio;
-+    }
-+
- 
-     /* packet filtering parameters */
-     val = json_object_get_value(conf_obj, "best_packet_filter");
-     if (json_value_get_type(val) == JSONBoolean) {
-         fwd_best_pkt = (bool)json_value_get_boolean(val);
-@@ -1349,6 +1406,8 @@ int main(void)
-         printf("# PUSH_DATA datagrams sent: %u (%u bytes)\n", cp_up_dgram_sent, cp_up_network_byte);
-         printf("# PUSH_DATA acknowledged: %.2f%%\n", 100.0 * up_ack_ratio);
-         printf("### [DOWNSTREAM] ###\n");
-+        if (duty_cycle_enabled) 
-+            printf("# TIME ON AIR available: %u ms\n", duty_cycle_time_avail);
-         printf("# PULL_DATA sent: %u (%.2f%% acknowledged)\n", cp_dw_pull_sent, 100.0 * dw_ack_ratio);
-         printf("# PULL_RESP(onse) datagrams received: %u (%u bytes)\n", cp_dw_dgram_rcv, cp_dw_network_byte);
-         printf("# RF packets sent to concentrator: %u (%u bytes)\n", (cp_nb_tx_ok+cp_nb_tx_fail), cp_dw_payload_byte);
-
-@@ -2833,6 +2921,25 @@ void thread_valid(void) {
-     while (!exit_sig && !quit_sig) {
-         wait_ms(1000);
- 
-+       if (duty_cycle_enabled) {
-+            static struct timespec last = { 0, 0 };
-+            struct timespec now;
-+            clock_gettime(CLOCK_MONOTONIC, &now);
-+
-+            if (last.tv_sec != 0) {
-+                // uint64(now.tv_sec) * 1000 + now.tv_nsec / 1000000
-+                
-+                duty_cycle_time_avail += difftimespec(now, last) * 1000u * duty_cycle_ratio;
-+
-+               if (duty_cycle_time_avail > duty_cycle_time_max) {
-+                    duty_cycle_time_avail = duty_cycle_time_max;
-+                }
-+            }
-+
-+            last = now;
-+        }
-+
-+
-         /* calculate when the time reference was last updated */
-         pthread_mutex_lock(&mx_timeref);
-         gps_ref_age = (long)difftime(time(NULL), time_reference_gps.systime);
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-gpsd.patch b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-gpsd.patch
deleted file mode 100644
index 02bef12..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-gpsd.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-diff --git a/lora_pkt_fwd/Makefile b/lora_pkt_fwd/Makefile
-index 1330d62..dda589e 100644
---- a/lora_pkt_fwd/Makefile
-+++ b/lora_pkt_fwd/Makefile
-@@ -22,7 +22,7 @@ RELEASE_VERSION := `cat ../VERSION`
- CC := $(CROSS_COMPILE)gcc
- AR := $(CROSS_COMPILE)ar
- 
--CFLAGS := -O2 -Wall -Wextra -std=c99 -Iinc -I.
-+MORECFLAGS := -Wall -Wextra -std=c99 -Iinc -I. -isystem =/usr/include/gps
- VFLAG := -D VERSION_STRING="\"$(RELEASE_VERSION)\""
- 
- ### Constants for Lora concentrator HAL library
-@@ -38,7 +38,7 @@ LGW_INC += $(LGW_PATH)/inc/loragw_gps.h
- 
- ### Linking options
- 
--LIBS := -lloragw -lrt -lpthread -lm
-+LIBS := -lloragw -lrt -lpthread -lm -lgps
- 
- ### General build targets
- 
-@@ -54,12 +54,14 @@ $(OBJDIR):
- 	mkdir -p $(OBJDIR)
- 
- $(OBJDIR)/%.o: src/%.c $(INCLUDES) | $(OBJDIR)
--	$(CC) -c $(CFLAGS) -I$(LGW_PATH)/inc $< -o $@
-+	@echo compile $@
-+	$(CC) -c $(CFLAGS) $(MORECFLAGS) -I$(LGW_PATH)/inc $< -o $@
- 
- ### Main program compilation and assembly
- 
- $(OBJDIR)/$(APP_NAME).o: src/$(APP_NAME).c $(LGW_INC) $(INCLUDES) | $(OBJDIR)
--	$(CC) -c $(CFLAGS) $(VFLAG) -I$(LGW_PATH)/inc $< -o $@
-+	@echo compile $@
-+	$(CC) -c $(CFLAGS) $(MORECFLAGS) $(VFLAG) -I$(LGW_PATH)/inc $< -o $@
- 
- $(APP_NAME): $(OBJDIR)/$(APP_NAME).o $(LGW_PATH)/libloragw.a $(OBJDIR)/parson.o $(OBJDIR)/base64.o $(OBJDIR)/jitqueue.o $(OBJDIR)/timersync.o
- 	$(CC) -L$(LGW_PATH) $< $(OBJDIR)/parson.o $(OBJDIR)/base64.o $(OBJDIR)/jitqueue.o $(OBJDIR)/timersync.o -o $@ $(LIBS)
-diff --git a/lora_pkt_fwd/src/lora_pkt_fwd.c b/lora_pkt_fwd/src/lora_pkt_fwd.c
-index 801f28d..6bca482 100644
---- a/lora_pkt_fwd/src/lora_pkt_fwd.c
-+++ b/lora_pkt_fwd/src/lora_pkt_fwd.c
-@@ -156,10 +156,10 @@ static bool xtal_correct_ok = false; /* set true when XTAL correction is stable
- static double xtal_correct = 1.0;
- 
- /* GPS configuration and synchronization */
--static char gps_tty_path[64] = "\0"; /* path of the TTY port GPS is connected on */
--static int gps_tty_fd = -1; /* file descriptor of the GPS TTY port */
-+static bool use_gps = false; /* Use the GPSD stream */
- static bool gps_enabled = false; /* is GPS enabled on that gateway ? */
--
-+static struct gps_data_t gpsdata;
-+static struct fixsource_t source;
- /* GPS time reference */
- static pthread_mutex_t mx_timeref = PTHREAD_MUTEX_INITIALIZER; /* control access to GPS time reference */
- static bool gps_ref_valid; /* is GPS reference acceptable (ie. not too old) */
-@@ -747,13 +747,6 @@ static int parse_gateway_configuration(const char * conf_file) {
-     }
-     MSG("INFO: packets received with no CRC will%s be forwarded\n", (fwd_nocrc_pkt ? "" : " NOT"));
- 
--    /* GPS module TTY path (optional) */
--    str = json_object_get_string(conf_obj, "gps_tty_path");
--    if (str != NULL) {
--        strncpy(gps_tty_path, str, sizeof gps_tty_path);
--        MSG("INFO: GPS serial port path is configured to \"%s\"\n", gps_tty_path);
--    }
--
-     /* get reference coordinates */
-     val = json_object_get_value(conf_obj, "ref_latitude");
-     if (val != NULL) {
-@@ -772,6 +765,17 @@ static int parse_gateway_configuration(const char * conf_file) {
-     }
- 
-     /* Gateway GPS coordinates hardcoding (aka. faking) option */
-+    val = json_object_get_value(conf_obj, "gps");
-+    if (json_value_get_type(val) == JSONBoolean) {
-+        use_gps = (bool)json_value_get_boolean(val);
-+        if (use_gps == true) {
-+            MSG("INFO: GPS is enabled\n");
-+        } else {
-+            MSG("INFO: GPS is disabled\n");
-+        }
-+    }
-+
-+    /* Gateway GPS coordinates hardcoding (aka. faking) option */
-     val = json_object_get_value(conf_obj, "fake_gps");
-     if (json_value_get_type(val) == JSONBoolean) {
-         gps_fake_enable = (bool)json_value_get_boolean(val);
-@@ -1098,14 +1102,14 @@ int main(void)
-     }
- 
-     /* Start GPS a.s.a.p., to allow it to lock */
--    if (gps_tty_path[0] != '\0') { /* do not try to open GPS device if no path set */
--        i = lgw_gps_enable(gps_tty_path, "ubx7", 0, &gps_tty_fd); /* HAL only supports u-blox 7 for now */
-+    if (use_gps == true) {
-+        int i = lgw_gps_enable(&gpsdata, &source); 
-         if (i != LGW_GPS_SUCCESS) {
--            printf("WARNING: [main] impossible to open %s for GPS sync (check permissions)\n", gps_tty_path);
-+            printf("WARNING: [main] impossible to open for GPS sync (Check GPSD)\n");
-             gps_enabled = false;
-             gps_ref_valid = false;
-         } else {
--            printf("INFO: [main] TTY port %s open for GPS synchronization\n", gps_tty_path);
-+            printf("INFO: [main] GPSD polling open for GPS synchronization\n");
-             gps_enabled = true;
-             gps_ref_valid = false;
-         }
-@@ -1413,7 +1417,7 @@ int main(void)
-         pthread_cancel(thrid_gps); /* don't wait for GPS thread */
-         pthread_cancel(thrid_valid); /* don't wait for validation thread */
- 
--        i = lgw_gps_disable(gps_tty_fd);
-+        i = lgw_gps_disable(&gpsdata);
-         if (i == LGW_HAL_SUCCESS) {
-             MSG("INFO: GPS closed successfully\n");
-         } else {
-@@ -2683,7 +2731,7 @@ static void gps_process_sync(void) {
-     i = lgw_gps_sync(&time_reference_gps, trig_tstamp, utc, gps_time);
-     pthread_mutex_unlock(&mx_timeref);
-     if (i != LGW_GPS_SUCCESS) {
--        MSG("WARNING: [gps] GPS out of sync, keeping previous time reference\n");
-+//       MSG("WARNING: [gps] GPS out of sync, keeping previous time reference\n");
-     }
- }
-
-@@ -2691,7 +2695,7 @@ static void gps_process_coords(void) {
-     /* position variable */
-     struct coord_s coord;
-     struct coord_s gpserr;
--    int    i = lgw_gps_get(NULL, NULL, &coord, &gpserr);
-+    int i = lgw_gps_get(NULL, NULL, &coord, &gpserr);
- 
-     /* update gateway coordinates */
-     pthread_mutex_lock(&mx_meas_gps);
-@@ -2707,96 +2711,88 @@ static void gps_process_coords(void) {
- }
- 
- void thread_gps(void) {
--    /* serial variables */
-     char serial_buff[128]; /* buffer to receive GPS data */
--    size_t wr_idx = 0;     /* pointer to end of chars in buffer */
--
--    /* variables for PPM pulse GPS synchronization */
-     enum gps_msg latest_msg; /* keep track of latest NMEA message parsed */
--
--    /* initialize some variables before loop */
--    memset(serial_buff, 0, sizeof serial_buff);
--
-+    memset(serial_buff, 0, sizeof serial_buff); /* initialize some variables before loop */
-+    fd_set fds;
-+    char delim[4] = "$";
-+    char *token[254];
-     while (!exit_sig && !quit_sig) {
--        size_t rd_idx = 0;
--        size_t frame_end_idx = 0;
--
--        /* blocking non-canonical read on serial port */
--        ssize_t nb_char = read(gps_tty_fd, serial_buff + wr_idx, LGW_GPS_MIN_MSG_SIZE);
--        if (nb_char <= 0) {
--            MSG("WARNING: [gps] read() returned value %d\n", nb_char);
-+        int r = 0;
-+        struct timeval tv;
-+        tv.tv_sec = 0;
-+        tv.tv_usec = 100000;
-+        FD_ZERO(&fds);
-+        FD_SET(gpsdata.gps_fd, &fds);
-+        errno = 0;
-+        r = select(gpsdata.gps_fd+1, &fds, NULL, NULL, &tv);
-+        if (r == -1 && errno != EINTR) {
-+            MSG("gpspipe: select error %s(%d)\n", strerror(errno), errno);
-+            exit(EXIT_FAILURE);
-+        } else if (r == 0)
-             continue;
--        }
--        wr_idx += (size_t)nb_char;
- 
--        /*******************************************
--         * Scan buffer for UBX/NMEA sync chars and *
--         * attempt to decode frame if one is found *
--         *******************************************/
--        while(rd_idx < wr_idx) {
-+        /* reading directly from the socket avoids decode overhead */
-+        errno = 0;
-+        r = (int)read(gpsdata.gps_fd, serial_buff, sizeof(serial_buff));
-+        if (r > 0) {
-+            int i = 0;
-             size_t frame_size = 0;
--
--            /* Scan buffer for UBX sync char */
--            if(serial_buff[rd_idx] == (char)LGW_GPS_UBX_SYNC_CHAR) {
--
--                /***********************
--                 * Found UBX sync char *
--                 ***********************/
--                latest_msg = lgw_parse_ubx(&serial_buff[rd_idx], (wr_idx - rd_idx), &frame_size);
--
--                if (frame_size > 0) {
--                    if (latest_msg == INCOMPLETE) {
--                        /* UBX header found but frame appears to be missing bytes */
--                        frame_size = 0;
--                    } else if (latest_msg == INVALID) {
--                        /* message header received but message appears to be corrupted */
--                        MSG("WARNING: [gps] could not get a valid message from GPS (no time)\n");
--                        frame_size = 0;
--                    } else if (latest_msg == UBX_NAV_TIMEGPS) {
--                        gps_process_sync();
-+            for (i = 0; i < r; i++) {
-+                if (serial_buff[i] == (char)LGW_GPS_UBX_SYNC_CHAR) {
-+                    /***********************
-+                     * Found UBX sync char *
-+                     ***********************/
-+                    size_t ubx_size = (uint8_t)serial_buff[i+4];
-+                    ubx_size |= (uint8_t)serial_buff[i+5] << 8;
-+                    ubx_size += 8;
-+                    if (ubx_size < 27){
-+                        latest_msg = lgw_parse_ubx(&serial_buff[i], ubx_size , &frame_size);
-                     }
--                }
--            } else if(serial_buff[rd_idx] == LGW_GPS_NMEA_SYNC_CHAR) {
--                /************************
--                 * Found NMEA sync char *
--                 ************************/
--                /* scan for NMEA end marker (LF = 0x0a) */
--                char* nmea_end_ptr = memchr(&serial_buff[rd_idx],(int)0x0a, (wr_idx - rd_idx));
--
--                if(nmea_end_ptr) {
--                    /* found end marker */
--                    frame_size = nmea_end_ptr - &serial_buff[rd_idx] + 1;
--                    latest_msg = lgw_parse_nmea(&serial_buff[rd_idx], frame_size);
--
--                    if(latest_msg == INVALID || latest_msg == UNKNOWN) {
--                        /* checksum failed */
--                        frame_size = 0;
--                    } else if (latest_msg == NMEA_RMC) { /* Get location from RMC frames */
--                        gps_process_coords();
-+                    if (frame_size > 0) {
-+                        if(latest_msg == INVALID || latest_msg == UNKNOWN) {
-+                            /* checksum failed */
-+                            frame_size = 0;
-+                        } else if (latest_msg == UBX_NAV_TIMEGPS) {
-+                            gps_process_sync();
-+                        }
-+                    }
-+                } else if((serial_buff[i] == LGW_GPS_NMEA_SYNC_CHAR) && (serial_buff[i+1] == 0x47) && (serial_buff[i+2] == 0x50)){
-+                    /************************
-+                     * Found NMEA sync char *
-+                     ************************/
-+                    int k, l= 0;
-+                    token[0] = strtok(serial_buff, delim);
-+
-+                    while (token[l] != NULL) {
-+                        l++;
-+                        token[l] = strtok(NULL, delim); 
-+                    }
-+                    for (k=0; k<=l-1; k++) {
-+                        if ((strlen(token[k]) > 66) && (strlen(token[k]) < 74)){
-+                            latest_msg = lgw_parse_nmea(token[k], strlen(token[k]));
-+                            if(latest_msg == INVALID || latest_msg == UNKNOWN) {
-+                                /* checksum failed */
-+                                frame_size = 0;
-+                            } else if (latest_msg == NMEA_RMC) {
-+                                /* Get location from RMC frames */
-+                                gps_process_coords();
-+                            }
-+                        }
-                     }
-                 }
-             }
--
--            if(frame_size > 0) {
--                /* At this point message is a checksum verified frame
--                   we're processed or ignored. Remove frame from buffer */
--                rd_idx += frame_size;
--                frame_end_idx = rd_idx;
-+        } else {
-+            if (r == -1) {
-+                if (errno == EAGAIN)
-+                    continue;
-+                else {
-+                    MSG(stderr, "gpspipe: read error %s(%d)\n", strerror(errno), errno);
-+                    exit(EXIT_FAILURE);
-+                }
-             } else {
--                rd_idx++;
-+                exit(EXIT_SUCCESS);
-             }
--        } /* ...for(rd_idx = 0... */
--
--        if(frame_end_idx) {
--          /* Frames have been processed. Remove bytes to end of last processed frame */
--          memcpy(serial_buff, &serial_buff[frame_end_idx], wr_idx - frame_end_idx);
--          wr_idx -= frame_end_idx;
--        } /* ...for(rd_idx = 0... */
--
--        /* Prevent buffer overflow */
--        if((sizeof(serial_buff) - wr_idx) < LGW_GPS_MIN_MSG_SIZE) {
--            memcpy(serial_buff, &serial_buff[LGW_GPS_MIN_MSG_SIZE], wr_idx - LGW_GPS_MIN_MSG_SIZE);
--            wr_idx -= LGW_GPS_MIN_MSG_SIZE;
-         }
-     }
-     MSG("\nINFO: End of GPS thread\n");
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-jit-queue-increase-peek-and-remove-sort-from-dequeue.patch b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-jit-queue-increase-peek-and-remove-sort-from-dequeue.patch
deleted file mode 100644
index 2b0aaf4..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-jit-queue-increase-peek-and-remove-sort-from-dequeue.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/lora_pkt_fwd/src/jitqueue.c b/lora_pkt_fwd/src/jitqueue.c
-index dbde8d2..f1b547b 100644
---- a/lora_pkt_fwd/src/jitqueue.c
-+++ b/lora_pkt_fwd/src/jitqueue.c
-@@ -37,6 +37,7 @@ Maintainer: Michael Coracin
- #define TX_MARGIN_DELAY         1000    /* Packet overlap margin in microseconds */
-                                         /* TODO: How much margin should we take? */
- #define TX_JIT_DELAY            30000   /* Pre-delay to program packet for TX in microseconds */
-+#define TX_PEEK_DELAY           60000   /* Look ahead time for TX in microseconds */
- #define TX_MAX_ADVANCE_DELAY    ((JIT_NUM_BEACON_IN_QUEUE + 1) * 128 * 1E6) /* Maximum advance delay accepted for a TX packet, compared to current time */
- 
- #define BEACON_GUARD            3000000 /* Interval where no ping slot can be placed,
-@@ -352,12 +353,12 @@ enum jit_error_e jit_dequeue(struct jit_queue_s *queue, int index, struct lgw_pk
-     memset(&(queue->nodes[queue->num_pkt]), 0, sizeof(struct jit_node_s));
- 
-     /* Sort queue in ascending order of packet timestamp */
--    jit_sort_queue(queue);
-+    // jit_sort_queue(queue);
- 
-     /* Done */
-     pthread_mutex_unlock(&mx_jit_queue);
- 
--    jit_print_queue(queue, false, DEBUG_JIT);
-+    // jit_print_queue(queue, false, DEBUG_JIT);
- 
-     MSG_DEBUG(DEBUG_JIT, "dequeued packet with count_us=%u from index %d\n", packet->count_us, index);
- 
-@@ -427,7 +428,7 @@ enum jit_error_e jit_peek(struct jit_queue_s *queue, struct timeval *time, int *
-      *  Warning: unsigned arithmetic (handle roll-over)
-      *      t_packet < t_current + TX_JIT_DELAY
-      */
--    if ((queue->nodes[idx_highest_priority].pkt.count_us - time_us) < TX_JIT_DELAY) {
-+    if ((queue->nodes[idx_highest_priority].pkt.count_us - time_us) < TX_PEEK_DELAY) {
-         *pkt_idx = idx_highest_priority;
-         MSG_DEBUG(DEBUG_JIT, "peek packet with count_us=%u at index %d\n",
-             queue->nodes[idx_highest_priority].pkt.count_us, idx_highest_priority);
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-parse-config-params-when-radio-disabled.patch b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-parse-config-params-when-radio-disabled.patch
deleted file mode 100644
index 0e7ded9..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-parse-config-params-when-radio-disabled.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/lora_pkt_fwd/src/lora_pkt_fwd.c b/lora_pkt_fwd/src/lora_pkt_fwd.c
-index 1c54d57..92f25e3 100644
---- a/lora_pkt_fwd/src/lora_pkt_fwd.c
-+++ b/lora_pkt_fwd/src/lora_pkt_fwd.c
-@@ -471,7 +471,8 @@ static int parse_SX1301_configuration(const char * conf_file) {
-         }
-         if (rfconf.enable == false) { /* radio disabled, nothing else to parse */
-             MSG("INFO: radio %i disabled\n", i);
--        } else  { /* radio enabled, will parse the other parameters */
-+        }
-+//        } else  { /* radio enabled, will parse the other parameters */
-             snprintf(param_name, sizeof param_name, "radio_%i.freq", i);
-             rfconf.freq_hz = (uint32_t)json_object_dotget_number(conf_obj, param_name);
-             snprintf(param_name, sizeof param_name, "radio_%i.rssi_offset", i);
-@@ -505,8 +506,8 @@ static int parse_SX1301_configuration(const char * conf_file) {
-             } else {
-                 rfconf.tx_enable = false;
-             }
--            MSG("INFO: radio %i enabled (type %s), center frequency %u, RSSI offset %f, tx enabled %d, tx_notch_freq %u\n", i, str, rfconf.freq_hz, rfconf.rssi_offset, rfconf.tx_enable, rfconf.tx_notch_freq);
--        }
-+            MSG("INFO: radio %i %sabled (type %s), center frequency %u, RSSI offset %f, tx enabled %d, tx_notch_freq %u\n", i, (rfconf.enable?"en":"dis"), str, rfconf.freq_hz, rfconf.rssi_offset, rfconf.tx_enable, rfconf.tx_notch_freq);
-+//        }
-         /* all parameters parsed, submitting configuration to the HAL */
-         if (lgw_rxrf_setconf(i, rfconf) != LGW_HAL_SUCCESS) {
-             MSG("ERROR: invalid configuration for radio %i\n", i);
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-remove-jit-power-check.patch b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-remove-jit-power-check.patch
deleted file mode 100644
index cbb226b..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-remove-jit-power-check.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/lora_pkt_fwd/src/lora_pkt_fwd.c b/lora_pkt_fwd/src/lora_pkt_fwd.c
-index 1c54d57..1e74d7f 100644
---- a/lora_pkt_fwd/src/lora_pkt_fwd.c
-+++ b/lora_pkt_fwd/src/lora_pkt_fwd.c
-@@ -2360,19 +2360,6 @@ void thread_down(void) {
-                 jit_result = JIT_ERROR_TX_FREQ;
-                 MSG("ERROR: Packet REJECTED, unsupported frequency - %u (min:%u,max:%u)\n", txpkt.freq_hz, tx_freq_min[txpkt.rf_chain], tx_freq_max[txpkt.rf_chain]);
-             }
--            if (jit_result == JIT_ERROR_OK) {
--                for (i=0; i<txlut.size; i++) {
--                    if (txlut.lut[i].rf_power == txpkt.rf_power) {
--                        /* this RF power is supported, we can continue */
--                        break;
--                    }
--                }
--                if (i == txlut.size) {
--                    /* this RF power is not supported */
--                    jit_result = JIT_ERROR_TX_POWER;
--                    MSG("ERROR: Packet REJECTED, unsupported RF power for TX - %d\n", txpkt.rf_power);
--                }
--            }
- 
-             /* insert packet to be sent into JIT queue */
-             if (jit_result == JIT_ERROR_OK) {
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init
deleted file mode 100755
index 5821e1e..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init
+++ /dev/null
@@ -1,248 +0,0 @@
-#!/bin/bash
-
-
-NAME="lora-packet-forwarder"
-ENABLED="yes"
-
-
-[ -f /etc/default/$NAME ] && source /etc/default/$NAME
-
-run_dir=/var/run/lora
-opt_conf_dir=/opt/lora
-conf_dir=/var/config/lora
-conf_file=$conf_dir/global_conf.json
-conf_file_local=$conf_dir/local_conf.json
-
-pkt_fwd=$run_dir/1/lora_pkt_fwd
-pkt_fwd_log=/var/log/lora-pkt-fwd-1.log
-pkt_fwd_pidfile=$run_dir/lora-pkt-fwd-1.pid
-
-port1=/sys/devices/platform/mts-io/ap1
-port2=/sys/devices/platform/mts-io/ap2
-
-lora_mtac_id="MTAC-LORA"
-lora_1_0_hw="MTAC-LORA-1.0"
-lora_1_5_h_hw="MTAC-LORA-1.5"
-lora_2_1_hw="MTAC-LORA-2.1"
-
-lora_mtac_id="MTAC-LORA"
-lora_mtac_id915="MTAC-LORA-915"
-lora_mtac_id868="MTAC-LORA-868"
-lora_mtac_h_id915="MTAC-LORA-H-915"
-lora_mtac_h_id868="MTAC-LORA-H-868"
-
-lora_mtcap_id="MTCAP-LORA"
-lora_mtcap_id868="MTCAP-LORA-868"
-lora_mtcap_id915="MTCAP-LORA-915"
-
-lora_mtac_g_id="MTAC-LORA-G"
-lora_mtac_g16_id868="MTAC-LORA-G16-868"
-lora_mtac_g16_id915="MTAC-LORA-G16-915"
-lora_mtac_g64_id868="MTAC-LORA-G64-868"
-lora_mtac_g64_id915="MTAC-LORA-G64-915"
-
-pkt_fwd_options=""
-
-gps_path="/dev/gps0"
-
-read_lora_hw_info() {
-    lora_id=$(mts-io-sysfs show lora/product-id 2> /dev/null)
-    lora_hw=$(mts-io-sysfs show lora/hw-version 2> /dev/null)
-    lora_eui=$(mts-io-sysfs show lora/eui 2> /dev/null)
-    lora_eui_raw=${lora_eui//:/}
-}
-
-hardware_found() {
-    if [[ "$lora_id" =~ "$lora_mtac_g_id" ]]; then
-        setup_mtcdt_2_1
-    elif [[ "$lora_id" =~ "$lora_mtcap_id" ]]; then
-        setup_mtcap
-    elif [[ "$lora_id" =~ "$lora_mtac_id" ]]; then
-        setup_mtcdt
-    else
-        return 1
-    fi
-    return 0
-}
-
-setup_mtcdt() {
-    if [ -d $port1 ] && [[ $(cat $port1/hw-version) = $lora_hw ]]; then
-        ln -sf /dev/spidev32766.2 /dev/spidev0.0
-    elif [ -d $port2 ] && [[ $(cat $port2/hw-version) = $lora_hw ]]; then
-        ln -sf /dev/spidev32765.2 /dev/spidev0.0
-    fi
-
-    if [ "$lora_hw" = "$lora_1_0_hw" ] && [[ ! "$lora_id" =~ .*-SPI ]]; then
-        if [ "$lora_id" = "$lora_mtac_id868" ]; then
-            GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_1_0.EU868
-        elif [ "$lora_id" = "$lora_mtac_id915" ]; then
-            GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_1_0.US915
-        else
-            echo "No valid configuration found for mtcdt exiting."
-            exit 1
-        fi
-        ln -sf /opt/lora/basic_pkt_fwd-usb $pkt_fwd
-    else
-        if [ "$lora_id" = "$lora_mtac_h_id868" ]; then
-            GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_1_5.EU868
-        elif [ "$lora_id" = "$lora_mtac_h_id915" ]; then
-            GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_1_5.US915
-        else
-            echo "No valid configuration found for mtcdt exiting."
-            exit 1
-        fi
-        ln -sf /opt/lora/lora_pkt_fwd $pkt_fwd
-    fi
-
-    opt_conf_file=$opt_conf_dir/global_conf.json
-    opt_conf_file_local=$opt_conf_dir/local_conf.json
-
-    cp $GLOBAL_CONF $opt_conf_file
-
-    if ! [ -f $conf_file ]; then
-        mkdir -p /var/config/lora/
-        cp $opt_conf_file $conf_file
-        cp $opt_conf_file_local $conf_file_local
-    fi
-}
-
-setup_mtcap() {
-    hw=$(mts-io-sysfs show hw-version 2> /dev/null)
-
-    if [ "$lora_id" = "$lora_mtcap_id868" ]; then
-        if [ "$hw" = "MTCAP-0.2" ]; then
-            GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP2_LORA_1_5.EU868
-        else
-            GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP_LORA_1_5.EU868
-        fi
-    elif [ "$lora_id" = "$lora_mtcap_id915" ]; then
-        if [ "$hw" = "MTCAP-0.2" ]; then
-            GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP2_LORA_1_5.US915
-        else
-            GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP_LORA_1_5.US915
-        fi
-    else
-        return 1
-    fi
-
-    opt_conf_file=$opt_conf_dir/global_conf.json
-    opt_conf_file_local=$opt_conf_dir/local_conf.json
-
-    cp $GLOBAL_CONF $opt_conf_file
-
-    if ! [ -f $conf_file ]; then
-        mkdir -p /var/config/lora/
-        cp $opt_conf_file $conf_file
-        cp $opt_conf_file_local $conf_file_local
-    fi
-
-    ln -sf /opt/lora/lora_pkt_fwd $pkt_fwd
-}
-
-setup_mtcdt_2_1() {
-    if [[ "$lora_id" = "$lora_mtac_g16_id868" ]]; then
-        GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_EU868
-    elif [[ "$lora_id" = "$lora_mtac_g16_id915" ]]; then
-        GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_16ch_US915
-    elif [[ "$lora_id" = "$lora_mtac_g64_id868" ]]; then
-        GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_2_1_test_single_antenna_64ch_8x8_EU868
-    elif [[ "$lora_id" = "$lora_mtac_g64_id915" ]]; then
-        GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_2_1_loc_single_antenna_64ch_US915
-    else
-        return 1
-    fi
-
-    opt_conf_file=$opt_conf_dir/global_conf.json
-
-    cp $GLOBAL_CONF $opt_conf_file
-
-    if ! [ -f $conf_file ]; then
-        mkdir -p /var/config/lora/
-        cp $opt_conf_file $conf_file
-    fi
-
-    ln -sf /opt/lora/pkt_forwarder $pkt_fwd
-
-    if [ -f $gps_path ]; then
-        pkt_fwd_options=" -g"
-    fi
-}
-
-do_start() {
-
-    mkdir -p $run_dir/1
-    rm -rf $run_dir/1/*
-
-    read_lora_hw_info
-
-    if hardware_found; then
-        echo "Found $lora_id with $lora_hw hardware. Configuring"
-    else
-        echo "$0: LORA card not detected"
-        exit 1
-    fi
-
-    if ! [ -f $conf_file ]; then
-        echo "$0: $conf_file missing"
-        exit 1
-    fi
-
-    #
-    # copy conf files to the run directory
-    #
-    cp $conf_file $run_dir/1/
-    if [ -f $conf_file_local ]; then
-        cp $conf_file_local $run_dir/1/
-        sed -i.bak "s/\(.*gateway_ID\"\s*\:\s*\"\)<.*>[^\"]*\(.*\)/\1${lora_eui_raw}\2/g" /var/run/lora/1/local_conf.json
-    fi
-
-    sed -i.bak "s/\(.*gateway_ID\"\s*\:\s*\"\)<.*>[^\"]*\(.*\)/\1${lora_eui_raw}\2/g" /var/run/lora/1/global_conf.json
-
-    #
-    # start packet forwarder
-    #
-    echo -n "Starting $NAME: "
-
-    /usr/sbin/start-stop-daemon --chdir $run_dir/1 --background --start --make-pidfile \
-        --pidfile $pkt_fwd_pidfile --startas /bin/bash -- -c "exec $pkt_fwd $pkt_fwd_options"
-
-    renice -n -20 -p $(pgrep $(basename $pkt_fwd))
-
-    echo "OK"
-}
-
-
-do_stop() {
-    echo -n "Stopping $NAME: "
-    start-stop-daemon --stop --quiet --oknodo --pidfile $pkt_fwd_pidfile --retry 5
-    rm -f $pkt_fwd_pidfile
-    echo "OK"
-}
-
-
-if [ "$ENABLED" != "yes" ]; then
-    echo "$NAME: disabled in /etc/default"
-    exit
-fi
-
-
-case "$1" in
-    "start")
-    do_start
-        ;;
-    "stop")
-    do_stop
-        ;;
-    "restart")
-        ## Stop the service and regardless of whether it was
-        ## running or not, start it again.
-        do_stop
-        do_start
-        ;;
-    *)
-        ## If no parameters are given, print which are avaiable.
-        echo "Usage: $0 {start|stop|restart}"
-        exit 1
-    ;;
-esac
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/mtcap/lora-packet-forwarder.default b/recipes-connectivity/lora/lora-packet-forwarder/mtcap/lora-packet-forwarder.default
deleted file mode 100644
index be7dcd5..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/mtcap/lora-packet-forwarder.default
+++ /dev/null
@@ -1,2 +0,0 @@
-# set to "yes" or "no" to control starting on boot
-ENABLED="yes"
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/mtcdt-2.1/lora-packet-forwarder.default b/recipes-connectivity/lora/lora-packet-forwarder/mtcdt-2.1/lora-packet-forwarder.default
deleted file mode 100644
index 0f92640..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/mtcdt-2.1/lora-packet-forwarder.default
+++ /dev/null
@@ -1,2 +0,0 @@
-# set to "yes" or "no" to control starting on boot
-ENABLED="no"
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.default b/recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.default
deleted file mode 100644
index 0f92640..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.default
+++ /dev/null
@@ -1,2 +0,0 @@
-# set to "yes" or "no" to control starting on boot
-ENABLED="no"
diff --git a/recipes-connectivity/lora/lora-packet-forwarder_4.0.1.bb b/recipes-connectivity/lora/lora-packet-forwarder_4.0.1.bb
deleted file mode 100644
index ce75f25..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder_4.0.1.bb
+++ /dev/null
@@ -1,130 +0,0 @@
-DESCRIPTION = "LoRa Packet Forwarder"
-HOMEPAGE = "https://github.com/Lora-net/packet_forwarder"
-PRIORITY = "optional"
-SECTION = "console/utils"
-# Semtech license is a modified BSD-style license
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=22af7693d7b76ef0fc76161c4be76c45"
-DEPENDS = "lora-gateway logrotate lora-logging"
-RDEPENDS_${PN} += "bash"
-PR = "r19"
-
-SRCREV = "v${PV}"
-
-SRC_URI = "git://github.com/Lora-net/packet_forwarder.git;protocol=git \
-           file://README.md \
-           file://lora-packet-forwarder.init \
-           file://lora-packet-forwarder.default \
-           file://global_conf.json.3.0.0.PCB_E336.EU868.basic.clksrc0 \
-           file://global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 \
-           file://global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0 \
-           file://global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 \
-           file://global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0 \
-           file://global_conf.json.3.0.0.MTAC_LORA_1_5.AS923.basic.clksrc0 \
-           file://global_conf.json.3.0.0.MTAC_LORA_1_5.AS923-LBT.basic.clksrc0 \
-           file://global_conf.json.3.0.0.MTAC_LORA_1_5.KR920-LBT.basic.clksrc0 \
-           file://global_conf.json.3.0.0.MTAC_LORA_1_5.IN865.basic.clksrc0 \
-           file://global_conf.json.3.0.0.MTAC_LORA_1_5.AU915.basic.clksrc0 \
-           file://global_conf.json.3.0.0.MTAC_LORA_1_5.RU864.basic.clksrc0 \
-           file://global_conf.json.3.1.0.MTCAP-LORA-1-5.EU868.basic \
-           file://global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic \
-           file://global_conf.json.3.1.0.MTCAP-LORA-1-5.AU915.basic \
-           file://global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923.basic \
-           file://global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923-LBT.basic \
-           file://global_conf.json.3.1.0.MTCAP-LORA-1-5.IN865.basic \
-           file://global_conf.json.3.1.0.MTCAP-LORA-1-5.KR920-LBT.basic \
-           file://global_conf.json.3.1.0.MTCAP-LORA-1-5.RU864.basic \
-           file://global_conf.json.MTCAP2-LORA-1.5.AS923 \
-           file://global_conf.json.MTCAP2-LORA-1.5.AS923-LBT \
-           file://global_conf.json.MTCAP2-LORA-1.5.AU915 \
-           file://global_conf.json.MTCAP2-LORA-1.5.EU868 \
-           file://global_conf.json.MTCAP2-LORA-1.5.IN865 \
-           file://global_conf.json.MTCAP2-LORA-1.5.KR920-LBT \
-           file://global_conf.json.MTCAP2-LORA-1.5.RU864 \
-           file://global_conf.json.MTCAP2-LORA-1.5.US915 \
-           file://local_conf.json \
-           file://lora-packet-forwarder-add-spi-dev-path.patch \
-           file://lora-packet-forwarder-remove-jit-power-check.patch \
-           file://lora-packet-forwarder-gpsd.patch \
-           file://lora-packet-forwarder-beacon-rfu-fix.patch \
-           file://lora-packet-forwarder-jit-queue-increase-peek-and-remove-sort-from-dequeue.patch \
-           file://lora-packet-forwarder-dedup-rx.patch \
-"
-
-
-S = "${WORKDIR}/git"
-B = "${S}"
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-
-LORA_DIR = "/opt/lora"
-
-export LGW_PATH = "${STAGING_LIBDIR}/lora"
-export LGW_INC = "${STAGING_INCDIR}/lora"
-
-CFLAGS += "-I${LGW_INC} -Iinc -I. -std=gnu11"
-
-do_compile() {
-  oe_runmake
-}
-
-do_install() {
-  install -d ${D}${LORA_DIR}
-  install -m 755 lora_pkt_fwd/lora_pkt_fwd ${D}${LORA_DIR}/
-  install -m 755 ${WORKDIR}/local_conf.json ${D}${LORA_DIR}/
-
-  install -d ${D}${LORA_DIR}/forwarder-utils
-  install -m 755 util_sink/util_sink ${D}${LORA_DIR}/forwarder-utils/
-  install -m 755 util_ack/util_ack ${D}${LORA_DIR}/forwarder-utils/
-  install -m 755 util_tx_test/util_tx_test ${D}${LORA_DIR}/forwarder-utils/
-  install -m 755 ${WORKDIR}/README.md  ${D}${LORA_DIR}/
-
-  install -d ${D}${sysconfdir}/default
-  install -m 0644 ${WORKDIR}/lora-packet-forwarder.default ${D}${sysconfdir}/default/lora-packet-forwarder
-  install -d ${D}${sysconfdir}/init.d
-  install -m 0755 ${WORKDIR}/lora-packet-forwarder.init ${D}${sysconfdir}/init.d/lora-packet-forwarder
-}
-
-do_install_append_mtcdt() {
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_0
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_0.EU868
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.EU868
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.RU864.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.RU864
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_0.US915
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.US915
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.AU915.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.AU915
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.AS923.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.AS923
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.AS923-LBT.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.AS923-LBT
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.KR920-LBT.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.KR920-LBT
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.IN865.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.IN865
-}
-
-do_install_append_mtcap() {
-  install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTCAP-LORA-1-5.EU868.basic ${D}${LORA_DIR}/global_conf.json.MTCAP_LORA_1_5.EU868
-  install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTCAP-LORA-1-5.RU864.basic ${D}${LORA_DIR}/global_conf.json.MTCAP_LORA_1_5.RU864
-  install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic ${D}${LORA_DIR}/global_conf.json.MTCAP_LORA_1_5.US915
-  install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTCAP-LORA-1-5.AU915.basic ${D}${LORA_DIR}/global_conf.json.MTCAP_LORA_1_5.AU915
-  install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923.basic ${D}${LORA_DIR}/global_conf.json.MTCAP_LORA_1_5.AS923
-  install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTCAP-LORA-1-5.AS923-LBT.basic ${D}${LORA_DIR}/global_conf.json.MTCAP_LORA_1_5.AS923-LBT
-  install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTCAP-LORA-1-5.KR920-LBT.basic ${D}${LORA_DIR}/global_conf.json.MTCAP_LORA_1_5.KR920-LBT
-  install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTCAP-LORA-1-5.IN865.basic ${D}${LORA_DIR}/global_conf.json.MTCAP_LORA_1_5.IN865
-
-  install -m 755 ${WORKDIR}/global_conf.json.MTCAP2-LORA-1.5.EU868 ${D}${LORA_DIR}/global_conf.json.MTCAP2_LORA_1_5.EU868
-  install -m 755 ${WORKDIR}/global_conf.json.MTCAP2-LORA-1.5.RU864 ${D}${LORA_DIR}/global_conf.json.MTCAP2_LORA_1_5.RU864
-  install -m 755 ${WORKDIR}/global_conf.json.MTCAP2-LORA-1.5.US915 ${D}${LORA_DIR}/global_conf.json.MTCAP2_LORA_1_5.US915
-  install -m 755 ${WORKDIR}/global_conf.json.MTCAP2-LORA-1.5.AU915 ${D}${LORA_DIR}/global_conf.json.MTCAP2_LORA_1_5.AU915
-  install -m 755 ${WORKDIR}/global_conf.json.MTCAP2-LORA-1.5.AS923 ${D}${LORA_DIR}/global_conf.json.MTCAP2_LORA_1_5.AS923
-  install -m 755 ${WORKDIR}/global_conf.json.MTCAP2-LORA-1.5.AS923-LBT ${D}${LORA_DIR}/global_conf.json.MTCAP2_LORA_1_5.AS923-LBT
-  install -m 755 ${WORKDIR}/global_conf.json.MTCAP2-LORA-1.5.KR920-LBT ${D}${LORA_DIR}/global_conf.json.MTCAP2_LORA_1_5.KR920-LBT
-  install -m 755 ${WORKDIR}/global_conf.json.MTCAP2-LORA-1.5.IN865 ${D}${LORA_DIR}/global_conf.json.MTCAP2_LORA_1_5.IN865
-}
-
-FILES_${PN} += "${LORA_DIR}"
-FILES_${PN}-dbg += "${LORA_DIR}/.debug ${LORA_DIR}/forwarder-utils/.debug"
-
-# disable this on purpose for dev purposes
-do_rm_work() {
-  echo "skipping"
-}
diff --git a/recipes-connectivity/lora/lora-query_1.0.4.bb b/recipes-connectivity/lora/lora-query_1.0.4.bb
deleted file mode 100644
index 730266f..0000000
--- a/recipes-connectivity/lora/lora-query_1.0.4.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "LoRa network server query tool"
-HOMEPAGE = "http://www.multitech.net/"
-LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "jsoncpp libmts"
-PR = "r1"
-
-SRCREV = "${PV}"
-
-SRC_URI = "git://git.multitech.net/lora-query;branch=master"
-
-S = "${WORKDIR}/git"
-
-do_compile() {
-    oe_runmake
-}
-
-do_install() {
-    oe_runmake install DESTDIR=${D}
-}
-
diff --git a/recipes-connectivity/mosquitto/mosquitto/config_mk.patch b/recipes-connectivity/mosquitto/mosquitto/config_mk.patch
deleted file mode 100644
index 437022c..0000000
--- a/recipes-connectivity/mosquitto/mosquitto/config_mk.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur old/config.mk new/config.mk
---- old/config.mk	2017-04-17 14:33:32.504351936 -0500
-+++ new/config.mk	2017-04-17 14:34:27.061557282 -0500
-@@ -83,9 +83,9 @@
- # Strip executables and shared libraries on install.
- WITH_STRIP:=no
-
- # Build static libraries
--WITH_STATIC_LIBRARIES:=no
-+WITH_STATIC_LIBRARIES:=yes
-
- # Build with async dns lookup support for bridges (temporary). Requires glibc.
- #WITH_ADNS:=yes
-
-@@ -272,7 +272,7 @@
- endif
- 
- INSTALL?=install
--prefix=/usr/local
-+prefix=/usr
- mandir=${prefix}/share/man
- localedir=${prefix}/share/locale
- STRIP?=strip
-
-
-
-
diff --git a/recipes-connectivity/mosquitto/mosquitto/mosquitto.conf b/recipes-connectivity/mosquitto/mosquitto/mosquitto.conf
deleted file mode 100644
index 25821b8..0000000
--- a/recipes-connectivity/mosquitto/mosquitto/mosquitto.conf
+++ /dev/null
@@ -1,812 +0,0 @@
-# Config file for mosquitto
-#
-# See mosquitto.conf(5) for more information.
-#
-# Default values are shown, uncomment to change.
-#
-# Use the # character to indicate a comment, but only if it is the 
-# very first character on the line.
-
-# =================================================================
-# General configuration
-# =================================================================
-
-# Time in seconds to wait before resending an outgoing QoS=1 or 
-# QoS=2 message.
-#retry_interval 20
-
-# Time in seconds between updates of the $SYS tree.
-# Set to 0 to disable the publishing of the $SYS tree.
-#sys_interval 10
-
-# Time in seconds between cleaning the internal message store of 
-# unreferenced messages. Lower values will result in lower memory 
-# usage but more processor time, higher values will have the 
-# opposite effect.
-# Setting a value of 0 means the unreferenced messages will be 
-# disposed of as quickly as possible.
-#store_clean_interval 10
-
-# Write process id to a file. Default is a blank string which means 
-# a pid file shouldn't be written.
-# This should be set to /var/run/mosquitto.pid if mosquitto is
-# being run automatically on boot with an init script and 
-# start-stop-daemon or similar.
-pid_file /var/run/mosquitto.pid
-
-# When run as root, drop privileges to this user and its primary 
-# group.
-# Leave blank to stay as root, but this is not recommended.
-# If run as a non-root user, this setting has no effect.
-# Note that on Windows this has no effect and so mosquitto should 
-# be started by the user you wish it to run as.
-user root
-
-# The maximum number of QoS 1 and 2 messages currently inflight per 
-# client.
-# This includes messages that are partway through handshakes and 
-# those that are being retried. Defaults to 20. Set to 0 for no 
-# maximum. Setting to 1 will guarantee in-order delivery of QoS 1 
-# and 2 messages.
-#max_inflight_messages 20
-
-# The maximum number of QoS 1 and 2 messages to hold in a queue 
-# above those that are currently in-flight.  Defaults to 100. Set 
-# to 0 for no maximum (not recommended).
-# See also queue_qos0_messages.
-#max_queued_messages 100
-
-# Set to true to queue messages with QoS 0 when a persistent client is
-# disconnected. These messages are included in the limit imposed by
-# max_queued_messages.
-# Defaults to false.
-# This is a non-standard option for the MQTT v3.1 spec but is allowed in
-# v3.1.1.
-#queue_qos0_messages false
-
-# This option sets the maximum publish payload size that the broker will allow.
-# Received messages that exceed this size will not be accepted by the broker.
-# The default value is 0, which means that all valid MQTT messages are
-# accepted. MQTT imposes a maximum payload size of 268435455 bytes. 
-#message_size_limit 0
-
-# This option controls whether a client is allowed to connect with a zero
-# length client id or not. This option only affects clients using MQTT v3.1.1
-# and later. If set to false, clients connecting with a zero length client id
-# are disconnected. If set to true, clients will be allocated a client id by
-# the broker. This means it is only useful for clients with clean session set
-# to true.
-#allow_zero_length_clientid true
-
-# If allow_zero_length_clientid is true, this option allows you to set a prefix
-# to automatically generated client ids to aid visibility in logs.
-#auto_id_prefix
-
-# This option allows persistent clients (those with clean session set to false)
-# to be removed if they do not reconnect within a certain time frame.
-#
-# This is a non-standard option in MQTT V3.1 but allowed in MQTT v3.1.1.
-#
-# Badly designed clients may set clean session to false whilst using a randomly
-# generated client id. This leads to persistent clients that will never
-# reconnect. This option allows these clients to be removed.
-#
-# The expiration period should be an integer followed by one of h d w m y for
-# hour, day, week, month and year respectively. For example
-#
-# persistent_client_expiration 2m
-# persistent_client_expiration 14d
-# persistent_client_expiration 1y
-#
-# The default if not set is to never expire persistent clients.
-#persistent_client_expiration
-
-# If a client is subscribed to multiple subscriptions that overlap, e.g. foo/#
-# and foo/+/baz , then MQTT expects that when the broker receives a message on
-# a topic that matches both subscriptions, such as foo/bar/baz, then the client
-# should only receive the message once.
-# Mosquitto keeps track of which clients a message has been sent to in order to
-# meet this requirement. The allow_duplicate_messages option allows this
-# behaviour to be disabled, which may be useful if you have a large number of
-# clients subscribed to the same set of topics and are very concerned about
-# minimising memory usage.
-# It can be safely set to true if you know in advance that your clients will
-# never have overlapping subscriptions, otherwise your clients must be able to
-# correctly deal with duplicate messages even when then have QoS=2.
-#allow_duplicate_messages false
-
-# The MQTT specification requires that the QoS of a message delivered to a
-# subscriber is never upgraded to match the QoS of the subscription. Enabling
-# this option changes this behaviour. If upgrade_outgoing_qos is set true,
-# messages sent to a subscriber will always match the QoS of its subscription.
-# This is a non-standard option explicitly disallowed by the spec.
-#upgrade_outgoing_qos false
-
-# =================================================================
-# Default listener
-# =================================================================
-
-# IP address/hostname to bind the default listener to. If not
-# given, the default listener will not be bound to a specific 
-# address and so will be accessible to all network interfaces.
-# bind_address ip-address/host name
-bind_address 127.0.0.1
-
-# Port to use for the default listener.
-port 1883
-
-# The maximum number of client connections to allow. This is 
-# a per listener setting.
-# Default is -1, which means unlimited connections.
-# Note that other process limits mean that unlimited connections 
-# are not really possible. Typically the default maximum number of 
-# connections possible is around 1024.
-#max_connections -1
-
-# Choose the protocol to use when listening.
-# This can be either mqtt or websockets.
-# Websockets support is currently disabled by default at compile time.
-# Certificate based TLS may be used with websockets, except that
-# only the cafile, certfile, keyfile and ciphers options are supported.
-protocol mqtt
-
-# When a listener is using the websockets protocol, it is possible to serve
-# http data as well. Set http_dir to a directory which contains the files you
-# wish to serve. If this option is not specified, then no normal http
-# connections will be possible.
-#http_dir
-
-# Set use_username_as_clientid to true to replace the clientid that a client
-# connected with with its username. This allows authentication to be tied to
-# the clientid, which means that it is possible to prevent one client
-# disconnecting another by using the same clientid.
-# If a client connects with no username it will be disconnected as not
-# authorised when this option is set to true.
-# Do not use in conjunction with clientid_prefixes.
-# See also use_identity_as_username.
-#use_username_as_clientid
-
-# -----------------------------------------------------------------
-# Certificate based SSL/TLS support
-# -----------------------------------------------------------------
-# The following options can be used to enable SSL/TLS support for 
-# this listener. Note that the recommended port for MQTT over TLS
-# is 8883, but this must be set manually.
-#
-# See also the mosquitto-tls man page.
-
-# At least one of cafile or capath must be defined. They both 
-# define methods of accessing the PEM encoded Certificate 
-# Authority certificates that have signed your server certificate 
-# and that you wish to trust.
-# cafile defines the path to a file containing the CA certificates.
-# capath defines a directory that will be searched for files
-# containing the CA certificates. For capath to work correctly, the
-# certificate files must have ".crt" as the file ending and you must run
-# "c_rehash <path to capath>" each time you add/remove a certificate.
-#cafile
-#capath
-
-# Path to the PEM encoded server certificate.
-#certfile
-
-# Path to the PEM encoded keyfile.
-#keyfile
-
-# This option defines the version of the TLS protocol to use for this listener.
-# The default value allows v1.2, v1.1 and v1.0, if they are all supported by
-# the version of openssl that the broker was compiled against. For openssl >=
-# 1.0.1 the valid values are tlsv1.2 tlsv1.1 and tlsv1. For openssl < 1.0.1 the
-# valid values are tlsv1.
-#tls_version
-
-# By default a TLS enabled listener will operate in a similar fashion to a
-# https enabled web server, in that the server has a certificate signed by a CA
-# and the client will verify that it is a trusted certificate. The overall aim
-# is encryption of the network traffic. By setting require_certificate to true,
-# the client must provide a valid certificate in order for the network
-# connection to proceed. This allows access to the broker to be controlled
-# outside of the mechanisms provided by MQTT.
-#require_certificate false
-
-# If require_certificate is true, you may set use_identity_as_username to true
-# to use the CN value from the client certificate as a username. If this is
-# true, the password_file option will not be used for this listener.
-#use_identity_as_username false
-
-# If you have require_certificate set to true, you can create a certificate
-# revocation list file to revoke access to particular client certificates. If
-# you have done this, use crlfile to point to the PEM encoded revocation file.
-#crlfile
-
-# If you wish to control which encryption ciphers are used, use the ciphers
-# option. The list of available ciphers can be optained using the "openssl
-# ciphers" command and should be provided in the same format as the output of
-# that command.
-# If unset defaults to DEFAULT:!aNULL:!eNULL:!LOW:!EXPORT:!SSLv2:@STRENGTH
-#ciphers DEFAULT:!aNULL:!eNULL:!LOW:!EXPORT:!SSLv2:@STRENGTH
-
-# -----------------------------------------------------------------
-# Pre-shared-key based SSL/TLS support
-# -----------------------------------------------------------------
-# The following options can be used to enable PSK based SSL/TLS support for
-# this listener. Note that the recommended port for MQTT over TLS is 8883, but
-# this must be set manually.
-#
-# See also the mosquitto-tls man page and the "Certificate based SSL/TLS
-# support" section. Only one of certificate or PSK encryption support can be
-# enabled for any listener.
-
-# The psk_hint option enables pre-shared-key support for this listener and also
-# acts as an identifier for this listener. The hint is sent to clients and may
-# be used locally to aid authentication. The hint is a free form string that
-# doesn't have much meaning in itself, so feel free to be creative.
-# If this option is provided, see psk_file to define the pre-shared keys to be
-# used or create a security plugin to handle them.
-#psk_hint
-
-# Set use_identity_as_username to have the psk identity sent by the client used
-# as its username. Authentication will be carried out using the PSK rather than
-# the MQTT username/password and so password_file will not be used for this
-# listener.
-#use_identity_as_username false
-
-# When using PSK, the encryption ciphers used will be chosen from the list of
-# available PSK ciphers. If you want to control which ciphers are available,
-# use the "ciphers" option.  The list of available ciphers can be optained
-# using the "openssl ciphers" command and should be provided in the same format
-# as the output of that command.
-#ciphers
-
-# =================================================================
-# Extra listeners
-# =================================================================
-
-# Listen on a port/ip address combination. By using this variable 
-# multiple times, mosquitto can listen on more than one port. If 
-# this variable is used and neither bind_address nor port given, 
-# then the default listener will not be started.
-# The port number to listen on must be given. Optionally, an ip 
-# address or host name may be supplied as a second argument. In 
-# this case, mosquitto will attempt to bind the listener to that 
-# address and so restrict access to the associated network and 
-# interface. By default, mosquitto will listen on all interfaces.
-# listener port-number [ip address/host name]
-#listener
-
-# The maximum number of client connections to allow. This is 
-# a per listener setting.
-# Default is -1, which means unlimited connections.
-# Note that other process limits mean that unlimited connections 
-# are not really possible. Typically the default maximum number of 
-# connections possible is around 1024.
-#max_connections -1
-
-# The listener can be restricted to operating within a topic hierarchy using
-# the mount_point option. This is achieved be prefixing the mount_point string
-# to all topics for any clients connected to this listener. This prefixing only
-# happens internally to the broker; the client will not see the prefix.
-#mount_point
-
-# Choose the protocol to use when listening.
-# This can be either mqtt or websockets.
-# Certificate based TLS may be used with websockets, except that only the
-# cafile, certfile, keyfile and ciphers options are supported.
-protocol mqtt
-
-# When a listener is using the websockets protocol, it is possible to serve
-# http data as well. Set http_dir to a directory which contains the files you
-# wish to serve. If this option is not specified, then no normal http
-# connections will be possible.
-#http_dir
-
-# Set use_username_as_clientid to true to replace the clientid that a client
-# connected with with its username. This allows authentication to be tied to
-# the clientid, which means that it is possible to prevent one client
-# disconnecting another by using the same clientid.
-# If a client connects with no username it will be disconnected as not
-# authorised when this option is set to true.
-# Do not use in conjunction with clientid_prefixes.
-# See also use_identity_as_username.
-#use_username_as_clientid
-
-# -----------------------------------------------------------------
-# Certificate based SSL/TLS support
-# -----------------------------------------------------------------
-# The following options can be used to enable certificate based SSL/TLS support
-# for this listener. Note that the recommended port for MQTT over TLS is 8883,
-# but this must be set manually.
-#
-# See also the mosquitto-tls man page and the "Pre-shared-key based SSL/TLS
-# support" section. Only one of certificate or PSK encryption support can be
-# enabled for any listener.
-
-# At least one of cafile or capath must be defined to enable certificate based
-# TLS encryption. They both define methods of accessing the PEM encoded
-# Certificate Authority certificates that have signed your server certificate
-# and that you wish to trust.
-# cafile defines the path to a file containing the CA certificates.
-# capath defines a directory that will be searched for files
-# containing the CA certificates. For capath to work correctly, the
-# certificate files must have ".crt" as the file ending and you must run
-# "c_rehash <path to capath>" each time you add/remove a certificate.
-#cafile
-#capath
-
-# Path to the PEM encoded server certificate.
-#certfile
-
-# Path to the PEM encoded keyfile.
-#keyfile
-
-# By default an TLS enabled listener will operate in a similar fashion to a
-# https enabled web server, in that the server has a certificate signed by a CA
-# and the client will verify that it is a trusted certificate. The overall aim
-# is encryption of the network traffic. By setting require_certificate to true,
-# the client must provide a valid certificate in order for the network
-# connection to proceed. This allows access to the broker to be controlled
-# outside of the mechanisms provided by MQTT.
-#require_certificate false
-
-# If require_certificate is true, you may set use_identity_as_username to true
-# to use the CN value from the client certificate as a username. If this is
-# true, the password_file option will not be used for this listener.
-#use_identity_as_username false
-
-# If you have require_certificate set to true, you can create a certificate
-# revocation list file to revoke access to particular client certificates. If
-# you have done this, use crlfile to point to the PEM encoded revocation file.
-#crlfile
-
-# If you wish to control which encryption ciphers are used, use the ciphers
-# option. The list of available ciphers can be optained using the "openssl
-# ciphers" command and should be provided in the same format as the output of
-# that command.
-#ciphers
-
-# -----------------------------------------------------------------
-# Pre-shared-key based SSL/TLS support
-# -----------------------------------------------------------------
-# The following options can be used to enable PSK based SSL/TLS support for
-# this listener. Note that the recommended port for MQTT over TLS is 8883, but
-# this must be set manually.
-#
-# See also the mosquitto-tls man page and the "Certificate based SSL/TLS
-# support" section. Only one of certificate or PSK encryption support can be
-# enabled for any listener.
-
-# The psk_hint option enables pre-shared-key support for this listener and also
-# acts as an identifier for this listener. The hint is sent to clients and may
-# be used locally to aid authentication. The hint is a free form string that
-# doesn't have much meaning in itself, so feel free to be creative.
-# If this option is provided, see psk_file to define the pre-shared keys to be
-# used or create a security plugin to handle them.
-#psk_hint
-
-# Set use_identity_as_username to have the psk identity sent by the client used
-# as its username. Authentication will be carried out using the PSK rather than
-# the MQTT username/password and so password_file will not be used for this
-# listener.
-#use_identity_as_username false
-
-# When using PSK, the encryption ciphers used will be chosen from the list of
-# available PSK ciphers. If you want to control which ciphers are available,
-# use the "ciphers" option.  The list of available ciphers can be optained
-# using the "openssl ciphers" command and should be provided in the same format
-# as the output of that command.
-#ciphers
-
-# =================================================================
-# Persistence
-# =================================================================
-
-# If persistence is enabled, save the in-memory database to disk 
-# every autosave_interval seconds. If set to 0, the persistence 
-# database will only be written when mosquitto exits. See also
-# autosave_on_changes.
-# Note that writing of the persistence database can be forced by 
-# sending mosquitto a SIGUSR1 signal.
-#autosave_interval 1800
-
-# If true, mosquitto will count the number of subscription changes, retained
-# messages received and queued messages and if the total exceeds
-# autosave_interval then the in-memory database will be saved to disk.
-# If false, mosquitto will save the in-memory database to disk by treating
-# autosave_interval as a time in seconds.
-#autosave_on_changes false
-
-# Save persistent message data to disk (true/false).
-# This saves information about all messages, including 
-# subscriptions, currently in-flight messages and retained 
-# messages.
-# retained_persistence is a synonym for this option.
-#persistence false
-
-# The filename to use for the persistent database, not including 
-# the path.
-#persistence_file mosquitto.db
-
-# Location for persistent database. Must include trailing /
-# Default is an empty string (current directory).
-# Set to e.g. /var/lib/mosquitto/ if running as a proper service on Linux or
-# similar.
-#persistence_location
-
-# =================================================================
-# Logging
-# =================================================================
-
-# Places to log to. Use multiple log_dest lines for multiple 
-# logging destinations.
-# Possible destinations are: stdout stderr syslog topic file
-#
-# stdout and stderr log to the console on the named output.
-#
-# syslog uses the userspace syslog facility which usually ends up 
-# in /var/log/messages or similar.
-#
-# topic logs to the broker topic '$SYS/broker/log/<severity>', 
-# where severity is one of D, E, W, N, I, M which are debug, error, 
-# warning, notice, information and message. Message type severity is used by
-# the subscribe/unsubscribe log_types and publishes log messages to
-# $SYS/broker/log/M/susbcribe or $SYS/broker/log/M/unsubscribe.
-#
-# The file destination requires an additional parameter which is the file to be
-# logged to, e.g. "log_dest file /var/log/mosquitto.log". The file will be
-# closed and reopened when the broker receives a HUP signal. Only a single file
-# destination may be configured.
-#
-# Note that if the broker is running as a Windows service it will default to
-# "log_dest none" and neither stdout nor stderr logging is available.
-# Use "log_dest none" if you wish to disable logging.
-log_dest file /var/log/mosquitto.log
-
-# If using syslog logging (not on Windows), messages will be logged to the
-# "daemon" facility by default. Use the log_facility option to choose which of
-# local0 to local7 to log to instead. The option value should be an integer
-# value, e.g. "log_facility 5" to use local5.
-#log_facility
-
-# Types of messages to log. Use multiple log_type lines for logging
-# multiple types of messages.
-# Possible types are: debug, error, warning, notice, information, 
-# none, subscribe, unsubscribe, websockets, all.
-# Note that debug type messages are for decoding the incoming/outgoing
-# network packets. They are not logged in "topics".
-log_type error
-log_type warning
-log_type notice
-log_type information
-
-# If set to true, client connection and disconnection messages will be included
-# in the log.
-connection_messages true
-
-# If set to true, add a timestamp value to each log message.
-log_timestamp true
-
-# =================================================================
-# Security
-# =================================================================
-
-# If set, only clients that have a matching prefix on their 
-# clientid will be allowed to connect to the broker. By default, 
-# all clients may connect.
-# For example, setting "secure-" here would mean a client "secure-
-# client" could connect but another with clientid "mqtt" couldn't.
-#clientid_prefixes
-
-# Boolean value that determines whether clients that connect 
-# without providing a username are allowed to connect. If set to 
-# false then a password file should be created (see the 
-# password_file option) to control authenticated client access. 
-# Defaults to true.
-#allow_anonymous true
-
-# In addition to the clientid_prefixes, allow_anonymous and TLS 
-# authentication options, username based authentication is also 
-# possible. The default support is described in "Default 
-# authentication and topic access control" below. The auth_plugin 
-# allows another authentication method to be used.
-# Specify the path to the loadable plugin and see the 
-# "Authentication and topic access plugin options" section below.
-#auth_plugin
-
-# -----------------------------------------------------------------
-# Default authentication and topic access control
-# -----------------------------------------------------------------
-
-# Control access to the broker using a password file. This file can be
-# generated using the mosquitto_passwd utility. If TLS support is not compiled
-# into mosquitto (it is recommended that TLS support should be included) then
-# plain text passwords are used, in which case the file should be a text file
-# with lines in the format:
-# username:password
-# The password (and colon) may be omitted if desired, although this 
-# offers very little in the way of security.
-# 
-# See the TLS client require_certificate and use_identity_as_username options
-# for alternative authentication options.
-#password_file
-
-# Access may also be controlled using a pre-shared-key file. This requires
-# TLS-PSK support and a listener configured to use it. The file should be text
-# lines in the format:
-# identity:key
-# The key should be in hexadecimal format without a leading "0x".
-#psk_file
-
-# Control access to topics on the broker using an access control list
-# file. If this parameter is defined then only the topics listed will
-# have access.
-# If the first character of a line of the ACL file is a # it is treated as a
-# comment.
-# Topic access is added with lines of the format:
-#
-# topic [read|write|readwrite] <topic>
-# 
-# The access type is controlled using "read", "write" or "readwrite". This
-# parameter is optional (unless <topic> contains a space character) - if not
-# given then the access is read/write.  <topic> can contain the + or #
-# wildcards as in subscriptions.
-# 
-# The first set of topics are applied to anonymous clients, assuming
-# allow_anonymous is true. User specific topic ACLs are added after a 
-# user line as follows:
-#
-# user <username>
-#
-# The username referred to here is the same as in password_file. It is
-# not the clientid.
-#
-#
-# If is also possible to define ACLs based on pattern substitution within the
-# topic. The patterns available for substition are:
-#
-# %c to match the client id of the client
-# %u to match the username of the client
-#
-# The substitution pattern must be the only text for that level of hierarchy.
-#
-# The form is the same as for the topic keyword, but using pattern as the
-# keyword.
-# Pattern ACLs apply to all users even if the "user" keyword has previously
-# been given.
-#
-# If using bridges with usernames and ACLs, connection messages can be allowed
-# with the following pattern:
-# pattern write $SYS/broker/connection/%c/state
-#
-# pattern [read|write|readwrite] <topic>
-#
-# Example:
-#
-# pattern write sensor/%u/data
-#
-#acl_file
-
-# -----------------------------------------------------------------
-# Authentication and topic access plugin options
-# -----------------------------------------------------------------
-
-# If the auth_plugin option above is used, define options to pass to the
-# plugin here as described by the plugin instructions. All options named
-# using the format auth_opt_* will be passed to the plugin, for example:
-#
-# auth_opt_db_host
-# auth_opt_db_port 
-# auth_opt_db_username
-# auth_opt_db_password
-
-
-# =================================================================
-# Bridges
-# =================================================================
-
-# A bridge is a way of connecting multiple MQTT brokers together.
-# Create a new bridge using the "connection" option as described below. Set
-# options for the bridges using the remaining parameters. You must specify the
-# address and at least one topic to subscribe to.
-# Each connection must have a unique name.
-# The address line may have multiple host address and ports specified. See
-# below in the round_robin description for more details on bridge behaviour if
-# multiple addresses are used.
-# The direction that the topic will be shared can be chosen by 
-# specifying out, in or both, where the default value is out. 
-# The QoS level of the bridged communication can be specified with the next
-# topic option. The default QoS level is 0, to change the QoS the topic
-# direction must also be given.
-# The local and remote prefix options allow a topic to be remapped when it is
-# bridged to/from the remote broker. This provides the ability to place a topic
-# tree in an appropriate location. 
-# For more details see the mosquitto.conf man page.
-# Multiple topics can be specified per connection, but be careful 
-# not to create any loops.
-# If you are using bridges with cleansession set to false (the default), then
-# you may get unexpected behaviour from incoming topics if you change what
-# topics you are subscribing to. This is because the remote broker keeps the
-# subscription for the old topic. If you have this problem, connect your bridge
-# with cleansession set to true, then reconnect with cleansession set to false
-# as normal.
-#connection <name>
-#address <host>[:<port>] [<host>[:<port>]]
-#topic <topic> [[[out | in | both] qos-level] local-prefix remote-prefix]
-
-# Set the version of the MQTT protocol to use with for this bridge. Can be one
-# of mqttv31 or mqttv311. Defaults to mqttv31.
-#bridge_protocol_version mqttv31
-
-# If a bridge has topics that have "out" direction, the default behaviour is to
-# send an unsubscribe request to the remote broker on that topic. This means
-# that changing a topic direction from "in" to "out" will not keep receiving
-# incoming messages. Sending these unsubscribe requests is not always
-# desirable, setting bridge_attempt_unsubscribe to false will disable sending
-# the unsubscribe request.
-#bridge_attempt_unsubscribe true
-
-# If the bridge has more than one address given in the address/addresses
-# configuration, the round_robin option defines the behaviour of the bridge on
-# a failure of the bridge connection. If round_robin is false, the default
-# value, then the first address is treated as the main bridge connection. If
-# the connection fails, the other secondary addresses will be attempted in
-# turn. Whilst connected to a secondary bridge, the bridge will periodically
-# attempt to reconnect to the main bridge until successful.
-# If round_robin is true, then all addresses are treated as equals. If a
-# connection fails, the next address will be tried and if successful will
-# remain connected until it fails
-#round_robin false
-
-# Set the client id to use on the remote end of this bridge connection. If not
-# defined, this defaults to 'name.hostname' where name is the connection name
-# and hostname is the hostname of this computer.
-# This replaces the old "clientid" option to avoid confusion. "clientid"
-# remains valid for the time being.
-#remote_clientid
-
-# Set the clientid to use on the local broker. If not defined, this defaults to
-# 'local.<clientid>'. If you are bridging a broker to itself, it is important
-# that local_clientid and clientid do not match.
-#local_clientid
-
-# Set the clean session variable for this bridge.
-# When set to true, when the bridge disconnects for any reason, all 
-# messages and subscriptions will be cleaned up on the remote 
-# broker. Note that with cleansession set to true, there may be a 
-# significant amount of retained messages sent when the bridge 
-# reconnects after losing its connection.
-# When set to false, the subscriptions and messages are kept on the 
-# remote broker, and delivered when the bridge reconnects.
-#cleansession false
-
-# If set to true, publish notification messages to the local and remote brokers
-# giving information about the state of the bridge connection. Retained
-# messages are published to the topic $SYS/broker/connection/<clientid>/state
-# unless the notification_topic option is used.
-# If the message is 1 then the connection is active, or 0 if the connection has
-# failed.
-#notifications true
-
-# Choose the topic on which notification messages for this bridge are
-# published. If not set, messages are published on the topic
-# $SYS/broker/connection/<clientid>/state
-#notification_topic 
-
-# Set the keepalive interval for this bridge connection, in 
-# seconds.
-#keepalive_interval 60
-
-# Set the start type of the bridge. This controls how the bridge starts and
-# can be one of three types: automatic, lazy and once. Note that RSMB provides
-# a fourth start type "manual" which isn't currently supported by mosquitto.
-#
-# "automatic" is the default start type and means that the bridge connection
-# will be started automatically when the broker starts and also restarted
-# after a short delay (30 seconds) if the connection fails.
-#
-# Bridges using the "lazy" start type will be started automatically when the
-# number of queued messages exceeds the number set with the "threshold"
-# parameter. It will be stopped automatically after the time set by the
-# "idle_timeout" parameter. Use this start type if you wish the connection to
-# only be active when it is needed.
-#
-# A bridge using the "once" start type will be started automatically when the
-# broker starts but will not be restarted if the connection fails.
-#start_type automatic
-
-# Set the amount of time a bridge using the automatic start type will wait
-# until attempting to reconnect.  Defaults to 30 seconds.
-#restart_timeout 30
-
-# Set the amount of time a bridge using the lazy start type must be idle before
-# it will be stopped. Defaults to 60 seconds.
-#idle_timeout 60
-
-# Set the number of messages that need to be queued for a bridge with lazy
-# start type to be restarted. Defaults to 10 messages.
-# Must be less than max_queued_messages.
-#threshold 10
-
-# If try_private is set to true, the bridge will attempt to indicate to the
-# remote broker that it is a bridge not an ordinary client. If successful, this
-# means that loop detection will be more effective and that retained messages
-# will be propagated correctly. Not all brokers support this feature so it may
-# be necessary to set try_private to false if your bridge does not connect
-# properly.
-#try_private true
-
-# Set the username to use when connecting to a broker that requires
-# authentication.
-# This replaces the old "username" option to avoid confusion. "username"
-# remains valid for the time being.
-#remote_username
-
-# Set the password to use when connecting to a broker that requires
-# authentication. This option is only used if remote_username is also set.
-# This replaces the old "password" option to avoid confusion. "password"
-# remains valid for the time being.
-#remote_password
-
-# -----------------------------------------------------------------
-# Certificate based SSL/TLS support
-# -----------------------------------------------------------------
-# Either bridge_cafile or bridge_capath must be defined to enable TLS support
-# for this bridge.
-# bridge_cafile defines the path to a file containing the
-# Certificate Authority certificates that have signed the remote broker
-# certificate.
-# bridge_capath defines a directory that will be searched for files containing
-# the CA certificates. For bridge_capath to work correctly, the certificate
-# files must have ".crt" as the file ending and you must run "c_rehash <path to
-# capath>" each time you add/remove a certificate.
-#bridge_cafile
-#bridge_capath
-
-# Path to the PEM encoded client certificate, if required by the remote broker.
-#bridge_certfile
-
-# Path to the PEM encoded client private key, if required by the remote broker.
-#bridge_keyfile
-
-# When using certificate based encryption, bridge_insecure disables
-# verification of the server hostname in the server certificate. This can be
-# useful when testing initial server configurations, but makes it possible for
-# a malicious third party to impersonate your server through DNS spoofing, for
-# example. Use this option in testing only. If you need to resort to using this
-# option in a production environment, your setup is at fault and there is no
-# point using encryption.
-#bridge_insecure false
-
-# -----------------------------------------------------------------
-# PSK based SSL/TLS support
-# -----------------------------------------------------------------
-# Pre-shared-key encryption provides an alternative to certificate based
-# encryption. A bridge can be configured to use PSK with the bridge_identity
-# and bridge_psk options. These are the client PSK identity, and pre-shared-key
-# in hexadecimal format with no "0x". Only one of certificate and PSK based
-# encryption can be used on one
-# bridge at once.
-#bridge_identity
-#bridge_psk
-
-
-# =================================================================
-# External config files
-# =================================================================
-
-# External configuration files may be included by using the 
-# include_dir option. This defines a directory that will be searched
-# for config files. All files that end in '.conf' will be loaded as
-# a configuration file. It is best to have this as the last option
-# in the main file. This option will only be processed from the main
-# configuration file. The directory specified must not contain the 
-# main configuration file.
-#include_dir
-
-# =================================================================
-# rsmb options - unlikely to ever be supported
-# =================================================================
-
-#ffdc_output
-#max_log_entries
-#trace_level
-#trace_output
diff --git a/recipes-connectivity/mosquitto/mosquitto/mosquitto.default b/recipes-connectivity/mosquitto/mosquitto/mosquitto.default
deleted file mode 100644
index be7dcd5..0000000
--- a/recipes-connectivity/mosquitto/mosquitto/mosquitto.default
+++ /dev/null
@@ -1,2 +0,0 @@
-# set to "yes" or "no" to control starting on boot
-ENABLED="yes"
diff --git a/recipes-connectivity/mosquitto/mosquitto/mosquitto.init b/recipes-connectivity/mosquitto/mosquitto/mosquitto.init
deleted file mode 100755
index 7b3e634..0000000
--- a/recipes-connectivity/mosquitto/mosquitto/mosquitto.init
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-#
-# mosquitto     Starts and stops Mosquitto
-#    mosquitto (MQTT 3.5 broker)
-#
-# chkconfig: - 58 74
-# description: mosquitto is a MQTT 3.5 broker. \
-# http://mosquitto.org/
-
-### BEGIN INIT INFO
-# Provides: mosquitto
-# Required-Start: $network $local_fs
-# Required-Stop: $network $local_fs
-# Should-Start: $syslog $named
-# Should-Stop: $syslog $named
-# Short-Description: start and stop mosquitto
-# Description: mosquitto is a MQTT 3.5 broker.
-### END INIT INFO
-
-PIDFILE=/var/run/mosquitto.pid
-DAEMON=/usr/sbin/mosquitto
-ENABLED="yes"
-
-[ -f /etc/default/mosquitto ] && . /etc/default/mosquitto
-
-start() {
-    echo "Starting Mosquitto..."
-    start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --exec $DAEMON -- -d -c /etc/mosquitto/mosquitto.conf
-}
-
-stop() {
-    echo "Stopping Mosquitto..."
-    start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
-}
-
-[ "$ENABLED" = "yes" ] || exit
-
-case "$1" in
-  start)
-        start
-        ;;
-  stop)
-        stop
-        ;;
-  restart)
-        stop
-        start
-        ;;
-  *)
-        echo $"Usage: $0 {start|stop|restart}"
-        exit 2
-esac
-
diff --git a/recipes-connectivity/mosquitto/mosquitto/mosquitto.logrotate.conf b/recipes-connectivity/mosquitto/mosquitto/mosquitto.logrotate.conf
deleted file mode 100644
index 5f4779b..0000000
--- a/recipes-connectivity/mosquitto/mosquitto/mosquitto.logrotate.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/mosquitto.log {
-    size 512k
-    rotate 4
-    compress
-    copytruncate
-    missingok
-}
diff --git a/recipes-connectivity/mosquitto/mosquitto/nostrip.patch b/recipes-connectivity/mosquitto/mosquitto/nostrip.patch
deleted file mode 100644
index b36be35..0000000
--- a/recipes-connectivity/mosquitto/mosquitto/nostrip.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Index: mosquitto-1.4/client/Makefile
-===================================================================
---- mosquitto-1.4.orig/client/Makefile	2015-02-17 19:44:09.000000000 -0600
-+++ mosquitto-1.4/client/Makefile	2015-03-25 11:34:01.388614891 -0500
-@@ -24,8 +24,8 @@
- 
- install : all
- 	$(INSTALL) -d ${DESTDIR}$(prefix)/bin
--	$(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto_pub ${DESTDIR}${prefix}/bin/mosquitto_pub
--	$(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto_sub ${DESTDIR}${prefix}/bin/mosquitto_sub
-+	$(INSTALL) mosquitto_pub ${DESTDIR}${prefix}/bin/mosquitto_pub
-+	$(INSTALL) mosquitto_sub ${DESTDIR}${prefix}/bin/mosquitto_sub
- 
- uninstall :
- 	-rm -f ${DESTDIR}${prefix}/bin/mosquitto_pub
-Index: mosquitto-1.4/lib/Makefile
-===================================================================
---- mosquitto-1.4.orig/lib/Makefile	2015-02-17 19:44:09.000000000 -0600
-+++ mosquitto-1.4/lib/Makefile	2015-03-25 11:34:01.388614891 -0500
-@@ -25,7 +25,7 @@
- 
- install : all
- 	$(INSTALL) -d ${DESTDIR}$(prefix)/lib${LIB_SUFFIX}/
--	$(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so.${SOVERSION}
-+	$(INSTALL) libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so.${SOVERSION}
- 	ln -sf libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so
- 	$(INSTALL) -d ${DESTDIR}${prefix}/include/
- 	$(INSTALL) mosquitto.h ${DESTDIR}${prefix}/include/mosquitto.h
-Index: mosquitto-1.4/src/Makefile
-===================================================================
---- mosquitto-1.4.orig/src/Makefile	2015-02-17 19:44:09.000000000 -0600
-+++ mosquitto-1.4/src/Makefile	2015-03-25 11:34:01.388614891 -0500
-@@ -103,10 +103,10 @@
- 
- install : all
- 	$(INSTALL) -d ${DESTDIR}$(prefix)/sbin
--	$(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto ${DESTDIR}${prefix}/sbin/mosquitto
-+	$(INSTALL) mosquitto ${DESTDIR}${prefix}/sbin/mosquitto
- 	$(INSTALL) mosquitto_plugin.h ${DESTDIR}${prefix}/include/mosquitto_plugin.h
- ifeq ($(WITH_TLS),yes)
--	$(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd
-+	$(INSTALL) mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd
- endif
- 
- uninstall :
-Index: mosquitto-1.4/lib/cpp/Makefile
-===================================================================
---- mosquitto-1.4.orig/lib/cpp/Makefile	2015-02-17 19:44:09.000000000 -0600
-+++ mosquitto-1.4/lib/cpp/Makefile	2015-03-25 11:34:25.984217051 -0500
-@@ -10,7 +10,7 @@
- 
- install : all
- 	$(INSTALL) -d ${DESTDIR}$(prefix)/lib${LIB_SUFFIX}/
--	$(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so.${SOVERSION}
-+	$(INSTALL) libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so.${SOVERSION}
- 	ln -sf libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so
- 	$(INSTALL) -d ${DESTDIR}${prefix}/include/
- 	$(INSTALL) mosquittopp.h ${DESTDIR}${prefix}/include/mosquittopp.h
diff --git a/recipes-connectivity/mosquitto/mosquitto_1.4.9.bb b/recipes-connectivity/mosquitto/mosquitto_1.4.9.bb
deleted file mode 100644
index a1e7df8..0000000
--- a/recipes-connectivity/mosquitto/mosquitto_1.4.9.bb
+++ /dev/null
@@ -1,77 +0,0 @@
-# This recipe was a merger of the Multitech Daisy 3.5 Recipe with the
-# reciped found at:
-# http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-iot-middleware/plain/recipes-connectivity/mosquitto/mosquitto_1.4.10.bb
-inherit autotools-brokensep
-SUMMARY = "Open source MQTT v3.5 implemention"
-DESCRIPTION = "Mosquitto is an open source (BSD licensed) message broker that implements the MQ Telemetry Transport protocol version 3.5. MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. "
-HOMEPAGE = "http://mosquitto.org/"
-SECTION = "console/network"
-LICENSE = "EPL-1.0 & EDL-1.0"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=62ddc846179e908dc0c8efec4a42ef20"
-
-# util-linux is needed to provide libuuid dependancy
-DEPENDS = "c-ares openssl util-linux"
-
-PR = "r3"
-
-SRC_URI = "http://mosquitto.org/files/source/${PN}-${PV}.tar.gz \
-           file://mosquitto.init \
-           file://mosquitto.conf \
-           file://mosquitto.default \
-           file://mosquitto.logrotate.conf \
-           file://nostrip.patch \
-           file://config_mk.patch \
-           "
-
-SRC_URI[md5sum] = "67943e2c5afebf7329628616eb2c41c5"
-SRC_URI[sha256sum] = "1df3ae07de40b80a74cd37a7b026895c544cdd3b42c9e0719ae91623aa98c58b"
-
-export LIB_SUFFIX="${@d.getVar('baselib', True).replace('lib', '')}"
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "mosquitto"
-INITSCRIPT_PARAMS = "defaults 70 30"
-do_compile() {
-    oe_runmake PREFIX=/usr
-}
-do_install() {
-    # oe_runmake DESTDIR=${D} prefix=/usr install
-	oe_runmake install DESTDIR=${D}
-	install -m 0755 -d ${D}/usr/lib
-    install -m 0644 lib/libmosquitto.a ${D}${libdir}/
-
-    install -d ${D}${sysconfdir}/init.d
-    install -d ${D}${sysconfdir}/default
-    install -m 0755 ${WORKDIR}/mosquitto.init ${D}${sysconfdir}/init.d/mosquitto
-    install -m 0644 ${WORKDIR}/mosquitto.conf ${D}${sysconfdir}/mosquitto/
-    install -m 0644 ${WORKDIR}/mosquitto.default ${D}${sysconfdir}/default/mosquitto
-
-    install -d ${D}${sysconfdir}/logrotate.d
-    install -m 0644 ${WORKDIR}/mosquitto.logrotate.conf ${D}${sysconfdir}/logrotate.d/mosquitto.conf
-}
-
-PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients ${PN}-python"
-
-CONFFILES_${PN} = "${sysconfdir}/mosquitto.conf ${sysconfdir}/default/mosquitto"
-FILES_${PN} = "${sbindir}/mosquitto \
-               ${bindir}/mosquitto_passwd \
-               ${sysconfdir}/mosquitto \
-               ${systemd_unitdir}/system/mosquitto.service \
-               ${sysconfdir}/ \
-"
-
-FILES_libmosquitto1 = "${libdir}/libmosquitto.so.1"
-
-FILES_libmosquittopp1 = "${libdir}/libmosquittopp.so.1"
-
-FILES_${PN}-clients = "${bindir}/mosquitto_pub \
-                       ${bindir}/mosquitto_sub \
-"
-
-FILES_${PN}-staticdev += "${libdir}/libmosquitto.a"
-
-FILES_${PN}-python = "/usr/lib/python2.7/site-packages"
-
-inherit systemd
-
-SYSTEMD_SERVICE_${PN} = "mosquitto.service"
diff --git a/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb b/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb
deleted file mode 100644
index 947dcdf..0000000
--- a/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb
+++ /dev/null
@@ -1,81 +0,0 @@
-# This recipe was a merger of the Multitech Daisy 3.5 Recipe with the
-# reciped found at:
-# http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-iot-middleware/plain/recipes-connectivity/mosquitto/mosquitto_1.4.10.bb
-inherit autotools-brokensep
-SUMMARY = "Open source MQTT v3.5 implemention"
-DESCRIPTION = "Mosquitto is an open source (BSD licensed) message broker that implements the MQ Telemetry Transport protocol version 3.5. MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. "
-HOMEPAGE = "http://mosquitto.org/"
-SECTION = "console/network"
-LICENSE = "EPL-1.0 & EDL-1.0"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=62ddc846179e908dc0c8efec4a42ef20"
-
-# util-linux is needed to provide libuuid dependancy
-DEPENDS = "c-ares openssl util-linux"
-
-PR = "r3"
-
-SRC_URI = "http://mosquitto.org/files/source/${PN}-${PV}.tar.gz \
-           file://mosquitto.init \
-           file://mosquitto.conf \
-           file://mosquitto.default \
-           file://mosquitto.logrotate.conf \
-           file://config_mk.patch \
-           "
-SRC_URI[md5sum] = "f98c99998a36a234f3a9d9b402b991db"
-SRC_URI[sha256sum] = "8557bc7ae34dfaf32a0fb56d2491b7a7f731269c88337227233013502df4d5b0"
-
-export LIB_SUFFIX="${@d.getVar('baselib', True).replace('lib', '')}"
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "mosquitto"
-INITSCRIPT_PARAMS = "defaults 70 30"
-do_compile() {
-    WITH_STATIC_LIBRARIES=1 oe_runmake PREFIX=/usr WITH_STATIC_LIBRARIES=1
-}
-do_install() {
-    # oe_runmake DESTDIR=${D} prefix=/usr install
-	oe_runmake install DESTDIR=${D}
-	install -m 0755 -d ${D}/usr/lib
-    install -m 0644 lib/libmosquitto.a ${D}${libdir}/
-
-    install -d ${D}${sysconfdir}/init.d
-    install -d ${D}${sysconfdir}/default
-    install -m 0755 ${WORKDIR}/mosquitto.init ${D}${sysconfdir}/init.d/mosquitto
-    install -m 0644 ${WORKDIR}/mosquitto.conf ${D}${sysconfdir}/mosquitto/
-    install -m 0644 ${WORKDIR}/mosquitto.default ${D}${sysconfdir}/default/mosquitto
-
-    install -d ${D}${sysconfdir}/logrotate.d
-    install -m 0644 ${WORKDIR}/mosquitto.logrotate.conf ${D}${sysconfdir}/logrotate.d/mosquitto.conf
-}
-
-do_rm_work() {
-    echo "skipping"
-}
-
-
-PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients ${PN}-python"
-
-CONFFILES_${PN} = "${sysconfdir}/mosquitto.conf ${sysconfdir}/default/mosquitto"
-FILES_${PN} = "${sbindir}/mosquitto \
-               ${bindir}/mosquitto_passwd \
-               ${sysconfdir}/mosquitto \
-               ${systemd_unitdir}/system/mosquitto.service \
-               ${sysconfdir}/ \
-"
-
-FILES_libmosquitto1 = "${libdir}/libmosquitto.so.1"
-
-FILES_libmosquittopp1 = "${libdir}/libmosquittopp.so.1"
-
-FILES_${PN}-clients = "${bindir}/mosquitto_pub \
-                       ${bindir}/mosquitto_sub \
-"
-
-FILES_${PN}-staticdev += "${libdir}/libmosquitto.a"
-
-FILES_${PN}-python = "/usr/lib/python2.7/site-packages"
-
-inherit systemd
-
-SYSTEMD_SERVICE_${PN} = "mosquitto.service"
-
diff --git a/recipes-connectivity/openssh/openssh/fix-potential-signed-overflow-in-pointer-arithmatic.patch b/recipes-connectivity/openssh/openssh/fix-potential-signed-overflow-in-pointer-arithmatic.patch
deleted file mode 100644
index 7e043a2..0000000
--- a/recipes-connectivity/openssh/openssh/fix-potential-signed-overflow-in-pointer-arithmatic.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 3328e98bcbf2930cd7eea3e6c92ad5dcbdf4794f Mon Sep 17 00:00:00 2001
-From: Yuanjie Huang <yuanjie.huang@windriver.com>
-Date: Wed, 24 Aug 2016 03:15:43 +0000
-Subject: [PATCH] Fix potential signed overflow in pointer arithmatic
-
-Pointer arithmatic results in implementation defined signed integer
-type, so that 's - src' in strlcpy and others may trigger signed overflow.
-In case of compilation by gcc or clang with -ftrapv option, the overflow
-would lead to program abort.
-
-Upstream-Status: Submitted [http://bugzilla.mindrot.org/show_bug.cgi?id=2608]
-
-Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com>
----
- openbsd-compat/strlcat.c | 8 ++++++--
- openbsd-compat/strlcpy.c | 8 ++++++--
- openbsd-compat/strnlen.c | 8 ++++++--
- 3 files changed, 18 insertions(+), 6 deletions(-)
-
-diff --git a/openbsd-compat/strlcat.c b/openbsd-compat/strlcat.c
-index bcc1b61..e758ebf 100644
---- a/openbsd-compat/strlcat.c
-+++ b/openbsd-compat/strlcat.c
-@@ -23,6 +23,7 @@
- 
- #include <sys/types.h>
- #include <string.h>
-+#include <stdint.h>
- 
- /*
-  * Appends src to string dst of size siz (unlike strncat, siz is the
-@@ -55,8 +56,11 @@ strlcat(char *dst, const char *src, size_t siz)
- 		s++;
- 	}
- 	*d = '\0';
--
--	return(dlen + (s - src));	/* count does not include NUL */
-+        /*
-+	 * Cast pointers to unsigned type before calculation, to avoid signed
-+	 * overflow when the string ends where the MSB has changed.
-+	 */
-+	return (dlen + ((uintptr_t)s - (uintptr_t)src));	/* count does not include NUL */
- }
- 
- #endif /* !HAVE_STRLCAT */
-diff --git a/openbsd-compat/strlcpy.c b/openbsd-compat/strlcpy.c
-index b4b1b60..b06f374 100644
---- a/openbsd-compat/strlcpy.c
-+++ b/openbsd-compat/strlcpy.c
-@@ -23,6 +23,7 @@
- 
- #include <sys/types.h>
- #include <string.h>
-+#include <stdint.h>
- 
- /*
-  * Copy src to string dst of size siz.  At most siz-1 characters
-@@ -51,8 +52,11 @@ strlcpy(char *dst, const char *src, size_t siz)
- 		while (*s++)
- 			;
- 	}
--
--	return(s - src - 1);	/* count does not include NUL */
-+        /*
-+	 * Cast pointers to unsigned type before calculation, to avoid signed
-+	 * overflow when the string ends where the MSB has changed.
-+	 */
-+	return ((uintptr_t)s - (uintptr_t)src - 1);	/* count does not include NUL */
- }
- 
- #endif /* !HAVE_STRLCPY */
-diff --git a/openbsd-compat/strnlen.c b/openbsd-compat/strnlen.c
-index 93d5155..9b8de5d 100644
---- a/openbsd-compat/strnlen.c
-+++ b/openbsd-compat/strnlen.c
-@@ -23,6 +23,7 @@
- #include <sys/types.h>
- 
- #include <string.h>
-+#include <stdint.h>
- 
- size_t
- strnlen(const char *str, size_t maxlen)
-@@ -31,7 +32,10 @@ strnlen(const char *str, size_t maxlen)
- 
- 	for (cp = str; maxlen != 0 && *cp != '\0'; cp++, maxlen--)
- 		;
--
--	return (size_t)(cp - str);
-+        /*
-+	 * Cast pointers to unsigned type before calculation, to avoid signed
-+	 * overflow when the string ends where the MSB has changed.
-+	 */
-+	return (size_t)((uintptr_t)cp - (uintptr_t)str);
- }
- #endif
--- 
-1.9.1
-
diff --git a/recipes-connectivity/openssh/openssh/init b/recipes-connectivity/openssh/openssh/init
deleted file mode 100644
index 386628a..0000000
--- a/recipes-connectivity/openssh/openssh/init
+++ /dev/null
@@ -1,153 +0,0 @@
-#! /bin/sh
-set -e
-
-PIDFILE=/var/run/sshd.pid
-
-# source function library
-. /etc/init.d/functions
-
-# /etc/init.d/ssh: start and stop the OpenBSD "secure shell" daemon
-
-test -x /usr/sbin/sshd || exit 0
-( /usr/sbin/sshd -\? 2>&1 | grep -q OpenSSH ) 2>/dev/null || exit 0
-
-# /etc/default/ssh may set SYSCONFDIR and SSHD_OPTS
-if test -f /etc/default/ssh; then
-    . /etc/default/ssh
-fi
-
-[ -z "$SYSCONFDIR" ] && SYSCONFDIR=/etc/ssh
-mkdir -p $SYSCONFDIR
-
-parse_sshd_opts() {
-    set -- ${SSHD_OPTS} --
-    sshd_config=/etc/ssh/sshd_config
-    while true ; do
-        case "$1" in
-        -f*) if [ "$1" = "-f" ] ; then
-                 sshd_config="$2"
-                 shift
-             else
-                 sshd_config="${1#-f}"
-             fi
-             shift
-             ;;
-        --) shift; break;;
-        *) shift;;
-        esac
-    done
-}
-
-check_for_no_start() {
-    # forget it if we're trying to start, and /etc/ssh/sshd_not_to_be_run exists
-    if [ -e $SYSCONFDIR/sshd_not_to_be_run ]; then
-	echo "OpenBSD Secure Shell server not in use ($SYSCONFDIR/sshd_not_to_be_run)"
-	exit 0
-    fi
-}
-
-check_privsep_dir() {
-    # Create the PrivSep empty dir if necessary
-    if [ ! -d /var/run/sshd ]; then
-	mkdir /var/run/sshd
-	chmod 0755 /var/run/sshd
-    fi
-}
-
-check_config() {
-	/usr/sbin/sshd -t $SSHD_OPTS || exit 1
-}
-
-check_keys() {
-	# parse location of keys
-	local HOST_KEY_RSA
-	local HOST_KEY_DSA
-	local HOST_KEY_ECDSA
-	local HOST_KEY_ED25519
-
-	parse_sshd_opts
-	HOST_KEY_RSA=$(grep ^HostKey "${sshd_config}" | grep _rsa_ | tail -1 | awk ' { print $2 } ')
-	[ -z "${HOST_KEY_RSA}" ] && HOST_KEY_RSA=$(grep HostKey "${sshd_config}" | grep _rsa_ | tail -1 | awk ' { print $2 } ')
-	[ -z "${HOST_KEY_RSA}" ] && HOST_KEY_RSA=$SYSCONFDIR/ssh_host_rsa_key
-	HOST_KEY_DSA=$(grep ^HostKey "${sshd_config}" | grep _dsa_ | tail -1 | awk ' { print $2 } ')
-	[ -z "${HOST_KEY_DSA}" ] && HOST_KEY_DSA=$(grep HostKey "${sshd_config}" | grep _dsa_ | tail -1 | awk ' { print $2 } ')
-	[ -z "${HOST_KEY_DSA}" ] && HOST_KEY_DSA=$SYSCONFDIR/ssh_host_dsa_key
-	HOST_KEY_ECDSA=$(grep ^HostKey "${sshd_config}" | grep _ecdsa_ | tail -1 | awk ' { print $2 } ')
-	[ -z "${HOST_KEY_ECDSA}" ] && HOST_KEY_ECDSA=$(grep HostKey "${sshd_config}" | grep _ecdsa_ | tail -1 | awk ' { print $2 } ')
-	[ -z "${HOST_KEY_ECDSA}" ] && HOST_KEY_ECDSA=$SYSCONFDIR/ssh_host_ecdsa_key
-	HOST_KEY_ED25519=$(grep ^HostKey "${sshd_config}" | grep _ed25519_ | tail -1 | awk ' { print $2 } ')
-	[ -z "${HOST_KEY_ED25519}" ] && HOST_KEY_ED25519=$(grep HostKey "${sshd_config}" | grep _ed25519_ | tail -1 | awk ' { print $2 } ')
-	[ -z "${HOST_KEY_ED25519}" ] && HOST_KEY_ED25519=$SYSCONFDIR/ssh_host_ed25519_key
-
-	# create keys if necessary
-	if [ ! -f $HOST_KEY_RSA ]; then
-		echo "  generating ssh RSA key..."
-		mkdir -p $(dirname $HOST_KEY_RSA)
-		ssh-keygen -q -f $HOST_KEY_RSA -N '' -t rsa
-	fi
-	if [ ! -f $HOST_KEY_ECDSA ]; then
-		echo "  generating ssh ECDSA key..."
-		mkdir -p $(dirname $HOST_KEY_ECDSA)
-		ssh-keygen -q -f $HOST_KEY_ECDSA -N '' -t ecdsa
-	fi
-	if [ ! -f $HOST_KEY_DSA ]; then
-		echo "  generating ssh DSA key..."
-		mkdir -p $(dirname $HOST_KEY_DSA)
-		ssh-keygen -q -f $HOST_KEY_DSA -N '' -t dsa
-	fi
-	if [ ! -f $HOST_KEY_ED25519 ]; then
-		echo "  generating ssh ED25519 key..."
-		mkdir -p $(dirname $HOST_KEY_ED25519)
-		ssh-keygen -q -f $HOST_KEY_ED25519 -N '' -t ed25519
-	fi
-}
-
-export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
-
-case "$1" in
-  start)
-	check_for_no_start
-	echo "Starting OpenBSD Secure Shell server: sshd"
-	check_keys
-	check_privsep_dir
-	start-stop-daemon -S -p $PIDFILE -x /usr/sbin/sshd -- $SSHD_OPTS
-        echo "done."
-	;;
-  stop)
-        echo -n "Stopping OpenBSD Secure Shell server: sshd"
-	start-stop-daemon -K -p $PIDFILE -x /usr/sbin/sshd
-        echo "."
-	;;
-
-  reload|force-reload)
-	check_for_no_start
-	check_keys
-	check_config
-        echo -n "Reloading OpenBSD Secure Shell server's configuration"
-	start-stop-daemon -K -p $PIDFILE -s 1 -x /usr/sbin/sshd
-	echo "."
-	;;
-
-  restart)
-  	check_keys
-	check_config
-        echo -n "Restarting OpenBSD Secure Shell server: sshd"
-	start-stop-daemon -K -p $PIDFILE --oknodo -x /usr/sbin/sshd
-	check_for_no_start
-	check_privsep_dir
-	sleep 2
-	start-stop-daemon -S -p $PIDFILE -x /usr/sbin/sshd -- $SSHD_OPTS
-	echo "."
-	;;
-
-  status)
-	status /usr/sbin/sshd
-	exit $?
-  ;;
-
-  *)
-	echo "Usage: /etc/init.d/ssh {start|stop|status|reload|force-reload|restart}"
-	exit 1
-esac
-
-exit 0
diff --git a/recipes-connectivity/openssh/openssh/openssh-8.1p1-add-test-support-for-busybox.patch b/recipes-connectivity/openssh/openssh/openssh-8.1p1-add-test-support-for-busybox.patch
deleted file mode 100644
index d6fbd3b..0000000
--- a/recipes-connectivity/openssh/openssh/openssh-8.1p1-add-test-support-for-busybox.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ruN a/regress/cipher-speed.sh b/regress/cipher-speed.sh
---- a/regress/cipher-speed.sh	2019-12-03 13:16:36.091896387 -0600
-+++ b/regress/cipher-speed.sh	2019-12-03 13:28:29.726275955 -0600
-@@ -17,7 +17,7 @@
- 		printf "%-60s" "$c/$m:"
- 		( ${SSH} -o 'compression no' \
- 			-F $OBJ/ssh_proxy -m $m -c $c somehost \
--			exec sh -c \'"dd of=/dev/null obs=32k"\' \
-+			exec sh -c \'"dd of=/dev/null bs=32k"\' \
- 		< ${DATA} ) 2>&1 | getbytes
- 
- 		if [ $? -ne 0 ]; then
-diff -ruN a/regress/key-options.sh b/regress/key-options.sh
---- a/regress/key-options.sh	2019-12-03 13:24:44.164243780 -0600
-+++ b/regress/key-options.sh	2019-12-03 13:33:14.447235791 -0600
-@@ -84,7 +84,7 @@
- 	fi
- 
- 	sed 's/.*/from="'"$f"'" &/' $origkeys >$authkeys
--	from=`head -1 $authkeys | cut -f1 -d ' '`
-+	from=`head -n 1 $authkeys | cut -f1 -d ' '`
- 	verbose "key option $from"
- 	r=`${SSH} -q -F $OBJ/ssh_proxy somehost 'echo true'`
- 	if [ "$r" = "true" ]; then
-diff -ruN a/regress/transfer.sh b/regress/transfer.sh
---- a/regress/transfer.sh	2019-12-03 13:16:58.342857354 -0600
-+++ b/regress/transfer.sh	2019-12-03 13:29:08.733267753 -0600
-@@ -13,7 +13,7 @@
- for s in 10 100 1k 32k 64k 128k 256k; do
- 	trace "dd-size ${s}"
- 	rm -f ${COPY}
--	dd if=$DATA obs=${s} 2> /dev/null | \
-+	dd if=$DATA bs=${s} 2> /dev/null | \
- 		${SSH} -q -F $OBJ/ssh_proxy somehost "cat > ${COPY}"
- 	if [ $? -ne 0 ]; then
- 		fail "ssh cat $DATA failed"
-diff -ruN a/regress/yes-head.sh b/regress/yes-head.sh
---- a/regress/yes-head.sh	2019-12-03 13:17:11.682259074 -0600
-+++ b/regress/yes-head.sh	2019-12-03 13:32:47.699869866 -0600
-@@ -3,7 +3,7 @@
- 
- tid="yes pipe head"
- 
--lines=`${SSH} -F $OBJ/ssh_proxy thishost 'sh -c "while true;do echo yes;done | _POSIX2_VERSION=199209 head -2000"' | (sleep 3 ; wc -l)`
-+lines=`${SSH} -F $OBJ/ssh_proxy thishost 'sh -c "while true;do echo yes;done | _POSIX2_VERSION=199209 head -n 2000"' | (sleep 3 ; wc -l)`
- if [ $? -ne 0 ]; then
- 	fail "yes|head test failed"
- 	lines = 0;
diff --git a/recipes-connectivity/openssh/openssh/openssh-8.1p1-conditional-compile-des-in-cipher.patch b/recipes-connectivity/openssh/openssh/openssh-8.1p1-conditional-compile-des-in-cipher.patch
deleted file mode 100644
index 507026c..0000000
--- a/recipes-connectivity/openssh/openssh/openssh-8.1p1-conditional-compile-des-in-cipher.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/cipher.c	2019-12-03 12:46:22.282290586 -0600
-+++ b/cipher.c	2019-12-03 12:45:19.273805437 -0600
-@@ -158,8 +158,10 @@
- u_int
- cipher_seclen(const struct sshcipher *c)
- {
-+#ifndef OPENSSL_NO_DES
- 	if (strcmp("3des-cbc", c->name) == 0)
- 		return 14;
-+#endif
- 	return cipher_keylen(c);
- }
- 
diff --git a/recipes-connectivity/openssh/openssh/openssh-8.1p1-conditional-compile-des-in-pkcs11.patch b/recipes-connectivity/openssh/openssh/openssh-8.1p1-conditional-compile-des-in-pkcs11.patch
deleted file mode 100644
index 46b60b5..0000000
--- a/recipes-connectivity/openssh/openssh/openssh-8.1p1-conditional-compile-des-in-pkcs11.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/pkcs11.h	2019-12-03 12:52:10.920974412 -0600
-+++ b/pkcs11.h	2019-12-03 12:56:56.383171416 -0600
-@@ -342,9 +342,11 @@
- #define CKK_GENERIC_SECRET	(0x10)
- #define CKK_RC2			(0x11)
- #define CKK_RC4			(0x12)
-+#ifndef OPENSSL_NO_DES
- #define CKK_DES			(0x13)
- #define CKK_DES2		(0x14)
- #define CKK_DES3		(0x15)
-+#endif /* OPENSSL_NO_DES */
- #define CKK_CAST		(0x16)
- #define CKK_CAST3		(0x17)
- #define CKK_CAST128		(0x18)
-@@ -512,6 +514,7 @@
- #define CKM_RC2_CBC_PAD			(0x105)
- #define CKM_RC4_KEY_GEN			(0x110)
- #define CKM_RC4				(0x111)
-+#ifndef OPENSSL_NO_DES
- #define CKM_DES_KEY_GEN			(0x120)
- #define CKM_DES_ECB			(0x121)
- #define CKM_DES_CBC			(0x122)
-@@ -525,6 +528,7 @@
- #define CKM_DES3_MAC			(0x134)
- #define CKM_DES3_MAC_GENERAL		(0x135)
- #define CKM_DES3_CBC_PAD		(0x136)
-+#endif /* OPENSSL_NO_DES */
- #define CKM_CDMF_KEY_GEN		(0x140)
- #define CKM_CDMF_ECB			(0x141)
- #define CKM_CDMF_CBC			(0x142)
-@@ -610,8 +614,10 @@
- #define CKM_MD5_KEY_DERIVATION		(0x390)
- #define CKM_MD2_KEY_DERIVATION		(0x391)
- #define CKM_SHA1_KEY_DERIVATION		(0x392)
-+#ifndef OPENSSL_NO_DES
- #define CKM_PBE_MD2_DES_CBC		(0x3a0)
- #define CKM_PBE_MD5_DES_CBC		(0x3a1)
-+#endif /* OPENSSL_NO_DES */
- #define CKM_PBE_MD5_CAST_CBC		(0x3a2)
- #define CKM_PBE_MD5_CAST3_CBC		(0x3a3)
- #define CKM_PBE_MD5_CAST5_CBC		(0x3a4)
-@@ -620,8 +626,10 @@
- #define CKM_PBE_SHA1_CAST128_CBC	(0x3a5)
- #define CKM_PBE_SHA1_RC4_128		(0x3a6)
- #define CKM_PBE_SHA1_RC4_40		(0x3a7)
-+#ifndef OPENSSL_NO_DES
- #define CKM_PBE_SHA1_DES3_EDE_CBC	(0x3a8)
- #define CKM_PBE_SHA1_DES2_EDE_CBC	(0x3a9)
-+#endif /* OPENSSL_NO_DES */
- #define CKM_PBE_SHA1_RC2_128_CBC	(0x3aa)
- #define CKM_PBE_SHA1_RC2_40_CBC		(0x3ab)
- #define CKM_PKCS5_PBKD2			(0x3b0)
diff --git a/recipes-connectivity/openssh/openssh/run-ptest b/recipes-connectivity/openssh/openssh/run-ptest
deleted file mode 100755
index 36a3d2a..0000000
--- a/recipes-connectivity/openssh/openssh/run-ptest
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-export TEST_SHELL=sh
-
-cd regress
-sed -i "/\t\tagent-ptrace /d" Makefile
-make -k .OBJDIR=`pwd` .CURDIR=`pwd` SUDO="sudo" tests \
-        | sed -e 's/^skipped/SKIP: /g' -e 's/^ok /PASS: /g' -e 's/^failed/FAIL: /g'
-
-SSHAGENT=`which ssh-agent`
-GDB=`which gdb`
-
-if [ -z "${SSHAGENT}" -o -z "${GDB}" ]; then
-       echo "SKIP: agent-ptrace"
-       exit
-fi
-
-useradd openssh-test
-
-eval `su -c "${SSHAGENT} -s" openssh-test` > /dev/null
-r=$?
-if [ $r -ne 0 ]; then
-	echo "FAIL: could not start ssh-agent: exit code $r"
-else
-	su -c "gdb -p ${SSH_AGENT_PID}" openssh-test > /tmp/gdb.out 2>&1 << EOF
-		quit
-EOF
-	r=$?
-	if [ $r -ne 0 ]; then
-		echo "gdb failed: exit code $r"
-	fi
-	egrep 'ptrace: Operation not permitted.|procfs:.*Permission denied.|ttrace.*Permission denied.|procfs:.*: Invalid argument.|Unable to access task ' >/dev/null /tmp/gdb.out
-	r=$?
-	rm -f /tmp/gdb.out
-	if [ $r -ne 0 ]; then
-		echo "FAIL: ptrace agent"
-	else
-		echo "PASS: ptrace agent"
-	fi
-
-	${SSHAGENT} -k > /dev/null
-fi
-userdel openssh-test
-
diff --git a/recipes-connectivity/openssh/openssh/ssh.default b/recipes-connectivity/openssh/openssh/ssh.default
deleted file mode 100644
index d5c0507..0000000
--- a/recipes-connectivity/openssh/openssh/ssh.default
+++ /dev/null
@@ -1,2 +0,0 @@
-# put keys here
-SYSCONFDIR=/var/config/ssh
diff --git a/recipes-connectivity/openssh/openssh/ssh_config b/recipes-connectivity/openssh/openssh/ssh_config
deleted file mode 100644
index 9e91915..0000000
--- a/recipes-connectivity/openssh/openssh/ssh_config
+++ /dev/null
@@ -1,48 +0,0 @@
-#	$OpenBSD: ssh_config,v 1.28 2013/09/16 11:35:43 sthen Exp $
-
-# This is the ssh client system-wide configuration file.  See
-# ssh_config(5) for more information.  This file provides defaults for
-# users, and the values can be changed in per-user configuration files
-# or on the command line.
-
-# Configuration data is parsed as follows:
-#  1. command line options
-#  2. user-specific file
-#  3. system-wide file
-# Any configuration value is only changed the first time it is set.
-# Thus, host-specific definitions should be at the beginning of the
-# configuration file, and defaults at the end.
-
-# Site-wide defaults for some commonly used options.  For a comprehensive
-# list of available options, their meanings and defaults, please see the
-# ssh_config(5) man page.
-
-Host *
-  ForwardAgent yes
-  ForwardX11 yes
-#   RhostsRSAAuthentication no
-#   RSAAuthentication yes
-#   PasswordAuthentication yes
-#   HostbasedAuthentication no
-#   GSSAPIAuthentication no
-#   GSSAPIDelegateCredentials no
-#   BatchMode no
-#   CheckHostIP yes
-#   AddressFamily any
-#   ConnectTimeout 0
-#   StrictHostKeyChecking ask
-#   IdentityFile ~/.ssh/identity
-#   IdentityFile ~/.ssh/id_rsa
-#   IdentityFile ~/.ssh/id_dsa
-#   Port 22
-#   Protocol 2,1
-#   Cipher 3des
-#   Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc
-#   MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160
-#   EscapeChar ~
-#   Tunnel no
-#   TunnelDevice any:any
-#   PermitLocalCommand no
-#   VisualHostKey no
-#   ProxyCommand ssh -q -W %h:%p gateway.example.com
-#   RekeyLimit 1G 1h
diff --git a/recipes-connectivity/openssh/openssh/sshd b/recipes-connectivity/openssh/openssh/sshd
deleted file mode 100644
index 182650b..0000000
--- a/recipes-connectivity/openssh/openssh/sshd
+++ /dev/null
@@ -1,11 +0,0 @@
-#%PAM-1.0
-
-auth       include      common-auth
-account    required     pam_nologin.so
-account    include      common-account
-password   include      common-password
-session    optional     pam_keyinit.so force revoke
-session    optional     pam_radauth.so
-session    include      common-session
-session    required     pam_loginuid.so
-
diff --git a/recipes-connectivity/openssh/openssh/sshd.socket b/recipes-connectivity/openssh/openssh/sshd.socket
deleted file mode 100644
index 12c39b2..0000000
--- a/recipes-connectivity/openssh/openssh/sshd.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Conflicts=sshd.service
-
-[Socket]
-ExecStartPre=@BASE_BINDIR@/mkdir -p /var/run/sshd
-ListenStream=22
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/recipes-connectivity/openssh/openssh/sshd@.service b/recipes-connectivity/openssh/openssh/sshd@.service
deleted file mode 100644
index 9d83dfb..0000000
--- a/recipes-connectivity/openssh/openssh/sshd@.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=OpenSSH Per-Connection Daemon
-Wants=sshdgenkeys.service
-After=sshdgenkeys.service
-
-[Service]
-Environment="SSHD_OPTS="
-EnvironmentFile=-/etc/default/ssh
-ExecStart=-@SBINDIR@/sshd -i $SSHD_OPTS
-ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID
-StandardInput=socket
-StandardError=syslog
-KillMode=process
diff --git a/recipes-connectivity/openssh/openssh/sshd_config b/recipes-connectivity/openssh/openssh/sshd_config
deleted file mode 100644
index 31fe5d9..0000000
--- a/recipes-connectivity/openssh/openssh/sshd_config
+++ /dev/null
@@ -1,132 +0,0 @@
-#	$OpenBSD: sshd_config,v 1.80 2008/07/02 02:24:18 djm Exp $
-
-# This is the sshd server system-wide configuration file.  See
-# sshd_config(5) for more information.
-
-# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
-
-# The strategy used for options in the default sshd_config shipped with
-# OpenSSH is to specify options with their default value where
-# possible, but leave them commented.  Uncommented options change a
-# default value.
-
-#Port 22
-#AddressFamily any
-#ListenAddress 0.0.0.0
-#ListenAddress ::
-
-# The default requires explicit activation of protocol 1
-Protocol 2
-
-# HostKey for protocol version 1
-#HostKey /etc/ssh/ssh_host_key
-# HostKeys for protocol version 2
-#HostKey /etc/ssh/ssh_host_rsa_key
-#HostKey /etc/ssh/ssh_host_dsa_key
-#HostKey /etc/ssh/ssh_host_ecdsa_key
-#HostKey /etc/ssh/ssh_host_ed25519_key
-
-# Lifetime and size of ephemeral version 1 server key
-#KeyRegenerationInterval 1h
-#ServerKeyBits 1024
-
-# Ciphers and keying
-#RekeyLimit default none
-
-# Logging
-# obsoletes QuietMode and FascistLogging
-#SyslogFacility AUTH
-#LogLevel INFO
-
-# Authentication:
-
-#LoginGraceTime 2m
-#PermitRootLogin yes
-#StrictModes yes
-#MaxAuthTries 6
-#MaxSessions 10
-
-#RSAAuthentication yes
-#PubkeyAuthentication yes
-
-# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
-# but this is overridden so installations will only check .ssh/authorized_keys
-AuthorizedKeysFile .ssh/authorized_keys
-
-#AuthorizedPrincipalsFile none
-
-#AuthorizedKeysCommand none
-#AuthorizedKeysCommandUser nobody
-
-# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
-#RhostsRSAAuthentication no
-# similar for protocol version 2
-#HostbasedAuthentication no
-# Change to yes if you don't trust ~/.ssh/known_hosts for
-# RhostsRSAAuthentication and HostbasedAuthentication
-#IgnoreUserKnownHosts no
-# Don't read the user's ~/.rhosts and ~/.shosts files
-#IgnoreRhosts yes
-
-# To disable tunneled clear text passwords, change to no here!
-#PasswordAuthentication yes
-#PermitEmptyPasswords no
-
-# Change to no to disable s/key passwords
-ChallengeResponseAuthentication no
-
-# Kerberos options
-#KerberosAuthentication no
-#KerberosOrLocalPasswd yes
-#KerberosTicketCleanup yes
-#KerberosGetAFSToken no
-
-# GSSAPI options
-#GSSAPIAuthentication no
-#GSSAPICleanupCredentials yes
-
-# Set this to 'yes' to enable PAM authentication, account processing,
-# and session processing. If this is enabled, PAM authentication will
-# be allowed through the ChallengeResponseAuthentication and
-# PasswordAuthentication.  Depending on your PAM configuration,
-# PAM authentication via ChallengeResponseAuthentication may bypass
-# the setting of "PermitRootLogin without-password".
-# If you just want the PAM account and session checks to run without
-# PAM authentication, then enable this but set PasswordAuthentication
-# and ChallengeResponseAuthentication to 'no'.
-#UsePAM no
-
-#AllowAgentForwarding yes
-#AllowTcpForwarding yes
-#GatewayPorts no
-#X11Forwarding no
-#X11DisplayOffset 10
-#X11UseLocalhost yes
-#PermitTTY yes
-#PrintMotd yes
-#PrintLastLog yes
-#TCPKeepAlive yes
-#UseLogin no
-#PermitUserEnvironment no
-Compression no
-ClientAliveInterval 15
-ClientAliveCountMax 4
-#UseDNS yes
-#PidFile /var/run/sshd.pid
-#MaxStartups 10:30:100
-#PermitTunnel no
-#ChrootDirectory none
-#VersionAddendum none
-
-# no default banner path
-#Banner none
-
-# override default of no subsystems
-Subsystem	sftp	/usr/libexec/sftp-server
-
-# Example of overriding settings on a per-user basis
-#Match User anoncvs
-#	X11Forwarding no
-#	AllowTcpForwarding no
-#	PermitTTY no
-#	ForceCommand cvs server
diff --git a/recipes-connectivity/openssh/openssh/sshdgenkeys.service b/recipes-connectivity/openssh/openssh/sshdgenkeys.service
deleted file mode 100644
index 148e6ad..0000000
--- a/recipes-connectivity/openssh/openssh/sshdgenkeys.service
+++ /dev/null
@@ -1,22 +0,0 @@
-[Unit]
-Description=OpenSSH Key Generation
-RequiresMountsFor=/var /run
-ConditionPathExists=!/var/run/ssh/ssh_host_rsa_key
-ConditionPathExists=!/var/run/ssh/ssh_host_dsa_key
-ConditionPathExists=!/var/run/ssh/ssh_host_ecdsa_key
-ConditionPathExists=!/var/run/ssh/ssh_host_ed25519_key
-ConditionPathExists=!/etc/ssh/ssh_host_rsa_key
-ConditionPathExists=!/etc/ssh/ssh_host_dsa_key
-ConditionPathExists=!/etc/ssh/ssh_host_ecdsa_key
-ConditionPathExists=!/etc/ssh/ssh_host_ed25519_key
-
-[Service]
-Environment="SYSCONFDIR=/etc/ssh"
-EnvironmentFile=-/etc/default/ssh
-ExecStart=@BASE_BINDIR@/mkdir -p $SYSCONFDIR
-ExecStart=@BINDIR@/ssh-keygen -q -f ${SYSCONFDIR}/ssh_host_rsa_key -N '' -t rsa
-ExecStart=@BINDIR@/ssh-keygen -q -f ${SYSCONFDIR}/ssh_host_dsa_key -N '' -t dsa
-ExecStart=@BINDIR@/ssh-keygen -q -f ${SYSCONFDIR}/ssh_host_ecdsa_key -N '' -t ecdsa
-ExecStart=@BINDIR@/ssh-keygen -q -f ${SYSCONFDIR}/ssh_host_ed25519_key -N '' -t ed25519
-Type=oneshot
-RemainAfterExit=yes
diff --git a/recipes-connectivity/openssh/openssh/volatiles.99_sshd b/recipes-connectivity/openssh/openssh/volatiles.99_sshd
deleted file mode 100644
index a0d2af3..0000000
--- a/recipes-connectivity/openssh/openssh/volatiles.99_sshd
+++ /dev/null
@@ -1,2 +0,0 @@
-d root root 0755 /var/run/sshd none
-f root root 0644 /var/log/lastlog none
diff --git a/recipes-connectivity/openssh/openssh_%.bbappend b/recipes-connectivity/openssh/openssh_%.bbappend
deleted file mode 100644
index 53d3da1..0000000
--- a/recipes-connectivity/openssh/openssh_%.bbappend
+++ /dev/null
@@ -1,22 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://ssh.default"
-
-KEYFILES = "ssh_host_dsa_key \
-ssh_host_dsa_key.pub \
-ssh_host_ecdsa_key \
-ssh_host_ecdsa_key.pub \
-ssh_host_rsa_key \
-ssh_host_rsa_key.pub \
-ssh_host_ed25519_key \
-ssh_host_ed25519_key.pub \
-"
-
-do_install_append() {
-  install -d ${D}${sysconfdir}/default
-  install -m 644 ${WORKDIR}/ssh.default ${D}${sysconfdir}/default/ssh
-  for f in ${KEYFILES}; do
-    ln -sf /var/config/ssh/$f ${D}${sysconfdir}/ssh/$f
-  done
-}
-CONFFILES_${PN}-sshd += "${sysconfdir}/init.d/sshd"
diff --git a/recipes-connectivity/openssh/openssh_8.1p1.bb b/recipes-connectivity/openssh/openssh_8.1p1.bb
deleted file mode 100644
index 5bfd8e3..0000000
--- a/recipes-connectivity/openssh/openssh_8.1p1.bb
+++ /dev/null
@@ -1,160 +0,0 @@
-SUMMARY = "A suite of security-related network utilities based on \
-the SSH protocol including the ssh client and sshd server"
-DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH) \
-Ssh (Secure Shell) is a program for logging into a remote machine \
-and for executing commands on a remote machine."
-HOMEPAGE = "http://www.openssh.com/"
-SECTION = "console/network"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=18d9e5a8b3dd1790d73502f50426d4d3"
-
-DEPENDS = "zlib openssl"
-DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-
-SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
-           file://sshd_config \
-           file://ssh_config \
-           file://init \
-           ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
-           file://sshd.socket \
-           file://sshd@.service \
-           file://sshdgenkeys.service \
-           file://volatiles.99_sshd \
-           file://openssh-8.1p1-add-test-support-for-busybox.patch \
-           file://run-ptest \
-           file://openssh-8.1p1-conditional-compile-des-in-cipher.patch \
-           file://openssh-8.1p1-conditional-compile-des-in-pkcs11.patch \
-           file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \
-           "
-
-PAM_SRC_URI = "file://sshd"
-
-SRC_URI[md5sum] = "513694343631a99841e815306806edf0"
-SRC_URI[sha256sum] = "02f5dbef3835d0753556f973cd57b4c19b6b1f6cd24c03445e23ac77ca1b93ff"
-
-inherit useradd update-rc.d update-alternatives systemd
-
-USERADD_PACKAGES = "${PN}-sshd"
-USERADD_PARAM_${PN}-sshd = "--system --no-create-home --home-dir /var/run/sshd --shell /bin/false --user-group sshd"
-INITSCRIPT_PACKAGES = "${PN}-sshd"
-INITSCRIPT_NAME_${PN}-sshd = "sshd"
-INITSCRIPT_PARAMS_${PN}-sshd = "defaults 9"
-
-SYSTEMD_PACKAGES = "${PN}-sshd"
-SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket"
-
-inherit autotools-brokensep ptest
-
-# LFS support:
-CFLAGS += "-D__FILE_OFFSET_BITS=64"
-
-# login path is hardcoded in sshd
-EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \
-                ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \
-                --without-zlib-version-check \
-                --with-privsep-path=/var/run/sshd \
-                --sysconfdir=${sysconfdir}/ssh \
-                --with-xauth=/usr/bin/xauth \
-                --disable-strip \
-                "
-
-# Since we do not depend on libbsd, we do not want configure to use it
-# just because it finds libutil.h.  But, specifying --disable-libutil
-# causes compile errors, so...
-CACHED_CONFIGUREVARS += "ac_cv_header_bsd_libutil_h=no ac_cv_header_libutil_h=no"
-
-# passwd path is hardcoded in sshd
-CACHED_CONFIGUREVARS += "ac_cv_path_PATH_PASSWD_PROG=${bindir}/passwd"
-
-# We don't want to depend on libblockfile
-CACHED_CONFIGUREVARS += "ac_cv_header_maillock_h=no"
-
-do_configure_prepend () {
-	export LD="${CC}"
-	install -m 0644 ${WORKDIR}/sshd_config ${B}/
-	install -m 0644 ${WORKDIR}/ssh_config ${B}/
-	if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then
-		cp aclocal.m4 acinclude.m4
-	fi
-}
-
-do_compile_ptest() {
-        # skip regress/unittests/ binaries: this will silently skip
-        # unittests in run-ptests which is good because they are so slow.
-        oe_runmake regress/modpipe regress/setuid-allowed regress/netcat
-}
-
-do_install_append () {
-	if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then
-		install -D -m 0644 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd
-		sed -i -e 's:#UsePAM no:UsePAM yes:' ${D}${sysconfdir}/ssh/sshd_config
-	fi
-
-	if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "x11" ]; then
-		sed -i -e 's:#X11Forwarding no:X11Forwarding yes:' ${D}${sysconfdir}/ssh/sshd_config
-	fi
-
-	install -d ${D}${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd
-	rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin
-	rmdir ${D}${localstatedir}/run/sshd ${D}${localstatedir}/run ${D}${localstatedir}
-	install -d ${D}/${sysconfdir}/default/volatiles
-	install -m 644 ${WORKDIR}/volatiles.99_sshd ${D}/${sysconfdir}/default/volatiles/99_sshd
-	install -m 0755 ${S}/contrib/ssh-copy-id ${D}${bindir}
-
-	# Create config files for read-only rootfs
-	install -d ${D}${sysconfdir}/ssh
-	install -m 644 ${D}${sysconfdir}/ssh/sshd_config ${D}${sysconfdir}/ssh/sshd_config_readonly
-	sed -i '/HostKey/d' ${D}${sysconfdir}/ssh/sshd_config_readonly
-	echo "HostKey /var/run/ssh/ssh_host_rsa_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly
-	echo "HostKey /var/run/ssh/ssh_host_dsa_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly
-	echo "HostKey /var/run/ssh/ssh_host_ecdsa_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly
-	echo "HostKey /var/run/ssh/ssh_host_ed25519_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly
-
-	install -d ${D}${systemd_unitdir}/system
-	install -c -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system
-	install -c -m 0644 ${WORKDIR}/sshd@.service ${D}${systemd_unitdir}/system
-	install -c -m 0644 ${WORKDIR}/sshdgenkeys.service ${D}${systemd_unitdir}/system
-	sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
-		-e 's,@SBINDIR@,${sbindir},g' \
-		-e 's,@BINDIR@,${bindir},g' \
-		${D}${systemd_unitdir}/system/sshd.socket ${D}${systemd_unitdir}/system/*.service
-}
-
-do_install_ptest () {
-	sed -i -e "s|^SFTPSERVER=.*|SFTPSERVER=${libexecdir}/sftp-server|" regress/test-exec.sh
-	cp -r regress ${D}${PTEST_PATH}
-}
-
-ALLOW_EMPTY_${PN} = "1"
-
-PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server"
-FILES_${PN}-scp = "${bindir}/scp.${BPN}"
-FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config"
-FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd ${systemd_unitdir}/system"
-FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly ${sysconfdir}/default/volatiles/99_sshd ${sysconfdir}/pam.d/sshd"
-FILES_${PN}-sftp = "${bindir}/sftp"
-FILES_${PN}-sftp-server = "${libexecdir}/sftp-server"
-FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"
-FILES_${PN}-keygen = "${bindir}/ssh-keygen"
-
-RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen"
-RDEPENDS_${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}"
-RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make"
-
-RPROVIDES_${PN}-ssh = "ssh"
-RPROVIDES_${PN}-sshd = "sshd"
-
-RCONFLICTS_${PN} = "dropbear"
-RCONFLICTS_${PN}-sshd = "dropbear"
-RCONFLICTS_${PN}-keygen = "ssh-keygen"
-
-CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config"
-CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config"
-
-ALTERNATIVE_PRIORITY = "90"
-ALTERNATIVE_${PN}-scp = "scp"
-ALTERNATIVE_${PN}-ssh = "ssh"
-
-do_rm_work () {
-}
diff --git a/recipes-connectivity/openssl/openssl.inc b/recipes-connectivity/openssl/openssl.inc
deleted file mode 100644
index 7533e8a..0000000
--- a/recipes-connectivity/openssl/openssl.inc
+++ /dev/null
@@ -1,249 +0,0 @@
-SUMMARY = "Secure Socket Layer"
-DESCRIPTION = "Secure Socket Layer (SSL) binary and related cryptographic tools."
-HOMEPAGE = "http://www.openssl.org/"
-BUGTRACKER = "http://www.openssl.org/news/vulnerabilities.html"
-SECTION = "libs/network"
-
-# "openssl | SSLeay" dual license
-LICENSE = "openssl"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
-
-DEPENDS = "makedepend-native hostperl-runtime-native"
-#DEPENDS = "makedepend-native perl-native-runtime"
-DEPENDS_append_class-target = " openssl-native"
-
-SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
-          "
-S = "${WORKDIR}/openssl-${PV}"
-
-PACKAGECONFIG[perl] = ",,,"
-
-AR_append = " r"
-TERMIO_libc-musl = "-DTERMIOS"
-TERMIO ?= "-DTERMIO"
-# Avoid binaries being marked as requiring an executable stack since it 
-# doesn't(which causes and this causes issues with SELinux
-CFLAG = "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \
-	 ${TERMIO} ${CFLAGS} -Wall -Wa,--noexecstack"
-
-export DIRS = "crypto ssl apps"
-export EX_LIBS = "-lgcc -ldl"
-export AS = "${CC} -c"
-EXTRA_OEMAKE = "-e MAKEFLAGS="
-
-inherit pkgconfig siteinfo multilib_header ptest
-
-PACKAGES =+ "libcrypto libssl ${PN}-misc openssl-conf"
-FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}"
-FILES_libssl = "${libdir}/libssl${SOLIBS}"
-FILES_${PN} =+ " ${libdir}/ssl/*"
-FILES_${PN}-misc = "${libdir}/ssl/misc"
-RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}"
-
-# Add the openssl.cnf file to the openssl-conf package.  Make the libcrypto
-# package RRECOMMENDS on this package.  This will enable the configuration
-# file to be installed for both the base openssl package and the libcrypto
-# package since the base openssl package depends on the libcrypto package.
-FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf"
-CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf"
-RRECOMMENDS_libcrypto += "openssl-conf"
-RDEPENDS_${PN}-ptest += "${PN}-misc make perl perl-module-filehandle bc"
-
-# Remove this to enable SSLv3. SSLv3 is defaulted to disabled due to the POODLE
-# vulnerability
-EXTRA_OECONF = " -no-ssl3"
-
-do_configure_prepend_darwin () {
-	sed -i -e '/version-script=openssl\.ld/d' Configure
-}
-
-do_configure () {
-	cd util
-	perl perlpath.pl ${STAGING_BINDIR_NATIVE}
-	cd ..
-	ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/
-
-	os=${HOST_OS}
-	case $os in
-	linux-uclibc |\
-	linux-uclibceabi |\
-	linux-gnueabi |\
-	linux-uclibcspe |\
-	linux-gnuspe |\
-	linux-musl*)
-		os=linux
-		;;
-		*)
-		;;
-	esac
-	target="$os-${HOST_ARCH}"
-	case $target in
-	linux-arm)
-		target=linux-armv4
-		;;
-	linux-armeb)
-		target=linux-elf-armeb
-		;;
-	linux-aarch64*)
-		target=linux-aarch64
-		;;
-	linux-sh3)
-		target=debian-sh3
-		;;
-	linux-sh4)
-		target=debian-sh4
-		;;
-	linux-i486)
-		target=debian-i386-i486
-		;;
-	linux-i586 | linux-viac3)
-		target=debian-i386-i586
-		;;
-	linux-i686)
-		target=debian-i386-i686/cmov
-		;;
-	linux-gnux32-x86_64)
-		target=linux-x32
-		;;
-	linux-gnu64-x86_64)
-		target=linux-x86_64
-		;;
-	linux-gnun32-mips*el)
-		target=debian-mipsn32el
-		;;
-	linux-gnun32-mips*)
-		target=debian-mipsn32
-		;;
-	linux-mips*64*el)
-		target=debian-mips64el
-		;;
-	linux-mips*64*)
-		target=debian-mips64
-		;;
-	linux-mips*el)
-		target=debian-mipsel
-		;;
-	linux-mips*)
-		target=debian-mips
-		;;
-	linux-microblaze*|linux-nios2*)
-		target=linux-generic32
-		;;
-	linux-powerpc)
-		target=linux-ppc
-		;;
-	linux-powerpc64)
-		target=linux-ppc64
-		;;
-	linux-supersparc)
-		target=linux-sparcv8
-		;;
-	linux-sparc)
-		target=linux-sparcv8
-		;;
-	darwin-i386)
-		target=darwin-i386-cc
-		;;
-	esac
-	# inject machine-specific flags
-	sed -i -e "s|^\(\"$target\",\s*\"[^:]\+\):\([^:]\+\)|\1:${CFLAG}|g" Configure
-        useprefix=${prefix}
-        if [ "x$useprefix" = "x" ]; then
-                useprefix=/
-        fi        
-	perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl --libdir=`basename ${libdir}` $target
-}
-
-do_compile_prepend_class-target () {
-    sed -i 's/\((OPENSSL=\)".*"/\1"openssl"/' Makefile
-}
-
-do_compile () {
-	oe_runmake depend
-	oe_runmake
-}
-
-do_compile_ptest () {
-	# build dependencies for test directory too
-	export DIRS="$DIRS test"
-	oe_runmake depend
-	oe_runmake buildtest
-}
-
-do_install () {
-	# Create ${D}/${prefix} to fix parallel issues
-	mkdir -p ${D}/${prefix}/
-
-	oe_runmake INSTALL_PREFIX="${D}" MANDIR="${mandir}" install
-
-	oe_libinstall -so libcrypto ${D}${libdir}
-	oe_libinstall -so libssl ${D}${libdir}
-
-	install -d ${D}${includedir}
-	cp --dereference -R include/openssl ${D}${includedir}
-
-	install -Dm 0755 ${WORKDIR}/openssl-c_rehash.sh ${D}${bindir}/c_rehash
-	sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash
-
-	oe_multilib_header openssl/opensslconf.h
-	if [ "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then
-		sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
-		sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/tsget
-	else
-		rm -f ${D}${libdir}/ssl/misc/CA.pl ${D}${libdir}/ssl/misc/tsget
-	fi
-
-	# Create SSL structure
-	install -d ${D}${sysconfdir}/ssl/
-	mv ${D}${libdir}/ssl/openssl.cnf \
-	   ${D}${libdir}/ssl/certs \
-	   ${D}${libdir}/ssl/private \
-	   \
-	   ${D}${sysconfdir}/ssl/
-	ln -sf ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/certs
-	ln -sf ${sysconfdir}/ssl/private ${D}${libdir}/ssl/private
-	ln -sf ${sysconfdir}/ssl/openssl.cnf ${D}${libdir}/ssl/openssl.cnf
-}
-
-do_install_ptest () {
-	cp -r -L Makefile.org Makefile test ${D}${PTEST_PATH}
-	cp Configure config e_os.h ${D}${PTEST_PATH}
-	cp -r -L include ${D}${PTEST_PATH}
-	ln -sf ${libdir}/libcrypto.a ${D}${PTEST_PATH}
-	ln -sf ${libdir}/libssl.a ${D}${PTEST_PATH}
-	mkdir -p ${D}${PTEST_PATH}/crypto
-	cp crypto/constant_time_locl.h ${D}${PTEST_PATH}/crypto
-	cp -r certs ${D}${PTEST_PATH}
-	mkdir -p ${D}${PTEST_PATH}/apps
-	ln -sf ${libdir}/ssl/misc/CA.sh  ${D}${PTEST_PATH}/apps
-	ln -sf ${sysconfdir}/ssl/openssl.cnf ${D}${PTEST_PATH}/apps
-	ln -sf ${bindir}/openssl         ${D}${PTEST_PATH}/apps
-	cp apps/server.pem              ${D}${PTEST_PATH}/apps
-	cp apps/server2.pem             ${D}${PTEST_PATH}/apps
-	mkdir -p ${D}${PTEST_PATH}/util
-	install util/opensslwrap.sh    ${D}${PTEST_PATH}/util
-	install util/shlib_wrap.sh     ${D}${PTEST_PATH}/util
-	# Time stamps are relevant for "make alltests", otherwise
-	# make may try to recompile binaries. Not only must the
-	# binary files be newer than the sources, they also must
-	# be more recent than the header files in /usr/include.
-	#
-	# Using "cp -a" is not sufficient, because do_install
-	# does not preserve the original time stamps.
-	#
-	# So instead of using the original file stamps, we set
-	# the current time for all files. Binaries will get
-	# modified again later when stripping them, but that's okay.
-	touch ${D}${PTEST_PATH}
-	find ${D}${PTEST_PATH} -type f -print0 | xargs --verbose -0 touch -r ${D}${PTEST_PATH}
-}
-
-do_install_append_class-native() {
-	create_wrapper ${D}${bindir}/openssl \
-	    OPENSSL_CONF=${libdir}/ssl/openssl.cnf \
-	    SSL_CERT_DIR=${libdir}/ssl/certs \
-	    SSL_CERT_FILE=${libdir}/ssl/cert.pem \
-	    OPENSSL_ENGINES=${libdir}/ssl/engines
-}
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-connectivity/openssl/openssl/CVE-2016-7055.patch b/recipes-connectivity/openssl/openssl/CVE-2016-7055.patch
deleted file mode 100644
index 83a74cd..0000000
--- a/recipes-connectivity/openssl/openssl/CVE-2016-7055.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 57c4b9f6a2f800b41ce2836986fe33640f6c3f8a Mon Sep 17 00:00:00 2001
-From: Andy Polyakov <appro@openssl.org>
-Date: Sun, 6 Nov 2016 18:33:17 +0100
-Subject: [PATCH] bn/asm/x86_64-mont.pl: fix for CVE-2016-7055 (Low severity).
-
-Reviewed-by: Rich Salz <rsalz@openssl.org>
-(cherry picked from commit 2fac86d9abeaa643677d1ffd0a139239fdf9406a)
-
-Upstream-Status: Backport [https://github.com/openssl/openssl/commit/57c4b9f6a2f800b41ce2836986fe33640f6c3f8a]
-CVE: CVE-2016-7055
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- crypto/bn/asm/x86_64-mont.pl | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/crypto/bn/asm/x86_64-mont.pl b/crypto/bn/asm/x86_64-mont.pl
-index 044fd7e..80492d8 100755
---- a/crypto/bn/asm/x86_64-mont.pl
-+++ b/crypto/bn/asm/x86_64-mont.pl
-@@ -1148,18 +1148,17 @@ $code.=<<___;
- 	mulx	2*8($aptr),%r15,%r13	# ...
- 	adox	-3*8($tptr),%r11
- 	adcx	%r15,%r12
--	adox	$zero,%r12
-+	adox	-2*8($tptr),%r12
- 	adcx	$zero,%r13
-+	adox	$zero,%r13
- 
- 	mov	$bptr,8(%rsp)		# off-load &b[i]
--	.byte	0x67
- 	mov	$mi,%r15
- 	imulq	24(%rsp),$mi		# "t[0]"*n0
- 	xor	%ebp,%ebp		# xor	$zero,$zero	# cf=0, of=0
- 
- 	mulx	3*8($aptr),%rax,%r14
- 	 mov	$mi,%rdx
--	adox	-2*8($tptr),%r12
- 	adcx	%rax,%r13
- 	adox	-1*8($tptr),%r13
- 	adcx	$zero,%r14
--- 
-2.7.4
-
diff --git a/recipes-connectivity/openssl/openssl/Makefiles-ptest.patch b/recipes-connectivity/openssl/openssl/Makefiles-ptest.patch
deleted file mode 100644
index 249446a..0000000
--- a/recipes-connectivity/openssl/openssl/Makefiles-ptest.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Add 'buildtest' and 'runtest' targets to Makefile, to build and run tests
-cross-compiled.
-
-Signed-off-by: Anders Roxell <anders.roxell@enea.com>
-Signed-off-by: Maxin B. John <maxin.john@enea.com>
-Upstream-Status: Pending
----
-Index: openssl-1.0.2/Makefile.org
-===================================================================
---- openssl-1.0.2.orig/Makefile.org
-+++ openssl-1.0.2/Makefile.org
-@@ -451,8 +451,16 @@ rehash.time: certs apps
- test:   tests
- 
- tests: rehash
-+	$(MAKE) buildtest
-+	$(MAKE) runtest
-+
-+buildtest:
-+	@(cd test && \
-+	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf exe apps);
-+
-+runtest:
- 	@(cd test && echo "testing..." && \
--	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf tests );
-+	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf alltests );
- 	OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a
- 
- report:
-Index: openssl-1.0.2/test/Makefile
-===================================================================
---- openssl-1.0.2.orig/test/Makefile
-+++ openssl-1.0.2/test/Makefile
-@@ -137,7 +137,7 @@ tests:	exe apps $(TESTS)
- apps:
- 	@(cd ..; $(MAKE) DIRS=apps all)
- 
--alltests: \
-+all-tests= \
- 	test_des test_idea test_sha test_md4 test_md5 test_hmac \
- 	test_md2 test_mdc2 test_wp \
- 	test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast test_aes \
-@@ -148,6 +148,11 @@ alltests: \
- 	test_jpake test_srp test_cms test_ocsp test_v3name test_heartbeat \
- 	test_constant_time
- 
-+alltests:
-+	@(for i in $(all-tests); do \
-+	( $(MAKE) $$i && echo "PASS: $$i" ) || echo "FAIL: $$i"; \
-+	done)
-+
- test_evp: $(EVPTEST)$(EXE_EXT) evptests.txt
- 	../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt
- 
-@@ -213,7 +218,7 @@ test_x509: ../apps/openssl$(EXE_EXT) tx5
- 	echo test second x509v3 certificate
- 	sh ./tx509 v3-cert2.pem 2>/dev/null
- 
--test_rsa: $(RSATEST)$(EXE_EXT) ../apps/openssl$(EXE_EXT) trsa testrsa.pem
-+test_rsa: ../apps/openssl$(EXE_EXT) trsa testrsa.pem
- 	@sh ./trsa 2>/dev/null
- 	../util/shlib_wrap.sh ./$(RSATEST)
- 
-@@ -313,11 +318,11 @@ test_tsa: ../apps/openssl$(EXE_EXT) test
- 	  sh ./testtsa; \
- 	fi
- 
--test_ige: $(IGETEST)$(EXE_EXT)
-+test_ige:
- 	@echo "Test IGE mode"
- 	../util/shlib_wrap.sh ./$(IGETEST)
- 
--test_jpake: $(JPAKETEST)$(EXE_EXT)
-+test_jpake:
- 	@echo "Test JPAKE"
- 	../util/shlib_wrap.sh ./$(JPAKETEST)
- 
diff --git a/recipes-connectivity/openssl/openssl/Use-SHA256-not-MD5-as-default-digest.patch b/recipes-connectivity/openssl/openssl/Use-SHA256-not-MD5-as-default-digest.patch
deleted file mode 100644
index 58c9ee7..0000000
--- a/recipes-connectivity/openssl/openssl/Use-SHA256-not-MD5-as-default-digest.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From d795f5f20a29adecf92c09459a3ee07ffac01a99 Mon Sep 17 00:00:00 2001
-From: Rich Salz <rsalz@akamai.com>
-Date: Sat, 13 Jun 2015 17:03:39 -0400
-Subject: [PATCH] Use SHA256 not MD5 as default digest.
-
-Commit f8547f62c212837dbf44fb7e2755e5774a59a57b upstream.
-
-Upstream-Status: Backport
-Backport from OpenSSL 2.0 to OpenSSL 1.0.2
-Commit f8547f62c212837dbf44fb7e2755e5774a59a57b   
-
-CVE: CVE-2004-2761
-
-    The MD5 Message-Digest Algorithm is not collision resistant,
-    which makes it easier for context-dependent attackers to            
-    conduct spoofing attacks, as demonstrated by attacks on the     
-    use of MD5 in the signature algorithm of an X.509 certificate.     
-
-Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
-Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com>     
-Signed-off-by: T.O. Radzy Radzykewycz <radzy@windriver.com> 
----
- apps/ca.c   | 2 +-
- apps/dgst.c | 2 +-
- apps/enc.c  | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/apps/ca.c b/apps/ca.c
-index 3b7336c..8f3a84b 100644
---- a/apps/ca.c
-+++ b/apps/ca.c
-@@ -1612,7 +1612,7 @@ static int certify_cert(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
-     } else
-         BIO_printf(bio_err, "Signature ok\n");
- 
--    if ((rreq = X509_to_X509_REQ(req, NULL, EVP_md5())) == NULL)
-+    if ((rreq = X509_to_X509_REQ(req, NULL, NULL)) == NULL)
-         goto err;
- 
-     ok = do_body(xret, pkey, x509, dgst, sigopts, policy, db, serial, subj,
-diff --git a/apps/dgst.c b/apps/dgst.c
-index 95e5fa3..0d1529f 100644
---- a/apps/dgst.c
-+++ b/apps/dgst.c
-@@ -442,7 +442,7 @@ int MAIN(int argc, char **argv)
-             goto end;
-         }
-         if (md == NULL)
--            md = EVP_md5();
-+            md = EVP_sha256();
-         if (!EVP_DigestInit_ex(mctx, md, impl)) {
-             BIO_printf(bio_err, "Error setting digest %s\n", pname);
-             ERR_print_errors(bio_err);
-diff --git a/apps/enc.c b/apps/enc.c
-index 7b7c70b..a7d944c 100644
---- a/apps/enc.c
-+++ b/apps/enc.c
-@@ -344,7 +344,7 @@ int MAIN(int argc, char **argv)
-     }
- 
-     if (dgst == NULL) {
--        dgst = EVP_md5();
-+        dgst = EVP_sha256();
-     }
- 
-     if (bufsize != NULL) {
--- 
-1.9.1
-
diff --git a/recipes-connectivity/openssl/openssl/configure-musl-target.patch b/recipes-connectivity/openssl/openssl/configure-musl-target.patch
deleted file mode 100644
index 613dc7b..0000000
--- a/recipes-connectivity/openssl/openssl/configure-musl-target.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Add musl triplet support
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Index: openssl-1.0.2a/Configure
-===================================================================
---- openssl-1.0.2a.orig/Configure
-+++ openssl-1.0.2a/Configure
-@@ -431,7 +431,7 @@ my %table=(
- #
- #       ./Configure linux-armv4 -march=armv6 -D__ARM_MAX_ARCH__=8
- #
--"linux-armv4",	"gcc: -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-armv4", "gcc: -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-aarch64","gcc: -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- # Configure script adds minimally required -march for assembly support,
- # if no -march was specified at command line. mips32 and mips64 below
-@@ -504,6 +504,8 @@ my %table=(
- "linux-gnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-uclibceabi-arm","$ENV{'CC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-uclibceabi-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-musleabi-arm","$ENV{'CC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-musleabi-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- 
- "linux-avr32","$ENV{'CC'}:-O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).",
- 
diff --git a/recipes-connectivity/openssl/openssl/configure-targets.patch b/recipes-connectivity/openssl/openssl/configure-targets.patch
deleted file mode 100644
index 691e74a..0000000
--- a/recipes-connectivity/openssl/openssl/configure-targets.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-The number of colons are important :)
-
-
----
- Configure |   16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-Index: openssl-1.0.2a/Configure
-===================================================================
---- openssl-1.0.2a.orig/Configure
-+++ openssl-1.0.2a/Configure
-@@ -443,6 +443,23 @@ my %table=(
- "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
- "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
- 
-+ 
-+# Linux on ARM
-+"linux-elf-arm","$ENV{'CC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-elf-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-gnueabi-arm","$ENV{'CC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-gnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-uclibceabi-arm","$ENV{'CC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-uclibceabi-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+
-+"linux-avr32","$ENV{'CC'}:-O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).",
-+
-+#### Linux on MIPS/MIPS64
-+"linux-mips","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-mips64","$ENV{'CC'}:-DB_ENDIAN -mabi=64 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-mips64el","$ENV{'CC'}:-DL_ENDIAN -mabi=64 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-mipsel","$ENV{'CC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+
- # Android: linux-* but without pointers to headers and libs.
- "android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "android-x86","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:".eval{my $asm=${x86_elf_asm};$asm=~s/:elf/:android/;$asm}.":dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch b/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch
deleted file mode 100644
index 68e54d5..0000000
--- a/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 83f318d68bbdab1ca898c94576a838cc97df4700 Mon Sep 17 00:00:00 2001
-From: Ludwig Nussel <ludwig.nussel@suse.de>
-Date: Wed, 21 Apr 2010 15:52:10 +0200
-Subject: [PATCH] also create old hash for compatibility
-
-Upstream-Status: Backport [debian]
-
-diff --git a/tools/c_rehash.in b/tools/c_rehash.in
-index b086ff9..b777d79 100644
---- a/tools/c_rehash.in
-+++ b/tools/c_rehash.in
-@@ -8,8 +8,6 @@ my $prefix;
- 
- my $openssl = $ENV{OPENSSL} || "openssl";
- my $pwd;
--my $x509hash = "-subject_hash";
--my $crlhash = "-hash";
- my $verbose = 0;
- my $symlink_exists=eval {symlink("",""); 1};
- my $removelinks = 1;
-@@ -18,10 +16,7 @@ my $removelinks = 1;
- while ( $ARGV[0] =~ /^-/ ) {
-     my $flag = shift @ARGV;
-     last if ( $flag eq '--');
--    if ( $flag eq '-old') {
--	    $x509hash = "-subject_hash_old";
--	    $crlhash = "-hash_old";
--    } elsif ( $flag eq '-h') {
-+    if ( $flag eq '-h') {
- 	    help();
-     } elsif ( $flag eq '-n' ) {
- 	    $removelinks = 0;
-@@ -113,7 +108,9 @@ sub hash_dir {
- 			next;
- 		}
- 		link_hash_cert($fname) if($cert);
-+		link_hash_cert_old($fname) if($cert);
- 		link_hash_crl($fname) if($crl);
-+		link_hash_crl_old($fname) if($crl);
- 	}
- }
- 
-@@ -146,6 +143,7 @@ sub check_file {
- 
- sub link_hash_cert {
- 		my $fname = $_[0];
-+		my $x509hash = $_[1] || '-subject_hash';
- 		$fname =~ s/'/'\\''/g;
- 		my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`;
- 		chomp $hash;
-@@ -176,11 +174,21 @@ sub link_hash_cert {
- 		$hashlist{$hash} = $fprint;
- }
- 
-+sub link_hash_cert_old {
-+		link_hash_cert($_[0], '-subject_hash_old');
-+}
-+
-+sub link_hash_crl_old {
-+		link_hash_crl($_[0], '-hash_old');
-+}
-+
-+
- # Same as above except for a CRL. CRL links are of the form <hash>.r<n>
- 
- sub link_hash_crl {
- 		my $fname = $_[0];
-+		my $crlhash = $_[1] || "-hash";
- 		$fname =~ s/'/'\\''/g;
- 		my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fname'`;
- 		chomp $hash;
diff --git a/recipes-connectivity/openssl/openssl/debian/ca.patch b/recipes-connectivity/openssl/openssl/debian/ca.patch
deleted file mode 100644
index fb745e4..0000000
--- a/recipes-connectivity/openssl/openssl/debian/ca.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8m/apps/CA.pl.in
-===================================================================
---- openssl-0.9.8m.orig/apps/CA.pl.in	2006-04-28 00:28:51.000000000 +0000
-+++ openssl-0.9.8m/apps/CA.pl.in	2010-02-27 00:36:51.000000000 +0000
-@@ -65,6 +65,7 @@
- foreach (@ARGV) {
- 	if ( /^(-\?|-h|-help)$/ ) {
- 	    print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-signcert|-verify\n";
-+	    print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
- 	    exit 0;
- 	} elsif (/^-newcert$/) {
- 	    # create a certificate
-@@ -165,6 +166,7 @@
- 	} else {
- 	    print STDERR "Unknown arg $_\n";
- 	    print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
-+	    print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
- 	    exit 1;
- 	}
- }
diff --git a/recipes-connectivity/openssl/openssl/debian/debian-targets.patch b/recipes-connectivity/openssl/openssl/debian/debian-targets.patch
deleted file mode 100644
index 39d4328..0000000
--- a/recipes-connectivity/openssl/openssl/debian/debian-targets.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-1.0.2/Configure
-===================================================================
---- openssl-1.0.2.orig/Configure
-+++ openssl-1.0.2/Configure
-@@ -107,6 +107,10 @@ my $gcc_devteam_warn = "-Wall -pedantic
- 
- my $clang_disabled_warnings = "-Wno-language-extension-token -Wno-extended-offsetof -Wno-padded -Wno-shorten-64-to-32 -Wno-format-nonliteral -Wno-missing-noreturn -Wno-unused-parameter -Wno-sign-conversion -Wno-unreachable-code -Wno-conversion -Wno-documentation -Wno-missing-variable-declarations -Wno-cast-align -Wno-incompatible-pointer-types-discards-qualifiers -Wno-missing-variable-declarations -Wno-missing-field-initializers -Wno-unused-macros -Wno-disabled-macro-expansion -Wno-conditional-uninitialized -Wno-switch-enum";
- 
-+# There are no separate CFLAGS/CPPFLAGS/LDFLAGS, set everything in CFLAGS
-+my $debian_cflags = `dpkg-buildflags --get CFLAGS` . `dpkg-buildflags --get CPPFLAGS` . `dpkg-buildflags --get LDFLAGS` . "-Wa,--noexecstack -Wall";
-+$debian_cflags =~ s/\n/ /g;
-+
- my $strict_warnings = 0;
- 
- my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL";
-@@ -343,6 +347,55 @@ my %table=(
- "osf1-alpha-cc",  "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
- "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so",
- 
-+# Debian GNU/* (various architectures)
-+"debian-alpha","gcc:-DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-alpha-ev4","gcc:-DTERMIO ${debian_cflags} -mcpu=ev4::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-alpha-ev5","gcc:-DTERMIO ${debian_cflags} -mcpu=ev5::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-arm64","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-armel","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-armhf","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::",
-+"debian-avr32", "gcc:-DB_ENDIAN -DTERMIO ${debian_cflags} -fomit-frame-pointer::-D_REENTRANT::-ldl:BN_LLONG_BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS ${debian_cflags} -march=i486::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-hppa","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mtune=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-ia64","gcc:-DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386-i486","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags} -march=i486::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386-i586","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags} -march=i586::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386-i686/cmov","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags} -march=i686::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-m68k","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mips",   "gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mipsel",   "gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mipsn32",   "mips64-linux-gnuabin32-gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mipsn32el",   "mips64el-linux-gnuabin32-gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mips64",   "mips64-linux-gnuabi64-gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mips64el",   "mips64el-linux-gnuabi64-gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-i386",	"gcc:-DL_ENDIAN -DTERMIOS ${debian_cflags} -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-m68k",	"gcc:-DB_ENDIAN -DTERMIOS ${debian_cflags}::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-sparc",	"gcc:-DB_ENDIAN -DTERMIOS ${debian_cflags} -mv8::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-alpha","gcc:-DTERMIOS ${debian_cflags}::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-i386",  "gcc:-DL_ENDIAN -DTERMIOS ${debian_cflags} -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-mips","gcc:-DL_ENDIAN ${debian_cflags}::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-or1k", "gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-powerpc","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-powerpcspe","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-ppc64","gcc:-m64 -DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-ppc64el","gcc:-m64 -DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64le:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-s390","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
-+"debian-s390x","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh3",   "gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh4",   "gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh3eb",   "gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh4eb",   "gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-m32r","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc-v8","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags} -mcpu=v8 -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc-v9","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags} -mcpu=v9 -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc64","gcc:-m64 -DB_ENDIAN -DTERMIO ${debian_cflags} -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-x32","gcc:-mx32 -DL_ENDIAN -DTERMIO ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::x32",
-+
- ####
- #### Variety of LINUX:-)
- ####
diff --git a/recipes-connectivity/openssl/openssl/debian/man-dir.patch b/recipes-connectivity/openssl/openssl/debian/man-dir.patch
deleted file mode 100644
index 4085e3b..0000000
--- a/recipes-connectivity/openssl/openssl/debian/man-dir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-1.0.0c/Makefile.org
-===================================================================
---- openssl-1.0.0c.orig/Makefile.org	2010-12-12 16:11:27.000000000 +0100
-+++ openssl-1.0.0c/Makefile.org	2010-12-12 16:11:37.000000000 +0100
-@@ -131,7 +131,7 @@
- 
- MAKEFILE= Makefile
- 
--MANDIR=$(OPENSSLDIR)/man
-+MANDIR=/usr/share/man
- MAN1=1
- MAN3=3
- MANSUFFIX=
diff --git a/recipes-connectivity/openssl/openssl/debian/man-section.patch b/recipes-connectivity/openssl/openssl/debian/man-section.patch
deleted file mode 100644
index 21c1d1a..0000000
--- a/recipes-connectivity/openssl/openssl/debian/man-section.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-1.0.0c/Makefile.org
-===================================================================
---- openssl-1.0.0c.orig/Makefile.org	2010-12-12 16:11:37.000000000 +0100
-+++ openssl-1.0.0c/Makefile.org	2010-12-12 16:13:28.000000000 +0100
-@@ -160,7 +160,8 @@
- MANDIR=/usr/share/man
- MAN1=1
- MAN3=3
--MANSUFFIX=
-+MANSUFFIX=ssl
-+MANSECTION=SSL
- HTMLSUFFIX=html
- HTMLDIR=$(OPENSSLDIR)/html
- SHELL=/bin/sh
-@@ -651,7 +652,7 @@
- 		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
- 		(cd `$(PERL) util/dirname.pl $$i`; \
- 		sh -c "$$pod2man \
--			--section=$$sec --center=OpenSSL \
-+			--section=$${sec}$(MANSECTION) --center=OpenSSL \
- 			--release=$(VERSION) `basename $$i`") \
- 			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
- 		$(PERL) util/extract-names.pl < $$i | \
-@@ -668,7 +669,7 @@
- 		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
- 		(cd `$(PERL) util/dirname.pl $$i`; \
- 		sh -c "$$pod2man \
--			--section=$$sec --center=OpenSSL \
-+			--section=$${sec}$(MANSECTION) --center=OpenSSL \
- 			--release=$(VERSION) `basename $$i`") \
- 			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
- 		$(PERL) util/extract-names.pl < $$i | \
diff --git a/recipes-connectivity/openssl/openssl/debian/no-rpath.patch b/recipes-connectivity/openssl/openssl/debian/no-rpath.patch
deleted file mode 100644
index 1ccb3b8..0000000
--- a/recipes-connectivity/openssl/openssl/debian/no-rpath.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-1.0.0c/Makefile.shared
-===================================================================
---- openssl-1.0.0c.orig/Makefile.shared	2010-08-21 13:36:49.000000000 +0200
-+++ openssl-1.0.0c/Makefile.shared	2010-12-12 16:13:36.000000000 +0100
-@@ -153,7 +153,7 @@
- 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
- 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
- 
--DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
-+DO_GNU_APP=LDFLAGS="$(CFLAGS)"
- 
- #This is rather special.  It's a special target with which one can link
- #applications without bothering with any features that have anything to
diff --git a/recipes-connectivity/openssl/openssl/debian/no-symbolic.patch b/recipes-connectivity/openssl/openssl/debian/no-symbolic.patch
deleted file mode 100644
index cc4408a..0000000
--- a/recipes-connectivity/openssl/openssl/debian/no-symbolic.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-1.0.0c/Makefile.shared
-===================================================================
---- openssl-1.0.0c.orig/Makefile.shared	2010-12-12 16:13:36.000000000 +0100
-+++ openssl-1.0.0c/Makefile.shared	2010-12-12 16:13:44.000000000 +0100
-@@ -151,7 +151,7 @@
- 	SHLIB_SUFFIX=; \
- 	ALLSYMSFLAGS='-Wl,--whole-archive'; \
- 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
--	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
-+	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
- 
- DO_GNU_APP=LDFLAGS="$(CFLAGS)"
- 
diff --git a/recipes-connectivity/openssl/openssl/debian/pic.patch b/recipes-connectivity/openssl/openssl/debian/pic.patch
deleted file mode 100644
index bfda388..0000000
--- a/recipes-connectivity/openssl/openssl/debian/pic.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-1.0.1c/crypto/des/asm/desboth.pl
-===================================================================
---- openssl-1.0.1c.orig/crypto/des/asm/desboth.pl	2001-10-24 23:20:56.000000000 +0200
-+++ openssl-1.0.1c/crypto/des/asm/desboth.pl	2012-07-29 14:15:26.000000000 +0200
-@@ -16,6 +16,11 @@
- 
- 	&push("edi");
- 
-+	&call   (&label("pic_point0"));
-+	&set_label("pic_point0");
-+	&blindpop("ebp");
-+	&add    ("ebp", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
-+
- 	&comment("");
- 	&comment("Load the data words");
- 	&mov($L,&DWP(0,"ebx","",0));
-@@ -47,15 +52,21 @@
- 	&mov(&swtmp(2),	(DWC(($enc)?"1":"0")));
- 	&mov(&swtmp(1),	"eax");
- 	&mov(&swtmp(0),	"ebx");
--	&call("DES_encrypt2");
-+	&exch("ebx", "ebp");
-+	&call("DES_encrypt2\@PLT");
-+	&exch("ebx", "ebp");
- 	&mov(&swtmp(2),	(DWC(($enc)?"0":"1")));
- 	&mov(&swtmp(1),	"edi");
- 	&mov(&swtmp(0),	"ebx");
--	&call("DES_encrypt2");
-+	&exch("ebx", "ebp");
-+	&call("DES_encrypt2\@PLT");
-+	&exch("ebx", "ebp");
- 	&mov(&swtmp(2),	(DWC(($enc)?"1":"0")));
- 	&mov(&swtmp(1),	"esi");
- 	&mov(&swtmp(0),	"ebx");
--	&call("DES_encrypt2");
-+	&exch("ebx", "ebp");
-+	&call("DES_encrypt2\@PLT");
-+	&exch("ebx", "ebp");
- 
- 	&stack_pop(3);
- 	&mov($L,&DWP(0,"ebx","",0));
-Index: openssl-1.0.1c/crypto/perlasm/cbc.pl
-===================================================================
---- openssl-1.0.1c.orig/crypto/perlasm/cbc.pl	2011-07-13 08:22:46.000000000 +0200
-+++ openssl-1.0.1c/crypto/perlasm/cbc.pl	2012-07-29 14:15:26.000000000 +0200
-@@ -122,7 +122,11 @@
- 	&mov(&DWP($data_off,"esp","",0),	"eax");	# put in array for call
- 	&mov(&DWP($data_off+4,"esp","",0),	"ebx");	#
- 
--	&call($enc_func);
-+	&call	(&label("pic_point0"));
-+	&set_label("pic_point0");
-+	&blindpop("ebx");
-+	&add	("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
-+	&call("$enc_func\@PLT");
- 
- 	&mov("eax",	&DWP($data_off,"esp","",0));
- 	&mov("ebx",	&DWP($data_off+4,"esp","",0));
-@@ -185,7 +189,11 @@
- 	&mov(&DWP($data_off,"esp","",0),	"eax");	# put in array for call
- 	&mov(&DWP($data_off+4,"esp","",0),	"ebx");	#
- 
--	&call($enc_func);
-+	&call	(&label("pic_point1"));
-+	&set_label("pic_point1");
-+	&blindpop("ebx");
-+	&add	("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point1") . "]");
-+	&call("$enc_func\@PLT");
- 
- 	&mov("eax",	&DWP($data_off,"esp","",0));
- 	&mov("ebx",	&DWP($data_off+4,"esp","",0));
-@@ -218,7 +226,11 @@
- 	&mov(&DWP($data_off,"esp","",0),	"eax");	# put back
- 	&mov(&DWP($data_off+4,"esp","",0),	"ebx");	#
- 
--	&call($dec_func);
-+	&call	(&label("pic_point2"));
-+	&set_label("pic_point2");
-+	&blindpop("ebx");
-+	&add	("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point2") . "]");
-+	&call("$dec_func\@PLT");
- 
- 	&mov("eax",	&DWP($data_off,"esp","",0));	# get return
- 	&mov("ebx",	&DWP($data_off+4,"esp","",0));	#
-@@ -261,7 +273,11 @@
- 	&mov(&DWP($data_off,"esp","",0),	"eax");	# put back
- 	&mov(&DWP($data_off+4,"esp","",0),	"ebx");	#
- 
--	&call($dec_func);
-+	&call	(&label("pic_point3"));
-+	&set_label("pic_point3");
-+	&blindpop("ebx");
-+	&add	("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point3") . "]");
-+	&call("$dec_func\@PLT");
- 
- 	&mov("eax",	&DWP($data_off,"esp","",0));	# get return
- 	&mov("ebx",	&DWP($data_off+4,"esp","",0));	#
-Index: openssl-1.0.1c/crypto/perlasm/x86gas.pl
-===================================================================
---- openssl-1.0.1c.orig/crypto/perlasm/x86gas.pl	2011-12-09 20:16:35.000000000 +0100
-+++ openssl-1.0.1c/crypto/perlasm/x86gas.pl	2012-07-29 14:15:26.000000000 +0200
-@@ -161,6 +161,7 @@
- 	if ($::macosx)	{ push (@out,"$tmp,2\n"); }
- 	elsif ($::elf)	{ push (@out,"$tmp,4\n"); }
- 	else		{ push (@out,"$tmp\n"); }
-+	if ($::elf)	{ push (@out,".hidden\tOPENSSL_ia32cap_P\n"); }
-     }
-     push(@out,$initseg) if ($initseg);
- }
-@@ -218,8 +219,23 @@
-     elsif ($::elf)
-     {	$initseg.=<<___;
- .section	.init
-+___
-+        if ($::pic)
-+	{   $initseg.=<<___;
-+	pushl	%ebx
-+	call	.pic_point0
-+.pic_point0:
-+	popl	%ebx
-+	addl	\$_GLOBAL_OFFSET_TABLE_+[.-.pic_point0],%ebx
-+	call	$f\@PLT
-+	popl	%ebx
-+___
-+	}
-+	else
-+	{   $initseg.=<<___;
- 	call	$f
- ___
-+	}
-     }
-     elsif ($::coff)
-     {   $initseg.=<<___;	# applies to both Cygwin and Mingw
-Index: openssl-1.0.1c/crypto/x86cpuid.pl
-===================================================================
---- openssl-1.0.1c.orig/crypto/x86cpuid.pl	2012-02-28 15:20:34.000000000 +0100
-+++ openssl-1.0.1c/crypto/x86cpuid.pl	2012-07-29 14:15:26.000000000 +0200
-@@ -8,6 +8,8 @@
- 
- for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
- 
-+push(@out, ".hidden OPENSSL_ia32cap_P\n");
-+
- &function_begin("OPENSSL_ia32_cpuid");
- 	&xor	("edx","edx");
- 	&pushf	();
-@@ -139,9 +141,7 @@
- &set_label("nocpuid");
- &function_end("OPENSSL_ia32_cpuid");
- 
--&external_label("OPENSSL_ia32cap_P");
--
--&function_begin_B("OPENSSL_rdtsc","EXTRN\t_OPENSSL_ia32cap_P:DWORD");
-+&function_begin_B("OPENSSL_rdtsc");
- 	&xor	("eax","eax");
- 	&xor	("edx","edx");
- 	&picmeup("ecx","OPENSSL_ia32cap_P");
-@@ -155,7 +155,7 @@
- # This works in Ring 0 only [read DJGPP+MS-DOS+privileged DPMI host],
- # but it's safe to call it on any [supported] 32-bit platform...
- # Just check for [non-]zero return value...
--&function_begin_B("OPENSSL_instrument_halt","EXTRN\t_OPENSSL_ia32cap_P:DWORD");
-+&function_begin_B("OPENSSL_instrument_halt");
- 	&picmeup("ecx","OPENSSL_ia32cap_P");
- 	&bt	(&DWP(0,"ecx"),4);
- 	&jnc	(&label("nohalt"));	# no TSC
-@@ -222,7 +222,7 @@
- 	&ret	();
- &function_end_B("OPENSSL_far_spin");
- 
--&function_begin_B("OPENSSL_wipe_cpu","EXTRN\t_OPENSSL_ia32cap_P:DWORD");
-+&function_begin_B("OPENSSL_wipe_cpu");
- 	&xor	("eax","eax");
- 	&xor	("edx","edx");
- 	&picmeup("ecx","OPENSSL_ia32cap_P");
diff --git a/recipes-connectivity/openssl/openssl/debian/version-script.patch b/recipes-connectivity/openssl/openssl/debian/version-script.patch
deleted file mode 100644
index a249180..0000000
--- a/recipes-connectivity/openssl/openssl/debian/version-script.patch
+++ /dev/null
@@ -1,4663 +0,0 @@
-Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/Configure
-===================================================================
---- openssl-1.0.2~beta1.obsolete.0.0498436515490575.orig/Configure	2014-02-24 21:02:30.000000000 +0100
-+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/Configure	2014-02-24 21:02:30.000000000 +0100
-@@ -1651,6 +1651,8 @@
- 		}
- 	}
- 
-+$shared_ldflag .= " -Wl,--version-script=openssl.ld";
-+
- open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";
- unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new";
- open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n";
-Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld	2014-02-24 22:19:08.601827266 +0100
-@@ -0,0 +1,4615 @@
-+OPENSSL_1.0.0 {
-+	global:
-+		BIO_f_ssl;
-+		BIO_new_buffer_ssl_connect;
-+		BIO_new_ssl;
-+		BIO_new_ssl_connect;
-+		BIO_proxy_ssl_copy_session_id;
-+		BIO_ssl_copy_session_id;
-+		BIO_ssl_shutdown;
-+		d2i_SSL_SESSION;
-+		DTLSv1_client_method;
-+		DTLSv1_method;
-+		DTLSv1_server_method;
-+		ERR_load_SSL_strings;
-+		i2d_SSL_SESSION;
-+		kssl_build_principal_2;
-+		kssl_cget_tkt;
-+		kssl_check_authent;
-+		kssl_ctx_free;
-+		kssl_ctx_new;
-+		kssl_ctx_setkey;
-+		kssl_ctx_setprinc;
-+		kssl_ctx_setstring;
-+		kssl_ctx_show;
-+		kssl_err_set;
-+		kssl_krb5_free_data_contents;
-+		kssl_sget_tkt;
-+		kssl_skip_confound;
-+		kssl_validate_times;
-+		PEM_read_bio_SSL_SESSION;
-+		PEM_read_SSL_SESSION;
-+		PEM_write_bio_SSL_SESSION;
-+		PEM_write_SSL_SESSION;
-+		SSL_accept;
-+		SSL_add_client_CA;
-+		SSL_add_dir_cert_subjects_to_stack;
-+		SSL_add_dir_cert_subjs_to_stk;
-+		SSL_add_file_cert_subjects_to_stack;
-+		SSL_add_file_cert_subjs_to_stk;
-+		SSL_alert_desc_string;
-+		SSL_alert_desc_string_long;
-+		SSL_alert_type_string;
-+		SSL_alert_type_string_long;
-+		SSL_callback_ctrl;
-+		SSL_check_private_key;
-+		SSL_CIPHER_description;
-+		SSL_CIPHER_get_bits;
-+		SSL_CIPHER_get_name;
-+		SSL_CIPHER_get_version;
-+		SSL_clear;
-+		SSL_COMP_add_compression_method;
-+		SSL_COMP_get_compression_methods;
-+		SSL_COMP_get_compress_methods;
-+		SSL_COMP_get_name;
-+		SSL_connect;
-+		SSL_copy_session_id;
-+		SSL_ctrl;
-+		SSL_CTX_add_client_CA;
-+		SSL_CTX_add_session;
-+		SSL_CTX_callback_ctrl;
-+		SSL_CTX_check_private_key;
-+		SSL_CTX_ctrl;
-+		SSL_CTX_flush_sessions;
-+		SSL_CTX_free;
-+		SSL_CTX_get_cert_store;
-+		SSL_CTX_get_client_CA_list;
-+		SSL_CTX_get_client_cert_cb;
-+		SSL_CTX_get_ex_data;
-+		SSL_CTX_get_ex_new_index;
-+		SSL_CTX_get_info_callback;
-+		SSL_CTX_get_quiet_shutdown;
-+		SSL_CTX_get_timeout;
-+		SSL_CTX_get_verify_callback;
-+		SSL_CTX_get_verify_depth;
-+		SSL_CTX_get_verify_mode;
-+		SSL_CTX_load_verify_locations;
-+		SSL_CTX_new;
-+		SSL_CTX_remove_session;
-+		SSL_CTX_sess_get_get_cb;
-+		SSL_CTX_sess_get_new_cb;
-+		SSL_CTX_sess_get_remove_cb;
-+		SSL_CTX_sessions;
-+		SSL_CTX_sess_set_get_cb;
-+		SSL_CTX_sess_set_new_cb;
-+		SSL_CTX_sess_set_remove_cb;
-+		SSL_CTX_set1_param;
-+		SSL_CTX_set_cert_store;
-+		SSL_CTX_set_cert_verify_callback;
-+		SSL_CTX_set_cert_verify_cb;
-+		SSL_CTX_set_cipher_list;
-+		SSL_CTX_set_client_CA_list;
-+		SSL_CTX_set_client_cert_cb;
-+		SSL_CTX_set_client_cert_engine;
-+		SSL_CTX_set_cookie_generate_cb;
-+		SSL_CTX_set_cookie_verify_cb;
-+		SSL_CTX_set_default_passwd_cb;
-+		SSL_CTX_set_default_passwd_cb_userdata;
-+		SSL_CTX_set_default_verify_paths;
-+		SSL_CTX_set_def_passwd_cb_ud;
-+		SSL_CTX_set_def_verify_paths;
-+		SSL_CTX_set_ex_data;
-+		SSL_CTX_set_generate_session_id;
-+		SSL_CTX_set_info_callback;
-+		SSL_CTX_set_msg_callback;
-+		SSL_CTX_set_psk_client_callback;
-+		SSL_CTX_set_psk_server_callback;
-+		SSL_CTX_set_purpose;
-+		SSL_CTX_set_quiet_shutdown;
-+		SSL_CTX_set_session_id_context;
-+		SSL_CTX_set_ssl_version;
-+		SSL_CTX_set_timeout;
-+		SSL_CTX_set_tmp_dh_callback;
-+		SSL_CTX_set_tmp_ecdh_callback;
-+		SSL_CTX_set_tmp_rsa_callback;
-+		SSL_CTX_set_trust;
-+		SSL_CTX_set_verify;
-+		SSL_CTX_set_verify_depth;
-+		SSL_CTX_use_cert_chain_file;
-+		SSL_CTX_use_certificate;
-+		SSL_CTX_use_certificate_ASN1;
-+		SSL_CTX_use_certificate_chain_file;
-+		SSL_CTX_use_certificate_file;
-+		SSL_CTX_use_PrivateKey;
-+		SSL_CTX_use_PrivateKey_ASN1;
-+		SSL_CTX_use_PrivateKey_file;
-+		SSL_CTX_use_psk_identity_hint;
-+		SSL_CTX_use_RSAPrivateKey;
-+		SSL_CTX_use_RSAPrivateKey_ASN1;
-+		SSL_CTX_use_RSAPrivateKey_file;
-+		SSL_do_handshake;
-+		SSL_dup;
-+		SSL_dup_CA_list;
-+		SSLeay_add_ssl_algorithms;
-+		SSL_free;
-+		SSL_get1_session;
-+		SSL_get_certificate;
-+		SSL_get_cipher_list;
-+		SSL_get_ciphers;
-+		SSL_get_client_CA_list;
-+		SSL_get_current_cipher;
-+		SSL_get_current_compression;
-+		SSL_get_current_expansion;
-+		SSL_get_default_timeout;
-+		SSL_get_error;
-+		SSL_get_ex_data;
-+		SSL_get_ex_data_X509_STORE_CTX_idx;
-+		SSL_get_ex_d_X509_STORE_CTX_idx;
-+		SSL_get_ex_new_index;
-+		SSL_get_fd;
-+		SSL_get_finished;
-+		SSL_get_info_callback;
-+		SSL_get_peer_cert_chain;
-+		SSL_get_peer_certificate;
-+		SSL_get_peer_finished;
-+		SSL_get_privatekey;
-+		SSL_get_psk_identity;
-+		SSL_get_psk_identity_hint;
-+		SSL_get_quiet_shutdown;
-+		SSL_get_rbio;
-+		SSL_get_read_ahead;
-+		SSL_get_rfd;
-+		SSL_get_servername;
-+		SSL_get_servername_type;
-+		SSL_get_session;
-+		SSL_get_shared_ciphers;
-+		SSL_get_shutdown;
-+		SSL_get_SSL_CTX;
-+		SSL_get_ssl_method;
-+		SSL_get_verify_callback;
-+		SSL_get_verify_depth;
-+		SSL_get_verify_mode;
-+		SSL_get_verify_result;
-+		SSL_get_version;
-+		SSL_get_wbio;
-+		SSL_get_wfd;
-+		SSL_has_matching_session_id;
-+		SSL_library_init;
-+		SSL_load_client_CA_file;
-+		SSL_load_error_strings;
-+		SSL_new;
-+		SSL_peek;
-+		SSL_pending;
-+		SSL_read;
-+		SSL_renegotiate;
-+		SSL_renegotiate_pending;
-+		SSL_rstate_string;
-+		SSL_rstate_string_long;
-+		SSL_SESSION_cmp;
-+		SSL_SESSION_free;
-+		SSL_SESSION_get_ex_data;
-+		SSL_SESSION_get_ex_new_index;
-+		SSL_SESSION_get_id;
-+		SSL_SESSION_get_time;
-+		SSL_SESSION_get_timeout;
-+		SSL_SESSION_hash;
-+		SSL_SESSION_new;
-+		SSL_SESSION_print;
-+		SSL_SESSION_print_fp;
-+		SSL_SESSION_set_ex_data;
-+		SSL_SESSION_set_time;
-+		SSL_SESSION_set_timeout;
-+		SSL_set1_param;
-+		SSL_set_accept_state;
-+		SSL_set_bio;
-+		SSL_set_cipher_list;
-+		SSL_set_client_CA_list;
-+		SSL_set_connect_state;
-+		SSL_set_ex_data;
-+		SSL_set_fd;
-+		SSL_set_generate_session_id;
-+		SSL_set_info_callback;
-+		SSL_set_msg_callback;
-+		SSL_set_psk_client_callback;
-+		SSL_set_psk_server_callback;
-+		SSL_set_purpose;
-+		SSL_set_quiet_shutdown;
-+		SSL_set_read_ahead;
-+		SSL_set_rfd;
-+		SSL_set_session;
-+		SSL_set_session_id_context;
-+		SSL_set_session_secret_cb;
-+		SSL_set_session_ticket_ext;
-+		SSL_set_session_ticket_ext_cb;
-+		SSL_set_shutdown;
-+		SSL_set_SSL_CTX;
-+		SSL_set_ssl_method;
-+		SSL_set_tmp_dh_callback;
-+		SSL_set_tmp_ecdh_callback;
-+		SSL_set_tmp_rsa_callback;
-+		SSL_set_trust;
-+		SSL_set_verify;
-+		SSL_set_verify_depth;
-+		SSL_set_verify_result;
-+		SSL_set_wfd;
-+		SSL_shutdown;
-+		SSL_state;
-+		SSL_state_string;
-+		SSL_state_string_long;
-+		SSL_use_certificate;
-+		SSL_use_certificate_ASN1;
-+		SSL_use_certificate_file;
-+		SSL_use_PrivateKey;
-+		SSL_use_PrivateKey_ASN1;
-+		SSL_use_PrivateKey_file;
-+		SSL_use_psk_identity_hint;
-+		SSL_use_RSAPrivateKey;
-+		SSL_use_RSAPrivateKey_ASN1;
-+		SSL_use_RSAPrivateKey_file;
-+		SSLv23_client_method;
-+		SSLv23_method;
-+		SSLv23_server_method;
-+		SSLv2_client_method;
-+		SSLv2_method;
-+		SSLv2_server_method;
-+		SSLv3_client_method;
-+		SSLv3_method;
-+		SSLv3_server_method;
-+		SSL_version;
-+		SSL_want;
-+		SSL_write;
-+		TLSv1_client_method;
-+		TLSv1_method;
-+		TLSv1_server_method;
-+
-+
-+		SSLeay;
-+		SSLeay_version;
-+		ASN1_BIT_STRING_asn1_meth;
-+		ASN1_HEADER_free;
-+		ASN1_HEADER_new;
-+		ASN1_IA5STRING_asn1_meth;
-+		ASN1_INTEGER_get;
-+		ASN1_INTEGER_set;
-+		ASN1_INTEGER_to_BN;
-+		ASN1_OBJECT_create;
-+		ASN1_OBJECT_free;
-+		ASN1_OBJECT_new;
-+		ASN1_PRINTABLE_type;
-+		ASN1_STRING_cmp;
-+		ASN1_STRING_dup;
-+		ASN1_STRING_free;
-+		ASN1_STRING_new;
-+		ASN1_STRING_print;
-+		ASN1_STRING_set;
-+		ASN1_STRING_type_new;
-+		ASN1_TYPE_free;
-+		ASN1_TYPE_new;
-+		ASN1_UNIVERSALSTRING_to_string;
-+		ASN1_UTCTIME_check;
-+		ASN1_UTCTIME_print;
-+		ASN1_UTCTIME_set;
-+		ASN1_check_infinite_end;
-+		ASN1_d2i_bio;
-+		ASN1_d2i_fp;
-+		ASN1_digest;
-+		ASN1_dup;
-+		ASN1_get_object;
-+		ASN1_i2d_bio;
-+		ASN1_i2d_fp;
-+		ASN1_object_size;
-+		ASN1_parse;
-+		ASN1_put_object;
-+		ASN1_sign;
-+		ASN1_verify;
-+		BF_cbc_encrypt;
-+		BF_cfb64_encrypt;
-+		BF_ecb_encrypt;
-+		BF_encrypt;
-+		BF_ofb64_encrypt;
-+		BF_options;
-+		BF_set_key;
-+		BIO_CONNECT_free;
-+		BIO_CONNECT_new;
-+		BIO_accept;
-+		BIO_ctrl;
-+		BIO_int_ctrl;
-+		BIO_debug_callback;
-+		BIO_dump;
-+		BIO_dup_chain;
-+		BIO_f_base64;
-+		BIO_f_buffer;
-+		BIO_f_cipher;
-+		BIO_f_md;
-+		BIO_f_null;
-+		BIO_f_proxy_server;
-+		BIO_fd_non_fatal_error;
-+		BIO_fd_should_retry;
-+		BIO_find_type;
-+		BIO_free;
-+		BIO_free_all;
-+		BIO_get_accept_socket;
-+		BIO_get_filter_bio;
-+		BIO_get_host_ip;
-+		BIO_get_port;
-+		BIO_get_retry_BIO;
-+		BIO_get_retry_reason;
-+		BIO_gethostbyname;
-+		BIO_gets;
-+		BIO_new;
-+		BIO_new_accept;
-+		BIO_new_connect;
-+		BIO_new_fd;
-+		BIO_new_file;
-+		BIO_new_fp;
-+		BIO_new_socket;
-+		BIO_pop;
-+		BIO_printf;
-+		BIO_push;
-+		BIO_puts;
-+		BIO_read;
-+		BIO_s_accept;
-+		BIO_s_connect;
-+		BIO_s_fd;
-+		BIO_s_file;
-+		BIO_s_mem;
-+		BIO_s_null;
-+		BIO_s_proxy_client;
-+		BIO_s_socket;
-+		BIO_set;
-+		BIO_set_cipher;
-+		BIO_set_tcp_ndelay;
-+		BIO_sock_cleanup;
-+		BIO_sock_error;
-+		BIO_sock_init;
-+		BIO_sock_non_fatal_error;
-+		BIO_sock_should_retry;
-+		BIO_socket_ioctl;
-+		BIO_write;
-+		BN_CTX_free;
-+		BN_CTX_new;
-+		BN_MONT_CTX_free;
-+		BN_MONT_CTX_new;
-+		BN_MONT_CTX_set;
-+		BN_add;
-+		BN_add_word;
-+		BN_hex2bn;
-+		BN_bin2bn;
-+		BN_bn2hex;
-+		BN_bn2bin;
-+		BN_clear;
-+		BN_clear_bit;
-+		BN_clear_free;
-+		BN_cmp;
-+		BN_copy;
-+		BN_div;
-+		BN_div_word;
-+		BN_dup;
-+		BN_free;
-+		BN_from_montgomery;
-+		BN_gcd;
-+		BN_generate_prime;
-+		BN_get_word;
-+		BN_is_bit_set;
-+		BN_is_prime;
-+		BN_lshift;
-+		BN_lshift1;
-+		BN_mask_bits;
-+		BN_mod;
-+		BN_mod_exp;
-+		BN_mod_exp_mont;
-+		BN_mod_exp_simple;
-+		BN_mod_inverse;
-+		BN_mod_mul;
-+		BN_mod_mul_montgomery;
-+		BN_mod_word;
-+		BN_mul;
-+		BN_new;
-+		BN_num_bits;
-+		BN_num_bits_word;
-+		BN_options;
-+		BN_print;
-+		BN_print_fp;
-+		BN_rand;
-+		BN_reciprocal;
-+		BN_rshift;
-+		BN_rshift1;
-+		BN_set_bit;
-+		BN_set_word;
-+		BN_sqr;
-+		BN_sub;
-+		BN_to_ASN1_INTEGER;
-+		BN_ucmp;
-+		BN_value_one;
-+		BUF_MEM_free;
-+		BUF_MEM_grow;
-+		BUF_MEM_new;
-+		BUF_strdup;
-+		CONF_free;
-+		CONF_get_number;
-+		CONF_get_section;
-+		CONF_get_string;
-+		CONF_load;
-+		CRYPTO_add_lock;
-+		CRYPTO_dbg_free;
-+		CRYPTO_dbg_malloc;
-+		CRYPTO_dbg_realloc;
-+		CRYPTO_dbg_remalloc;
-+		CRYPTO_free;
-+		CRYPTO_get_add_lock_callback;
-+		CRYPTO_get_id_callback;
-+		CRYPTO_get_lock_name;
-+		CRYPTO_get_locking_callback;
-+		CRYPTO_get_mem_functions;
-+		CRYPTO_lock;
-+		CRYPTO_malloc;
-+		CRYPTO_mem_ctrl;
-+		CRYPTO_mem_leaks;
-+		CRYPTO_mem_leaks_cb;
-+		CRYPTO_mem_leaks_fp;
-+		CRYPTO_realloc;
-+		CRYPTO_remalloc;
-+		CRYPTO_set_add_lock_callback;
-+		CRYPTO_set_id_callback;
-+		CRYPTO_set_locking_callback;
-+		CRYPTO_set_mem_functions;
-+		CRYPTO_thread_id;
-+		DH_check;
-+		DH_compute_key;
-+		DH_free;
-+		DH_generate_key;
-+		DH_generate_parameters;
-+		DH_new;
-+		DH_size;
-+		DHparams_print;
-+		DHparams_print_fp;
-+		DSA_free;
-+		DSA_generate_key;
-+		DSA_generate_parameters;
-+		DSA_is_prime;
-+		DSA_new;
-+		DSA_print;
-+		DSA_print_fp;
-+		DSA_sign;
-+		DSA_sign_setup;
-+		DSA_size;
-+		DSA_verify;
-+		DSAparams_print;
-+		DSAparams_print_fp;
-+		ERR_clear_error;
-+		ERR_error_string;
-+		ERR_free_strings;
-+		ERR_func_error_string;
-+		ERR_get_err_state_table;
-+		ERR_get_error;
-+		ERR_get_error_line;
-+		ERR_get_state;
-+		ERR_get_string_table;
-+		ERR_lib_error_string;
-+		ERR_load_ASN1_strings;
-+		ERR_load_BIO_strings;
-+		ERR_load_BN_strings;
-+		ERR_load_BUF_strings;
-+		ERR_load_CONF_strings;
-+		ERR_load_DH_strings;
-+		ERR_load_DSA_strings;
-+		ERR_load_ERR_strings;
-+		ERR_load_EVP_strings;
-+		ERR_load_OBJ_strings;
-+		ERR_load_PEM_strings;
-+		ERR_load_PROXY_strings;
-+		ERR_load_RSA_strings;
-+		ERR_load_X509_strings;
-+		ERR_load_crypto_strings;
-+		ERR_load_strings;
-+		ERR_peek_error;
-+		ERR_peek_error_line;
-+		ERR_print_errors;
-+		ERR_print_errors_fp;
-+		ERR_put_error;
-+		ERR_reason_error_string;
-+		ERR_remove_state;
-+		EVP_BytesToKey;
-+		EVP_CIPHER_CTX_cleanup;
-+		EVP_CipherFinal;
-+		EVP_CipherInit;
-+		EVP_CipherUpdate;
-+		EVP_DecodeBlock;
-+		EVP_DecodeFinal;
-+		EVP_DecodeInit;
-+		EVP_DecodeUpdate;
-+		EVP_DecryptFinal;
-+		EVP_DecryptInit;
-+		EVP_DecryptUpdate;
-+		EVP_DigestFinal;
-+		EVP_DigestInit;
-+		EVP_DigestUpdate;
-+		EVP_EncodeBlock;
-+		EVP_EncodeFinal;
-+		EVP_EncodeInit;
-+		EVP_EncodeUpdate;
-+		EVP_EncryptFinal;
-+		EVP_EncryptInit;
-+		EVP_EncryptUpdate;
-+		EVP_OpenFinal;
-+		EVP_OpenInit;
-+		EVP_PKEY_assign;
-+		EVP_PKEY_copy_parameters;
-+		EVP_PKEY_free;
-+		EVP_PKEY_missing_parameters;
-+		EVP_PKEY_new;
-+		EVP_PKEY_save_parameters;
-+		EVP_PKEY_size;
-+		EVP_PKEY_type;
-+		EVP_SealFinal;
-+		EVP_SealInit;
-+		EVP_SignFinal;
-+		EVP_VerifyFinal;
-+		EVP_add_alias;
-+		EVP_add_cipher;
-+		EVP_add_digest;
-+		EVP_bf_cbc;
-+		EVP_bf_cfb64;
-+		EVP_bf_ecb;
-+		EVP_bf_ofb;
-+		EVP_cleanup;
-+		EVP_des_cbc;
-+		EVP_des_cfb64;
-+		EVP_des_ecb;
-+		EVP_des_ede;
-+		EVP_des_ede3;
-+		EVP_des_ede3_cbc;
-+		EVP_des_ede3_cfb64;
-+		EVP_des_ede3_ofb;
-+		EVP_des_ede_cbc;
-+		EVP_des_ede_cfb64;
-+		EVP_des_ede_ofb;
-+		EVP_des_ofb;
-+		EVP_desx_cbc;
-+		EVP_dss;
-+		EVP_dss1;
-+		EVP_enc_null;
-+		EVP_get_cipherbyname;
-+		EVP_get_digestbyname;
-+		EVP_get_pw_prompt;
-+		EVP_idea_cbc;
-+		EVP_idea_cfb64;
-+		EVP_idea_ecb;
-+		EVP_idea_ofb;
-+		EVP_md2;
-+		EVP_md5;
-+		EVP_md_null;
-+		EVP_rc2_cbc;
-+		EVP_rc2_cfb64;
-+		EVP_rc2_ecb;
-+		EVP_rc2_ofb;
-+		EVP_rc4;
-+		EVP_read_pw_string;
-+		EVP_set_pw_prompt;
-+		EVP_sha;
-+		EVP_sha1;
-+		MD2;
-+		MD2_Final;
-+		MD2_Init;
-+		MD2_Update;
-+		MD2_options;
-+		MD5;
-+		MD5_Final;
-+		MD5_Init;
-+		MD5_Update;
-+		MDC2;
-+		MDC2_Final;
-+		MDC2_Init;
-+		MDC2_Update;
-+		NETSCAPE_SPKAC_free;
-+		NETSCAPE_SPKAC_new;
-+		NETSCAPE_SPKI_free;
-+		NETSCAPE_SPKI_new;
-+		NETSCAPE_SPKI_sign;
-+		NETSCAPE_SPKI_verify;
-+		OBJ_add_object;
-+		OBJ_bsearch;
-+		OBJ_cleanup;
-+		OBJ_cmp;
-+		OBJ_create;
-+		OBJ_dup;
-+		OBJ_ln2nid;
-+		OBJ_new_nid;
-+		OBJ_nid2ln;
-+		OBJ_nid2obj;
-+		OBJ_nid2sn;
-+		OBJ_obj2nid;
-+		OBJ_sn2nid;
-+		OBJ_txt2nid;
-+		PEM_ASN1_read;
-+		PEM_ASN1_read_bio;
-+		PEM_ASN1_write;
-+		PEM_ASN1_write_bio;
-+		PEM_SealFinal;
-+		PEM_SealInit;
-+		PEM_SealUpdate;
-+		PEM_SignFinal;
-+		PEM_SignInit;
-+		PEM_SignUpdate;
-+		PEM_X509_INFO_read;
-+		PEM_X509_INFO_read_bio;
-+		PEM_X509_INFO_write_bio;
-+		PEM_dek_info;
-+		PEM_do_header;
-+		PEM_get_EVP_CIPHER_INFO;
-+		PEM_proc_type;
-+		PEM_read;
-+		PEM_read_DHparams;
-+		PEM_read_DSAPrivateKey;
-+		PEM_read_DSAparams;
-+		PEM_read_PKCS7;
-+		PEM_read_PrivateKey;
-+		PEM_read_RSAPrivateKey;
-+		PEM_read_X509;
-+		PEM_read_X509_CRL;
-+		PEM_read_X509_REQ;
-+		PEM_read_bio;
-+		PEM_read_bio_DHparams;
-+		PEM_read_bio_DSAPrivateKey;
-+		PEM_read_bio_DSAparams;
-+		PEM_read_bio_PKCS7;
-+		PEM_read_bio_PrivateKey;
-+		PEM_read_bio_RSAPrivateKey;
-+		PEM_read_bio_X509;
-+		PEM_read_bio_X509_CRL;
-+		PEM_read_bio_X509_REQ;
-+		PEM_write;
-+		PEM_write_DHparams;
-+		PEM_write_DSAPrivateKey;
-+		PEM_write_DSAparams;
-+		PEM_write_PKCS7;
-+		PEM_write_PrivateKey;
-+		PEM_write_RSAPrivateKey;
-+		PEM_write_X509;
-+		PEM_write_X509_CRL;
-+		PEM_write_X509_REQ;
-+		PEM_write_bio;
-+		PEM_write_bio_DHparams;
-+		PEM_write_bio_DSAPrivateKey;
-+		PEM_write_bio_DSAparams;
-+		PEM_write_bio_PKCS7;
-+		PEM_write_bio_PrivateKey;
-+		PEM_write_bio_RSAPrivateKey;
-+		PEM_write_bio_X509;
-+		PEM_write_bio_X509_CRL;
-+		PEM_write_bio_X509_REQ;
-+		PKCS7_DIGEST_free;
-+		PKCS7_DIGEST_new;
-+		PKCS7_ENCRYPT_free;
-+		PKCS7_ENCRYPT_new;
-+		PKCS7_ENC_CONTENT_free;
-+		PKCS7_ENC_CONTENT_new;
-+		PKCS7_ENVELOPE_free;
-+		PKCS7_ENVELOPE_new;
-+		PKCS7_ISSUER_AND_SERIAL_digest;
-+		PKCS7_ISSUER_AND_SERIAL_free;
-+		PKCS7_ISSUER_AND_SERIAL_new;
-+		PKCS7_RECIP_INFO_free;
-+		PKCS7_RECIP_INFO_new;
-+		PKCS7_SIGNED_free;
-+		PKCS7_SIGNED_new;
-+		PKCS7_SIGNER_INFO_free;
-+		PKCS7_SIGNER_INFO_new;
-+		PKCS7_SIGN_ENVELOPE_free;
-+		PKCS7_SIGN_ENVELOPE_new;
-+		PKCS7_dup;
-+		PKCS7_free;
-+		PKCS7_new;
-+		PROXY_ENTRY_add_noproxy;
-+		PROXY_ENTRY_clear_noproxy;
-+		PROXY_ENTRY_free;
-+		PROXY_ENTRY_get_noproxy;
-+		PROXY_ENTRY_new;
-+		PROXY_ENTRY_set_server;
-+		PROXY_add_noproxy;
-+		PROXY_add_server;
-+		PROXY_check_by_host;
-+		PROXY_check_url;
-+		PROXY_clear_noproxy;
-+		PROXY_free;
-+		PROXY_get_noproxy;
-+		PROXY_get_proxies;
-+		PROXY_get_proxy_entry;
-+		PROXY_load_conf;
-+		PROXY_new;
-+		PROXY_print;
-+		RAND_bytes;
-+		RAND_cleanup;
-+		RAND_file_name;
-+		RAND_load_file;
-+		RAND_screen;
-+		RAND_seed;
-+		RAND_write_file;
-+		RC2_cbc_encrypt;
-+		RC2_cfb64_encrypt;
-+		RC2_ecb_encrypt;
-+		RC2_encrypt;
-+		RC2_ofb64_encrypt;
-+		RC2_set_key;
-+		RC4;
-+		RC4_options;
-+		RC4_set_key;
-+		RSAPrivateKey_asn1_meth;
-+		RSAPrivateKey_dup;
-+		RSAPublicKey_dup;
-+		RSA_PKCS1_SSLeay;
-+		RSA_free;
-+		RSA_generate_key;
-+		RSA_new;
-+		RSA_new_method;
-+		RSA_print;
-+		RSA_print_fp;
-+		RSA_private_decrypt;
-+		RSA_private_encrypt;
-+		RSA_public_decrypt;
-+		RSA_public_encrypt;
-+		RSA_set_default_method;
-+		RSA_sign;
-+		RSA_sign_ASN1_OCTET_STRING;
-+		RSA_size;
-+		RSA_verify;
-+		RSA_verify_ASN1_OCTET_STRING;
-+		SHA;
-+		SHA1;
-+		SHA1_Final;
-+		SHA1_Init;
-+		SHA1_Update;
-+		SHA_Final;
-+		SHA_Init;
-+		SHA_Update;
-+		OpenSSL_add_all_algorithms;
-+		OpenSSL_add_all_ciphers;
-+		OpenSSL_add_all_digests;
-+		TXT_DB_create_index;
-+		TXT_DB_free;
-+		TXT_DB_get_by_index;
-+		TXT_DB_insert;
-+		TXT_DB_read;
-+		TXT_DB_write;
-+		X509_ALGOR_free;
-+		X509_ALGOR_new;
-+		X509_ATTRIBUTE_free;
-+		X509_ATTRIBUTE_new;
-+		X509_CINF_free;
-+		X509_CINF_new;
-+		X509_CRL_INFO_free;
-+		X509_CRL_INFO_new;
-+		X509_CRL_add_ext;
-+		X509_CRL_cmp;
-+		X509_CRL_delete_ext;
-+		X509_CRL_dup;
-+		X509_CRL_free;
-+		X509_CRL_get_ext;
-+		X509_CRL_get_ext_by_NID;
-+		X509_CRL_get_ext_by_OBJ;
-+		X509_CRL_get_ext_by_critical;
-+		X509_CRL_get_ext_count;
-+		X509_CRL_new;
-+		X509_CRL_sign;
-+		X509_CRL_verify;
-+		X509_EXTENSION_create_by_NID;
-+		X509_EXTENSION_create_by_OBJ;
-+		X509_EXTENSION_dup;
-+		X509_EXTENSION_free;
-+		X509_EXTENSION_get_critical;
-+		X509_EXTENSION_get_data;
-+		X509_EXTENSION_get_object;
-+		X509_EXTENSION_new;
-+		X509_EXTENSION_set_critical;
-+		X509_EXTENSION_set_data;
-+		X509_EXTENSION_set_object;
-+		X509_INFO_free;
-+		X509_INFO_new;
-+		X509_LOOKUP_by_alias;
-+		X509_LOOKUP_by_fingerprint;
-+		X509_LOOKUP_by_issuer_serial;
-+		X509_LOOKUP_by_subject;
-+		X509_LOOKUP_ctrl;
-+		X509_LOOKUP_file;
-+		X509_LOOKUP_free;
-+		X509_LOOKUP_hash_dir;
-+		X509_LOOKUP_init;
-+		X509_LOOKUP_new;
-+		X509_LOOKUP_shutdown;
-+		X509_NAME_ENTRY_create_by_NID;
-+		X509_NAME_ENTRY_create_by_OBJ;
-+		X509_NAME_ENTRY_dup;
-+		X509_NAME_ENTRY_free;
-+		X509_NAME_ENTRY_get_data;
-+		X509_NAME_ENTRY_get_object;
-+		X509_NAME_ENTRY_new;
-+		X509_NAME_ENTRY_set_data;
-+		X509_NAME_ENTRY_set_object;
-+		X509_NAME_add_entry;
-+		X509_NAME_cmp;
-+		X509_NAME_delete_entry;
-+		X509_NAME_digest;
-+		X509_NAME_dup;
-+		X509_NAME_entry_count;
-+		X509_NAME_free;
-+		X509_NAME_get_entry;
-+		X509_NAME_get_index_by_NID;
-+		X509_NAME_get_index_by_OBJ;
-+		X509_NAME_get_text_by_NID;
-+		X509_NAME_get_text_by_OBJ;
-+		X509_NAME_hash;
-+		X509_NAME_new;
-+		X509_NAME_oneline;
-+		X509_NAME_print;
-+		X509_NAME_set;
-+		X509_OBJECT_free_contents;
-+		X509_OBJECT_retrieve_by_subject;
-+		X509_OBJECT_up_ref_count;
-+		X509_PKEY_free;
-+		X509_PKEY_new;
-+		X509_PUBKEY_free;
-+		X509_PUBKEY_get;
-+		X509_PUBKEY_new;
-+		X509_PUBKEY_set;
-+		X509_REQ_INFO_free;
-+		X509_REQ_INFO_new;
-+		X509_REQ_dup;
-+		X509_REQ_free;
-+		X509_REQ_get_pubkey;
-+		X509_REQ_new;
-+		X509_REQ_print;
-+		X509_REQ_print_fp;
-+		X509_REQ_set_pubkey;
-+		X509_REQ_set_subject_name;
-+		X509_REQ_set_version;
-+		X509_REQ_sign;
-+		X509_REQ_to_X509;
-+		X509_REQ_verify;
-+		X509_REVOKED_add_ext;
-+		X509_REVOKED_delete_ext;
-+		X509_REVOKED_free;
-+		X509_REVOKED_get_ext;
-+		X509_REVOKED_get_ext_by_NID;
-+		X509_REVOKED_get_ext_by_OBJ;
-+		X509_REVOKED_get_ext_by_critical;
-+		X509_REVOKED_get_ext_by_critic;
-+		X509_REVOKED_get_ext_count;
-+		X509_REVOKED_new;
-+		X509_SIG_free;
-+		X509_SIG_new;
-+		X509_STORE_CTX_cleanup;
-+		X509_STORE_CTX_init;
-+		X509_STORE_add_cert;
-+		X509_STORE_add_lookup;
-+		X509_STORE_free;
-+		X509_STORE_get_by_subject;
-+		X509_STORE_load_locations;
-+		X509_STORE_new;
-+		X509_STORE_set_default_paths;
-+		X509_VAL_free;
-+		X509_VAL_new;
-+		X509_add_ext;
-+		X509_asn1_meth;
-+		X509_certificate_type;
-+		X509_check_private_key;
-+		X509_cmp_current_time;
-+		X509_delete_ext;
-+		X509_digest;
-+		X509_dup;
-+		X509_free;
-+		X509_get_default_cert_area;
-+		X509_get_default_cert_dir;
-+		X509_get_default_cert_dir_env;
-+		X509_get_default_cert_file;
-+		X509_get_default_cert_file_env;
-+		X509_get_default_private_dir;
-+		X509_get_ext;
-+		X509_get_ext_by_NID;
-+		X509_get_ext_by_OBJ;
-+		X509_get_ext_by_critical;
-+		X509_get_ext_count;
-+		X509_get_issuer_name;
-+		X509_get_pubkey;
-+		X509_get_pubkey_parameters;
-+		X509_get_serialNumber;
-+		X509_get_subject_name;
-+		X509_gmtime_adj;
-+		X509_issuer_and_serial_cmp;
-+		X509_issuer_and_serial_hash;
-+		X509_issuer_name_cmp;
-+		X509_issuer_name_hash;
-+		X509_load_cert_file;
-+		X509_new;
-+		X509_print;
-+		X509_print_fp;
-+		X509_set_issuer_name;
-+		X509_set_notAfter;
-+		X509_set_notBefore;
-+		X509_set_pubkey;
-+		X509_set_serialNumber;
-+		X509_set_subject_name;
-+		X509_set_version;
-+		X509_sign;
-+		X509_subject_name_cmp;
-+		X509_subject_name_hash;
-+		X509_to_X509_REQ;
-+		X509_verify;
-+		X509_verify_cert;
-+		X509_verify_cert_error_string;
-+		X509v3_add_ext;
-+		X509v3_add_extension;
-+		X509v3_add_netscape_extensions;
-+		X509v3_add_standard_extensions;
-+		X509v3_cleanup_extensions;
-+		X509v3_data_type_by_NID;
-+		X509v3_data_type_by_OBJ;
-+		X509v3_delete_ext;
-+		X509v3_get_ext;
-+		X509v3_get_ext_by_NID;
-+		X509v3_get_ext_by_OBJ;
-+		X509v3_get_ext_by_critical;
-+		X509v3_get_ext_count;
-+		X509v3_pack_string;
-+		X509v3_pack_type_by_NID;
-+		X509v3_pack_type_by_OBJ;
-+		X509v3_unpack_string;
-+		_des_crypt;
-+		a2d_ASN1_OBJECT;
-+		a2i_ASN1_INTEGER;
-+		a2i_ASN1_STRING;
-+		asn1_Finish;
-+		asn1_GetSequence;
-+		bn_div_words;
-+		bn_expand2;
-+		bn_mul_add_words;
-+		bn_mul_words;
-+		BN_uadd;
-+		BN_usub;
-+		bn_sqr_words;
-+		_ossl_old_crypt;
-+		d2i_ASN1_BIT_STRING;
-+		d2i_ASN1_BOOLEAN;
-+		d2i_ASN1_HEADER;
-+		d2i_ASN1_IA5STRING;
-+		d2i_ASN1_INTEGER;
-+		d2i_ASN1_OBJECT;
-+		d2i_ASN1_OCTET_STRING;
-+		d2i_ASN1_PRINTABLE;
-+		d2i_ASN1_PRINTABLESTRING;
-+		d2i_ASN1_SET;
-+		d2i_ASN1_T61STRING;
-+		d2i_ASN1_TYPE;
-+		d2i_ASN1_UTCTIME;
-+		d2i_ASN1_bytes;
-+		d2i_ASN1_type_bytes;
-+		d2i_DHparams;
-+		d2i_DSAPrivateKey;
-+		d2i_DSAPrivateKey_bio;
-+		d2i_DSAPrivateKey_fp;
-+		d2i_DSAPublicKey;
-+		d2i_DSAparams;
-+		d2i_NETSCAPE_SPKAC;
-+		d2i_NETSCAPE_SPKI;
-+		d2i_Netscape_RSA;
-+		d2i_PKCS7;
-+		d2i_PKCS7_DIGEST;
-+		d2i_PKCS7_ENCRYPT;
-+		d2i_PKCS7_ENC_CONTENT;
-+		d2i_PKCS7_ENVELOPE;
-+		d2i_PKCS7_ISSUER_AND_SERIAL;
-+		d2i_PKCS7_RECIP_INFO;
-+		d2i_PKCS7_SIGNED;
-+		d2i_PKCS7_SIGNER_INFO;
-+		d2i_PKCS7_SIGN_ENVELOPE;
-+		d2i_PKCS7_bio;
-+		d2i_PKCS7_fp;
-+		d2i_PrivateKey;
-+		d2i_PublicKey;
-+		d2i_RSAPrivateKey;
-+		d2i_RSAPrivateKey_bio;
-+		d2i_RSAPrivateKey_fp;
-+		d2i_RSAPublicKey;
-+		d2i_X509;
-+		d2i_X509_ALGOR;
-+		d2i_X509_ATTRIBUTE;
-+		d2i_X509_CINF;
-+		d2i_X509_CRL;
-+		d2i_X509_CRL_INFO;
-+		d2i_X509_CRL_bio;
-+		d2i_X509_CRL_fp;
-+		d2i_X509_EXTENSION;
-+		d2i_X509_NAME;
-+		d2i_X509_NAME_ENTRY;
-+		d2i_X509_PKEY;
-+		d2i_X509_PUBKEY;
-+		d2i_X509_REQ;
-+		d2i_X509_REQ_INFO;
-+		d2i_X509_REQ_bio;
-+		d2i_X509_REQ_fp;
-+		d2i_X509_REVOKED;
-+		d2i_X509_SIG;
-+		d2i_X509_VAL;
-+		d2i_X509_bio;
-+		d2i_X509_fp;
-+		DES_cbc_cksum;
-+		DES_cbc_encrypt;
-+		DES_cblock_print_file;
-+		DES_cfb64_encrypt;
-+		DES_cfb_encrypt;
-+		DES_decrypt3;
-+		DES_ecb3_encrypt;
-+		DES_ecb_encrypt;
-+		DES_ede3_cbc_encrypt;
-+		DES_ede3_cfb64_encrypt;
-+		DES_ede3_ofb64_encrypt;
-+		DES_enc_read;
-+		DES_enc_write;
-+		DES_encrypt1;
-+		DES_encrypt2;
-+		DES_encrypt3;
-+		DES_fcrypt;
-+		DES_is_weak_key;
-+		DES_key_sched;
-+		DES_ncbc_encrypt;
-+		DES_ofb64_encrypt;
-+		DES_ofb_encrypt;
-+		DES_options;
-+		DES_pcbc_encrypt;
-+		DES_quad_cksum;
-+		DES_random_key;
-+		_ossl_old_des_random_seed;
-+		_ossl_old_des_read_2passwords;
-+		_ossl_old_des_read_password;
-+		_ossl_old_des_read_pw;
-+		_ossl_old_des_read_pw_string;
-+		DES_set_key;
-+		DES_set_odd_parity;
-+		DES_string_to_2keys;
-+		DES_string_to_key;
-+		DES_xcbc_encrypt;
-+		DES_xwhite_in2out;
-+		fcrypt_body;
-+		i2a_ASN1_INTEGER;
-+		i2a_ASN1_OBJECT;
-+		i2a_ASN1_STRING;
-+		i2d_ASN1_BIT_STRING;
-+		i2d_ASN1_BOOLEAN;
-+		i2d_ASN1_HEADER;
-+		i2d_ASN1_IA5STRING;
-+		i2d_ASN1_INTEGER;
-+		i2d_ASN1_OBJECT;
-+		i2d_ASN1_OCTET_STRING;
-+		i2d_ASN1_PRINTABLE;
-+		i2d_ASN1_SET;
-+		i2d_ASN1_TYPE;
-+		i2d_ASN1_UTCTIME;
-+		i2d_ASN1_bytes;
-+		i2d_DHparams;
-+		i2d_DSAPrivateKey;
-+		i2d_DSAPrivateKey_bio;
-+		i2d_DSAPrivateKey_fp;
-+		i2d_DSAPublicKey;
-+		i2d_DSAparams;
-+		i2d_NETSCAPE_SPKAC;
-+		i2d_NETSCAPE_SPKI;
-+		i2d_Netscape_RSA;
-+		i2d_PKCS7;
-+		i2d_PKCS7_DIGEST;
-+		i2d_PKCS7_ENCRYPT;
-+		i2d_PKCS7_ENC_CONTENT;
-+		i2d_PKCS7_ENVELOPE;
-+		i2d_PKCS7_ISSUER_AND_SERIAL;
-+		i2d_PKCS7_RECIP_INFO;
-+		i2d_PKCS7_SIGNED;
-+		i2d_PKCS7_SIGNER_INFO;
-+		i2d_PKCS7_SIGN_ENVELOPE;
-+		i2d_PKCS7_bio;
-+		i2d_PKCS7_fp;
-+		i2d_PrivateKey;
-+		i2d_PublicKey;
-+		i2d_RSAPrivateKey;
-+		i2d_RSAPrivateKey_bio;
-+		i2d_RSAPrivateKey_fp;
-+		i2d_RSAPublicKey;
-+		i2d_X509;
-+		i2d_X509_ALGOR;
-+		i2d_X509_ATTRIBUTE;
-+		i2d_X509_CINF;
-+		i2d_X509_CRL;
-+		i2d_X509_CRL_INFO;
-+		i2d_X509_CRL_bio;
-+		i2d_X509_CRL_fp;
-+		i2d_X509_EXTENSION;
-+		i2d_X509_NAME;
-+		i2d_X509_NAME_ENTRY;
-+		i2d_X509_PKEY;
-+		i2d_X509_PUBKEY;
-+		i2d_X509_REQ;
-+		i2d_X509_REQ_INFO;
-+		i2d_X509_REQ_bio;
-+		i2d_X509_REQ_fp;
-+		i2d_X509_REVOKED;
-+		i2d_X509_SIG;
-+		i2d_X509_VAL;
-+		i2d_X509_bio;
-+		i2d_X509_fp;
-+		idea_cbc_encrypt;
-+		idea_cfb64_encrypt;
-+		idea_ecb_encrypt;
-+		idea_encrypt;
-+		idea_ofb64_encrypt;
-+		idea_options;
-+		idea_set_decrypt_key;
-+		idea_set_encrypt_key;
-+		lh_delete;
-+		lh_doall;
-+		lh_doall_arg;
-+		lh_free;
-+		lh_insert;
-+		lh_new;
-+		lh_node_stats;
-+		lh_node_stats_bio;
-+		lh_node_usage_stats;
-+		lh_node_usage_stats_bio;
-+		lh_retrieve;
-+		lh_stats;
-+		lh_stats_bio;
-+		lh_strhash;
-+		sk_delete;
-+		sk_delete_ptr;
-+		sk_dup;
-+		sk_find;
-+		sk_free;
-+		sk_insert;
-+		sk_new;
-+		sk_pop;
-+		sk_pop_free;
-+		sk_push;
-+		sk_set_cmp_func;
-+		sk_shift;
-+		sk_unshift;
-+		sk_zero;
-+		BIO_f_nbio_test;
-+		ASN1_TYPE_get;
-+		ASN1_TYPE_set;
-+		PKCS7_content_free;
-+		ERR_load_PKCS7_strings;
-+		X509_find_by_issuer_and_serial;
-+		X509_find_by_subject;
-+		PKCS7_ctrl;
-+		PKCS7_set_type;
-+		PKCS7_set_content;
-+		PKCS7_SIGNER_INFO_set;
-+		PKCS7_add_signer;
-+		PKCS7_add_certificate;
-+		PKCS7_add_crl;
-+		PKCS7_content_new;
-+		PKCS7_dataSign;
-+		PKCS7_dataVerify;
-+		PKCS7_dataInit;
-+		PKCS7_add_signature;
-+		PKCS7_cert_from_signer_info;
-+		PKCS7_get_signer_info;
-+		EVP_delete_alias;
-+		EVP_mdc2;
-+		PEM_read_bio_RSAPublicKey;
-+		PEM_write_bio_RSAPublicKey;
-+		d2i_RSAPublicKey_bio;
-+		i2d_RSAPublicKey_bio;
-+		PEM_read_RSAPublicKey;
-+		PEM_write_RSAPublicKey;
-+		d2i_RSAPublicKey_fp;
-+		i2d_RSAPublicKey_fp;
-+		BIO_copy_next_retry;
-+		RSA_flags;
-+		X509_STORE_add_crl;
-+		X509_load_crl_file;
-+		EVP_rc2_40_cbc;
-+		EVP_rc4_40;
-+		EVP_CIPHER_CTX_init;
-+		HMAC;
-+		HMAC_Init;
-+		HMAC_Update;
-+		HMAC_Final;
-+		ERR_get_next_error_library;
-+		EVP_PKEY_cmp_parameters;
-+		HMAC_cleanup;
-+		BIO_ptr_ctrl;
-+		BIO_new_file_internal;
-+		BIO_new_fp_internal;
-+		BIO_s_file_internal;
-+		BN_BLINDING_convert;
-+		BN_BLINDING_invert;
-+		BN_BLINDING_update;
-+		RSA_blinding_on;
-+		RSA_blinding_off;
-+		i2t_ASN1_OBJECT;
-+		BN_BLINDING_new;
-+		BN_BLINDING_free;
-+		EVP_cast5_cbc;
-+		EVP_cast5_cfb64;
-+		EVP_cast5_ecb;
-+		EVP_cast5_ofb;
-+		BF_decrypt;
-+		CAST_set_key;
-+		CAST_encrypt;
-+		CAST_decrypt;
-+		CAST_ecb_encrypt;
-+		CAST_cbc_encrypt;
-+		CAST_cfb64_encrypt;
-+		CAST_ofb64_encrypt;
-+		RC2_decrypt;
-+		OBJ_create_objects;
-+		BN_exp;
-+		BN_mul_word;
-+		BN_sub_word;
-+		BN_dec2bn;
-+		BN_bn2dec;
-+		BIO_ghbn_ctrl;
-+		CRYPTO_free_ex_data;
-+		CRYPTO_get_ex_data;
-+		CRYPTO_set_ex_data;
-+		ERR_load_CRYPTO_strings;
-+		ERR_load_CRYPTOlib_strings;
-+		EVP_PKEY_bits;
-+		MD5_Transform;
-+		SHA1_Transform;
-+		SHA_Transform;
-+		X509_STORE_CTX_get_chain;
-+		X509_STORE_CTX_get_current_cert;
-+		X509_STORE_CTX_get_error;
-+		X509_STORE_CTX_get_error_depth;
-+		X509_STORE_CTX_get_ex_data;
-+		X509_STORE_CTX_set_cert;
-+		X509_STORE_CTX_set_chain;
-+		X509_STORE_CTX_set_error;
-+		X509_STORE_CTX_set_ex_data;
-+		CRYPTO_dup_ex_data;
-+		CRYPTO_get_new_lockid;
-+		CRYPTO_new_ex_data;
-+		RSA_set_ex_data;
-+		RSA_get_ex_data;
-+		RSA_get_ex_new_index;
-+		RSA_padding_add_PKCS1_type_1;
-+		RSA_padding_add_PKCS1_type_2;
-+		RSA_padding_add_SSLv23;
-+		RSA_padding_add_none;
-+		RSA_padding_check_PKCS1_type_1;
-+		RSA_padding_check_PKCS1_type_2;
-+		RSA_padding_check_SSLv23;
-+		RSA_padding_check_none;
-+		bn_add_words;
-+		d2i_Netscape_RSA_2;
-+		CRYPTO_get_ex_new_index;
-+		RIPEMD160_Init;
-+		RIPEMD160_Update;
-+		RIPEMD160_Final;
-+		RIPEMD160;
-+		RIPEMD160_Transform;
-+		RC5_32_set_key;
-+		RC5_32_ecb_encrypt;
-+		RC5_32_encrypt;
-+		RC5_32_decrypt;
-+		RC5_32_cbc_encrypt;
-+		RC5_32_cfb64_encrypt;
-+		RC5_32_ofb64_encrypt;
-+		BN_bn2mpi;
-+		BN_mpi2bn;
-+		ASN1_BIT_STRING_get_bit;
-+		ASN1_BIT_STRING_set_bit;
-+		BIO_get_ex_data;
-+		BIO_get_ex_new_index;
-+		BIO_set_ex_data;
-+		X509v3_get_key_usage;
-+		X509v3_set_key_usage;
-+		a2i_X509v3_key_usage;
-+		i2a_X509v3_key_usage;
-+		EVP_PKEY_decrypt;
-+		EVP_PKEY_encrypt;
-+		PKCS7_RECIP_INFO_set;
-+		PKCS7_add_recipient;
-+		PKCS7_add_recipient_info;
-+		PKCS7_set_cipher;
-+		ASN1_TYPE_get_int_octetstring;
-+		ASN1_TYPE_get_octetstring;
-+		ASN1_TYPE_set_int_octetstring;
-+		ASN1_TYPE_set_octetstring;
-+		ASN1_UTCTIME_set_string;
-+		ERR_add_error_data;
-+		ERR_set_error_data;
-+		EVP_CIPHER_asn1_to_param;
-+		EVP_CIPHER_param_to_asn1;
-+		EVP_CIPHER_get_asn1_iv;
-+		EVP_CIPHER_set_asn1_iv;
-+		EVP_rc5_32_12_16_cbc;
-+		EVP_rc5_32_12_16_cfb64;
-+		EVP_rc5_32_12_16_ecb;
-+		EVP_rc5_32_12_16_ofb;
-+		asn1_add_error;
-+		d2i_ASN1_BMPSTRING;
-+		i2d_ASN1_BMPSTRING;
-+		BIO_f_ber;
-+		BN_init;
-+		COMP_CTX_new;
-+		COMP_CTX_free;
-+		COMP_CTX_compress_block;
-+		COMP_CTX_expand_block;
-+		X509_STORE_CTX_get_ex_new_index;
-+		OBJ_NAME_add;
-+		BIO_socket_nbio;
-+		EVP_rc2_64_cbc;
-+		OBJ_NAME_cleanup;
-+		OBJ_NAME_get;
-+		OBJ_NAME_init;
-+		OBJ_NAME_new_index;
-+		OBJ_NAME_remove;
-+		BN_MONT_CTX_copy;
-+		BIO_new_socks4a_connect;
-+		BIO_s_socks4a_connect;
-+		PROXY_set_connect_mode;
-+		RAND_SSLeay;
-+		RAND_set_rand_method;
-+		RSA_memory_lock;
-+		bn_sub_words;
-+		bn_mul_normal;
-+		bn_mul_comba8;
-+		bn_mul_comba4;
-+		bn_sqr_normal;
-+		bn_sqr_comba8;
-+		bn_sqr_comba4;
-+		bn_cmp_words;
-+		bn_mul_recursive;
-+		bn_mul_part_recursive;
-+		bn_sqr_recursive;
-+		bn_mul_low_normal;
-+		BN_RECP_CTX_init;
-+		BN_RECP_CTX_new;
-+		BN_RECP_CTX_free;
-+		BN_RECP_CTX_set;
-+		BN_mod_mul_reciprocal;
-+		BN_mod_exp_recp;
-+		BN_div_recp;
-+		BN_CTX_init;
-+		BN_MONT_CTX_init;
-+		RAND_get_rand_method;
-+		PKCS7_add_attribute;
-+		PKCS7_add_signed_attribute;
-+		PKCS7_digest_from_attributes;
-+		PKCS7_get_attribute;
-+		PKCS7_get_issuer_and_serial;
-+		PKCS7_get_signed_attribute;
-+		COMP_compress_block;
-+		COMP_expand_block;
-+		COMP_rle;
-+		COMP_zlib;
-+		ms_time_diff;
-+		ms_time_new;
-+		ms_time_free;
-+		ms_time_cmp;
-+		ms_time_get;
-+		PKCS7_set_attributes;
-+		PKCS7_set_signed_attributes;
-+		X509_ATTRIBUTE_create;
-+		X509_ATTRIBUTE_dup;
-+		ASN1_GENERALIZEDTIME_check;
-+		ASN1_GENERALIZEDTIME_print;
-+		ASN1_GENERALIZEDTIME_set;
-+		ASN1_GENERALIZEDTIME_set_string;
-+		ASN1_TIME_print;
-+		BASIC_CONSTRAINTS_free;
-+		BASIC_CONSTRAINTS_new;
-+		ERR_load_X509V3_strings;
-+		NETSCAPE_CERT_SEQUENCE_free;
-+		NETSCAPE_CERT_SEQUENCE_new;
-+		OBJ_txt2obj;
-+		PEM_read_NETSCAPE_CERT_SEQUENCE;
-+		PEM_read_NS_CERT_SEQ;
-+		PEM_read_bio_NETSCAPE_CERT_SEQUENCE;
-+		PEM_read_bio_NS_CERT_SEQ;
-+		PEM_write_NETSCAPE_CERT_SEQUENCE;
-+		PEM_write_NS_CERT_SEQ;
-+		PEM_write_bio_NETSCAPE_CERT_SEQUENCE;
-+		PEM_write_bio_NS_CERT_SEQ;
-+		X509V3_EXT_add;
-+		X509V3_EXT_add_alias;
-+		X509V3_EXT_add_conf;
-+		X509V3_EXT_cleanup;
-+		X509V3_EXT_conf;
-+		X509V3_EXT_conf_nid;
-+		X509V3_EXT_get;
-+		X509V3_EXT_get_nid;
-+		X509V3_EXT_print;
-+		X509V3_EXT_print_fp;
-+		X509V3_add_standard_extensions;
-+		X509V3_add_value;
-+		X509V3_add_value_bool;
-+		X509V3_add_value_int;
-+		X509V3_conf_free;
-+		X509V3_get_value_bool;
-+		X509V3_get_value_int;
-+		X509V3_parse_list;
-+		d2i_ASN1_GENERALIZEDTIME;
-+		d2i_ASN1_TIME;
-+		d2i_BASIC_CONSTRAINTS;
-+		d2i_NETSCAPE_CERT_SEQUENCE;
-+		d2i_ext_ku;
-+		ext_ku_free;
-+		ext_ku_new;
-+		i2d_ASN1_GENERALIZEDTIME;
-+		i2d_ASN1_TIME;
-+		i2d_BASIC_CONSTRAINTS;
-+		i2d_NETSCAPE_CERT_SEQUENCE;
-+		i2d_ext_ku;
-+		EVP_MD_CTX_copy;
-+		i2d_ASN1_ENUMERATED;
-+		d2i_ASN1_ENUMERATED;
-+		ASN1_ENUMERATED_set;
-+		ASN1_ENUMERATED_get;
-+		BN_to_ASN1_ENUMERATED;
-+		ASN1_ENUMERATED_to_BN;
-+		i2a_ASN1_ENUMERATED;
-+		a2i_ASN1_ENUMERATED;
-+		i2d_GENERAL_NAME;
-+		d2i_GENERAL_NAME;
-+		GENERAL_NAME_new;
-+		GENERAL_NAME_free;
-+		GENERAL_NAMES_new;
-+		GENERAL_NAMES_free;
-+		d2i_GENERAL_NAMES;
-+		i2d_GENERAL_NAMES;
-+		i2v_GENERAL_NAMES;
-+		i2s_ASN1_OCTET_STRING;
-+		s2i_ASN1_OCTET_STRING;
-+		X509V3_EXT_check_conf;
-+		hex_to_string;
-+		string_to_hex;
-+		DES_ede3_cbcm_encrypt;
-+		RSA_padding_add_PKCS1_OAEP;
-+		RSA_padding_check_PKCS1_OAEP;
-+		X509_CRL_print_fp;
-+		X509_CRL_print;
-+		i2v_GENERAL_NAME;
-+		v2i_GENERAL_NAME;
-+		i2d_PKEY_USAGE_PERIOD;
-+		d2i_PKEY_USAGE_PERIOD;
-+		PKEY_USAGE_PERIOD_new;
-+		PKEY_USAGE_PERIOD_free;
-+		v2i_GENERAL_NAMES;
-+		i2s_ASN1_INTEGER;
-+		X509V3_EXT_d2i;
-+		name_cmp;
-+		str_dup;
-+		i2s_ASN1_ENUMERATED;
-+		i2s_ASN1_ENUMERATED_TABLE;
-+		BIO_s_log;
-+		BIO_f_reliable;
-+		PKCS7_dataFinal;
-+		PKCS7_dataDecode;
-+		X509V3_EXT_CRL_add_conf;
-+		BN_set_params;
-+		BN_get_params;
-+		BIO_get_ex_num;
-+		BIO_set_ex_free_func;
-+		EVP_ripemd160;
-+		ASN1_TIME_set;
-+		i2d_AUTHORITY_KEYID;
-+		d2i_AUTHORITY_KEYID;
-+		AUTHORITY_KEYID_new;
-+		AUTHORITY_KEYID_free;
-+		ASN1_seq_unpack;
-+		ASN1_seq_pack;
-+		ASN1_unpack_string;
-+		ASN1_pack_string;
-+		PKCS12_pack_safebag;
-+		PKCS12_MAKE_KEYBAG;
-+		PKCS8_encrypt;
-+		PKCS12_MAKE_SHKEYBAG;
-+		PKCS12_pack_p7data;
-+		PKCS12_pack_p7encdata;
-+		PKCS12_add_localkeyid;
-+		PKCS12_add_friendlyname_asc;
-+		PKCS12_add_friendlyname_uni;
-+		PKCS12_get_friendlyname;
-+		PKCS12_pbe_crypt;
-+		PKCS12_decrypt_d2i;
-+		PKCS12_i2d_encrypt;
-+		PKCS12_init;
-+		PKCS12_key_gen_asc;
-+		PKCS12_key_gen_uni;
-+		PKCS12_gen_mac;
-+		PKCS12_verify_mac;
-+		PKCS12_set_mac;
-+		PKCS12_setup_mac;
-+		OPENSSL_asc2uni;
-+		OPENSSL_uni2asc;
-+		i2d_PKCS12_BAGS;
-+		PKCS12_BAGS_new;
-+		d2i_PKCS12_BAGS;
-+		PKCS12_BAGS_free;
-+		i2d_PKCS12;
-+		d2i_PKCS12;
-+		PKCS12_new;
-+		PKCS12_free;
-+		i2d_PKCS12_MAC_DATA;
-+		PKCS12_MAC_DATA_new;
-+		d2i_PKCS12_MAC_DATA;
-+		PKCS12_MAC_DATA_free;
-+		i2d_PKCS12_SAFEBAG;
-+		PKCS12_SAFEBAG_new;
-+		d2i_PKCS12_SAFEBAG;
-+		PKCS12_SAFEBAG_free;
-+		ERR_load_PKCS12_strings;
-+		PKCS12_PBE_add;
-+		PKCS8_add_keyusage;
-+		PKCS12_get_attr_gen;
-+		PKCS12_parse;
-+		PKCS12_create;
-+		i2d_PKCS12_bio;
-+		i2d_PKCS12_fp;
-+		d2i_PKCS12_bio;
-+		d2i_PKCS12_fp;
-+		i2d_PBEPARAM;
-+		PBEPARAM_new;
-+		d2i_PBEPARAM;
-+		PBEPARAM_free;
-+		i2d_PKCS8_PRIV_KEY_INFO;
-+		PKCS8_PRIV_KEY_INFO_new;
-+		d2i_PKCS8_PRIV_KEY_INFO;
-+		PKCS8_PRIV_KEY_INFO_free;
-+		EVP_PKCS82PKEY;
-+		EVP_PKEY2PKCS8;
-+		PKCS8_set_broken;
-+		EVP_PBE_ALGOR_CipherInit;
-+		EVP_PBE_alg_add;
-+		PKCS5_pbe_set;
-+		EVP_PBE_cleanup;
-+		i2d_SXNET;
-+		d2i_SXNET;
-+		SXNET_new;
-+		SXNET_free;
-+		i2d_SXNETID;
-+		d2i_SXNETID;
-+		SXNETID_new;
-+		SXNETID_free;
-+		DSA_SIG_new;
-+		DSA_SIG_free;
-+		DSA_do_sign;
-+		DSA_do_verify;
-+		d2i_DSA_SIG;
-+		i2d_DSA_SIG;
-+		i2d_ASN1_VISIBLESTRING;
-+		d2i_ASN1_VISIBLESTRING;
-+		i2d_ASN1_UTF8STRING;
-+		d2i_ASN1_UTF8STRING;
-+		i2d_DIRECTORYSTRING;
-+		d2i_DIRECTORYSTRING;
-+		i2d_DISPLAYTEXT;
-+		d2i_DISPLAYTEXT;
-+		d2i_ASN1_SET_OF_X509;
-+		i2d_ASN1_SET_OF_X509;
-+		i2d_PBKDF2PARAM;
-+		PBKDF2PARAM_new;
-+		d2i_PBKDF2PARAM;
-+		PBKDF2PARAM_free;
-+		i2d_PBE2PARAM;
-+		PBE2PARAM_new;
-+		d2i_PBE2PARAM;
-+		PBE2PARAM_free;
-+		d2i_ASN1_SET_OF_GENERAL_NAME;
-+		i2d_ASN1_SET_OF_GENERAL_NAME;
-+		d2i_ASN1_SET_OF_SXNETID;
-+		i2d_ASN1_SET_OF_SXNETID;
-+		d2i_ASN1_SET_OF_POLICYQUALINFO;
-+		i2d_ASN1_SET_OF_POLICYQUALINFO;
-+		d2i_ASN1_SET_OF_POLICYINFO;
-+		i2d_ASN1_SET_OF_POLICYINFO;
-+		SXNET_add_id_asc;
-+		SXNET_add_id_ulong;
-+		SXNET_add_id_INTEGER;
-+		SXNET_get_id_asc;
-+		SXNET_get_id_ulong;
-+		SXNET_get_id_INTEGER;
-+		X509V3_set_conf_lhash;
-+		i2d_CERTIFICATEPOLICIES;
-+		CERTIFICATEPOLICIES_new;
-+		CERTIFICATEPOLICIES_free;
-+		d2i_CERTIFICATEPOLICIES;
-+		i2d_POLICYINFO;
-+		POLICYINFO_new;
-+		d2i_POLICYINFO;
-+		POLICYINFO_free;
-+		i2d_POLICYQUALINFO;
-+		POLICYQUALINFO_new;
-+		d2i_POLICYQUALINFO;
-+		POLICYQUALINFO_free;
-+		i2d_USERNOTICE;
-+		USERNOTICE_new;
-+		d2i_USERNOTICE;
-+		USERNOTICE_free;
-+		i2d_NOTICEREF;
-+		NOTICEREF_new;
-+		d2i_NOTICEREF;
-+		NOTICEREF_free;
-+		X509V3_get_string;
-+		X509V3_get_section;
-+		X509V3_string_free;
-+		X509V3_section_free;
-+		X509V3_set_ctx;
-+		s2i_ASN1_INTEGER;
-+		CRYPTO_set_locked_mem_functions;
-+		CRYPTO_get_locked_mem_functions;
-+		CRYPTO_malloc_locked;
-+		CRYPTO_free_locked;
-+		BN_mod_exp2_mont;
-+		ERR_get_error_line_data;
-+		ERR_peek_error_line_data;
-+		PKCS12_PBE_keyivgen;
-+		X509_ALGOR_dup;
-+		d2i_ASN1_SET_OF_DIST_POINT;
-+		i2d_ASN1_SET_OF_DIST_POINT;
-+		i2d_CRL_DIST_POINTS;
-+		CRL_DIST_POINTS_new;
-+		CRL_DIST_POINTS_free;
-+		d2i_CRL_DIST_POINTS;
-+		i2d_DIST_POINT;
-+		DIST_POINT_new;
-+		d2i_DIST_POINT;
-+		DIST_POINT_free;
-+		i2d_DIST_POINT_NAME;
-+		DIST_POINT_NAME_new;
-+		DIST_POINT_NAME_free;
-+		d2i_DIST_POINT_NAME;
-+		X509V3_add_value_uchar;
-+		d2i_ASN1_SET_OF_X509_ATTRIBUTE;
-+		i2d_ASN1_SET_OF_ASN1_TYPE;
-+		d2i_ASN1_SET_OF_X509_EXTENSION;
-+		d2i_ASN1_SET_OF_X509_NAME_ENTRY;
-+		d2i_ASN1_SET_OF_ASN1_TYPE;
-+		i2d_ASN1_SET_OF_X509_ATTRIBUTE;
-+		i2d_ASN1_SET_OF_X509_EXTENSION;
-+		i2d_ASN1_SET_OF_X509_NAME_ENTRY;
-+		X509V3_EXT_i2d;
-+		X509V3_EXT_val_prn;
-+		X509V3_EXT_add_list;
-+		EVP_CIPHER_type;
-+		EVP_PBE_CipherInit;
-+		X509V3_add_value_bool_nf;
-+		d2i_ASN1_UINTEGER;
-+		sk_value;
-+		sk_num;
-+		sk_set;
-+		i2d_ASN1_SET_OF_X509_REVOKED;
-+		sk_sort;
-+		d2i_ASN1_SET_OF_X509_REVOKED;
-+		i2d_ASN1_SET_OF_X509_ALGOR;
-+		i2d_ASN1_SET_OF_X509_CRL;
-+		d2i_ASN1_SET_OF_X509_ALGOR;
-+		d2i_ASN1_SET_OF_X509_CRL;
-+		i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO;
-+		i2d_ASN1_SET_OF_PKCS7_RECIP_INFO;
-+		d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO;
-+		d2i_ASN1_SET_OF_PKCS7_RECIP_INFO;
-+		PKCS5_PBE_add;
-+		PEM_write_bio_PKCS8;
-+		i2d_PKCS8_fp;
-+		PEM_read_bio_PKCS8_PRIV_KEY_INFO;
-+		PEM_read_bio_P8_PRIV_KEY_INFO;
-+		d2i_PKCS8_bio;
-+		d2i_PKCS8_PRIV_KEY_INFO_fp;
-+		PEM_write_bio_PKCS8_PRIV_KEY_INFO;
-+		PEM_write_bio_P8_PRIV_KEY_INFO;
-+		PEM_read_PKCS8;
-+		d2i_PKCS8_PRIV_KEY_INFO_bio;
-+		d2i_PKCS8_fp;
-+		PEM_write_PKCS8;
-+		PEM_read_PKCS8_PRIV_KEY_INFO;
-+		PEM_read_P8_PRIV_KEY_INFO;
-+		PEM_read_bio_PKCS8;
-+		PEM_write_PKCS8_PRIV_KEY_INFO;
-+		PEM_write_P8_PRIV_KEY_INFO;
-+		PKCS5_PBE_keyivgen;
-+		i2d_PKCS8_bio;
-+		i2d_PKCS8_PRIV_KEY_INFO_fp;
-+		i2d_PKCS8_PRIV_KEY_INFO_bio;
-+		BIO_s_bio;
-+		PKCS5_pbe2_set;
-+		PKCS5_PBKDF2_HMAC_SHA1;
-+		PKCS5_v2_PBE_keyivgen;
-+		PEM_write_bio_PKCS8PrivateKey;
-+		PEM_write_PKCS8PrivateKey;
-+		BIO_ctrl_get_read_request;
-+		BIO_ctrl_pending;
-+		BIO_ctrl_wpending;
-+		BIO_new_bio_pair;
-+		BIO_ctrl_get_write_guarantee;
-+		CRYPTO_num_locks;
-+		CONF_load_bio;
-+		CONF_load_fp;
-+		i2d_ASN1_SET_OF_ASN1_OBJECT;
-+		d2i_ASN1_SET_OF_ASN1_OBJECT;
-+		PKCS7_signatureVerify;
-+		RSA_set_method;
-+		RSA_get_method;
-+		RSA_get_default_method;
-+		RSA_check_key;
-+		OBJ_obj2txt;
-+		DSA_dup_DH;
-+		X509_REQ_get_extensions;
-+		X509_REQ_set_extension_nids;
-+		BIO_nwrite;
-+		X509_REQ_extension_nid;
-+		BIO_nread;
-+		X509_REQ_get_extension_nids;
-+		BIO_nwrite0;
-+		X509_REQ_add_extensions_nid;
-+		BIO_nread0;
-+		X509_REQ_add_extensions;
-+		BIO_new_mem_buf;
-+		DH_set_ex_data;
-+		DH_set_method;
-+		DSA_OpenSSL;
-+		DH_get_ex_data;
-+		DH_get_ex_new_index;
-+		DSA_new_method;
-+		DH_new_method;
-+		DH_OpenSSL;
-+		DSA_get_ex_new_index;
-+		DH_get_default_method;
-+		DSA_set_ex_data;
-+		DH_set_default_method;
-+		DSA_get_ex_data;
-+		X509V3_EXT_REQ_add_conf;
-+		NETSCAPE_SPKI_print;
-+		NETSCAPE_SPKI_set_pubkey;
-+		NETSCAPE_SPKI_b64_encode;
-+		NETSCAPE_SPKI_get_pubkey;
-+		NETSCAPE_SPKI_b64_decode;
-+		UTF8_putc;
-+		UTF8_getc;
-+		RSA_null_method;
-+		ASN1_tag2str;
-+		BIO_ctrl_reset_read_request;
-+		DISPLAYTEXT_new;
-+		ASN1_GENERALIZEDTIME_free;
-+		X509_REVOKED_get_ext_d2i;
-+		X509_set_ex_data;
-+		X509_reject_set_bit_asc;
-+		X509_NAME_add_entry_by_txt;
-+		X509_NAME_add_entry_by_NID;
-+		X509_PURPOSE_get0;
-+		PEM_read_X509_AUX;
-+		d2i_AUTHORITY_INFO_ACCESS;
-+		PEM_write_PUBKEY;
-+		ACCESS_DESCRIPTION_new;
-+		X509_CERT_AUX_free;
-+		d2i_ACCESS_DESCRIPTION;
-+		X509_trust_clear;
-+		X509_TRUST_add;
-+		ASN1_VISIBLESTRING_new;
-+		X509_alias_set1;
-+		ASN1_PRINTABLESTRING_free;
-+		EVP_PKEY_get1_DSA;
-+		ASN1_BMPSTRING_new;
-+		ASN1_mbstring_copy;
-+		ASN1_UTF8STRING_new;
-+		DSA_get_default_method;
-+		i2d_ASN1_SET_OF_ACCESS_DESCRIPTION;
-+		ASN1_T61STRING_free;
-+		DSA_set_method;
-+		X509_get_ex_data;
-+		ASN1_STRING_type;
-+		X509_PURPOSE_get_by_sname;
-+		ASN1_TIME_free;
-+		ASN1_OCTET_STRING_cmp;
-+		ASN1_BIT_STRING_new;
-+		X509_get_ext_d2i;
-+		PEM_read_bio_X509_AUX;
-+		ASN1_STRING_set_default_mask_asc;
-+		ASN1_STRING_set_def_mask_asc;
-+		PEM_write_bio_RSA_PUBKEY;
-+		ASN1_INTEGER_cmp;
-+		d2i_RSA_PUBKEY_fp;
-+		X509_trust_set_bit_asc;
-+		PEM_write_bio_DSA_PUBKEY;
-+		X509_STORE_CTX_free;
-+		EVP_PKEY_set1_DSA;
-+		i2d_DSA_PUBKEY_fp;
-+		X509_load_cert_crl_file;
-+		ASN1_TIME_new;
-+		i2d_RSA_PUBKEY;
-+		X509_STORE_CTX_purpose_inherit;
-+		PEM_read_RSA_PUBKEY;
-+		d2i_X509_AUX;
-+		i2d_DSA_PUBKEY;
-+		X509_CERT_AUX_print;
-+		PEM_read_DSA_PUBKEY;
-+		i2d_RSA_PUBKEY_bio;
-+		ASN1_BIT_STRING_num_asc;
-+		i2d_PUBKEY;
-+		ASN1_UTCTIME_free;
-+		DSA_set_default_method;
-+		X509_PURPOSE_get_by_id;
-+		ACCESS_DESCRIPTION_free;
-+		PEM_read_bio_PUBKEY;
-+		ASN1_STRING_set_by_NID;
-+		X509_PURPOSE_get_id;
-+		DISPLAYTEXT_free;
-+		OTHERNAME_new;
-+		X509_CERT_AUX_new;
-+		X509_TRUST_cleanup;
-+		X509_NAME_add_entry_by_OBJ;
-+		X509_CRL_get_ext_d2i;
-+		X509_PURPOSE_get0_name;
-+		PEM_read_PUBKEY;
-+		i2d_DSA_PUBKEY_bio;
-+		i2d_OTHERNAME;
-+		ASN1_OCTET_STRING_free;
-+		ASN1_BIT_STRING_set_asc;
-+		X509_get_ex_new_index;
-+		ASN1_STRING_TABLE_cleanup;
-+		X509_TRUST_get_by_id;
-+		X509_PURPOSE_get_trust;
-+		ASN1_STRING_length;
-+		d2i_ASN1_SET_OF_ACCESS_DESCRIPTION;
-+		ASN1_PRINTABLESTRING_new;
-+		X509V3_get_d2i;
-+		ASN1_ENUMERATED_free;
-+		i2d_X509_CERT_AUX;
-+		X509_STORE_CTX_set_trust;
-+		ASN1_STRING_set_default_mask;
-+		X509_STORE_CTX_new;
-+		EVP_PKEY_get1_RSA;
-+		DIRECTORYSTRING_free;
-+		PEM_write_X509_AUX;
-+		ASN1_OCTET_STRING_set;
-+		d2i_DSA_PUBKEY_fp;
-+		d2i_RSA_PUBKEY;
-+		X509_TRUST_get0_name;
-+		X509_TRUST_get0;
-+		AUTHORITY_INFO_ACCESS_free;
-+		ASN1_IA5STRING_new;
-+		d2i_DSA_PUBKEY;
-+		X509_check_purpose;
-+		ASN1_ENUMERATED_new;
-+		d2i_RSA_PUBKEY_bio;
-+		d2i_PUBKEY;
-+		X509_TRUST_get_trust;
-+		X509_TRUST_get_flags;
-+		ASN1_BMPSTRING_free;
-+		ASN1_T61STRING_new;
-+		ASN1_UTCTIME_new;
-+		i2d_AUTHORITY_INFO_ACCESS;
-+		EVP_PKEY_set1_RSA;
-+		X509_STORE_CTX_set_purpose;
-+		ASN1_IA5STRING_free;
-+		PEM_write_bio_X509_AUX;
-+		X509_PURPOSE_get_count;
-+		CRYPTO_add_info;
-+		X509_NAME_ENTRY_create_by_txt;
-+		ASN1_STRING_get_default_mask;
-+		X509_alias_get0;
-+		ASN1_STRING_data;
-+		i2d_ACCESS_DESCRIPTION;
-+		X509_trust_set_bit;
-+		ASN1_BIT_STRING_free;
-+		PEM_read_bio_RSA_PUBKEY;
-+		X509_add1_reject_object;
-+		X509_check_trust;
-+		PEM_read_bio_DSA_PUBKEY;
-+		X509_PURPOSE_add;
-+		ASN1_STRING_TABLE_get;
-+		ASN1_UTF8STRING_free;
-+		d2i_DSA_PUBKEY_bio;
-+		PEM_write_RSA_PUBKEY;
-+		d2i_OTHERNAME;
-+		X509_reject_set_bit;
-+		PEM_write_DSA_PUBKEY;
-+		X509_PURPOSE_get0_sname;
-+		EVP_PKEY_set1_DH;
-+		ASN1_OCTET_STRING_dup;
-+		ASN1_BIT_STRING_set;
-+		X509_TRUST_get_count;
-+		ASN1_INTEGER_free;
-+		OTHERNAME_free;
-+		i2d_RSA_PUBKEY_fp;
-+		ASN1_INTEGER_dup;
-+		d2i_X509_CERT_AUX;
-+		PEM_write_bio_PUBKEY;
-+		ASN1_VISIBLESTRING_free;
-+		X509_PURPOSE_cleanup;
-+		ASN1_mbstring_ncopy;
-+		ASN1_GENERALIZEDTIME_new;
-+		EVP_PKEY_get1_DH;
-+		ASN1_OCTET_STRING_new;
-+		ASN1_INTEGER_new;
-+		i2d_X509_AUX;
-+		ASN1_BIT_STRING_name_print;
-+		X509_cmp;
-+		ASN1_STRING_length_set;
-+		DIRECTORYSTRING_new;
-+		X509_add1_trust_object;
-+		PKCS12_newpass;
-+		SMIME_write_PKCS7;
-+		SMIME_read_PKCS7;
-+		DES_set_key_checked;
-+		PKCS7_verify;
-+		PKCS7_encrypt;
-+		DES_set_key_unchecked;
-+		SMIME_crlf_copy;
-+		i2d_ASN1_PRINTABLESTRING;
-+		PKCS7_get0_signers;
-+		PKCS7_decrypt;
-+		SMIME_text;
-+		PKCS7_simple_smimecap;
-+		PKCS7_get_smimecap;
-+		PKCS7_sign;
-+		PKCS7_add_attrib_smimecap;
-+		CRYPTO_dbg_set_options;
-+		CRYPTO_remove_all_info;
-+		CRYPTO_get_mem_debug_functions;
-+		CRYPTO_is_mem_check_on;
-+		CRYPTO_set_mem_debug_functions;
-+		CRYPTO_pop_info;
-+		CRYPTO_push_info_;
-+		CRYPTO_set_mem_debug_options;
-+		PEM_write_PKCS8PrivateKey_nid;
-+		PEM_write_bio_PKCS8PrivateKey_nid;
-+		PEM_write_bio_PKCS8PrivKey_nid;
-+		d2i_PKCS8PrivateKey_bio;
-+		ASN1_NULL_free;
-+		d2i_ASN1_NULL;
-+		ASN1_NULL_new;
-+		i2d_PKCS8PrivateKey_bio;
-+		i2d_PKCS8PrivateKey_fp;
-+		i2d_ASN1_NULL;
-+		i2d_PKCS8PrivateKey_nid_fp;
-+		d2i_PKCS8PrivateKey_fp;
-+		i2d_PKCS8PrivateKey_nid_bio;
-+		i2d_PKCS8PrivateKeyInfo_fp;
-+		i2d_PKCS8PrivateKeyInfo_bio;
-+		PEM_cb;
-+		i2d_PrivateKey_fp;
-+		d2i_PrivateKey_bio;
-+		d2i_PrivateKey_fp;
-+		i2d_PrivateKey_bio;
-+		X509_reject_clear;
-+		X509_TRUST_set_default;
-+		d2i_AutoPrivateKey;
-+		X509_ATTRIBUTE_get0_type;
-+		X509_ATTRIBUTE_set1_data;
-+		X509at_get_attr;
-+		X509at_get_attr_count;
-+		X509_ATTRIBUTE_create_by_NID;
-+		X509_ATTRIBUTE_set1_object;
-+		X509_ATTRIBUTE_count;
-+		X509_ATTRIBUTE_create_by_OBJ;
-+		X509_ATTRIBUTE_get0_object;
-+		X509at_get_attr_by_NID;
-+		X509at_add1_attr;
-+		X509_ATTRIBUTE_get0_data;
-+		X509at_delete_attr;
-+		X509at_get_attr_by_OBJ;
-+		RAND_add;
-+		BIO_number_written;
-+		BIO_number_read;
-+		X509_STORE_CTX_get1_chain;
-+		ERR_load_RAND_strings;
-+		RAND_pseudo_bytes;
-+		X509_REQ_get_attr_by_NID;
-+		X509_REQ_get_attr;
-+		X509_REQ_add1_attr_by_NID;
-+		X509_REQ_get_attr_by_OBJ;
-+		X509at_add1_attr_by_NID;
-+		X509_REQ_add1_attr_by_OBJ;
-+		X509_REQ_get_attr_count;
-+		X509_REQ_add1_attr;
-+		X509_REQ_delete_attr;
-+		X509at_add1_attr_by_OBJ;
-+		X509_REQ_add1_attr_by_txt;
-+		X509_ATTRIBUTE_create_by_txt;
-+		X509at_add1_attr_by_txt;
-+		BN_pseudo_rand;
-+		BN_is_prime_fasttest;
-+		BN_CTX_end;
-+		BN_CTX_start;
-+		BN_CTX_get;
-+		EVP_PKEY2PKCS8_broken;
-+		ASN1_STRING_TABLE_add;
-+		CRYPTO_dbg_get_options;
-+		AUTHORITY_INFO_ACCESS_new;
-+		CRYPTO_get_mem_debug_options;
-+		DES_crypt;
-+		PEM_write_bio_X509_REQ_NEW;
-+		PEM_write_X509_REQ_NEW;
-+		BIO_callback_ctrl;
-+		RAND_egd;
-+		RAND_status;
-+		bn_dump1;
-+		DES_check_key_parity;
-+		lh_num_items;
-+		RAND_event;
-+		DSO_new;
-+		DSO_new_method;
-+		DSO_free;
-+		DSO_flags;
-+		DSO_up;
-+		DSO_set_default_method;
-+		DSO_get_default_method;
-+		DSO_get_method;
-+		DSO_set_method;
-+		DSO_load;
-+		DSO_bind_var;
-+		DSO_METHOD_null;
-+		DSO_METHOD_openssl;
-+		DSO_METHOD_dlfcn;
-+		DSO_METHOD_win32;
-+		ERR_load_DSO_strings;
-+		DSO_METHOD_dl;
-+		NCONF_load;
-+		NCONF_load_fp;
-+		NCONF_new;
-+		NCONF_get_string;
-+		NCONF_free;
-+		NCONF_get_number;
-+		CONF_dump_fp;
-+		NCONF_load_bio;
-+		NCONF_dump_fp;
-+		NCONF_get_section;
-+		NCONF_dump_bio;
-+		CONF_dump_bio;
-+		NCONF_free_data;
-+		CONF_set_default_method;
-+		ERR_error_string_n;
-+		BIO_snprintf;
-+		DSO_ctrl;
-+		i2d_ASN1_SET_OF_ASN1_INTEGER;
-+		i2d_ASN1_SET_OF_PKCS12_SAFEBAG;
-+		i2d_ASN1_SET_OF_PKCS7;
-+		BIO_vfree;
-+		d2i_ASN1_SET_OF_ASN1_INTEGER;
-+		d2i_ASN1_SET_OF_PKCS12_SAFEBAG;
-+		ASN1_UTCTIME_get;
-+		X509_REQ_digest;
-+		X509_CRL_digest;
-+		d2i_ASN1_SET_OF_PKCS7;
-+		EVP_CIPHER_CTX_set_key_length;
-+		EVP_CIPHER_CTX_ctrl;
-+		BN_mod_exp_mont_word;
-+		RAND_egd_bytes;
-+		X509_REQ_get1_email;
-+		X509_get1_email;
-+		X509_email_free;
-+		i2d_RSA_NET;
-+		d2i_RSA_NET_2;
-+		d2i_RSA_NET;
-+		DSO_bind_func;
-+		CRYPTO_get_new_dynlockid;
-+		sk_new_null;
-+		CRYPTO_set_dynlock_destroy_callback;
-+		CRYPTO_set_dynlock_destroy_cb;
-+		CRYPTO_destroy_dynlockid;
-+		CRYPTO_set_dynlock_size;
-+		CRYPTO_set_dynlock_create_callback;
-+		CRYPTO_set_dynlock_create_cb;
-+		CRYPTO_set_dynlock_lock_callback;
-+		CRYPTO_set_dynlock_lock_cb;
-+		CRYPTO_get_dynlock_lock_callback;
-+		CRYPTO_get_dynlock_lock_cb;
-+		CRYPTO_get_dynlock_destroy_callback;
-+		CRYPTO_get_dynlock_destroy_cb;
-+		CRYPTO_get_dynlock_value;
-+		CRYPTO_get_dynlock_create_callback;
-+		CRYPTO_get_dynlock_create_cb;
-+		c2i_ASN1_BIT_STRING;
-+		i2c_ASN1_BIT_STRING;
-+		RAND_poll;
-+		c2i_ASN1_INTEGER;
-+		i2c_ASN1_INTEGER;
-+		BIO_dump_indent;
-+		ASN1_parse_dump;
-+		c2i_ASN1_OBJECT;
-+		X509_NAME_print_ex_fp;
-+		ASN1_STRING_print_ex_fp;
-+		X509_NAME_print_ex;
-+		ASN1_STRING_print_ex;
-+		MD4;
-+		MD4_Transform;
-+		MD4_Final;
-+		MD4_Update;
-+		MD4_Init;
-+		EVP_md4;
-+		i2d_PUBKEY_bio;
-+		i2d_PUBKEY_fp;
-+		d2i_PUBKEY_bio;
-+		ASN1_STRING_to_UTF8;
-+		BIO_vprintf;
-+		BIO_vsnprintf;
-+		d2i_PUBKEY_fp;
-+		X509_cmp_time;
-+		X509_STORE_CTX_set_time;
-+		X509_STORE_CTX_get1_issuer;
-+		X509_OBJECT_retrieve_match;
-+		X509_OBJECT_idx_by_subject;
-+		X509_STORE_CTX_set_flags;
-+		X509_STORE_CTX_trusted_stack;
-+		X509_time_adj;
-+		X509_check_issued;
-+		ASN1_UTCTIME_cmp_time_t;
-+		DES_set_weak_key_flag;
-+		DES_check_key;
-+		DES_rw_mode;
-+		RSA_PKCS1_RSAref;
-+		X509_keyid_set1;
-+		BIO_next;
-+		DSO_METHOD_vms;
-+		BIO_f_linebuffer;
-+		BN_bntest_rand;
-+		OPENSSL_issetugid;
-+		BN_rand_range;
-+		ERR_load_ENGINE_strings;
-+		ENGINE_set_DSA;
-+		ENGINE_get_finish_function;
-+		ENGINE_get_default_RSA;
-+		ENGINE_get_BN_mod_exp;
-+		DSA_get_default_openssl_method;
-+		ENGINE_set_DH;
-+		ENGINE_set_def_BN_mod_exp_crt;
-+		ENGINE_set_default_BN_mod_exp_crt;
-+		ENGINE_init;
-+		DH_get_default_openssl_method;
-+		RSA_set_default_openssl_method;
-+		ENGINE_finish;
-+		ENGINE_load_public_key;
-+		ENGINE_get_DH;
-+		ENGINE_ctrl;
-+		ENGINE_get_init_function;
-+		ENGINE_set_init_function;
-+		ENGINE_set_default_DSA;
-+		ENGINE_get_name;
-+		ENGINE_get_last;
-+		ENGINE_get_prev;
-+		ENGINE_get_default_DH;
-+		ENGINE_get_RSA;
-+		ENGINE_set_default;
-+		ENGINE_get_RAND;
-+		ENGINE_get_first;
-+		ENGINE_by_id;
-+		ENGINE_set_finish_function;
-+		ENGINE_get_def_BN_mod_exp_crt;
-+		ENGINE_get_default_BN_mod_exp_crt;
-+		RSA_get_default_openssl_method;
-+		ENGINE_set_RSA;
-+		ENGINE_load_private_key;
-+		ENGINE_set_default_RAND;
-+		ENGINE_set_BN_mod_exp;
-+		ENGINE_remove;
-+		ENGINE_free;
-+		ENGINE_get_BN_mod_exp_crt;
-+		ENGINE_get_next;
-+		ENGINE_set_name;
-+		ENGINE_get_default_DSA;
-+		ENGINE_set_default_BN_mod_exp;
-+		ENGINE_set_default_RSA;
-+		ENGINE_get_default_RAND;
-+		ENGINE_get_default_BN_mod_exp;
-+		ENGINE_set_RAND;
-+		ENGINE_set_id;
-+		ENGINE_set_BN_mod_exp_crt;
-+		ENGINE_set_default_DH;
-+		ENGINE_new;
-+		ENGINE_get_id;
-+		DSA_set_default_openssl_method;
-+		ENGINE_add;
-+		DH_set_default_openssl_method;
-+		ENGINE_get_DSA;
-+		ENGINE_get_ctrl_function;
-+		ENGINE_set_ctrl_function;
-+		BN_pseudo_rand_range;
-+		X509_STORE_CTX_set_verify_cb;
-+		ERR_load_COMP_strings;
-+		PKCS12_item_decrypt_d2i;
-+		ASN1_UTF8STRING_it;
-+		ENGINE_unregister_ciphers;
-+		ENGINE_get_ciphers;
-+		d2i_OCSP_BASICRESP;
-+		KRB5_CHECKSUM_it;
-+		EC_POINT_add;
-+		ASN1_item_ex_i2d;
-+		OCSP_CERTID_it;
-+		d2i_OCSP_RESPBYTES;
-+		X509V3_add1_i2d;
-+		PKCS7_ENVELOPE_it;
-+		UI_add_input_boolean;
-+		ENGINE_unregister_RSA;
-+		X509V3_EXT_nconf;
-+		ASN1_GENERALSTRING_free;
-+		d2i_OCSP_CERTSTATUS;
-+		X509_REVOKED_set_serialNumber;
-+		X509_print_ex;
-+		OCSP_ONEREQ_get1_ext_d2i;
-+		ENGINE_register_all_RAND;
-+		ENGINE_load_dynamic;
-+		PBKDF2PARAM_it;
-+		EXTENDED_KEY_USAGE_new;
-+		EC_GROUP_clear_free;
-+		OCSP_sendreq_bio;
-+		ASN1_item_digest;
-+		OCSP_BASICRESP_delete_ext;
-+		OCSP_SIGNATURE_it;
-+		X509_CRL_it;
-+		OCSP_BASICRESP_add_ext;
-+		KRB5_ENCKEY_it;
-+		UI_method_set_closer;
-+		X509_STORE_set_purpose;
-+		i2d_ASN1_GENERALSTRING;
-+		OCSP_response_status;
-+		i2d_OCSP_SERVICELOC;
-+		ENGINE_get_digest_engine;
-+		EC_GROUP_set_curve_GFp;
-+		OCSP_REQUEST_get_ext_by_OBJ;
-+		_ossl_old_des_random_key;
-+		ASN1_T61STRING_it;
-+		EC_GROUP_method_of;
-+		i2d_KRB5_APREQ;
-+		_ossl_old_des_encrypt;
-+		ASN1_PRINTABLE_new;
-+		HMAC_Init_ex;
-+		d2i_KRB5_AUTHENT;
-+		OCSP_archive_cutoff_new;
-+		EC_POINT_set_Jprojective_coordinates_GFp;
-+		EC_POINT_set_Jproj_coords_GFp;
-+		_ossl_old_des_is_weak_key;
-+		OCSP_BASICRESP_get_ext_by_OBJ;
-+		EC_POINT_oct2point;
-+		OCSP_SINGLERESP_get_ext_count;
-+		UI_ctrl;
-+		_shadow_DES_rw_mode;
-+		asn1_do_adb;
-+		ASN1_template_i2d;
-+		ENGINE_register_DH;
-+		UI_construct_prompt;
-+		X509_STORE_set_trust;
-+		UI_dup_input_string;
-+		d2i_KRB5_APREQ;
-+		EVP_MD_CTX_copy_ex;
-+		OCSP_request_is_signed;
-+		i2d_OCSP_REQINFO;
-+		KRB5_ENCKEY_free;
-+		OCSP_resp_get0;
-+		GENERAL_NAME_it;
-+		ASN1_GENERALIZEDTIME_it;
-+		X509_STORE_set_flags;
-+		EC_POINT_set_compressed_coordinates_GFp;
-+		EC_POINT_set_compr_coords_GFp;
-+		OCSP_response_status_str;
-+		d2i_OCSP_REVOKEDINFO;
-+		OCSP_basic_add1_cert;
-+		ERR_get_implementation;
-+		EVP_CipherFinal_ex;
-+		OCSP_CERTSTATUS_new;
-+		CRYPTO_cleanup_all_ex_data;
-+		OCSP_resp_find;
-+		BN_nnmod;
-+		X509_CRL_sort;
-+		X509_REVOKED_set_revocationDate;
-+		ENGINE_register_RAND;
-+		OCSP_SERVICELOC_new;
-+		EC_POINT_set_affine_coordinates_GFp;
-+		EC_POINT_set_affine_coords_GFp;
-+		_ossl_old_des_options;
-+		SXNET_it;
-+		UI_dup_input_boolean;
-+		PKCS12_add_CSPName_asc;
-+		EC_POINT_is_at_infinity;
-+		ENGINE_load_cryptodev;
-+		DSO_convert_filename;
-+		POLICYQUALINFO_it;
-+		ENGINE_register_ciphers;
-+		BN_mod_lshift_quick;
-+		DSO_set_filename;
-+		ASN1_item_free;
-+		KRB5_TKTBODY_free;
-+		AUTHORITY_KEYID_it;
-+		KRB5_APREQBODY_new;
-+		X509V3_EXT_REQ_add_nconf;
-+		ENGINE_ctrl_cmd_string;
-+		i2d_OCSP_RESPDATA;
-+		EVP_MD_CTX_init;
-+		EXTENDED_KEY_USAGE_free;
-+		PKCS7_ATTR_SIGN_it;
-+		UI_add_error_string;
-+		KRB5_CHECKSUM_free;
-+		OCSP_REQUEST_get_ext;
-+		ENGINE_load_ubsec;
-+		ENGINE_register_all_digests;
-+		PKEY_USAGE_PERIOD_it;
-+		PKCS12_unpack_authsafes;
-+		ASN1_item_unpack;
-+		NETSCAPE_SPKAC_it;
-+		X509_REVOKED_it;
-+		ASN1_STRING_encode;
-+		EVP_aes_128_ecb;
-+		KRB5_AUTHENT_free;
-+		OCSP_BASICRESP_get_ext_by_critical;
-+		OCSP_BASICRESP_get_ext_by_crit;
-+		OCSP_cert_status_str;
-+		d2i_OCSP_REQUEST;
-+		UI_dup_info_string;
-+		_ossl_old_des_xwhite_in2out;
-+		PKCS12_it;
-+		OCSP_SINGLERESP_get_ext_by_critical;
-+		OCSP_SINGLERESP_get_ext_by_crit;
-+		OCSP_CERTSTATUS_free;
-+		_ossl_old_des_crypt;
-+		ASN1_item_i2d;
-+		EVP_DecryptFinal_ex;
-+		ENGINE_load_openssl;
-+		ENGINE_get_cmd_defns;
-+		ENGINE_set_load_privkey_function;
-+		ENGINE_set_load_privkey_fn;
-+		EVP_EncryptFinal_ex;
-+		ENGINE_set_default_digests;
-+		X509_get0_pubkey_bitstr;
-+		asn1_ex_i2c;
-+		ENGINE_register_RSA;
-+		ENGINE_unregister_DSA;
-+		_ossl_old_des_key_sched;
-+		X509_EXTENSION_it;
-+		i2d_KRB5_AUTHENT;
-+		SXNETID_it;
-+		d2i_OCSP_SINGLERESP;
-+		EDIPARTYNAME_new;
-+		PKCS12_certbag2x509;
-+		_ossl_old_des_ofb64_encrypt;
-+		d2i_EXTENDED_KEY_USAGE;
-+		ERR_print_errors_cb;
-+		ENGINE_set_ciphers;
-+		d2i_KRB5_APREQBODY;
-+		UI_method_get_flusher;
-+		X509_PUBKEY_it;
-+		_ossl_old_des_enc_read;
-+		PKCS7_ENCRYPT_it;
-+		i2d_OCSP_RESPONSE;
-+		EC_GROUP_get_cofactor;
-+		PKCS12_unpack_p7data;
-+		d2i_KRB5_AUTHDATA;
-+		OCSP_copy_nonce;
-+		KRB5_AUTHDATA_new;
-+		OCSP_RESPDATA_new;
-+		EC_GFp_mont_method;
-+		OCSP_REVOKEDINFO_free;
-+		UI_get_ex_data;
-+		KRB5_APREQBODY_free;
-+		EC_GROUP_get0_generator;
-+		UI_get_default_method;
-+		X509V3_set_nconf;
-+		PKCS12_item_i2d_encrypt;
-+		X509_add1_ext_i2d;
-+		PKCS7_SIGNER_INFO_it;
-+		KRB5_PRINCNAME_new;
-+		PKCS12_SAFEBAG_it;
-+		EC_GROUP_get_order;
-+		d2i_OCSP_RESPID;
-+		OCSP_request_verify;
-+		NCONF_get_number_e;
-+		_ossl_old_des_decrypt3;
-+		X509_signature_print;
-+		OCSP_SINGLERESP_free;
-+		ENGINE_load_builtin_engines;
-+		i2d_OCSP_ONEREQ;
-+		OCSP_REQUEST_add_ext;
-+		OCSP_RESPBYTES_new;
-+		EVP_MD_CTX_create;
-+		OCSP_resp_find_status;
-+		X509_ALGOR_it;
-+		ASN1_TIME_it;
-+		OCSP_request_set1_name;
-+		OCSP_ONEREQ_get_ext_count;
-+		UI_get0_result;
-+		PKCS12_AUTHSAFES_it;
-+		EVP_aes_256_ecb;
-+		PKCS12_pack_authsafes;
-+		ASN1_IA5STRING_it;
-+		UI_get_input_flags;
-+		EC_GROUP_set_generator;
-+		_ossl_old_des_string_to_2keys;
-+		OCSP_CERTID_free;
-+		X509_CERT_AUX_it;
-+		CERTIFICATEPOLICIES_it;
-+		_ossl_old_des_ede3_cbc_encrypt;
-+		RAND_set_rand_engine;
-+		DSO_get_loaded_filename;
-+		X509_ATTRIBUTE_it;
-+		OCSP_ONEREQ_get_ext_by_NID;
-+		PKCS12_decrypt_skey;
-+		KRB5_AUTHENT_it;
-+		UI_dup_error_string;
-+		RSAPublicKey_it;
-+		i2d_OCSP_REQUEST;
-+		PKCS12_x509crl2certbag;
-+		OCSP_SERVICELOC_it;
-+		ASN1_item_sign;
-+		X509_CRL_set_issuer_name;
-+		OBJ_NAME_do_all_sorted;
-+		i2d_OCSP_BASICRESP;
-+		i2d_OCSP_RESPBYTES;
-+		PKCS12_unpack_p7encdata;
-+		HMAC_CTX_init;
-+		ENGINE_get_digest;
-+		OCSP_RESPONSE_print;
-+		KRB5_TKTBODY_it;
-+		ACCESS_DESCRIPTION_it;
-+		PKCS7_ISSUER_AND_SERIAL_it;
-+		PBE2PARAM_it;
-+		PKCS12_certbag2x509crl;
-+		PKCS7_SIGNED_it;
-+		ENGINE_get_cipher;
-+		i2d_OCSP_CRLID;
-+		OCSP_SINGLERESP_new;
-+		ENGINE_cmd_is_executable;
-+		RSA_up_ref;
-+		ASN1_GENERALSTRING_it;
-+		ENGINE_register_DSA;
-+		X509V3_EXT_add_nconf_sk;
-+		ENGINE_set_load_pubkey_function;
-+		PKCS8_decrypt;
-+		PEM_bytes_read_bio;
-+		DIRECTORYSTRING_it;
-+		d2i_OCSP_CRLID;
-+		EC_POINT_is_on_curve;
-+		CRYPTO_set_locked_mem_ex_functions;
-+		CRYPTO_set_locked_mem_ex_funcs;
-+		d2i_KRB5_CHECKSUM;
-+		ASN1_item_dup;
-+		X509_it;
-+		BN_mod_add;
-+		KRB5_AUTHDATA_free;
-+		_ossl_old_des_cbc_cksum;
-+		ASN1_item_verify;
-+		CRYPTO_set_mem_ex_functions;
-+		EC_POINT_get_Jprojective_coordinates_GFp;
-+		EC_POINT_get_Jproj_coords_GFp;
-+		ZLONG_it;
-+		CRYPTO_get_locked_mem_ex_functions;
-+		CRYPTO_get_locked_mem_ex_funcs;
-+		ASN1_TIME_check;
-+		UI_get0_user_data;
-+		HMAC_CTX_cleanup;
-+		DSA_up_ref;
-+		_ossl_old_des_ede3_cfb64_encrypt;
-+		_ossl_odes_ede3_cfb64_encrypt;
-+		ASN1_BMPSTRING_it;
-+		ASN1_tag2bit;
-+		UI_method_set_flusher;
-+		X509_ocspid_print;
-+		KRB5_ENCDATA_it;
-+		ENGINE_get_load_pubkey_function;
-+		UI_add_user_data;
-+		OCSP_REQUEST_delete_ext;
-+		UI_get_method;
-+		OCSP_ONEREQ_free;
-+		ASN1_PRINTABLESTRING_it;
-+		X509_CRL_set_nextUpdate;
-+		OCSP_REQUEST_it;
-+		OCSP_BASICRESP_it;
-+		AES_ecb_encrypt;
-+		BN_mod_sqr;
-+		NETSCAPE_CERT_SEQUENCE_it;
-+		GENERAL_NAMES_it;
-+		AUTHORITY_INFO_ACCESS_it;
-+		ASN1_FBOOLEAN_it;
-+		UI_set_ex_data;
-+		_ossl_old_des_string_to_key;
-+		ENGINE_register_all_RSA;
-+		d2i_KRB5_PRINCNAME;
-+		OCSP_RESPBYTES_it;
-+		X509_CINF_it;
-+		ENGINE_unregister_digests;
-+		d2i_EDIPARTYNAME;
-+		d2i_OCSP_SERVICELOC;
-+		ENGINE_get_digests;
-+		_ossl_old_des_set_odd_parity;
-+		OCSP_RESPDATA_free;
-+		d2i_KRB5_TICKET;
-+		OTHERNAME_it;
-+		EVP_MD_CTX_cleanup;
-+		d2i_ASN1_GENERALSTRING;
-+		X509_CRL_set_version;
-+		BN_mod_sub;
-+		OCSP_SINGLERESP_get_ext_by_NID;
-+		ENGINE_get_ex_new_index;
-+		OCSP_REQUEST_free;
-+		OCSP_REQUEST_add1_ext_i2d;
-+		X509_VAL_it;
-+		EC_POINTs_make_affine;
-+		EC_POINT_mul;
-+		X509V3_EXT_add_nconf;
-+		X509_TRUST_set;
-+		X509_CRL_add1_ext_i2d;
-+		_ossl_old_des_fcrypt;
-+		DISPLAYTEXT_it;
-+		X509_CRL_set_lastUpdate;
-+		OCSP_BASICRESP_free;
-+		OCSP_BASICRESP_add1_ext_i2d;
-+		d2i_KRB5_AUTHENTBODY;
-+		CRYPTO_set_ex_data_implementation;
-+		CRYPTO_set_ex_data_impl;
-+		KRB5_ENCDATA_new;
-+		DSO_up_ref;
-+		OCSP_crl_reason_str;
-+		UI_get0_result_string;
-+		ASN1_GENERALSTRING_new;
-+		X509_SIG_it;
-+		ERR_set_implementation;
-+		ERR_load_EC_strings;
-+		UI_get0_action_string;
-+		OCSP_ONEREQ_get_ext;
-+		EC_POINT_method_of;
-+		i2d_KRB5_APREQBODY;
-+		_ossl_old_des_ecb3_encrypt;
-+		CRYPTO_get_mem_ex_functions;
-+		ENGINE_get_ex_data;
-+		UI_destroy_method;
-+		ASN1_item_i2d_bio;
-+		OCSP_ONEREQ_get_ext_by_OBJ;
-+		ASN1_primitive_new;
-+		ASN1_PRINTABLE_it;
-+		EVP_aes_192_ecb;
-+		OCSP_SIGNATURE_new;
-+		LONG_it;
-+		ASN1_VISIBLESTRING_it;
-+		OCSP_SINGLERESP_add1_ext_i2d;
-+		d2i_OCSP_CERTID;
-+		ASN1_item_d2i_fp;
-+		CRL_DIST_POINTS_it;
-+		GENERAL_NAME_print;
-+		OCSP_SINGLERESP_delete_ext;
-+		PKCS12_SAFEBAGS_it;
-+		d2i_OCSP_SIGNATURE;
-+		OCSP_request_add1_nonce;
-+		ENGINE_set_cmd_defns;
-+		OCSP_SERVICELOC_free;
-+		EC_GROUP_free;
-+		ASN1_BIT_STRING_it;
-+		X509_REQ_it;
-+		_ossl_old_des_cbc_encrypt;
-+		ERR_unload_strings;
-+		PKCS7_SIGN_ENVELOPE_it;
-+		EDIPARTYNAME_free;
-+		OCSP_REQINFO_free;
-+		EC_GROUP_new_curve_GFp;
-+		OCSP_REQUEST_get1_ext_d2i;
-+		PKCS12_item_pack_safebag;
-+		asn1_ex_c2i;
-+		ENGINE_register_digests;
-+		i2d_OCSP_REVOKEDINFO;
-+		asn1_enc_restore;
-+		UI_free;
-+		UI_new_method;
-+		EVP_EncryptInit_ex;
-+		X509_pubkey_digest;
-+		EC_POINT_invert;
-+		OCSP_basic_sign;
-+		i2d_OCSP_RESPID;
-+		OCSP_check_nonce;
-+		ENGINE_ctrl_cmd;
-+		d2i_KRB5_ENCKEY;
-+		OCSP_parse_url;
-+		OCSP_SINGLERESP_get_ext;
-+		OCSP_CRLID_free;
-+		OCSP_BASICRESP_get1_ext_d2i;
-+		RSAPrivateKey_it;
-+		ENGINE_register_all_DH;
-+		i2d_EDIPARTYNAME;
-+		EC_POINT_get_affine_coordinates_GFp;
-+		EC_POINT_get_affine_coords_GFp;
-+		OCSP_CRLID_new;
-+		ENGINE_get_flags;
-+		OCSP_ONEREQ_it;
-+		UI_process;
-+		ASN1_INTEGER_it;
-+		EVP_CipherInit_ex;
-+		UI_get_string_type;
-+		ENGINE_unregister_DH;
-+		ENGINE_register_all_DSA;
-+		OCSP_ONEREQ_get_ext_by_critical;
-+		bn_dup_expand;
-+		OCSP_cert_id_new;
-+		BASIC_CONSTRAINTS_it;
-+		BN_mod_add_quick;
-+		EC_POINT_new;
-+		EVP_MD_CTX_destroy;
-+		OCSP_RESPBYTES_free;
-+		EVP_aes_128_cbc;
-+		OCSP_SINGLERESP_get1_ext_d2i;
-+		EC_POINT_free;
-+		DH_up_ref;
-+		X509_NAME_ENTRY_it;
-+		UI_get_ex_new_index;
-+		BN_mod_sub_quick;
-+		OCSP_ONEREQ_add_ext;
-+		OCSP_request_sign;
-+		EVP_DigestFinal_ex;
-+		ENGINE_set_digests;
-+		OCSP_id_issuer_cmp;
-+		OBJ_NAME_do_all;
-+		EC_POINTs_mul;
-+		ENGINE_register_complete;
-+		X509V3_EXT_nconf_nid;
-+		ASN1_SEQUENCE_it;
-+		UI_set_default_method;
-+		RAND_query_egd_bytes;
-+		UI_method_get_writer;
-+		UI_OpenSSL;
-+		PEM_def_callback;
-+		ENGINE_cleanup;
-+		DIST_POINT_it;
-+		OCSP_SINGLERESP_it;
-+		d2i_KRB5_TKTBODY;
-+		EC_POINT_cmp;
-+		OCSP_REVOKEDINFO_new;
-+		i2d_OCSP_CERTSTATUS;
-+		OCSP_basic_add1_nonce;
-+		ASN1_item_ex_d2i;
-+		BN_mod_lshift1_quick;
-+		UI_set_method;
-+		OCSP_id_get0_info;
-+		BN_mod_sqrt;
-+		EC_GROUP_copy;
-+		KRB5_ENCDATA_free;
-+		_ossl_old_des_cfb_encrypt;
-+		OCSP_SINGLERESP_get_ext_by_OBJ;
-+		OCSP_cert_to_id;
-+		OCSP_RESPID_new;
-+		OCSP_RESPDATA_it;
-+		d2i_OCSP_RESPDATA;
-+		ENGINE_register_all_complete;
-+		OCSP_check_validity;
-+		PKCS12_BAGS_it;
-+		OCSP_url_svcloc_new;
-+		ASN1_template_free;
-+		OCSP_SINGLERESP_add_ext;
-+		KRB5_AUTHENTBODY_it;
-+		X509_supported_extension;
-+		i2d_KRB5_AUTHDATA;
-+		UI_method_get_opener;
-+		ENGINE_set_ex_data;
-+		OCSP_REQUEST_print;
-+		CBIGNUM_it;
-+		KRB5_TICKET_new;
-+		KRB5_APREQ_new;
-+		EC_GROUP_get_curve_GFp;
-+		KRB5_ENCKEY_new;
-+		ASN1_template_d2i;
-+		_ossl_old_des_quad_cksum;
-+		OCSP_single_get0_status;
-+		BN_swap;
-+		POLICYINFO_it;
-+		ENGINE_set_destroy_function;
-+		asn1_enc_free;
-+		OCSP_RESPID_it;
-+		EC_GROUP_new;
-+		EVP_aes_256_cbc;
-+		i2d_KRB5_PRINCNAME;
-+		_ossl_old_des_encrypt2;
-+		_ossl_old_des_encrypt3;
-+		PKCS8_PRIV_KEY_INFO_it;
-+		OCSP_REQINFO_it;
-+		PBEPARAM_it;
-+		KRB5_AUTHENTBODY_new;
-+		X509_CRL_add0_revoked;
-+		EDIPARTYNAME_it;
-+		NETSCAPE_SPKI_it;
-+		UI_get0_test_string;
-+		ENGINE_get_cipher_engine;
-+		ENGINE_register_all_ciphers;
-+		EC_POINT_copy;
-+		BN_kronecker;
-+		_ossl_old_des_ede3_ofb64_encrypt;
-+		_ossl_odes_ede3_ofb64_encrypt;
-+		UI_method_get_reader;
-+		OCSP_BASICRESP_get_ext_count;
-+		ASN1_ENUMERATED_it;
-+		UI_set_result;
-+		i2d_KRB5_TICKET;
-+		X509_print_ex_fp;
-+		EVP_CIPHER_CTX_set_padding;
-+		d2i_OCSP_RESPONSE;
-+		ASN1_UTCTIME_it;
-+		_ossl_old_des_enc_write;
-+		OCSP_RESPONSE_new;
-+		AES_set_encrypt_key;
-+		OCSP_resp_count;
-+		KRB5_CHECKSUM_new;
-+		ENGINE_load_cswift;
-+		OCSP_onereq_get0_id;
-+		ENGINE_set_default_ciphers;
-+		NOTICEREF_it;
-+		X509V3_EXT_CRL_add_nconf;
-+		OCSP_REVOKEDINFO_it;
-+		AES_encrypt;
-+		OCSP_REQUEST_new;
-+		ASN1_ANY_it;
-+		CRYPTO_ex_data_new_class;
-+		_ossl_old_des_ncbc_encrypt;
-+		i2d_KRB5_TKTBODY;
-+		EC_POINT_clear_free;
-+		AES_decrypt;
-+		asn1_enc_init;
-+		UI_get_result_maxsize;
-+		OCSP_CERTID_new;
-+		ENGINE_unregister_RAND;
-+		UI_method_get_closer;
-+		d2i_KRB5_ENCDATA;
-+		OCSP_request_onereq_count;
-+		OCSP_basic_verify;
-+		KRB5_AUTHENTBODY_free;
-+		ASN1_item_d2i;
-+		ASN1_primitive_free;
-+		i2d_EXTENDED_KEY_USAGE;
-+		i2d_OCSP_SIGNATURE;
-+		asn1_enc_save;
-+		ENGINE_load_nuron;
-+		_ossl_old_des_pcbc_encrypt;
-+		PKCS12_MAC_DATA_it;
-+		OCSP_accept_responses_new;
-+		asn1_do_lock;
-+		PKCS7_ATTR_VERIFY_it;
-+		KRB5_APREQBODY_it;
-+		i2d_OCSP_SINGLERESP;
-+		ASN1_item_ex_new;
-+		UI_add_verify_string;
-+		_ossl_old_des_set_key;
-+		KRB5_PRINCNAME_it;
-+		EVP_DecryptInit_ex;
-+		i2d_OCSP_CERTID;
-+		ASN1_item_d2i_bio;
-+		EC_POINT_dbl;
-+		asn1_get_choice_selector;
-+		i2d_KRB5_CHECKSUM;
-+		ENGINE_set_table_flags;
-+		AES_options;
-+		ENGINE_load_chil;
-+		OCSP_id_cmp;
-+		OCSP_BASICRESP_new;
-+		OCSP_REQUEST_get_ext_by_NID;
-+		KRB5_APREQ_it;
-+		ENGINE_get_destroy_function;
-+		CONF_set_nconf;
-+		ASN1_PRINTABLE_free;
-+		OCSP_BASICRESP_get_ext_by_NID;
-+		DIST_POINT_NAME_it;
-+		X509V3_extensions_print;
-+		_ossl_old_des_cfb64_encrypt;
-+		X509_REVOKED_add1_ext_i2d;
-+		_ossl_old_des_ofb_encrypt;
-+		KRB5_TKTBODY_new;
-+		ASN1_OCTET_STRING_it;
-+		ERR_load_UI_strings;
-+		i2d_KRB5_ENCKEY;
-+		ASN1_template_new;
-+		OCSP_SIGNATURE_free;
-+		ASN1_item_i2d_fp;
-+		KRB5_PRINCNAME_free;
-+		PKCS7_RECIP_INFO_it;
-+		EXTENDED_KEY_USAGE_it;
-+		EC_GFp_simple_method;
-+		EC_GROUP_precompute_mult;
-+		OCSP_request_onereq_get0;
-+		UI_method_set_writer;
-+		KRB5_AUTHENT_new;
-+		X509_CRL_INFO_it;
-+		DSO_set_name_converter;
-+		AES_set_decrypt_key;
-+		PKCS7_DIGEST_it;
-+		PKCS12_x5092certbag;
-+		EVP_DigestInit_ex;
-+		i2a_ACCESS_DESCRIPTION;
-+		OCSP_RESPONSE_it;
-+		PKCS7_ENC_CONTENT_it;
-+		OCSP_request_add0_id;
-+		EC_POINT_make_affine;
-+		DSO_get_filename;
-+		OCSP_CERTSTATUS_it;
-+		OCSP_request_add1_cert;
-+		UI_get0_output_string;
-+		UI_dup_verify_string;
-+		BN_mod_lshift;
-+		KRB5_AUTHDATA_it;
-+		asn1_set_choice_selector;
-+		OCSP_basic_add1_status;
-+		OCSP_RESPID_free;
-+		asn1_get_field_ptr;
-+		UI_add_input_string;
-+		OCSP_CRLID_it;
-+		i2d_KRB5_AUTHENTBODY;
-+		OCSP_REQUEST_get_ext_count;
-+		ENGINE_load_atalla;
-+		X509_NAME_it;
-+		USERNOTICE_it;
-+		OCSP_REQINFO_new;
-+		OCSP_BASICRESP_get_ext;
-+		CRYPTO_get_ex_data_implementation;
-+		CRYPTO_get_ex_data_impl;
-+		ASN1_item_pack;
-+		i2d_KRB5_ENCDATA;
-+		X509_PURPOSE_set;
-+		X509_REQ_INFO_it;
-+		UI_method_set_opener;
-+		ASN1_item_ex_free;
-+		ASN1_BOOLEAN_it;
-+		ENGINE_get_table_flags;
-+		UI_create_method;
-+		OCSP_ONEREQ_add1_ext_i2d;
-+		_shadow_DES_check_key;
-+		d2i_OCSP_REQINFO;
-+		UI_add_info_string;
-+		UI_get_result_minsize;
-+		ASN1_NULL_it;
-+		BN_mod_lshift1;
-+		d2i_OCSP_ONEREQ;
-+		OCSP_ONEREQ_new;
-+		KRB5_TICKET_it;
-+		EVP_aes_192_cbc;
-+		KRB5_TICKET_free;
-+		UI_new;
-+		OCSP_response_create;
-+		_ossl_old_des_xcbc_encrypt;
-+		PKCS7_it;
-+		OCSP_REQUEST_get_ext_by_critical;
-+		OCSP_REQUEST_get_ext_by_crit;
-+		ENGINE_set_flags;
-+		_ossl_old_des_ecb_encrypt;
-+		OCSP_response_get1_basic;
-+		EVP_Digest;
-+		OCSP_ONEREQ_delete_ext;
-+		ASN1_TBOOLEAN_it;
-+		ASN1_item_new;
-+		ASN1_TIME_to_generalizedtime;
-+		BIGNUM_it;
-+		AES_cbc_encrypt;
-+		ENGINE_get_load_privkey_function;
-+		ENGINE_get_load_privkey_fn;
-+		OCSP_RESPONSE_free;
-+		UI_method_set_reader;
-+		i2d_ASN1_T61STRING;
-+		EC_POINT_set_to_infinity;
-+		ERR_load_OCSP_strings;
-+		EC_POINT_point2oct;
-+		KRB5_APREQ_free;
-+		ASN1_OBJECT_it;
-+		OCSP_crlID_new;
-+		OCSP_crlID2_new;
-+		CONF_modules_load_file;
-+		CONF_imodule_set_usr_data;
-+		ENGINE_set_default_string;
-+		CONF_module_get_usr_data;
-+		ASN1_add_oid_module;
-+		CONF_modules_finish;
-+		OPENSSL_config;
-+		CONF_modules_unload;
-+		CONF_imodule_get_value;
-+		CONF_module_set_usr_data;
-+		CONF_parse_list;
-+		CONF_module_add;
-+		CONF_get1_default_config_file;
-+		CONF_imodule_get_flags;
-+		CONF_imodule_get_module;
-+		CONF_modules_load;
-+		CONF_imodule_get_name;
-+		ERR_peek_top_error;
-+		CONF_imodule_get_usr_data;
-+		CONF_imodule_set_flags;
-+		ENGINE_add_conf_module;
-+		ERR_peek_last_error_line;
-+		ERR_peek_last_error_line_data;
-+		ERR_peek_last_error;
-+		DES_read_2passwords;
-+		DES_read_password;
-+		UI_UTIL_read_pw;
-+		UI_UTIL_read_pw_string;
-+		ENGINE_load_aep;
-+		ENGINE_load_sureware;
-+		OPENSSL_add_all_algorithms_noconf;
-+		OPENSSL_add_all_algo_noconf;
-+		OPENSSL_add_all_algorithms_conf;
-+		OPENSSL_add_all_algo_conf;
-+		OPENSSL_load_builtin_modules;
-+		AES_ofb128_encrypt;
-+		AES_ctr128_encrypt;
-+		AES_cfb128_encrypt;
-+		ENGINE_load_4758cca;
-+		_ossl_096_des_random_seed;
-+		EVP_aes_256_ofb;
-+		EVP_aes_192_ofb;
-+		EVP_aes_128_cfb128;
-+		EVP_aes_256_cfb128;
-+		EVP_aes_128_ofb;
-+		EVP_aes_192_cfb128;
-+		CONF_modules_free;
-+		NCONF_default;
-+		OPENSSL_no_config;
-+		NCONF_WIN32;
-+		ASN1_UNIVERSALSTRING_new;
-+		EVP_des_ede_ecb;
-+		i2d_ASN1_UNIVERSALSTRING;
-+		ASN1_UNIVERSALSTRING_free;
-+		ASN1_UNIVERSALSTRING_it;
-+		d2i_ASN1_UNIVERSALSTRING;
-+		EVP_des_ede3_ecb;
-+		X509_REQ_print_ex;
-+		ENGINE_up_ref;
-+		BUF_MEM_grow_clean;
-+		CRYPTO_realloc_clean;
-+		BUF_strlcat;
-+		BIO_indent;
-+		BUF_strlcpy;
-+		OpenSSLDie;
-+		OPENSSL_cleanse;
-+		ENGINE_setup_bsd_cryptodev;
-+		ERR_release_err_state_table;
-+		EVP_aes_128_cfb8;
-+		FIPS_corrupt_rsa;
-+		FIPS_selftest_des;
-+		EVP_aes_128_cfb1;
-+		EVP_aes_192_cfb8;
-+		FIPS_mode_set;
-+		FIPS_selftest_dsa;
-+		EVP_aes_256_cfb8;
-+		FIPS_allow_md5;
-+		DES_ede3_cfb_encrypt;
-+		EVP_des_ede3_cfb8;
-+		FIPS_rand_seeded;
-+		AES_cfbr_encrypt_block;
-+		AES_cfb8_encrypt;
-+		FIPS_rand_seed;
-+		FIPS_corrupt_des;
-+		EVP_aes_192_cfb1;
-+		FIPS_selftest_aes;
-+		FIPS_set_prng_key;
-+		EVP_des_cfb8;
-+		FIPS_corrupt_dsa;
-+		FIPS_test_mode;
-+		FIPS_rand_method;
-+		EVP_aes_256_cfb1;
-+		ERR_load_FIPS_strings;
-+		FIPS_corrupt_aes;
-+		FIPS_selftest_sha1;
-+		FIPS_selftest_rsa;
-+		FIPS_corrupt_sha1;
-+		EVP_des_cfb1;
-+		FIPS_dsa_check;
-+		AES_cfb1_encrypt;
-+		EVP_des_ede3_cfb1;
-+		FIPS_rand_check;
-+		FIPS_md5_allowed;
-+		FIPS_mode;
-+		FIPS_selftest_failed;
-+		sk_is_sorted;
-+		X509_check_ca;
-+		HMAC_CTX_set_flags;
-+		d2i_PROXY_CERT_INFO_EXTENSION;
-+		PROXY_POLICY_it;
-+		i2d_PROXY_POLICY;
-+		i2d_PROXY_CERT_INFO_EXTENSION;
-+		d2i_PROXY_POLICY;
-+		PROXY_CERT_INFO_EXTENSION_new;
-+		PROXY_CERT_INFO_EXTENSION_free;
-+		PROXY_CERT_INFO_EXTENSION_it;
-+		PROXY_POLICY_free;
-+		PROXY_POLICY_new;
-+		BN_MONT_CTX_set_locked;
-+		FIPS_selftest_rng;
-+		EVP_sha384;
-+		EVP_sha512;
-+		EVP_sha224;
-+		EVP_sha256;
-+		FIPS_selftest_hmac;
-+		FIPS_corrupt_rng;
-+		BN_mod_exp_mont_consttime;
-+		RSA_X931_hash_id;
-+		RSA_padding_check_X931;
-+		RSA_verify_PKCS1_PSS;
-+		RSA_padding_add_X931;
-+		RSA_padding_add_PKCS1_PSS;
-+		PKCS1_MGF1;
-+		BN_X931_generate_Xpq;
-+		RSA_X931_generate_key;
-+		BN_X931_derive_prime;
-+		BN_X931_generate_prime;
-+		RSA_X931_derive;
-+		BIO_new_dgram;
-+		BN_get0_nist_prime_384;
-+		ERR_set_mark;
-+		X509_STORE_CTX_set0_crls;
-+		ENGINE_set_STORE;
-+		ENGINE_register_ECDSA;
-+		STORE_meth_set_list_start_fn;
-+		STORE_method_set_list_start_function;
-+		BN_BLINDING_invert_ex;
-+		NAME_CONSTRAINTS_free;
-+		STORE_ATTR_INFO_set_number;
-+		BN_BLINDING_get_thread_id;
-+		X509_STORE_CTX_set0_param;
-+		POLICY_MAPPING_it;
-+		STORE_parse_attrs_start;
-+		POLICY_CONSTRAINTS_free;
-+		EVP_PKEY_add1_attr_by_NID;
-+		BN_nist_mod_192;
-+		EC_GROUP_get_trinomial_basis;
-+		STORE_set_method;
-+		GENERAL_SUBTREE_free;
-+		NAME_CONSTRAINTS_it;
-+		ECDH_get_default_method;
-+		PKCS12_add_safe;
-+		EC_KEY_new_by_curve_name;
-+		STORE_meth_get_update_store_fn;
-+		STORE_method_get_update_store_function;
-+		ENGINE_register_ECDH;
-+		SHA512_Update;
-+		i2d_ECPrivateKey;
-+		BN_get0_nist_prime_192;
-+		STORE_modify_certificate;
-+		EC_POINT_set_affine_coordinates_GF2m;
-+		EC_POINT_set_affine_coords_GF2m;
-+		BN_GF2m_mod_exp_arr;
-+		STORE_ATTR_INFO_modify_number;
-+		X509_keyid_get0;
-+		ENGINE_load_gmp;
-+		pitem_new;
-+		BN_GF2m_mod_mul_arr;
-+		STORE_list_public_key_endp;
-+		o2i_ECPublicKey;
-+		EC_KEY_copy;
-+		BIO_dump_fp;
-+		X509_policy_node_get0_parent;
-+		EC_GROUP_check_discriminant;
-+		i2o_ECPublicKey;
-+		EC_KEY_precompute_mult;
-+		a2i_IPADDRESS;
-+		STORE_meth_set_initialise_fn;
-+		STORE_method_set_initialise_function;
-+		X509_STORE_CTX_set_depth;
-+		X509_VERIFY_PARAM_inherit;
-+		EC_POINT_point2bn;
-+		STORE_ATTR_INFO_set_dn;
-+		X509_policy_tree_get0_policies;
-+		EC_GROUP_new_curve_GF2m;
-+		STORE_destroy_method;
-+		ENGINE_unregister_STORE;
-+		EVP_PKEY_get1_EC_KEY;
-+		STORE_ATTR_INFO_get0_number;
-+		ENGINE_get_default_ECDH;
-+		EC_KEY_get_conv_form;
-+		ASN1_OCTET_STRING_NDEF_it;
-+		STORE_delete_public_key;
-+		STORE_get_public_key;
-+		STORE_modify_arbitrary;
-+		ENGINE_get_static_state;
-+		pqueue_iterator;
-+		ECDSA_SIG_new;
-+		OPENSSL_DIR_end;
-+		BN_GF2m_mod_sqr;
-+		EC_POINT_bn2point;
-+		X509_VERIFY_PARAM_set_depth;
-+		EC_KEY_set_asn1_flag;
-+		STORE_get_method;
-+		EC_KEY_get_key_method_data;
-+		ECDSA_sign_ex;
-+		STORE_parse_attrs_end;
-+		EC_GROUP_get_point_conversion_form;
-+		EC_GROUP_get_point_conv_form;
-+		STORE_method_set_store_function;
-+		STORE_ATTR_INFO_in;
-+		PEM_read_bio_ECPKParameters;
-+		EC_GROUP_get_pentanomial_basis;
-+		EVP_PKEY_add1_attr_by_txt;
-+		BN_BLINDING_set_flags;
-+		X509_VERIFY_PARAM_set1_policies;
-+		X509_VERIFY_PARAM_set1_name;
-+		X509_VERIFY_PARAM_set_purpose;
-+		STORE_get_number;
-+		ECDSA_sign_setup;
-+		BN_GF2m_mod_solve_quad_arr;
-+		EC_KEY_up_ref;
-+		POLICY_MAPPING_free;
-+		BN_GF2m_mod_div;
-+		X509_VERIFY_PARAM_set_flags;
-+		EC_KEY_free;
-+		STORE_meth_set_list_next_fn;
-+		STORE_method_set_list_next_function;
-+		PEM_write_bio_ECPrivateKey;
-+		d2i_EC_PUBKEY;
-+		STORE_meth_get_generate_fn;
-+		STORE_method_get_generate_function;
-+		STORE_meth_set_list_end_fn;
-+		STORE_method_set_list_end_function;
-+		pqueue_print;
-+		EC_GROUP_have_precompute_mult;
-+		EC_KEY_print_fp;
-+		BN_GF2m_mod_arr;
-+		PEM_write_bio_X509_CERT_PAIR;
-+		EVP_PKEY_cmp;
-+		X509_policy_level_node_count;
-+		STORE_new_engine;
-+		STORE_list_public_key_start;
-+		X509_VERIFY_PARAM_new;
-+		ECDH_get_ex_data;
-+		EVP_PKEY_get_attr;
-+		ECDSA_do_sign;
-+		ENGINE_unregister_ECDH;
-+		ECDH_OpenSSL;
-+		EC_KEY_set_conv_form;
-+		EC_POINT_dup;
-+		GENERAL_SUBTREE_new;
-+		STORE_list_crl_endp;
-+		EC_get_builtin_curves;
-+		X509_policy_node_get0_qualifiers;
-+		X509_pcy_node_get0_qualifiers;
-+		STORE_list_crl_end;
-+		EVP_PKEY_set1_EC_KEY;
-+		BN_GF2m_mod_sqrt_arr;
-+		i2d_ECPrivateKey_bio;
-+		ECPKParameters_print_fp;
-+		pqueue_find;
-+		ECDSA_SIG_free;
-+		PEM_write_bio_ECPKParameters;
-+		STORE_method_set_ctrl_function;
-+		STORE_list_public_key_end;
-+		EC_KEY_set_private_key;
-+		pqueue_peek;
-+		STORE_get_arbitrary;
-+		STORE_store_crl;
-+		X509_policy_node_get0_policy;
-+		PKCS12_add_safes;
-+		BN_BLINDING_convert_ex;
-+		X509_policy_tree_free;
-+		OPENSSL_ia32cap_loc;
-+		BN_GF2m_poly2arr;
-+		STORE_ctrl;
-+		STORE_ATTR_INFO_compare;
-+		BN_get0_nist_prime_224;
-+		i2d_ECParameters;
-+		i2d_ECPKParameters;
-+		BN_GENCB_call;
-+		d2i_ECPKParameters;
-+		STORE_meth_set_generate_fn;
-+		STORE_method_set_generate_function;
-+		ENGINE_set_ECDH;
-+		NAME_CONSTRAINTS_new;
-+		SHA256_Init;
-+		EC_KEY_get0_public_key;
-+		PEM_write_bio_EC_PUBKEY;
-+		STORE_ATTR_INFO_set_cstr;
-+		STORE_list_crl_next;
-+		STORE_ATTR_INFO_in_range;
-+		ECParameters_print;
-+		STORE_meth_set_delete_fn;
-+		STORE_method_set_delete_function;
-+		STORE_list_certificate_next;
-+		ASN1_generate_nconf;
-+		BUF_memdup;
-+		BN_GF2m_mod_mul;
-+		STORE_meth_get_list_next_fn;
-+		STORE_method_get_list_next_function;
-+		STORE_ATTR_INFO_get0_dn;
-+		STORE_list_private_key_next;
-+		EC_GROUP_set_seed;
-+		X509_VERIFY_PARAM_set_trust;
-+		STORE_ATTR_INFO_free;
-+		STORE_get_private_key;
-+		EVP_PKEY_get_attr_count;
-+		STORE_ATTR_INFO_new;
-+		EC_GROUP_get_curve_GF2m;
-+		STORE_meth_set_revoke_fn;
-+		STORE_method_set_revoke_function;
-+		STORE_store_number;
-+		BN_is_prime_ex;
-+		STORE_revoke_public_key;
-+		X509_STORE_CTX_get0_param;
-+		STORE_delete_arbitrary;
-+		PEM_read_X509_CERT_PAIR;
-+		X509_STORE_set_depth;
-+		ECDSA_get_ex_data;
-+		SHA224;
-+		BIO_dump_indent_fp;
-+		EC_KEY_set_group;
-+		BUF_strndup;
-+		STORE_list_certificate_start;
-+		BN_GF2m_mod;
-+		X509_REQ_check_private_key;
-+		EC_GROUP_get_seed_len;
-+		ERR_load_STORE_strings;
-+		PEM_read_bio_EC_PUBKEY;
-+		STORE_list_private_key_end;
-+		i2d_EC_PUBKEY;
-+		ECDSA_get_default_method;
-+		ASN1_put_eoc;
-+		X509_STORE_CTX_get_explicit_policy;
-+		X509_STORE_CTX_get_expl_policy;
-+		X509_VERIFY_PARAM_table_cleanup;
-+		STORE_modify_private_key;
-+		X509_VERIFY_PARAM_free;
-+		EC_METHOD_get_field_type;
-+		EC_GFp_nist_method;
-+		STORE_meth_set_modify_fn;
-+		STORE_method_set_modify_function;
-+		STORE_parse_attrs_next;
-+		ENGINE_load_padlock;
-+		EC_GROUP_set_curve_name;
-+		X509_CERT_PAIR_it;
-+		STORE_meth_get_revoke_fn;
-+		STORE_method_get_revoke_function;
-+		STORE_method_set_get_function;
-+		STORE_modify_number;
-+		STORE_method_get_store_function;
-+		STORE_store_private_key;
-+		BN_GF2m_mod_sqr_arr;
-+		RSA_setup_blinding;
-+		BIO_s_datagram;
-+		STORE_Memory;
-+		sk_find_ex;
-+		EC_GROUP_set_curve_GF2m;
-+		ENGINE_set_default_ECDSA;
-+		POLICY_CONSTRAINTS_new;
-+		BN_GF2m_mod_sqrt;
-+		ECDH_set_default_method;
-+		EC_KEY_generate_key;
-+		SHA384_Update;
-+		BN_GF2m_arr2poly;
-+		STORE_method_get_get_function;
-+		STORE_meth_set_cleanup_fn;
-+		STORE_method_set_cleanup_function;
-+		EC_GROUP_check;
-+		d2i_ECPrivateKey_bio;
-+		EC_KEY_insert_key_method_data;
-+		STORE_meth_get_lock_store_fn;
-+		STORE_method_get_lock_store_function;
-+		X509_VERIFY_PARAM_get_depth;
-+		SHA224_Final;
-+		STORE_meth_set_update_store_fn;
-+		STORE_method_set_update_store_function;
-+		SHA224_Update;
-+		d2i_ECPrivateKey;
-+		ASN1_item_ndef_i2d;
-+		STORE_delete_private_key;
-+		ERR_pop_to_mark;
-+		ENGINE_register_all_STORE;
-+		X509_policy_level_get0_node;
-+		i2d_PKCS7_NDEF;
-+		EC_GROUP_get_degree;
-+		ASN1_generate_v3;
-+		STORE_ATTR_INFO_modify_cstr;
-+		X509_policy_tree_level_count;
-+		BN_GF2m_add;
-+		EC_KEY_get0_group;
-+		STORE_generate_crl;
-+		STORE_store_public_key;
-+		X509_CERT_PAIR_free;
-+		STORE_revoke_private_key;
-+		BN_nist_mod_224;
-+		SHA512_Final;
-+		STORE_ATTR_INFO_modify_dn;
-+		STORE_meth_get_initialise_fn;
-+		STORE_method_get_initialise_function;
-+		STORE_delete_number;
-+		i2d_EC_PUBKEY_bio;
-+		BIO_dgram_non_fatal_error;
-+		EC_GROUP_get_asn1_flag;
-+		STORE_ATTR_INFO_in_ex;
-+		STORE_list_crl_start;
-+		ECDH_get_ex_new_index;
-+		STORE_meth_get_modify_fn;
-+		STORE_method_get_modify_function;
-+		v2i_ASN1_BIT_STRING;
-+		STORE_store_certificate;
-+		OBJ_bsearch_ex;
-+		X509_STORE_CTX_set_default;
-+		STORE_ATTR_INFO_set_sha1str;
-+		BN_GF2m_mod_inv;
-+		BN_GF2m_mod_exp;
-+		STORE_modify_public_key;
-+		STORE_meth_get_list_start_fn;
-+		STORE_method_get_list_start_function;
-+		EC_GROUP_get0_seed;
-+		STORE_store_arbitrary;
-+		STORE_meth_set_unlock_store_fn;
-+		STORE_method_set_unlock_store_function;
-+		BN_GF2m_mod_div_arr;
-+		ENGINE_set_ECDSA;
-+		STORE_create_method;
-+		ECPKParameters_print;
-+		EC_KEY_get0_private_key;
-+		PEM_write_EC_PUBKEY;
-+		X509_VERIFY_PARAM_set1;
-+		ECDH_set_method;
-+		v2i_GENERAL_NAME_ex;
-+		ECDH_set_ex_data;
-+		STORE_generate_key;
-+		BN_nist_mod_521;
-+		X509_policy_tree_get0_level;
-+		EC_GROUP_set_point_conversion_form;
-+		EC_GROUP_set_point_conv_form;
-+		PEM_read_EC_PUBKEY;
-+		i2d_ECDSA_SIG;
-+		ECDSA_OpenSSL;
-+		STORE_delete_crl;
-+		EC_KEY_get_enc_flags;
-+		ASN1_const_check_infinite_end;
-+		EVP_PKEY_delete_attr;
-+		ECDSA_set_default_method;
-+		EC_POINT_set_compressed_coordinates_GF2m;
-+		EC_POINT_set_compr_coords_GF2m;
-+		EC_GROUP_cmp;
-+		STORE_revoke_certificate;
-+		BN_get0_nist_prime_256;
-+		STORE_meth_get_delete_fn;
-+		STORE_method_get_delete_function;
-+		SHA224_Init;
-+		PEM_read_ECPrivateKey;
-+		SHA512_Init;
-+		STORE_parse_attrs_endp;
-+		BN_set_negative;
-+		ERR_load_ECDSA_strings;
-+		EC_GROUP_get_basis_type;
-+		STORE_list_public_key_next;
-+		i2v_ASN1_BIT_STRING;
-+		STORE_OBJECT_free;
-+		BN_nist_mod_384;
-+		i2d_X509_CERT_PAIR;
-+		PEM_write_ECPKParameters;
-+		ECDH_compute_key;
-+		STORE_ATTR_INFO_get0_sha1str;
-+		ENGINE_register_all_ECDH;
-+		pqueue_pop;
-+		STORE_ATTR_INFO_get0_cstr;
-+		POLICY_CONSTRAINTS_it;
-+		STORE_get_ex_new_index;
-+		EVP_PKEY_get_attr_by_OBJ;
-+		X509_VERIFY_PARAM_add0_policy;
-+		BN_GF2m_mod_solve_quad;
-+		SHA256;
-+		i2d_ECPrivateKey_fp;
-+		X509_policy_tree_get0_user_policies;
-+		X509_pcy_tree_get0_usr_policies;
-+		OPENSSL_DIR_read;
-+		ENGINE_register_all_ECDSA;
-+		X509_VERIFY_PARAM_lookup;
-+		EC_POINT_get_affine_coordinates_GF2m;
-+		EC_POINT_get_affine_coords_GF2m;
-+		EC_GROUP_dup;
-+		ENGINE_get_default_ECDSA;
-+		EC_KEY_new;
-+		SHA256_Transform;
-+		EC_KEY_set_enc_flags;
-+		ECDSA_verify;
-+		EC_POINT_point2hex;
-+		ENGINE_get_STORE;
-+		SHA512;
-+		STORE_get_certificate;
-+		ECDSA_do_sign_ex;
-+		ECDSA_do_verify;
-+		d2i_ECPrivateKey_fp;
-+		STORE_delete_certificate;
-+		SHA512_Transform;
-+		X509_STORE_set1_param;
-+		STORE_method_get_ctrl_function;
-+		STORE_free;
-+		PEM_write_ECPrivateKey;
-+		STORE_meth_get_unlock_store_fn;
-+		STORE_method_get_unlock_store_function;
-+		STORE_get_ex_data;
-+		EC_KEY_set_public_key;
-+		PEM_read_ECPKParameters;
-+		X509_CERT_PAIR_new;
-+		ENGINE_register_STORE;
-+		RSA_generate_key_ex;
-+		DSA_generate_parameters_ex;
-+		ECParameters_print_fp;
-+		X509V3_NAME_from_section;
-+		EVP_PKEY_add1_attr;
-+		STORE_modify_crl;
-+		STORE_list_private_key_start;
-+		POLICY_MAPPINGS_it;
-+		GENERAL_SUBTREE_it;
-+		EC_GROUP_get_curve_name;
-+		PEM_write_X509_CERT_PAIR;
-+		BIO_dump_indent_cb;
-+		d2i_X509_CERT_PAIR;
-+		STORE_list_private_key_endp;
-+		asn1_const_Finish;
-+		i2d_EC_PUBKEY_fp;
-+		BN_nist_mod_256;
-+		X509_VERIFY_PARAM_add0_table;
-+		pqueue_free;
-+		BN_BLINDING_create_param;
-+		ECDSA_size;
-+		d2i_EC_PUBKEY_bio;
-+		BN_get0_nist_prime_521;
-+		STORE_ATTR_INFO_modify_sha1str;
-+		BN_generate_prime_ex;
-+		EC_GROUP_new_by_curve_name;
-+		SHA256_Final;
-+		DH_generate_parameters_ex;
-+		PEM_read_bio_ECPrivateKey;
-+		STORE_meth_get_cleanup_fn;
-+		STORE_method_get_cleanup_function;
-+		ENGINE_get_ECDH;
-+		d2i_ECDSA_SIG;
-+		BN_is_prime_fasttest_ex;
-+		ECDSA_sign;
-+		X509_policy_check;
-+		EVP_PKEY_get_attr_by_NID;
-+		STORE_set_ex_data;
-+		ENGINE_get_ECDSA;
-+		EVP_ecdsa;
-+		BN_BLINDING_get_flags;
-+		PKCS12_add_cert;
-+		STORE_OBJECT_new;
-+		ERR_load_ECDH_strings;
-+		EC_KEY_dup;
-+		EVP_CIPHER_CTX_rand_key;
-+		ECDSA_set_method;
-+		a2i_IPADDRESS_NC;
-+		d2i_ECParameters;
-+		STORE_list_certificate_end;
-+		STORE_get_crl;
-+		X509_POLICY_NODE_print;
-+		SHA384_Init;
-+		EC_GF2m_simple_method;
-+		ECDSA_set_ex_data;
-+		SHA384_Final;
-+		PKCS7_set_digest;
-+		EC_KEY_print;
-+		STORE_meth_set_lock_store_fn;
-+		STORE_method_set_lock_store_function;
-+		ECDSA_get_ex_new_index;
-+		SHA384;
-+		POLICY_MAPPING_new;
-+		STORE_list_certificate_endp;
-+		X509_STORE_CTX_get0_policy_tree;
-+		EC_GROUP_set_asn1_flag;
-+		EC_KEY_check_key;
-+		d2i_EC_PUBKEY_fp;
-+		PKCS7_set0_type_other;
-+		PEM_read_bio_X509_CERT_PAIR;
-+		pqueue_next;
-+		STORE_meth_get_list_end_fn;
-+		STORE_method_get_list_end_function;
-+		EVP_PKEY_add1_attr_by_OBJ;
-+		X509_VERIFY_PARAM_set_time;
-+		pqueue_new;
-+		ENGINE_set_default_ECDH;
-+		STORE_new_method;
-+		PKCS12_add_key;
-+		DSO_merge;
-+		EC_POINT_hex2point;
-+		BIO_dump_cb;
-+		SHA256_Update;
-+		pqueue_insert;
-+		pitem_free;
-+		BN_GF2m_mod_inv_arr;
-+		ENGINE_unregister_ECDSA;
-+		BN_BLINDING_set_thread_id;
-+		get_rfc3526_prime_8192;
-+		X509_VERIFY_PARAM_clear_flags;
-+		get_rfc2409_prime_1024;
-+		DH_check_pub_key;
-+		get_rfc3526_prime_2048;
-+		get_rfc3526_prime_6144;
-+		get_rfc3526_prime_1536;
-+		get_rfc3526_prime_3072;
-+		get_rfc3526_prime_4096;
-+		get_rfc2409_prime_768;
-+		X509_VERIFY_PARAM_get_flags;
-+		EVP_CIPHER_CTX_new;
-+		EVP_CIPHER_CTX_free;
-+		Camellia_cbc_encrypt;
-+		Camellia_cfb128_encrypt;
-+		Camellia_cfb1_encrypt;
-+		Camellia_cfb8_encrypt;
-+		Camellia_ctr128_encrypt;
-+		Camellia_cfbr_encrypt_block;
-+		Camellia_decrypt;
-+		Camellia_ecb_encrypt;
-+		Camellia_encrypt;
-+		Camellia_ofb128_encrypt;
-+		Camellia_set_key;
-+		EVP_camellia_128_cbc;
-+		EVP_camellia_128_cfb128;
-+		EVP_camellia_128_cfb1;
-+		EVP_camellia_128_cfb8;
-+		EVP_camellia_128_ecb;
-+		EVP_camellia_128_ofb;
-+		EVP_camellia_192_cbc;
-+		EVP_camellia_192_cfb128;
-+		EVP_camellia_192_cfb1;
-+		EVP_camellia_192_cfb8;
-+		EVP_camellia_192_ecb;
-+		EVP_camellia_192_ofb;
-+		EVP_camellia_256_cbc;
-+		EVP_camellia_256_cfb128;
-+		EVP_camellia_256_cfb1;
-+		EVP_camellia_256_cfb8;
-+		EVP_camellia_256_ecb;
-+		EVP_camellia_256_ofb;
-+		a2i_ipadd;
-+		ASIdentifiers_free;
-+		i2d_ASIdOrRange;
-+		EVP_CIPHER_block_size;
-+		v3_asid_is_canonical;
-+		IPAddressChoice_free;
-+		EVP_CIPHER_CTX_set_app_data;
-+		BIO_set_callback_arg;
-+		v3_addr_add_prefix;
-+		IPAddressOrRange_it;
-+		BIO_set_flags;
-+		ASIdentifiers_it;
-+		v3_addr_get_range;
-+		BIO_method_type;
-+		v3_addr_inherits;
-+		IPAddressChoice_it;
-+		AES_ige_encrypt;
-+		v3_addr_add_range;
-+		EVP_CIPHER_CTX_nid;
-+		d2i_ASRange;
-+		v3_addr_add_inherit;
-+		v3_asid_add_id_or_range;
-+		v3_addr_validate_resource_set;
-+		EVP_CIPHER_iv_length;
-+		EVP_MD_type;
-+		v3_asid_canonize;
-+		IPAddressRange_free;
-+		v3_asid_add_inherit;
-+		EVP_CIPHER_CTX_key_length;
-+		IPAddressRange_new;
-+		ASIdOrRange_new;
-+		EVP_MD_size;
-+		EVP_MD_CTX_test_flags;
-+		BIO_clear_flags;
-+		i2d_ASRange;
-+		IPAddressRange_it;
-+		IPAddressChoice_new;
-+		ASIdentifierChoice_new;
-+		ASRange_free;
-+		EVP_MD_pkey_type;
-+		EVP_MD_CTX_clear_flags;
-+		IPAddressFamily_free;
-+		i2d_IPAddressFamily;
-+		IPAddressOrRange_new;
-+		EVP_CIPHER_flags;
-+		v3_asid_validate_resource_set;
-+		d2i_IPAddressRange;
-+		AES_bi_ige_encrypt;
-+		BIO_get_callback;
-+		IPAddressOrRange_free;
-+		v3_addr_subset;
-+		d2i_IPAddressFamily;
-+		v3_asid_subset;
-+		BIO_test_flags;
-+		i2d_ASIdentifierChoice;
-+		ASRange_it;
-+		d2i_ASIdentifiers;
-+		ASRange_new;
-+		d2i_IPAddressChoice;
-+		v3_addr_get_afi;
-+		EVP_CIPHER_key_length;
-+		EVP_Cipher;
-+		i2d_IPAddressOrRange;
-+		ASIdOrRange_it;
-+		EVP_CIPHER_nid;
-+		i2d_IPAddressChoice;
-+		EVP_CIPHER_CTX_block_size;
-+		ASIdentifiers_new;
-+		v3_addr_validate_path;
-+		IPAddressFamily_new;
-+		EVP_MD_CTX_set_flags;
-+		v3_addr_is_canonical;
-+		i2d_IPAddressRange;
-+		IPAddressFamily_it;
-+		v3_asid_inherits;
-+		EVP_CIPHER_CTX_cipher;
-+		EVP_CIPHER_CTX_get_app_data;
-+		EVP_MD_block_size;
-+		EVP_CIPHER_CTX_flags;
-+		v3_asid_validate_path;
-+		d2i_IPAddressOrRange;
-+		v3_addr_canonize;
-+		ASIdentifierChoice_it;
-+		EVP_MD_CTX_md;
-+		d2i_ASIdentifierChoice;
-+		BIO_method_name;
-+		EVP_CIPHER_CTX_iv_length;
-+		ASIdOrRange_free;
-+		ASIdentifierChoice_free;
-+		BIO_get_callback_arg;
-+		BIO_set_callback;
-+		d2i_ASIdOrRange;
-+		i2d_ASIdentifiers;
-+		SEED_decrypt;
-+		SEED_encrypt;
-+		SEED_cbc_encrypt;
-+		EVP_seed_ofb;
-+		SEED_cfb128_encrypt;
-+		SEED_ofb128_encrypt;
-+		EVP_seed_cbc;
-+		SEED_ecb_encrypt;
-+		EVP_seed_ecb;
-+		SEED_set_key;
-+		EVP_seed_cfb128;
-+		X509_EXTENSIONS_it;
-+		X509_get1_ocsp;
-+		OCSP_REQ_CTX_free;
-+		i2d_X509_EXTENSIONS;
-+		OCSP_sendreq_nbio;
-+		OCSP_sendreq_new;
-+		d2i_X509_EXTENSIONS;
-+		X509_ALGORS_it;
-+		X509_ALGOR_get0;
-+		X509_ALGOR_set0;
-+		AES_unwrap_key;
-+		AES_wrap_key;
-+		X509at_get0_data_by_OBJ;
-+		ASN1_TYPE_set1;
-+		ASN1_STRING_set0;
-+		i2d_X509_ALGORS;
-+		BIO_f_zlib;
-+		COMP_zlib_cleanup;
-+		d2i_X509_ALGORS;
-+		CMS_ReceiptRequest_free;
-+		PEM_write_CMS;
-+		CMS_add0_CertificateChoices;
-+		CMS_unsigned_add1_attr_by_OBJ;
-+		ERR_load_CMS_strings;
-+		CMS_sign_receipt;
-+		i2d_CMS_ContentInfo;
-+		CMS_signed_delete_attr;
-+		d2i_CMS_bio;
-+		CMS_unsigned_get_attr_by_NID;
-+		CMS_verify;
-+		SMIME_read_CMS;
-+		CMS_decrypt_set1_key;
-+		CMS_SignerInfo_get0_algs;
-+		CMS_add1_cert;
-+		CMS_set_detached;
-+		CMS_encrypt;
-+		CMS_EnvelopedData_create;
-+		CMS_uncompress;
-+		CMS_add0_crl;
-+		CMS_SignerInfo_verify_content;
-+		CMS_unsigned_get0_data_by_OBJ;
-+		PEM_write_bio_CMS;
-+		CMS_unsigned_get_attr;
-+		CMS_RecipientInfo_ktri_cert_cmp;
-+		CMS_RecipientInfo_ktri_get0_algs;
-+		CMS_RecipInfo_ktri_get0_algs;
-+		CMS_ContentInfo_free;
-+		CMS_final;
-+		CMS_add_simple_smimecap;
-+		CMS_SignerInfo_verify;
-+		CMS_data;
-+		CMS_ContentInfo_it;
-+		d2i_CMS_ReceiptRequest;
-+		CMS_compress;
-+		CMS_digest_create;
-+		CMS_SignerInfo_cert_cmp;
-+		CMS_SignerInfo_sign;
-+		CMS_data_create;
-+		i2d_CMS_bio;
-+		CMS_EncryptedData_set1_key;
-+		CMS_decrypt;
-+		int_smime_write_ASN1;
-+		CMS_unsigned_delete_attr;
-+		CMS_unsigned_get_attr_count;
-+		CMS_add_smimecap;
-+		PEM_read_CMS;
-+		CMS_signed_get_attr_by_OBJ;
-+		d2i_CMS_ContentInfo;
-+		CMS_add_standard_smimecap;
-+		CMS_ContentInfo_new;
-+		CMS_RecipientInfo_type;
-+		CMS_get0_type;
-+		CMS_is_detached;
-+		CMS_sign;
-+		CMS_signed_add1_attr;
-+		CMS_unsigned_get_attr_by_OBJ;
-+		SMIME_write_CMS;
-+		CMS_EncryptedData_decrypt;
-+		CMS_get0_RecipientInfos;
-+		CMS_add0_RevocationInfoChoice;
-+		CMS_decrypt_set1_pkey;
-+		CMS_SignerInfo_set1_signer_cert;
-+		CMS_get0_signers;
-+		CMS_ReceiptRequest_get0_values;
-+		CMS_signed_get0_data_by_OBJ;
-+		CMS_get0_SignerInfos;
-+		CMS_add0_cert;
-+		CMS_EncryptedData_encrypt;
-+		CMS_digest_verify;
-+		CMS_set1_signers_certs;
-+		CMS_signed_get_attr;
-+		CMS_RecipientInfo_set0_key;
-+		CMS_SignedData_init;
-+		CMS_RecipientInfo_kekri_get0_id;
-+		CMS_verify_receipt;
-+		CMS_ReceiptRequest_it;
-+		PEM_read_bio_CMS;
-+		CMS_get1_crls;
-+		CMS_add0_recipient_key;
-+		SMIME_read_ASN1;
-+		CMS_ReceiptRequest_new;
-+		CMS_get0_content;
-+		CMS_get1_ReceiptRequest;
-+		CMS_signed_add1_attr_by_OBJ;
-+		CMS_RecipientInfo_kekri_id_cmp;
-+		CMS_add1_ReceiptRequest;
-+		CMS_SignerInfo_get0_signer_id;
-+		CMS_unsigned_add1_attr_by_NID;
-+		CMS_unsigned_add1_attr;
-+		CMS_signed_get_attr_by_NID;
-+		CMS_get1_certs;
-+		CMS_signed_add1_attr_by_NID;
-+		CMS_unsigned_add1_attr_by_txt;
-+		CMS_dataFinal;
-+		CMS_RecipientInfo_ktri_get0_signer_id;
-+		CMS_RecipInfo_ktri_get0_sigr_id;
-+		i2d_CMS_ReceiptRequest;
-+		CMS_add1_recipient_cert;
-+		CMS_dataInit;
-+		CMS_signed_add1_attr_by_txt;
-+		CMS_RecipientInfo_decrypt;
-+		CMS_signed_get_attr_count;
-+		CMS_get0_eContentType;
-+		CMS_set1_eContentType;
-+		CMS_ReceiptRequest_create0;
-+		CMS_add1_signer;
-+		CMS_RecipientInfo_set0_pkey;
-+		ENGINE_set_load_ssl_client_cert_function;
-+		ENGINE_set_ld_ssl_clnt_cert_fn;
-+		ENGINE_get_ssl_client_cert_function;
-+		ENGINE_get_ssl_client_cert_fn;
-+		ENGINE_load_ssl_client_cert;
-+		ENGINE_load_capi;
-+		OPENSSL_isservice;
-+		FIPS_dsa_sig_decode;
-+		EVP_CIPHER_CTX_clear_flags;
-+		FIPS_rand_status;
-+		FIPS_rand_set_key;
-+		CRYPTO_set_mem_info_functions;
-+		RSA_X931_generate_key_ex;
-+		int_ERR_set_state_func;
-+		int_EVP_MD_set_engine_callbacks;
-+		int_CRYPTO_set_do_dynlock_callback;
-+		FIPS_rng_stick;
-+		EVP_CIPHER_CTX_set_flags;
-+		BN_X931_generate_prime_ex;
-+		FIPS_selftest_check;
-+		FIPS_rand_set_dt;
-+		CRYPTO_dbg_pop_info;
-+		FIPS_dsa_free;
-+		RSA_X931_derive_ex;
-+		FIPS_rsa_new;
-+		FIPS_rand_bytes;
-+		fips_cipher_test;
-+		EVP_CIPHER_CTX_test_flags;
-+		CRYPTO_malloc_debug_init;
-+		CRYPTO_dbg_push_info;
-+		FIPS_corrupt_rsa_keygen;
-+		FIPS_dh_new;
-+		FIPS_corrupt_dsa_keygen;
-+		FIPS_dh_free;
-+		fips_pkey_signature_test;
-+		EVP_add_alg_module;
-+		int_RAND_init_engine_callbacks;
-+		int_EVP_CIPHER_set_engine_callbacks;
-+		int_EVP_MD_init_engine_callbacks;
-+		FIPS_rand_test_mode;
-+		FIPS_rand_reset;
-+		FIPS_dsa_new;
-+		int_RAND_set_callbacks;
-+		BN_X931_derive_prime_ex;
-+		int_ERR_lib_init;
-+		int_EVP_CIPHER_init_engine_callbacks;
-+		FIPS_rsa_free;
-+		FIPS_dsa_sig_encode;
-+		CRYPTO_dbg_remove_all_info;
-+		OPENSSL_init;
-+		CRYPTO_strdup;
-+		JPAKE_STEP3A_process;
-+		JPAKE_STEP1_release;
-+		JPAKE_get_shared_key;
-+		JPAKE_STEP3B_init;
-+		JPAKE_STEP1_generate;
-+		JPAKE_STEP1_init;
-+		JPAKE_STEP3B_process;
-+		JPAKE_STEP2_generate;
-+		JPAKE_CTX_new;
-+		JPAKE_CTX_free;
-+		JPAKE_STEP3B_release;
-+		JPAKE_STEP3A_release;
-+		JPAKE_STEP2_process;
-+		JPAKE_STEP3B_generate;
-+		JPAKE_STEP1_process;
-+		JPAKE_STEP3A_generate;
-+		JPAKE_STEP2_release;
-+		JPAKE_STEP3A_init;
-+		ERR_load_JPAKE_strings;
-+		JPAKE_STEP2_init;
-+		pqueue_size;
-+		i2d_TS_ACCURACY;
-+		i2d_TS_MSG_IMPRINT_fp;
-+		i2d_TS_MSG_IMPRINT;
-+		EVP_PKEY_print_public;
-+		EVP_PKEY_CTX_new;
-+		i2d_TS_TST_INFO;
-+		EVP_PKEY_asn1_find;
-+		DSO_METHOD_beos;
-+		TS_CONF_load_cert;
-+		TS_REQ_get_ext;
-+		EVP_PKEY_sign_init;
-+		ASN1_item_print;
-+		TS_TST_INFO_set_nonce;
-+		TS_RESP_dup;
-+		ENGINE_register_pkey_meths;
-+		EVP_PKEY_asn1_add0;
-+		PKCS7_add0_attrib_signing_time;
-+		i2d_TS_TST_INFO_fp;
-+		BIO_asn1_get_prefix;
-+		TS_TST_INFO_set_time;
-+		EVP_PKEY_meth_set_decrypt;
-+		EVP_PKEY_set_type_str;
-+		EVP_PKEY_CTX_get_keygen_info;
-+		TS_REQ_set_policy_id;
-+		d2i_TS_RESP_fp;
-+		ENGINE_get_pkey_asn1_meth_engine;
-+		ENGINE_get_pkey_asn1_meth_eng;
-+		WHIRLPOOL_Init;
-+		TS_RESP_set_status_info;
-+		EVP_PKEY_keygen;
-+		EVP_DigestSignInit;
-+		TS_ACCURACY_set_millis;
-+		TS_REQ_dup;
-+		GENERAL_NAME_dup;
-+		ASN1_SEQUENCE_ANY_it;
-+		WHIRLPOOL;
-+		X509_STORE_get1_crls;
-+		ENGINE_get_pkey_asn1_meth;
-+		EVP_PKEY_asn1_new;
-+		BIO_new_NDEF;
-+		ENGINE_get_pkey_meth;
-+		TS_MSG_IMPRINT_set_algo;
-+		i2d_TS_TST_INFO_bio;
-+		TS_TST_INFO_set_ordering;
-+		TS_TST_INFO_get_ext_by_OBJ;
-+		CRYPTO_THREADID_set_pointer;
-+		TS_CONF_get_tsa_section;
-+		SMIME_write_ASN1;
-+		TS_RESP_CTX_set_signer_key;
-+		EVP_PKEY_encrypt_old;
-+		EVP_PKEY_encrypt_init;
-+		CRYPTO_THREADID_cpy;
-+		ASN1_PCTX_get_cert_flags;
-+		i2d_ESS_SIGNING_CERT;
-+		TS_CONF_load_key;
-+		i2d_ASN1_SEQUENCE_ANY;
-+		d2i_TS_MSG_IMPRINT_bio;
-+		EVP_PKEY_asn1_set_public;
-+		b2i_PublicKey_bio;
-+		BIO_asn1_set_prefix;
-+		EVP_PKEY_new_mac_key;
-+		BIO_new_CMS;
-+		CRYPTO_THREADID_cmp;
-+		TS_REQ_ext_free;
-+		EVP_PKEY_asn1_set_free;
-+		EVP_PKEY_get0_asn1;
-+		d2i_NETSCAPE_X509;
-+		EVP_PKEY_verify_recover_init;
-+		EVP_PKEY_CTX_set_data;
-+		EVP_PKEY_keygen_init;
-+		TS_RESP_CTX_set_status_info;
-+		TS_MSG_IMPRINT_get_algo;
-+		TS_REQ_print_bio;
-+		EVP_PKEY_CTX_ctrl_str;
-+		EVP_PKEY_get_default_digest_nid;
-+		PEM_write_bio_PKCS7_stream;
-+		TS_MSG_IMPRINT_print_bio;
-+		BN_asc2bn;
-+		TS_REQ_get_policy_id;
-+		ENGINE_set_default_pkey_asn1_meths;
-+		ENGINE_set_def_pkey_asn1_meths;
-+		d2i_TS_ACCURACY;
-+		DSO_global_lookup;
-+		TS_CONF_set_tsa_name;
-+		i2d_ASN1_SET_ANY;
-+		ENGINE_load_gost;
-+		WHIRLPOOL_BitUpdate;
-+		ASN1_PCTX_get_flags;
-+		TS_TST_INFO_get_ext_by_NID;
-+		TS_RESP_new;
-+		ESS_CERT_ID_dup;
-+		TS_STATUS_INFO_dup;
-+		TS_REQ_delete_ext;
-+		EVP_DigestVerifyFinal;
-+		EVP_PKEY_print_params;
-+		i2d_CMS_bio_stream;
-+		TS_REQ_get_msg_imprint;
-+		OBJ_find_sigid_by_algs;
-+		TS_TST_INFO_get_serial;
-+		TS_REQ_get_nonce;
-+		X509_PUBKEY_set0_param;
-+		EVP_PKEY_CTX_set0_keygen_info;
-+		DIST_POINT_set_dpname;
-+		i2d_ISSUING_DIST_POINT;
-+		ASN1_SET_ANY_it;
-+		EVP_PKEY_CTX_get_data;
-+		TS_STATUS_INFO_print_bio;
-+		EVP_PKEY_derive_init;
-+		d2i_TS_TST_INFO;
-+		EVP_PKEY_asn1_add_alias;
-+		d2i_TS_RESP_bio;
-+		OTHERNAME_cmp;
-+		GENERAL_NAME_set0_value;
-+		PKCS7_RECIP_INFO_get0_alg;
-+		TS_RESP_CTX_new;
-+		TS_RESP_set_tst_info;
-+		PKCS7_final;
-+		EVP_PKEY_base_id;
-+		TS_RESP_CTX_set_signer_cert;
-+		TS_REQ_set_msg_imprint;
-+		EVP_PKEY_CTX_ctrl;
-+		TS_CONF_set_digests;
-+		d2i_TS_MSG_IMPRINT;
-+		EVP_PKEY_meth_set_ctrl;
-+		TS_REQ_get_ext_by_NID;
-+		PKCS5_pbe_set0_algor;
-+		BN_BLINDING_thread_id;
-+		TS_ACCURACY_new;
-+		X509_CRL_METHOD_free;
-+		ASN1_PCTX_get_nm_flags;
-+		EVP_PKEY_meth_set_sign;
-+		CRYPTO_THREADID_current;
-+		EVP_PKEY_decrypt_init;
-+		NETSCAPE_X509_free;
-+		i2b_PVK_bio;
-+		EVP_PKEY_print_private;
-+		GENERAL_NAME_get0_value;
-+		b2i_PVK_bio;
-+		ASN1_UTCTIME_adj;
-+		TS_TST_INFO_new;
-+		EVP_MD_do_all_sorted;
-+		TS_CONF_set_default_engine;
-+		TS_ACCURACY_set_seconds;
-+		TS_TST_INFO_get_time;
-+		PKCS8_pkey_get0;
-+		EVP_PKEY_asn1_get0;
-+		OBJ_add_sigid;
-+		PKCS7_SIGNER_INFO_sign;
-+		EVP_PKEY_paramgen_init;
-+		EVP_PKEY_sign;
-+		OBJ_sigid_free;
-+		EVP_PKEY_meth_set_init;
-+		d2i_ESS_ISSUER_SERIAL;
-+		ISSUING_DIST_POINT_new;
-+		ASN1_TIME_adj;
-+		TS_OBJ_print_bio;
-+		EVP_PKEY_meth_set_verify_recover;
-+		EVP_PKEY_meth_set_vrfy_recover;
-+		TS_RESP_get_status_info;
-+		CMS_stream;
-+		EVP_PKEY_CTX_set_cb;
-+		PKCS7_to_TS_TST_INFO;
-+		ASN1_PCTX_get_oid_flags;
-+		TS_TST_INFO_add_ext;
-+		EVP_PKEY_meth_set_derive;
-+		i2d_TS_RESP_fp;
-+		i2d_TS_MSG_IMPRINT_bio;
-+		TS_RESP_CTX_set_accuracy;
-+		TS_REQ_set_nonce;
-+		ESS_CERT_ID_new;
-+		ENGINE_pkey_asn1_find_str;
-+		TS_REQ_get_ext_count;
-+		BUF_reverse;
-+		TS_TST_INFO_print_bio;
-+		d2i_ISSUING_DIST_POINT;
-+		ENGINE_get_pkey_meths;
-+		i2b_PrivateKey_bio;
-+		i2d_TS_RESP;
-+		b2i_PublicKey;
-+		TS_VERIFY_CTX_cleanup;
-+		TS_STATUS_INFO_free;
-+		TS_RESP_verify_token;
-+		OBJ_bsearch_ex_;
-+		ASN1_bn_print;
-+		EVP_PKEY_asn1_get_count;
-+		ENGINE_register_pkey_asn1_meths;
-+		ASN1_PCTX_set_nm_flags;
-+		EVP_DigestVerifyInit;
-+		ENGINE_set_default_pkey_meths;
-+		TS_TST_INFO_get_policy_id;
-+		TS_REQ_get_cert_req;
-+		X509_CRL_set_meth_data;
-+		PKCS8_pkey_set0;
-+		ASN1_STRING_copy;
-+		d2i_TS_TST_INFO_fp;
-+		X509_CRL_match;
-+		EVP_PKEY_asn1_set_private;
-+		TS_TST_INFO_get_ext_d2i;
-+		TS_RESP_CTX_add_policy;
-+		d2i_TS_RESP;
-+		TS_CONF_load_certs;
-+		TS_TST_INFO_get_msg_imprint;
-+		ERR_load_TS_strings;
-+		TS_TST_INFO_get_version;
-+		EVP_PKEY_CTX_dup;
-+		EVP_PKEY_meth_set_verify;
-+		i2b_PublicKey_bio;
-+		TS_CONF_set_certs;
-+		EVP_PKEY_asn1_get0_info;
-+		TS_VERIFY_CTX_free;
-+		TS_REQ_get_ext_by_critical;
-+		TS_RESP_CTX_set_serial_cb;
-+		X509_CRL_get_meth_data;
-+		TS_RESP_CTX_set_time_cb;
-+		TS_MSG_IMPRINT_get_msg;
-+		TS_TST_INFO_ext_free;
-+		TS_REQ_get_version;
-+		TS_REQ_add_ext;
-+		EVP_PKEY_CTX_set_app_data;
-+		OBJ_bsearch_;
-+		EVP_PKEY_meth_set_verifyctx;
-+		i2d_PKCS7_bio_stream;
-+		CRYPTO_THREADID_set_numeric;
-+		PKCS7_sign_add_signer;
-+		d2i_TS_TST_INFO_bio;
-+		TS_TST_INFO_get_ordering;
-+		TS_RESP_print_bio;
-+		TS_TST_INFO_get_exts;
-+		HMAC_CTX_copy;
-+		PKCS5_pbe2_set_iv;
-+		ENGINE_get_pkey_asn1_meths;
-+		b2i_PrivateKey;
-+		EVP_PKEY_CTX_get_app_data;
-+		TS_REQ_set_cert_req;
-+		CRYPTO_THREADID_set_callback;
-+		TS_CONF_set_serial;
-+		TS_TST_INFO_free;
-+		d2i_TS_REQ_fp;
-+		TS_RESP_verify_response;
-+		i2d_ESS_ISSUER_SERIAL;
-+		TS_ACCURACY_get_seconds;
-+		EVP_CIPHER_do_all;
-+		b2i_PrivateKey_bio;
-+		OCSP_CERTID_dup;
-+		X509_PUBKEY_get0_param;
-+		TS_MSG_IMPRINT_dup;
-+		PKCS7_print_ctx;
-+		i2d_TS_REQ_bio;
-+		EVP_whirlpool;
-+		EVP_PKEY_asn1_set_param;
-+		EVP_PKEY_meth_set_encrypt;
-+		ASN1_PCTX_set_flags;
-+		i2d_ESS_CERT_ID;
-+		TS_VERIFY_CTX_new;
-+		TS_RESP_CTX_set_extension_cb;
-+		ENGINE_register_all_pkey_meths;
-+		TS_RESP_CTX_set_status_info_cond;
-+		TS_RESP_CTX_set_stat_info_cond;
-+		EVP_PKEY_verify;
-+		WHIRLPOOL_Final;
-+		X509_CRL_METHOD_new;
-+		EVP_DigestSignFinal;
-+		TS_RESP_CTX_set_def_policy;
-+		NETSCAPE_X509_it;
-+		TS_RESP_create_response;
-+		PKCS7_SIGNER_INFO_get0_algs;
-+		TS_TST_INFO_get_nonce;
-+		EVP_PKEY_decrypt_old;
-+		TS_TST_INFO_set_policy_id;
-+		TS_CONF_set_ess_cert_id_chain;
-+		EVP_PKEY_CTX_get0_pkey;
-+		d2i_TS_REQ;
-+		EVP_PKEY_asn1_find_str;
-+		BIO_f_asn1;
-+		ESS_SIGNING_CERT_new;
-+		EVP_PBE_find;
-+		X509_CRL_get0_by_cert;
-+		EVP_PKEY_derive;
-+		i2d_TS_REQ;
-+		TS_TST_INFO_delete_ext;
-+		ESS_ISSUER_SERIAL_free;
-+		ASN1_PCTX_set_str_flags;
-+		ENGINE_get_pkey_asn1_meth_str;
-+		TS_CONF_set_signer_key;
-+		TS_ACCURACY_get_millis;
-+		TS_RESP_get_token;
-+		TS_ACCURACY_dup;
-+		ENGINE_register_all_pkey_asn1_meths;
-+		ENGINE_reg_all_pkey_asn1_meths;
-+		X509_CRL_set_default_method;
-+		CRYPTO_THREADID_hash;
-+		CMS_ContentInfo_print_ctx;
-+		TS_RESP_free;
-+		ISSUING_DIST_POINT_free;
-+		ESS_ISSUER_SERIAL_new;
-+		CMS_add1_crl;
-+		PKCS7_add1_attrib_digest;
-+		TS_RESP_CTX_add_md;
-+		TS_TST_INFO_dup;
-+		ENGINE_set_pkey_asn1_meths;
-+		PEM_write_bio_Parameters;
-+		TS_TST_INFO_get_accuracy;
-+		X509_CRL_get0_by_serial;
-+		TS_TST_INFO_set_version;
-+		TS_RESP_CTX_get_tst_info;
-+		TS_RESP_verify_signature;
-+		CRYPTO_THREADID_get_callback;
-+		TS_TST_INFO_get_tsa;
-+		TS_STATUS_INFO_new;
-+		EVP_PKEY_CTX_get_cb;
-+		TS_REQ_get_ext_d2i;
-+		GENERAL_NAME_set0_othername;
-+		TS_TST_INFO_get_ext_count;
-+		TS_RESP_CTX_get_request;
-+		i2d_NETSCAPE_X509;
-+		ENGINE_get_pkey_meth_engine;
-+		EVP_PKEY_meth_set_signctx;
-+		EVP_PKEY_asn1_copy;
-+		ASN1_TYPE_cmp;
-+		EVP_CIPHER_do_all_sorted;
-+		EVP_PKEY_CTX_free;
-+		ISSUING_DIST_POINT_it;
-+		d2i_TS_MSG_IMPRINT_fp;
-+		X509_STORE_get1_certs;
-+		EVP_PKEY_CTX_get_operation;
-+		d2i_ESS_SIGNING_CERT;
-+		TS_CONF_set_ordering;
-+		EVP_PBE_alg_add_type;
-+		TS_REQ_set_version;
-+		EVP_PKEY_get0;
-+		BIO_asn1_set_suffix;
-+		i2d_TS_STATUS_INFO;
-+		EVP_MD_do_all;
-+		TS_TST_INFO_set_accuracy;
-+		PKCS7_add_attrib_content_type;
-+		ERR_remove_thread_state;
-+		EVP_PKEY_meth_add0;
-+		TS_TST_INFO_set_tsa;
-+		EVP_PKEY_meth_new;
-+		WHIRLPOOL_Update;
-+		TS_CONF_set_accuracy;
-+		ASN1_PCTX_set_oid_flags;
-+		ESS_SIGNING_CERT_dup;
-+		d2i_TS_REQ_bio;
-+		X509_time_adj_ex;
-+		TS_RESP_CTX_add_flags;
-+		d2i_TS_STATUS_INFO;
-+		TS_MSG_IMPRINT_set_msg;
-+		BIO_asn1_get_suffix;
-+		TS_REQ_free;
-+		EVP_PKEY_meth_free;
-+		TS_REQ_get_exts;
-+		TS_RESP_CTX_set_clock_precision_digits;
-+		TS_RESP_CTX_set_clk_prec_digits;
-+		TS_RESP_CTX_add_failure_info;
-+		i2d_TS_RESP_bio;
-+		EVP_PKEY_CTX_get0_peerkey;
-+		PEM_write_bio_CMS_stream;
-+		TS_REQ_new;
-+		TS_MSG_IMPRINT_new;
-+		EVP_PKEY_meth_find;
-+		EVP_PKEY_id;
-+		TS_TST_INFO_set_serial;
-+		a2i_GENERAL_NAME;
-+		TS_CONF_set_crypto_device;
-+		EVP_PKEY_verify_init;
-+		TS_CONF_set_policies;
-+		ASN1_PCTX_new;
-+		ESS_CERT_ID_free;
-+		ENGINE_unregister_pkey_meths;
-+		TS_MSG_IMPRINT_free;
-+		TS_VERIFY_CTX_init;
-+		PKCS7_stream;
-+		TS_RESP_CTX_set_certs;
-+		TS_CONF_set_def_policy;
-+		ASN1_GENERALIZEDTIME_adj;
-+		NETSCAPE_X509_new;
-+		TS_ACCURACY_free;
-+		TS_RESP_get_tst_info;
-+		EVP_PKEY_derive_set_peer;
-+		PEM_read_bio_Parameters;
-+		TS_CONF_set_clock_precision_digits;
-+		TS_CONF_set_clk_prec_digits;
-+		ESS_ISSUER_SERIAL_dup;
-+		TS_ACCURACY_get_micros;
-+		ASN1_PCTX_get_str_flags;
-+		NAME_CONSTRAINTS_check;
-+		ASN1_BIT_STRING_check;
-+		X509_check_akid;
-+		ENGINE_unregister_pkey_asn1_meths;
-+		ENGINE_unreg_pkey_asn1_meths;
-+		ASN1_PCTX_free;
-+		PEM_write_bio_ASN1_stream;
-+		i2d_ASN1_bio_stream;
-+		TS_X509_ALGOR_print_bio;
-+		EVP_PKEY_meth_set_cleanup;
-+		EVP_PKEY_asn1_free;
-+		ESS_SIGNING_CERT_free;
-+		TS_TST_INFO_set_msg_imprint;
-+		GENERAL_NAME_cmp;
-+		d2i_ASN1_SET_ANY;
-+		ENGINE_set_pkey_meths;
-+		i2d_TS_REQ_fp;
-+		d2i_ASN1_SEQUENCE_ANY;
-+		GENERAL_NAME_get0_otherName;
-+		d2i_ESS_CERT_ID;
-+		OBJ_find_sigid_algs;
-+		EVP_PKEY_meth_set_keygen;
-+		PKCS5_PBKDF2_HMAC;
-+		EVP_PKEY_paramgen;
-+		EVP_PKEY_meth_set_paramgen;
-+		BIO_new_PKCS7;
-+		EVP_PKEY_verify_recover;
-+		TS_ext_print_bio;
-+		TS_ASN1_INTEGER_print_bio;
-+		check_defer;
-+		DSO_pathbyaddr;
-+		EVP_PKEY_set_type;
-+		TS_ACCURACY_set_micros;
-+		TS_REQ_to_TS_VERIFY_CTX;
-+		EVP_PKEY_meth_set_copy;
-+		ASN1_PCTX_set_cert_flags;
-+		TS_TST_INFO_get_ext;
-+		EVP_PKEY_asn1_set_ctrl;
-+		TS_TST_INFO_get_ext_by_critical;
-+		EVP_PKEY_CTX_new_id;
-+		TS_REQ_get_ext_by_OBJ;
-+		TS_CONF_set_signer_cert;
-+		X509_NAME_hash_old;
-+		ASN1_TIME_set_string;
-+		EVP_MD_flags;
-+		TS_RESP_CTX_free;
-+		DSAparams_dup;
-+		DHparams_dup;
-+		OCSP_REQ_CTX_add1_header;
-+		OCSP_REQ_CTX_set1_req;
-+		X509_STORE_set_verify_cb;
-+		X509_STORE_CTX_get0_current_crl;
-+		X509_STORE_CTX_get0_parent_ctx;
-+		X509_STORE_CTX_get0_current_issuer;
-+		X509_STORE_CTX_get0_cur_issuer;
-+		X509_issuer_name_hash_old;
-+		X509_subject_name_hash_old;
-+		EVP_CIPHER_CTX_copy;
-+		UI_method_get_prompt_constructor;
-+		UI_method_get_prompt_constructr;
-+		UI_method_set_prompt_constructor;
-+		UI_method_set_prompt_constructr;
-+		EVP_read_pw_string_min;
-+		CRYPTO_cts128_encrypt;
-+		CRYPTO_cts128_decrypt_block;
-+		CRYPTO_cfb128_1_encrypt;
-+		CRYPTO_cbc128_encrypt;
-+		CRYPTO_ctr128_encrypt;
-+		CRYPTO_ofb128_encrypt;
-+		CRYPTO_cts128_decrypt;
-+		CRYPTO_cts128_encrypt_block;
-+		CRYPTO_cbc128_decrypt;
-+		CRYPTO_cfb128_encrypt;
-+		CRYPTO_cfb128_8_encrypt;
-+
-+	local:
-+		*;
-+};
-+
-+
-+OPENSSL_1.0.1 {
-+	global:
-+		SSL_renegotiate_abbreviated;
-+		TLSv1_1_method;
-+		TLSv1_1_client_method;
-+		TLSv1_1_server_method;
-+		SSL_CTX_set_srp_client_pwd_callback;
-+		SSL_CTX_set_srp_client_pwd_cb;
-+		SSL_get_srp_g;
-+		SSL_CTX_set_srp_username_callback;
-+		SSL_CTX_set_srp_un_cb;
-+		SSL_get_srp_userinfo;
-+		SSL_set_srp_server_param;
-+		SSL_set_srp_server_param_pw;
-+		SSL_get_srp_N;
-+		SSL_get_srp_username;
-+		SSL_CTX_set_srp_password;
-+		SSL_CTX_set_srp_strength;
-+		SSL_CTX_set_srp_verify_param_callback;
-+		SSL_CTX_set_srp_vfy_param_cb;
-+		SSL_CTX_set_srp_cb_arg;
-+		SSL_CTX_set_srp_username;
-+		SSL_CTX_SRP_CTX_init;
-+		SSL_SRP_CTX_init;
-+		SRP_Calc_A_param;
-+		SRP_generate_server_master_secret;
-+		SRP_gen_server_master_secret;
-+		SSL_CTX_SRP_CTX_free;
-+		SRP_generate_client_master_secret;
-+		SRP_gen_client_master_secret;
-+		SSL_srp_server_param_with_username;
-+		SSL_srp_server_param_with_un;
-+		SSL_SRP_CTX_free;
-+		SSL_set_debug;
-+		SSL_SESSION_get0_peer;
-+		TLSv1_2_client_method;
-+		SSL_SESSION_set1_id_context;
-+		TLSv1_2_server_method;
-+		SSL_cache_hit;
-+		SSL_get0_kssl_ctx;
-+		SSL_set0_kssl_ctx;
-+		SSL_set_state;
-+		SSL_CIPHER_get_id;
-+		TLSv1_2_method;
-+		kssl_ctx_get0_client_princ;
-+		SSL_export_keying_material;
-+		SSL_set_tlsext_use_srtp;
-+		SSL_CTX_set_next_protos_advertised_cb;
-+		SSL_CTX_set_next_protos_adv_cb;
-+		SSL_get0_next_proto_negotiated;
-+		SSL_get_selected_srtp_profile;
-+		SSL_CTX_set_tlsext_use_srtp;
-+		SSL_select_next_proto;
-+		SSL_get_srtp_profiles;
-+		SSL_CTX_set_next_proto_select_cb;
-+		SSL_CTX_set_next_proto_sel_cb;
-+		SSL_SESSION_get_compress_id;
-+
-+		SRP_VBASE_get_by_user;
-+		SRP_Calc_server_key;
-+		SRP_create_verifier;
-+		SRP_create_verifier_BN;
-+		SRP_Calc_u;
-+		SRP_VBASE_free;
-+		SRP_Calc_client_key;
-+		SRP_get_default_gN;
-+		SRP_Calc_x;
-+		SRP_Calc_B;
-+		SRP_VBASE_new;
-+		SRP_check_known_gN_param;
-+		SRP_Calc_A;
-+		SRP_Verify_A_mod_N;
-+		SRP_VBASE_init;
-+		SRP_Verify_B_mod_N;
-+		EC_KEY_set_public_key_affine_coordinates;
-+		EC_KEY_set_pub_key_aff_coords;
-+		EVP_aes_192_ctr;
-+		EVP_PKEY_meth_get0_info;
-+		EVP_PKEY_meth_copy;
-+		ERR_add_error_vdata;
-+		EVP_aes_128_ctr;
-+		EVP_aes_256_ctr;
-+		EC_GFp_nistp224_method;
-+		EC_KEY_get_flags;
-+		RSA_padding_add_PKCS1_PSS_mgf1;
-+		EVP_aes_128_xts;
-+		EVP_aes_256_xts;
-+		EVP_aes_128_gcm;
-+		EC_KEY_clear_flags;
-+		EC_KEY_set_flags;
-+		EVP_aes_256_ccm;
-+		RSA_verify_PKCS1_PSS_mgf1;
-+		EVP_aes_128_ccm;
-+		EVP_aes_192_gcm;
-+		X509_ALGOR_set_md;
-+		RAND_init_fips;
-+		EVP_aes_256_gcm;
-+		EVP_aes_192_ccm;
-+		CMAC_CTX_copy;
-+		CMAC_CTX_free;
-+		CMAC_CTX_get0_cipher_ctx;
-+		CMAC_CTX_cleanup;
-+		CMAC_Init;
-+		CMAC_Update;
-+		CMAC_resume;
-+		CMAC_CTX_new;
-+		CMAC_Final;
-+		CRYPTO_ctr128_encrypt_ctr32;
-+		CRYPTO_gcm128_release;
-+		CRYPTO_ccm128_decrypt_ccm64;
-+		CRYPTO_ccm128_encrypt;
-+		CRYPTO_gcm128_encrypt;
-+		CRYPTO_xts128_encrypt;
-+		EVP_rc4_hmac_md5;
-+		CRYPTO_nistcts128_decrypt_block;
-+		CRYPTO_gcm128_setiv;
-+		CRYPTO_nistcts128_encrypt;
-+		EVP_aes_128_cbc_hmac_sha1;
-+		CRYPTO_gcm128_tag;
-+		CRYPTO_ccm128_encrypt_ccm64;
-+		ENGINE_load_rdrand;
-+		CRYPTO_ccm128_setiv;
-+		CRYPTO_nistcts128_encrypt_block;
-+		CRYPTO_gcm128_aad;
-+		CRYPTO_ccm128_init;
-+		CRYPTO_nistcts128_decrypt;
-+		CRYPTO_gcm128_new;
-+		CRYPTO_ccm128_tag;
-+		CRYPTO_ccm128_decrypt;
-+		CRYPTO_ccm128_aad;
-+		CRYPTO_gcm128_init;
-+		CRYPTO_gcm128_decrypt;
-+		ENGINE_load_rsax;
-+		CRYPTO_gcm128_decrypt_ctr32;
-+		CRYPTO_gcm128_encrypt_ctr32;
-+		CRYPTO_gcm128_finish;
-+		EVP_aes_256_cbc_hmac_sha1;
-+		PKCS5_pbkdf2_set;
-+		CMS_add0_recipient_password;
-+		CMS_decrypt_set1_password;
-+		CMS_RecipientInfo_set0_password;
-+		RAND_set_fips_drbg_type;
-+		X509_REQ_sign_ctx;
-+		RSA_PSS_PARAMS_new;
-+		X509_CRL_sign_ctx;
-+		X509_signature_dump;
-+		d2i_RSA_PSS_PARAMS;
-+		RSA_PSS_PARAMS_it;
-+		RSA_PSS_PARAMS_free;
-+		X509_sign_ctx;
-+		i2d_RSA_PSS_PARAMS;
-+		ASN1_item_sign_ctx;
-+		EC_GFp_nistp521_method;
-+		EC_GFp_nistp256_method;
-+		OPENSSL_stderr;
-+		OPENSSL_cpuid_setup;
-+		OPENSSL_showfatal;
-+		BIO_new_dgram_sctp;
-+		BIO_dgram_sctp_msg_waiting;
-+		BIO_dgram_sctp_wait_for_dry;
-+		BIO_s_datagram_sctp;
-+		BIO_dgram_is_sctp;
-+		BIO_dgram_sctp_notification_cb;
-+} OPENSSL_1.0.0;
-+
-+OPENSSL_1.0.1d {
-+	global:
-+		CRYPTO_memcmp;
-+} OPENSSL_1.0.1;
-+
-+OPENSSL_1.0.2 {
-+	global:
-+		SSL_CTX_set_alpn_protos;
-+		SSL_set_alpn_protos;
-+		SSL_CTX_set_alpn_select_cb;
-+		SSL_get0_alpn_selected;
-+		SSL_CTX_set_custom_cli_ext;
-+		SSL_CTX_set_custom_srv_ext;
-+		SSL_CTX_set_srv_supp_data;
-+		SSL_CTX_set_cli_supp_data;
-+		SSL_set_cert_cb;
-+		SSL_CTX_use_serverinfo;
-+		SSL_CTX_use_serverinfo_file;
-+		SSL_CTX_set_cert_cb;
-+		SSL_CTX_get0_param;
-+		SSL_get0_param;
-+		SSL_certs_clear;
-+		DTLSv1_2_method;
-+		DTLSv1_2_server_method;
-+		DTLSv1_2_client_method;
-+		DTLS_method;
-+		DTLS_server_method;
-+		DTLS_client_method;
-+		SSL_CTX_get_ssl_method;
-+		SSL_CTX_get0_certificate;
-+		SSL_CTX_get0_privatekey;
-+		SSL_COMP_set0_compression_methods;
-+		SSL_COMP_free_compression_methods;
-+		SSL_CIPHER_find;
-+		SSL_is_server;
-+		SSL_CONF_CTX_new;
-+		SSL_CONF_CTX_finish;
-+		SSL_CONF_CTX_free;
-+		SSL_CONF_CTX_set_flags;
-+		SSL_CONF_CTX_clear_flags;
-+		SSL_CONF_CTX_set1_prefix;
-+		SSL_CONF_CTX_set_ssl;
-+		SSL_CONF_CTX_set_ssl_ctx;
-+		SSL_CONF_cmd;
-+		SSL_CONF_cmd_argv;
-+		SSL_CONF_cmd_value_type;
-+		SSL_trace;
-+		SSL_CIPHER_standard_name;
-+		SSL_get_tlsa_record_byname;
-+		ASN1_TIME_diff;
-+		BIO_hex_string;
-+		CMS_RecipientInfo_get0_pkey_ctx;
-+		CMS_RecipientInfo_encrypt;
-+		CMS_SignerInfo_get0_pkey_ctx;
-+		CMS_SignerInfo_get0_md_ctx;
-+		CMS_SignerInfo_get0_signature;
-+		CMS_RecipientInfo_kari_get0_alg;
-+		CMS_RecipientInfo_kari_get0_reks;
-+		CMS_RecipientInfo_kari_get0_orig_id;
-+		CMS_RecipientInfo_kari_orig_id_cmp;
-+		CMS_RecipientEncryptedKey_get0_id;
-+		CMS_RecipientEncryptedKey_cert_cmp;
-+		CMS_RecipientInfo_kari_set0_pkey;
-+		CMS_RecipientInfo_kari_get0_ctx;
-+		CMS_RecipientInfo_kari_decrypt;
-+		CMS_SharedInfo_encode;
-+		DH_compute_key_padded;
-+		d2i_DHxparams;
-+		i2d_DHxparams;
-+		DH_get_1024_160;
-+		DH_get_2048_224;
-+		DH_get_2048_256;
-+		DH_KDF_X9_42;
-+		ECDH_KDF_X9_62;
-+		ECDSA_METHOD_new;
-+		ECDSA_METHOD_free;
-+		ECDSA_METHOD_set_app_data;
-+		ECDSA_METHOD_get_app_data;
-+		ECDSA_METHOD_set_sign;
-+		ECDSA_METHOD_set_sign_setup;
-+		ECDSA_METHOD_set_verify;
-+		ECDSA_METHOD_set_flags;
-+		ECDSA_METHOD_set_name;
-+		EVP_des_ede3_wrap;
-+		EVP_aes_128_wrap;
-+		EVP_aes_192_wrap;
-+		EVP_aes_256_wrap;
-+		EVP_aes_128_cbc_hmac_sha256;
-+		EVP_aes_256_cbc_hmac_sha256;
-+		CRYPTO_128_wrap;
-+		CRYPTO_128_unwrap;
-+		OCSP_REQ_CTX_nbio;
-+		OCSP_REQ_CTX_new;
-+		OCSP_set_max_response_length;
-+		OCSP_REQ_CTX_i2d;
-+		OCSP_REQ_CTX_nbio_d2i;
-+		OCSP_REQ_CTX_get0_mem_bio;
-+		OCSP_REQ_CTX_http;
-+		RSA_padding_add_PKCS1_OAEP_mgf1;
-+		RSA_padding_check_PKCS1_OAEP_mgf1;
-+		RSA_OAEP_PARAMS_free;
-+		RSA_OAEP_PARAMS_it;
-+		RSA_OAEP_PARAMS_new;
-+		SSL_get_sigalgs;
-+		SSL_get_shared_sigalgs;
-+		SSL_check_chain;
-+		X509_chain_up_ref;
-+		X509_http_nbio;
-+		X509_CRL_http_nbio;
-+		X509_REVOKED_dup;
-+		i2d_re_X509_tbs;
-+		X509_get0_signature;
-+		X509_get_signature_nid;
-+		X509_CRL_diff;
-+		X509_chain_check_suiteb;
-+		X509_CRL_check_suiteb;
-+		X509_check_host;
-+		X509_check_email;
-+		X509_check_ip;
-+		X509_check_ip_asc;
-+		X509_STORE_set_lookup_crls_cb;
-+		X509_STORE_CTX_get0_store;
-+		X509_VERIFY_PARAM_set1_host;
-+		X509_VERIFY_PARAM_add1_host;
-+		X509_VERIFY_PARAM_set_hostflags;
-+		X509_VERIFY_PARAM_get0_peername;
-+		X509_VERIFY_PARAM_set1_email;
-+		X509_VERIFY_PARAM_set1_ip;
-+		X509_VERIFY_PARAM_set1_ip_asc;
-+		X509_VERIFY_PARAM_get0_name;
-+		X509_VERIFY_PARAM_get_count;
-+		X509_VERIFY_PARAM_get0;
-+		X509V3_EXT_free;
-+		EC_GROUP_get_mont_data;
-+		EC_curve_nid2nist;
-+		EC_curve_nist2nid;
-+		PEM_write_bio_DHxparams;
-+		PEM_write_DHxparams;
-+		SSL_CTX_add_client_custom_ext;
-+		SSL_CTX_add_server_custom_ext;
-+		SSL_extension_supported;
-+		BUF_strnlen;
-+		sk_deep_copy;
-+		SSL_test_functions;
-+} OPENSSL_1.0.1d;
-+
-Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/openssl.ld
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/openssl.ld	2014-02-24 21:02:30.000000000 +0100
-@@ -0,0 +1,10 @@
-+OPENSSL_1.0.0 {
-+	global:
-+		bind_engine;
-+		v_check;
-+		OPENSSL_init;
-+		OPENSSL_finish;
-+	local:
-+		*;
-+};
-+
-Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/ccgost/openssl.ld
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/ccgost/openssl.ld	2014-02-24 21:02:30.000000000 +0100
-@@ -0,0 +1,10 @@
-+OPENSSL_1.0.0 {
-+	global:
-+		bind_engine;
-+		v_check;
-+		OPENSSL_init;
-+		OPENSSL_finish;
-+	local:
-+		*;
-+};
-+
diff --git a/recipes-connectivity/openssl/openssl/debian1.0.2/block_digicert_malaysia.patch b/recipes-connectivity/openssl/openssl/debian1.0.2/block_digicert_malaysia.patch
deleted file mode 100644
index c43bcd1..0000000
--- a/recipes-connectivity/openssl/openssl/debian1.0.2/block_digicert_malaysia.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Raphael Geissert <geissert@debian.org>
-Description: make X509_verify_cert indicate that any certificate whose
- name contains "Digicert Sdn. Bhd." (from Malaysia) is revoked.
-Forwarded: not-needed
-Origin: vendor
-Last-Update: 2011-11-05
-
-Upstream-Status: Backport [debian]
-
-
-Index: openssl-1.0.2~beta1/crypto/x509/x509_vfy.c
-===================================================================
---- openssl-1.0.2~beta1.orig/crypto/x509/x509_vfy.c	2014-02-25 00:16:12.488028844 +0100
-+++ openssl-1.0.2~beta1/crypto/x509/x509_vfy.c	2014-02-25 00:16:12.484028929 +0100
-@@ -964,10 +964,11 @@
- 	for (i = sk_X509_num(ctx->chain) - 1; i >= 0; i--)
- 		{
- 		x = sk_X509_value(ctx->chain, i);
--		/* Mark DigiNotar certificates as revoked, no matter
--		 * where in the chain they are.
-+		/* Mark certificates containing the following names as
-+		 * revoked, no matter where in the chain they are.
- 		 */
--		if (x->name && strstr(x->name, "DigiNotar"))
-+		if (x->name && (strstr(x->name, "DigiNotar") ||
-+			strstr(x->name, "Digicert Sdn. Bhd.")))
- 			{
- 			ctx->error = X509_V_ERR_CERT_REVOKED;
- 			ctx->error_depth = i;
diff --git a/recipes-connectivity/openssl/openssl/debian1.0.2/block_diginotar.patch b/recipes-connectivity/openssl/openssl/debian1.0.2/block_diginotar.patch
deleted file mode 100644
index d81e22c..0000000
--- a/recipes-connectivity/openssl/openssl/debian1.0.2/block_diginotar.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Raphael Geissert <geissert@debian.org>
-Description: make X509_verify_cert indicate that any certificate whose
- name contains "DigiNotar" is revoked.
-Forwarded: not-needed
-Origin: vendor
-Last-Update: 2011-09-08
-Bug: http://bugs.debian.org/639744
-Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
-Reviewed-by: Dr Stephen N Henson <shenson@drh-consultancy.co.uk>
-
-This is not meant as final patch.  
-
-Upstream-Status: Backport [debian]
-
-Signed-off-by: Armin Kuster <akuster@mvista.com>
-
-Index: openssl-1.0.2g/crypto/x509/x509_vfy.c
-===================================================================
---- openssl-1.0.2g.orig/crypto/x509/x509_vfy.c
-+++ openssl-1.0.2g/crypto/x509/x509_vfy.c
-@@ -119,6 +119,7 @@ static int check_trust(X509_STORE_CTX *c
- static int check_revocation(X509_STORE_CTX *ctx);
- static int check_cert(X509_STORE_CTX *ctx);
- static int check_policy(X509_STORE_CTX *ctx);
-+static int check_ca_blacklist(X509_STORE_CTX *ctx);
- 
- static int get_crl_score(X509_STORE_CTX *ctx, X509 **pissuer,
-                          unsigned int *preasons, X509_CRL *crl, X509 *x);
-@@ -489,6 +490,9 @@ int X509_verify_cert(X509_STORE_CTX *ctx
-     if (!ok)
-         goto err;
- 
-+	ok = check_ca_blacklist(ctx);
-+	if(!ok) goto err;
-+
- #ifndef OPENSSL_NO_RFC3779
-     /* RFC 3779 path validation, now that CRL check has been done */
-     ok = v3_asid_validate_path(ctx);
-@@ -996,6 +1000,29 @@ static int check_crl_time(X509_STORE_CTX
-     return 1;
- }
- 
-+static int check_ca_blacklist(X509_STORE_CTX *ctx)
-+	{
-+	X509 *x;
-+	int i;
-+	/* Check all certificates against the blacklist */
-+	for (i = sk_X509_num(ctx->chain) - 1; i >= 0; i--)
-+		{
-+		x = sk_X509_value(ctx->chain, i);
-+		/* Mark DigiNotar certificates as revoked, no matter
-+		 * where in the chain they are.
-+		 */
-+		if (x->name && strstr(x->name, "DigiNotar"))
-+			{
-+			ctx->error = X509_V_ERR_CERT_REVOKED;
-+			ctx->error_depth = i;
-+			ctx->current_cert = x;
-+			if (!ctx->verify_cb(0,ctx))
-+				return 0;
-+			}
-+		}
-+	return 1;
-+	}
-+
- static int get_crl_sk(X509_STORE_CTX *ctx, X509_CRL **pcrl, X509_CRL **pdcrl,
-                       X509 **pissuer, int *pscore, unsigned int *preasons,
-                       STACK_OF(X509_CRL) *crls)
diff --git a/recipes-connectivity/openssl/openssl/debian1.0.2/version-script.patch b/recipes-connectivity/openssl/openssl/debian1.0.2/version-script.patch
deleted file mode 100644
index 29f11a2..0000000
--- a/recipes-connectivity/openssl/openssl/debian1.0.2/version-script.patch
+++ /dev/null
@@ -1,4656 +0,0 @@
-Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/Configure
-===================================================================
---- openssl-1.0.2~beta1.obsolete.0.0498436515490575.orig/Configure	2014-02-24 21:02:30.000000000 +0100
-+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/Configure	2014-02-24 21:02:30.000000000 +0100
-@@ -1651,6 +1651,8 @@
- 		}
- 	}
- 
-+$shared_ldflag .= " -Wl,--version-script=openssl.ld";
-+
- open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";
- unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new";
- open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n";
-Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld	2014-02-24 22:19:08.601827266 +0100
-@@ -0,0 +1,4608 @@
-+OPENSSL_1.0.2d {
-+	global:
-+		BIO_f_ssl;
-+		BIO_new_buffer_ssl_connect;
-+		BIO_new_ssl;
-+		BIO_new_ssl_connect;
-+		BIO_proxy_ssl_copy_session_id;
-+		BIO_ssl_copy_session_id;
-+		BIO_ssl_shutdown;
-+		d2i_SSL_SESSION;
-+		DTLSv1_client_method;
-+		DTLSv1_method;
-+		DTLSv1_server_method;
-+		ERR_load_SSL_strings;
-+		i2d_SSL_SESSION;
-+		kssl_build_principal_2;
-+		kssl_cget_tkt;
-+		kssl_check_authent;
-+		kssl_ctx_free;
-+		kssl_ctx_new;
-+		kssl_ctx_setkey;
-+		kssl_ctx_setprinc;
-+		kssl_ctx_setstring;
-+		kssl_ctx_show;
-+		kssl_err_set;
-+		kssl_krb5_free_data_contents;
-+		kssl_sget_tkt;
-+		kssl_skip_confound;
-+		kssl_validate_times;
-+		PEM_read_bio_SSL_SESSION;
-+		PEM_read_SSL_SESSION;
-+		PEM_write_bio_SSL_SESSION;
-+		PEM_write_SSL_SESSION;
-+		SSL_accept;
-+		SSL_add_client_CA;
-+		SSL_add_dir_cert_subjects_to_stack;
-+		SSL_add_dir_cert_subjs_to_stk;
-+		SSL_add_file_cert_subjects_to_stack;
-+		SSL_add_file_cert_subjs_to_stk;
-+		SSL_alert_desc_string;
-+		SSL_alert_desc_string_long;
-+		SSL_alert_type_string;
-+		SSL_alert_type_string_long;
-+		SSL_callback_ctrl;
-+		SSL_check_private_key;
-+		SSL_CIPHER_description;
-+		SSL_CIPHER_get_bits;
-+		SSL_CIPHER_get_name;
-+		SSL_CIPHER_get_version;
-+		SSL_clear;
-+		SSL_COMP_add_compression_method;
-+		SSL_COMP_get_compression_methods;
-+		SSL_COMP_get_compress_methods;
-+		SSL_COMP_get_name;
-+		SSL_connect;
-+		SSL_copy_session_id;
-+		SSL_ctrl;
-+		SSL_CTX_add_client_CA;
-+		SSL_CTX_add_session;
-+		SSL_CTX_callback_ctrl;
-+		SSL_CTX_check_private_key;
-+		SSL_CTX_ctrl;
-+		SSL_CTX_flush_sessions;
-+		SSL_CTX_free;
-+		SSL_CTX_get_cert_store;
-+		SSL_CTX_get_client_CA_list;
-+		SSL_CTX_get_client_cert_cb;
-+		SSL_CTX_get_ex_data;
-+		SSL_CTX_get_ex_new_index;
-+		SSL_CTX_get_info_callback;
-+		SSL_CTX_get_quiet_shutdown;
-+		SSL_CTX_get_timeout;
-+		SSL_CTX_get_verify_callback;
-+		SSL_CTX_get_verify_depth;
-+		SSL_CTX_get_verify_mode;
-+		SSL_CTX_load_verify_locations;
-+		SSL_CTX_new;
-+		SSL_CTX_remove_session;
-+		SSL_CTX_sess_get_get_cb;
-+		SSL_CTX_sess_get_new_cb;
-+		SSL_CTX_sess_get_remove_cb;
-+		SSL_CTX_sessions;
-+		SSL_CTX_sess_set_get_cb;
-+		SSL_CTX_sess_set_new_cb;
-+		SSL_CTX_sess_set_remove_cb;
-+		SSL_CTX_set1_param;
-+		SSL_CTX_set_cert_store;
-+		SSL_CTX_set_cert_verify_callback;
-+		SSL_CTX_set_cert_verify_cb;
-+		SSL_CTX_set_cipher_list;
-+		SSL_CTX_set_client_CA_list;
-+		SSL_CTX_set_client_cert_cb;
-+		SSL_CTX_set_client_cert_engine;
-+		SSL_CTX_set_cookie_generate_cb;
-+		SSL_CTX_set_cookie_verify_cb;
-+		SSL_CTX_set_default_passwd_cb;
-+		SSL_CTX_set_default_passwd_cb_userdata;
-+		SSL_CTX_set_default_verify_paths;
-+		SSL_CTX_set_def_passwd_cb_ud;
-+		SSL_CTX_set_def_verify_paths;
-+		SSL_CTX_set_ex_data;
-+		SSL_CTX_set_generate_session_id;
-+		SSL_CTX_set_info_callback;
-+		SSL_CTX_set_msg_callback;
-+		SSL_CTX_set_psk_client_callback;
-+		SSL_CTX_set_psk_server_callback;
-+		SSL_CTX_set_purpose;
-+		SSL_CTX_set_quiet_shutdown;
-+		SSL_CTX_set_session_id_context;
-+		SSL_CTX_set_ssl_version;
-+		SSL_CTX_set_timeout;
-+		SSL_CTX_set_tmp_dh_callback;
-+		SSL_CTX_set_tmp_ecdh_callback;
-+		SSL_CTX_set_tmp_rsa_callback;
-+		SSL_CTX_set_trust;
-+		SSL_CTX_set_verify;
-+		SSL_CTX_set_verify_depth;
-+		SSL_CTX_use_cert_chain_file;
-+		SSL_CTX_use_certificate;
-+		SSL_CTX_use_certificate_ASN1;
-+		SSL_CTX_use_certificate_chain_file;
-+		SSL_CTX_use_certificate_file;
-+		SSL_CTX_use_PrivateKey;
-+		SSL_CTX_use_PrivateKey_ASN1;
-+		SSL_CTX_use_PrivateKey_file;
-+		SSL_CTX_use_psk_identity_hint;
-+		SSL_CTX_use_RSAPrivateKey;
-+		SSL_CTX_use_RSAPrivateKey_ASN1;
-+		SSL_CTX_use_RSAPrivateKey_file;
-+		SSL_do_handshake;
-+		SSL_dup;
-+		SSL_dup_CA_list;
-+		SSLeay_add_ssl_algorithms;
-+		SSL_free;
-+		SSL_get1_session;
-+		SSL_get_certificate;
-+		SSL_get_cipher_list;
-+		SSL_get_ciphers;
-+		SSL_get_client_CA_list;
-+		SSL_get_current_cipher;
-+		SSL_get_current_compression;
-+		SSL_get_current_expansion;
-+		SSL_get_default_timeout;
-+		SSL_get_error;
-+		SSL_get_ex_data;
-+		SSL_get_ex_data_X509_STORE_CTX_idx;
-+		SSL_get_ex_d_X509_STORE_CTX_idx;
-+		SSL_get_ex_new_index;
-+		SSL_get_fd;
-+		SSL_get_finished;
-+		SSL_get_info_callback;
-+		SSL_get_peer_cert_chain;
-+		SSL_get_peer_certificate;
-+		SSL_get_peer_finished;
-+		SSL_get_privatekey;
-+		SSL_get_psk_identity;
-+		SSL_get_psk_identity_hint;
-+		SSL_get_quiet_shutdown;
-+		SSL_get_rbio;
-+		SSL_get_read_ahead;
-+		SSL_get_rfd;
-+		SSL_get_servername;
-+		SSL_get_servername_type;
-+		SSL_get_session;
-+		SSL_get_shared_ciphers;
-+		SSL_get_shutdown;
-+		SSL_get_SSL_CTX;
-+		SSL_get_ssl_method;
-+		SSL_get_verify_callback;
-+		SSL_get_verify_depth;
-+		SSL_get_verify_mode;
-+		SSL_get_verify_result;
-+		SSL_get_version;
-+		SSL_get_wbio;
-+		SSL_get_wfd;
-+		SSL_has_matching_session_id;
-+		SSL_library_init;
-+		SSL_load_client_CA_file;
-+		SSL_load_error_strings;
-+		SSL_new;
-+		SSL_peek;
-+		SSL_pending;
-+		SSL_read;
-+		SSL_renegotiate;
-+		SSL_renegotiate_pending;
-+		SSL_rstate_string;
-+		SSL_rstate_string_long;
-+		SSL_SESSION_cmp;
-+		SSL_SESSION_free;
-+		SSL_SESSION_get_ex_data;
-+		SSL_SESSION_get_ex_new_index;
-+		SSL_SESSION_get_id;
-+		SSL_SESSION_get_time;
-+		SSL_SESSION_get_timeout;
-+		SSL_SESSION_hash;
-+		SSL_SESSION_new;
-+		SSL_SESSION_print;
-+		SSL_SESSION_print_fp;
-+		SSL_SESSION_set_ex_data;
-+		SSL_SESSION_set_time;
-+		SSL_SESSION_set_timeout;
-+		SSL_set1_param;
-+		SSL_set_accept_state;
-+		SSL_set_bio;
-+		SSL_set_cipher_list;
-+		SSL_set_client_CA_list;
-+		SSL_set_connect_state;
-+		SSL_set_ex_data;
-+		SSL_set_fd;
-+		SSL_set_generate_session_id;
-+		SSL_set_info_callback;
-+		SSL_set_msg_callback;
-+		SSL_set_psk_client_callback;
-+		SSL_set_psk_server_callback;
-+		SSL_set_purpose;
-+		SSL_set_quiet_shutdown;
-+		SSL_set_read_ahead;
-+		SSL_set_rfd;
-+		SSL_set_session;
-+		SSL_set_session_id_context;
-+		SSL_set_session_secret_cb;
-+		SSL_set_session_ticket_ext;
-+		SSL_set_session_ticket_ext_cb;
-+		SSL_set_shutdown;
-+		SSL_set_SSL_CTX;
-+		SSL_set_ssl_method;
-+		SSL_set_tmp_dh_callback;
-+		SSL_set_tmp_ecdh_callback;
-+		SSL_set_tmp_rsa_callback;
-+		SSL_set_trust;
-+		SSL_set_verify;
-+		SSL_set_verify_depth;
-+		SSL_set_verify_result;
-+		SSL_set_wfd;
-+		SSL_shutdown;
-+		SSL_state;
-+		SSL_state_string;
-+		SSL_state_string_long;
-+		SSL_use_certificate;
-+		SSL_use_certificate_ASN1;
-+		SSL_use_certificate_file;
-+		SSL_use_PrivateKey;
-+		SSL_use_PrivateKey_ASN1;
-+		SSL_use_PrivateKey_file;
-+		SSL_use_psk_identity_hint;
-+		SSL_use_RSAPrivateKey;
-+		SSL_use_RSAPrivateKey_ASN1;
-+		SSL_use_RSAPrivateKey_file;
-+		SSLv23_client_method;
-+		SSLv23_method;
-+		SSLv23_server_method;
-+		SSLv2_client_method;
-+		SSLv2_method;
-+		SSLv2_server_method;
-+		SSLv3_client_method;
-+		SSLv3_method;
-+		SSLv3_server_method;
-+		SSL_version;
-+		SSL_want;
-+		SSL_write;
-+		TLSv1_client_method;
-+		TLSv1_method;
-+		TLSv1_server_method;
-+
-+
-+		SSLeay;
-+		SSLeay_version;
-+		ASN1_BIT_STRING_asn1_meth;
-+		ASN1_HEADER_free;
-+		ASN1_HEADER_new;
-+		ASN1_IA5STRING_asn1_meth;
-+		ASN1_INTEGER_get;
-+		ASN1_INTEGER_set;
-+		ASN1_INTEGER_to_BN;
-+		ASN1_OBJECT_create;
-+		ASN1_OBJECT_free;
-+		ASN1_OBJECT_new;
-+		ASN1_PRINTABLE_type;
-+		ASN1_STRING_cmp;
-+		ASN1_STRING_dup;
-+		ASN1_STRING_free;
-+		ASN1_STRING_new;
-+		ASN1_STRING_print;
-+		ASN1_STRING_set;
-+		ASN1_STRING_type_new;
-+		ASN1_TYPE_free;
-+		ASN1_TYPE_new;
-+		ASN1_UNIVERSALSTRING_to_string;
-+		ASN1_UTCTIME_check;
-+		ASN1_UTCTIME_print;
-+		ASN1_UTCTIME_set;
-+		ASN1_check_infinite_end;
-+		ASN1_d2i_bio;
-+		ASN1_d2i_fp;
-+		ASN1_digest;
-+		ASN1_dup;
-+		ASN1_get_object;
-+		ASN1_i2d_bio;
-+		ASN1_i2d_fp;
-+		ASN1_object_size;
-+		ASN1_parse;
-+		ASN1_put_object;
-+		ASN1_sign;
-+		ASN1_verify;
-+		BF_cbc_encrypt;
-+		BF_cfb64_encrypt;
-+		BF_ecb_encrypt;
-+		BF_encrypt;
-+		BF_ofb64_encrypt;
-+		BF_options;
-+		BF_set_key;
-+		BIO_CONNECT_free;
-+		BIO_CONNECT_new;
-+		BIO_accept;
-+		BIO_ctrl;
-+		BIO_int_ctrl;
-+		BIO_debug_callback;
-+		BIO_dump;
-+		BIO_dup_chain;
-+		BIO_f_base64;
-+		BIO_f_buffer;
-+		BIO_f_cipher;
-+		BIO_f_md;
-+		BIO_f_null;
-+		BIO_f_proxy_server;
-+		BIO_fd_non_fatal_error;
-+		BIO_fd_should_retry;
-+		BIO_find_type;
-+		BIO_free;
-+		BIO_free_all;
-+		BIO_get_accept_socket;
-+		BIO_get_filter_bio;
-+		BIO_get_host_ip;
-+		BIO_get_port;
-+		BIO_get_retry_BIO;
-+		BIO_get_retry_reason;
-+		BIO_gethostbyname;
-+		BIO_gets;
-+		BIO_new;
-+		BIO_new_accept;
-+		BIO_new_connect;
-+		BIO_new_fd;
-+		BIO_new_file;
-+		BIO_new_fp;
-+		BIO_new_socket;
-+		BIO_pop;
-+		BIO_printf;
-+		BIO_push;
-+		BIO_puts;
-+		BIO_read;
-+		BIO_s_accept;
-+		BIO_s_connect;
-+		BIO_s_fd;
-+		BIO_s_file;
-+		BIO_s_mem;
-+		BIO_s_null;
-+		BIO_s_proxy_client;
-+		BIO_s_socket;
-+		BIO_set;
-+		BIO_set_cipher;
-+		BIO_set_tcp_ndelay;
-+		BIO_sock_cleanup;
-+		BIO_sock_error;
-+		BIO_sock_init;
-+		BIO_sock_non_fatal_error;
-+		BIO_sock_should_retry;
-+		BIO_socket_ioctl;
-+		BIO_write;
-+		BN_CTX_free;
-+		BN_CTX_new;
-+		BN_MONT_CTX_free;
-+		BN_MONT_CTX_new;
-+		BN_MONT_CTX_set;
-+		BN_add;
-+		BN_add_word;
-+		BN_hex2bn;
-+		BN_bin2bn;
-+		BN_bn2hex;
-+		BN_bn2bin;
-+		BN_clear;
-+		BN_clear_bit;
-+		BN_clear_free;
-+		BN_cmp;
-+		BN_copy;
-+		BN_div;
-+		BN_div_word;
-+		BN_dup;
-+		BN_free;
-+		BN_from_montgomery;
-+		BN_gcd;
-+		BN_generate_prime;
-+		BN_get_word;
-+		BN_is_bit_set;
-+		BN_is_prime;
-+		BN_lshift;
-+		BN_lshift1;
-+		BN_mask_bits;
-+		BN_mod;
-+		BN_mod_exp;
-+		BN_mod_exp_mont;
-+		BN_mod_exp_simple;
-+		BN_mod_inverse;
-+		BN_mod_mul;
-+		BN_mod_mul_montgomery;
-+		BN_mod_word;
-+		BN_mul;
-+		BN_new;
-+		BN_num_bits;
-+		BN_num_bits_word;
-+		BN_options;
-+		BN_print;
-+		BN_print_fp;
-+		BN_rand;
-+		BN_reciprocal;
-+		BN_rshift;
-+		BN_rshift1;
-+		BN_set_bit;
-+		BN_set_word;
-+		BN_sqr;
-+		BN_sub;
-+		BN_to_ASN1_INTEGER;
-+		BN_ucmp;
-+		BN_value_one;
-+		BUF_MEM_free;
-+		BUF_MEM_grow;
-+		BUF_MEM_new;
-+		BUF_strdup;
-+		CONF_free;
-+		CONF_get_number;
-+		CONF_get_section;
-+		CONF_get_string;
-+		CONF_load;
-+		CRYPTO_add_lock;
-+		CRYPTO_dbg_free;
-+		CRYPTO_dbg_malloc;
-+		CRYPTO_dbg_realloc;
-+		CRYPTO_dbg_remalloc;
-+		CRYPTO_free;
-+		CRYPTO_get_add_lock_callback;
-+		CRYPTO_get_id_callback;
-+		CRYPTO_get_lock_name;
-+		CRYPTO_get_locking_callback;
-+		CRYPTO_get_mem_functions;
-+		CRYPTO_lock;
-+		CRYPTO_malloc;
-+		CRYPTO_mem_ctrl;
-+		CRYPTO_mem_leaks;
-+		CRYPTO_mem_leaks_cb;
-+		CRYPTO_mem_leaks_fp;
-+		CRYPTO_realloc;
-+		CRYPTO_remalloc;
-+		CRYPTO_set_add_lock_callback;
-+		CRYPTO_set_id_callback;
-+		CRYPTO_set_locking_callback;
-+		CRYPTO_set_mem_functions;
-+		CRYPTO_thread_id;
-+		DH_check;
-+		DH_compute_key;
-+		DH_free;
-+		DH_generate_key;
-+		DH_generate_parameters;
-+		DH_new;
-+		DH_size;
-+		DHparams_print;
-+		DHparams_print_fp;
-+		DSA_free;
-+		DSA_generate_key;
-+		DSA_generate_parameters;
-+		DSA_is_prime;
-+		DSA_new;
-+		DSA_print;
-+		DSA_print_fp;
-+		DSA_sign;
-+		DSA_sign_setup;
-+		DSA_size;
-+		DSA_verify;
-+		DSAparams_print;
-+		DSAparams_print_fp;
-+		ERR_clear_error;
-+		ERR_error_string;
-+		ERR_free_strings;
-+		ERR_func_error_string;
-+		ERR_get_err_state_table;
-+		ERR_get_error;
-+		ERR_get_error_line;
-+		ERR_get_state;
-+		ERR_get_string_table;
-+		ERR_lib_error_string;
-+		ERR_load_ASN1_strings;
-+		ERR_load_BIO_strings;
-+		ERR_load_BN_strings;
-+		ERR_load_BUF_strings;
-+		ERR_load_CONF_strings;
-+		ERR_load_DH_strings;
-+		ERR_load_DSA_strings;
-+		ERR_load_ERR_strings;
-+		ERR_load_EVP_strings;
-+		ERR_load_OBJ_strings;
-+		ERR_load_PEM_strings;
-+		ERR_load_PROXY_strings;
-+		ERR_load_RSA_strings;
-+		ERR_load_X509_strings;
-+		ERR_load_crypto_strings;
-+		ERR_load_strings;
-+		ERR_peek_error;
-+		ERR_peek_error_line;
-+		ERR_print_errors;
-+		ERR_print_errors_fp;
-+		ERR_put_error;
-+		ERR_reason_error_string;
-+		ERR_remove_state;
-+		EVP_BytesToKey;
-+		EVP_CIPHER_CTX_cleanup;
-+		EVP_CipherFinal;
-+		EVP_CipherInit;
-+		EVP_CipherUpdate;
-+		EVP_DecodeBlock;
-+		EVP_DecodeFinal;
-+		EVP_DecodeInit;
-+		EVP_DecodeUpdate;
-+		EVP_DecryptFinal;
-+		EVP_DecryptInit;
-+		EVP_DecryptUpdate;
-+		EVP_DigestFinal;
-+		EVP_DigestInit;
-+		EVP_DigestUpdate;
-+		EVP_EncodeBlock;
-+		EVP_EncodeFinal;
-+		EVP_EncodeInit;
-+		EVP_EncodeUpdate;
-+		EVP_EncryptFinal;
-+		EVP_EncryptInit;
-+		EVP_EncryptUpdate;
-+		EVP_OpenFinal;
-+		EVP_OpenInit;
-+		EVP_PKEY_assign;
-+		EVP_PKEY_copy_parameters;
-+		EVP_PKEY_free;
-+		EVP_PKEY_missing_parameters;
-+		EVP_PKEY_new;
-+		EVP_PKEY_save_parameters;
-+		EVP_PKEY_size;
-+		EVP_PKEY_type;
-+		EVP_SealFinal;
-+		EVP_SealInit;
-+		EVP_SignFinal;
-+		EVP_VerifyFinal;
-+		EVP_add_alias;
-+		EVP_add_cipher;
-+		EVP_add_digest;
-+		EVP_bf_cbc;
-+		EVP_bf_cfb64;
-+		EVP_bf_ecb;
-+		EVP_bf_ofb;
-+		EVP_cleanup;
-+		EVP_des_cbc;
-+		EVP_des_cfb64;
-+		EVP_des_ecb;
-+		EVP_des_ede;
-+		EVP_des_ede3;
-+		EVP_des_ede3_cbc;
-+		EVP_des_ede3_cfb64;
-+		EVP_des_ede3_ofb;
-+		EVP_des_ede_cbc;
-+		EVP_des_ede_cfb64;
-+		EVP_des_ede_ofb;
-+		EVP_des_ofb;
-+		EVP_desx_cbc;
-+		EVP_dss;
-+		EVP_dss1;
-+		EVP_enc_null;
-+		EVP_get_cipherbyname;
-+		EVP_get_digestbyname;
-+		EVP_get_pw_prompt;
-+		EVP_idea_cbc;
-+		EVP_idea_cfb64;
-+		EVP_idea_ecb;
-+		EVP_idea_ofb;
-+		EVP_md2;
-+		EVP_md5;
-+		EVP_md_null;
-+		EVP_rc2_cbc;
-+		EVP_rc2_cfb64;
-+		EVP_rc2_ecb;
-+		EVP_rc2_ofb;
-+		EVP_rc4;
-+		EVP_read_pw_string;
-+		EVP_set_pw_prompt;
-+		EVP_sha;
-+		EVP_sha1;
-+		MD2;
-+		MD2_Final;
-+		MD2_Init;
-+		MD2_Update;
-+		MD2_options;
-+		MD5;
-+		MD5_Final;
-+		MD5_Init;
-+		MD5_Update;
-+		MDC2;
-+		MDC2_Final;
-+		MDC2_Init;
-+		MDC2_Update;
-+		NETSCAPE_SPKAC_free;
-+		NETSCAPE_SPKAC_new;
-+		NETSCAPE_SPKI_free;
-+		NETSCAPE_SPKI_new;
-+		NETSCAPE_SPKI_sign;
-+		NETSCAPE_SPKI_verify;
-+		OBJ_add_object;
-+		OBJ_bsearch;
-+		OBJ_cleanup;
-+		OBJ_cmp;
-+		OBJ_create;
-+		OBJ_dup;
-+		OBJ_ln2nid;
-+		OBJ_new_nid;
-+		OBJ_nid2ln;
-+		OBJ_nid2obj;
-+		OBJ_nid2sn;
-+		OBJ_obj2nid;
-+		OBJ_sn2nid;
-+		OBJ_txt2nid;
-+		PEM_ASN1_read;
-+		PEM_ASN1_read_bio;
-+		PEM_ASN1_write;
-+		PEM_ASN1_write_bio;
-+		PEM_SealFinal;
-+		PEM_SealInit;
-+		PEM_SealUpdate;
-+		PEM_SignFinal;
-+		PEM_SignInit;
-+		PEM_SignUpdate;
-+		PEM_X509_INFO_read;
-+		PEM_X509_INFO_read_bio;
-+		PEM_X509_INFO_write_bio;
-+		PEM_dek_info;
-+		PEM_do_header;
-+		PEM_get_EVP_CIPHER_INFO;
-+		PEM_proc_type;
-+		PEM_read;
-+		PEM_read_DHparams;
-+		PEM_read_DSAPrivateKey;
-+		PEM_read_DSAparams;
-+		PEM_read_PKCS7;
-+		PEM_read_PrivateKey;
-+		PEM_read_RSAPrivateKey;
-+		PEM_read_X509;
-+		PEM_read_X509_CRL;
-+		PEM_read_X509_REQ;
-+		PEM_read_bio;
-+		PEM_read_bio_DHparams;
-+		PEM_read_bio_DSAPrivateKey;
-+		PEM_read_bio_DSAparams;
-+		PEM_read_bio_PKCS7;
-+		PEM_read_bio_PrivateKey;
-+		PEM_read_bio_RSAPrivateKey;
-+		PEM_read_bio_X509;
-+		PEM_read_bio_X509_CRL;
-+		PEM_read_bio_X509_REQ;
-+		PEM_write;
-+		PEM_write_DHparams;
-+		PEM_write_DSAPrivateKey;
-+		PEM_write_DSAparams;
-+		PEM_write_PKCS7;
-+		PEM_write_PrivateKey;
-+		PEM_write_RSAPrivateKey;
-+		PEM_write_X509;
-+		PEM_write_X509_CRL;
-+		PEM_write_X509_REQ;
-+		PEM_write_bio;
-+		PEM_write_bio_DHparams;
-+		PEM_write_bio_DSAPrivateKey;
-+		PEM_write_bio_DSAparams;
-+		PEM_write_bio_PKCS7;
-+		PEM_write_bio_PrivateKey;
-+		PEM_write_bio_RSAPrivateKey;
-+		PEM_write_bio_X509;
-+		PEM_write_bio_X509_CRL;
-+		PEM_write_bio_X509_REQ;
-+		PKCS7_DIGEST_free;
-+		PKCS7_DIGEST_new;
-+		PKCS7_ENCRYPT_free;
-+		PKCS7_ENCRYPT_new;
-+		PKCS7_ENC_CONTENT_free;
-+		PKCS7_ENC_CONTENT_new;
-+		PKCS7_ENVELOPE_free;
-+		PKCS7_ENVELOPE_new;
-+		PKCS7_ISSUER_AND_SERIAL_digest;
-+		PKCS7_ISSUER_AND_SERIAL_free;
-+		PKCS7_ISSUER_AND_SERIAL_new;
-+		PKCS7_RECIP_INFO_free;
-+		PKCS7_RECIP_INFO_new;
-+		PKCS7_SIGNED_free;
-+		PKCS7_SIGNED_new;
-+		PKCS7_SIGNER_INFO_free;
-+		PKCS7_SIGNER_INFO_new;
-+		PKCS7_SIGN_ENVELOPE_free;
-+		PKCS7_SIGN_ENVELOPE_new;
-+		PKCS7_dup;
-+		PKCS7_free;
-+		PKCS7_new;
-+		PROXY_ENTRY_add_noproxy;
-+		PROXY_ENTRY_clear_noproxy;
-+		PROXY_ENTRY_free;
-+		PROXY_ENTRY_get_noproxy;
-+		PROXY_ENTRY_new;
-+		PROXY_ENTRY_set_server;
-+		PROXY_add_noproxy;
-+		PROXY_add_server;
-+		PROXY_check_by_host;
-+		PROXY_check_url;
-+		PROXY_clear_noproxy;
-+		PROXY_free;
-+		PROXY_get_noproxy;
-+		PROXY_get_proxies;
-+		PROXY_get_proxy_entry;
-+		PROXY_load_conf;
-+		PROXY_new;
-+		PROXY_print;
-+		RAND_bytes;
-+		RAND_cleanup;
-+		RAND_file_name;
-+		RAND_load_file;
-+		RAND_screen;
-+		RAND_seed;
-+		RAND_write_file;
-+		RC2_cbc_encrypt;
-+		RC2_cfb64_encrypt;
-+		RC2_ecb_encrypt;
-+		RC2_encrypt;
-+		RC2_ofb64_encrypt;
-+		RC2_set_key;
-+		RC4;
-+		RC4_options;
-+		RC4_set_key;
-+		RSAPrivateKey_asn1_meth;
-+		RSAPrivateKey_dup;
-+		RSAPublicKey_dup;
-+		RSA_PKCS1_SSLeay;
-+		RSA_free;
-+		RSA_generate_key;
-+		RSA_new;
-+		RSA_new_method;
-+		RSA_print;
-+		RSA_print_fp;
-+		RSA_private_decrypt;
-+		RSA_private_encrypt;
-+		RSA_public_decrypt;
-+		RSA_public_encrypt;
-+		RSA_set_default_method;
-+		RSA_sign;
-+		RSA_sign_ASN1_OCTET_STRING;
-+		RSA_size;
-+		RSA_verify;
-+		RSA_verify_ASN1_OCTET_STRING;
-+		SHA;
-+		SHA1;
-+		SHA1_Final;
-+		SHA1_Init;
-+		SHA1_Update;
-+		SHA_Final;
-+		SHA_Init;
-+		SHA_Update;
-+		OpenSSL_add_all_algorithms;
-+		OpenSSL_add_all_ciphers;
-+		OpenSSL_add_all_digests;
-+		TXT_DB_create_index;
-+		TXT_DB_free;
-+		TXT_DB_get_by_index;
-+		TXT_DB_insert;
-+		TXT_DB_read;
-+		TXT_DB_write;
-+		X509_ALGOR_free;
-+		X509_ALGOR_new;
-+		X509_ATTRIBUTE_free;
-+		X509_ATTRIBUTE_new;
-+		X509_CINF_free;
-+		X509_CINF_new;
-+		X509_CRL_INFO_free;
-+		X509_CRL_INFO_new;
-+		X509_CRL_add_ext;
-+		X509_CRL_cmp;
-+		X509_CRL_delete_ext;
-+		X509_CRL_dup;
-+		X509_CRL_free;
-+		X509_CRL_get_ext;
-+		X509_CRL_get_ext_by_NID;
-+		X509_CRL_get_ext_by_OBJ;
-+		X509_CRL_get_ext_by_critical;
-+		X509_CRL_get_ext_count;
-+		X509_CRL_new;
-+		X509_CRL_sign;
-+		X509_CRL_verify;
-+		X509_EXTENSION_create_by_NID;
-+		X509_EXTENSION_create_by_OBJ;
-+		X509_EXTENSION_dup;
-+		X509_EXTENSION_free;
-+		X509_EXTENSION_get_critical;
-+		X509_EXTENSION_get_data;
-+		X509_EXTENSION_get_object;
-+		X509_EXTENSION_new;
-+		X509_EXTENSION_set_critical;
-+		X509_EXTENSION_set_data;
-+		X509_EXTENSION_set_object;
-+		X509_INFO_free;
-+		X509_INFO_new;
-+		X509_LOOKUP_by_alias;
-+		X509_LOOKUP_by_fingerprint;
-+		X509_LOOKUP_by_issuer_serial;
-+		X509_LOOKUP_by_subject;
-+		X509_LOOKUP_ctrl;
-+		X509_LOOKUP_file;
-+		X509_LOOKUP_free;
-+		X509_LOOKUP_hash_dir;
-+		X509_LOOKUP_init;
-+		X509_LOOKUP_new;
-+		X509_LOOKUP_shutdown;
-+		X509_NAME_ENTRY_create_by_NID;
-+		X509_NAME_ENTRY_create_by_OBJ;
-+		X509_NAME_ENTRY_dup;
-+		X509_NAME_ENTRY_free;
-+		X509_NAME_ENTRY_get_data;
-+		X509_NAME_ENTRY_get_object;
-+		X509_NAME_ENTRY_new;
-+		X509_NAME_ENTRY_set_data;
-+		X509_NAME_ENTRY_set_object;
-+		X509_NAME_add_entry;
-+		X509_NAME_cmp;
-+		X509_NAME_delete_entry;
-+		X509_NAME_digest;
-+		X509_NAME_dup;
-+		X509_NAME_entry_count;
-+		X509_NAME_free;
-+		X509_NAME_get_entry;
-+		X509_NAME_get_index_by_NID;
-+		X509_NAME_get_index_by_OBJ;
-+		X509_NAME_get_text_by_NID;
-+		X509_NAME_get_text_by_OBJ;
-+		X509_NAME_hash;
-+		X509_NAME_new;
-+		X509_NAME_oneline;
-+		X509_NAME_print;
-+		X509_NAME_set;
-+		X509_OBJECT_free_contents;
-+		X509_OBJECT_retrieve_by_subject;
-+		X509_OBJECT_up_ref_count;
-+		X509_PKEY_free;
-+		X509_PKEY_new;
-+		X509_PUBKEY_free;
-+		X509_PUBKEY_get;
-+		X509_PUBKEY_new;
-+		X509_PUBKEY_set;
-+		X509_REQ_INFO_free;
-+		X509_REQ_INFO_new;
-+		X509_REQ_dup;
-+		X509_REQ_free;
-+		X509_REQ_get_pubkey;
-+		X509_REQ_new;
-+		X509_REQ_print;
-+		X509_REQ_print_fp;
-+		X509_REQ_set_pubkey;
-+		X509_REQ_set_subject_name;
-+		X509_REQ_set_version;
-+		X509_REQ_sign;
-+		X509_REQ_to_X509;
-+		X509_REQ_verify;
-+		X509_REVOKED_add_ext;
-+		X509_REVOKED_delete_ext;
-+		X509_REVOKED_free;
-+		X509_REVOKED_get_ext;
-+		X509_REVOKED_get_ext_by_NID;
-+		X509_REVOKED_get_ext_by_OBJ;
-+		X509_REVOKED_get_ext_by_critical;
-+		X509_REVOKED_get_ext_by_critic;
-+		X509_REVOKED_get_ext_count;
-+		X509_REVOKED_new;
-+		X509_SIG_free;
-+		X509_SIG_new;
-+		X509_STORE_CTX_cleanup;
-+		X509_STORE_CTX_init;
-+		X509_STORE_add_cert;
-+		X509_STORE_add_lookup;
-+		X509_STORE_free;
-+		X509_STORE_get_by_subject;
-+		X509_STORE_load_locations;
-+		X509_STORE_new;
-+		X509_STORE_set_default_paths;
-+		X509_VAL_free;
-+		X509_VAL_new;
-+		X509_add_ext;
-+		X509_asn1_meth;
-+		X509_certificate_type;
-+		X509_check_private_key;
-+		X509_cmp_current_time;
-+		X509_delete_ext;
-+		X509_digest;
-+		X509_dup;
-+		X509_free;
-+		X509_get_default_cert_area;
-+		X509_get_default_cert_dir;
-+		X509_get_default_cert_dir_env;
-+		X509_get_default_cert_file;
-+		X509_get_default_cert_file_env;
-+		X509_get_default_private_dir;
-+		X509_get_ext;
-+		X509_get_ext_by_NID;
-+		X509_get_ext_by_OBJ;
-+		X509_get_ext_by_critical;
-+		X509_get_ext_count;
-+		X509_get_issuer_name;
-+		X509_get_pubkey;
-+		X509_get_pubkey_parameters;
-+		X509_get_serialNumber;
-+		X509_get_subject_name;
-+		X509_gmtime_adj;
-+		X509_issuer_and_serial_cmp;
-+		X509_issuer_and_serial_hash;
-+		X509_issuer_name_cmp;
-+		X509_issuer_name_hash;
-+		X509_load_cert_file;
-+		X509_new;
-+		X509_print;
-+		X509_print_fp;
-+		X509_set_issuer_name;
-+		X509_set_notAfter;
-+		X509_set_notBefore;
-+		X509_set_pubkey;
-+		X509_set_serialNumber;
-+		X509_set_subject_name;
-+		X509_set_version;
-+		X509_sign;
-+		X509_subject_name_cmp;
-+		X509_subject_name_hash;
-+		X509_to_X509_REQ;
-+		X509_verify;
-+		X509_verify_cert;
-+		X509_verify_cert_error_string;
-+		X509v3_add_ext;
-+		X509v3_add_extension;
-+		X509v3_add_netscape_extensions;
-+		X509v3_add_standard_extensions;
-+		X509v3_cleanup_extensions;
-+		X509v3_data_type_by_NID;
-+		X509v3_data_type_by_OBJ;
-+		X509v3_delete_ext;
-+		X509v3_get_ext;
-+		X509v3_get_ext_by_NID;
-+		X509v3_get_ext_by_OBJ;
-+		X509v3_get_ext_by_critical;
-+		X509v3_get_ext_count;
-+		X509v3_pack_string;
-+		X509v3_pack_type_by_NID;
-+		X509v3_pack_type_by_OBJ;
-+		X509v3_unpack_string;
-+		_des_crypt;
-+		a2d_ASN1_OBJECT;
-+		a2i_ASN1_INTEGER;
-+		a2i_ASN1_STRING;
-+		asn1_Finish;
-+		asn1_GetSequence;
-+		bn_div_words;
-+		bn_expand2;
-+		bn_mul_add_words;
-+		bn_mul_words;
-+		BN_uadd;
-+		BN_usub;
-+		bn_sqr_words;
-+		_ossl_old_crypt;
-+		d2i_ASN1_BIT_STRING;
-+		d2i_ASN1_BOOLEAN;
-+		d2i_ASN1_HEADER;
-+		d2i_ASN1_IA5STRING;
-+		d2i_ASN1_INTEGER;
-+		d2i_ASN1_OBJECT;
-+		d2i_ASN1_OCTET_STRING;
-+		d2i_ASN1_PRINTABLE;
-+		d2i_ASN1_PRINTABLESTRING;
-+		d2i_ASN1_SET;
-+		d2i_ASN1_T61STRING;
-+		d2i_ASN1_TYPE;
-+		d2i_ASN1_UTCTIME;
-+		d2i_ASN1_bytes;
-+		d2i_ASN1_type_bytes;
-+		d2i_DHparams;
-+		d2i_DSAPrivateKey;
-+		d2i_DSAPrivateKey_bio;
-+		d2i_DSAPrivateKey_fp;
-+		d2i_DSAPublicKey;
-+		d2i_DSAparams;
-+		d2i_NETSCAPE_SPKAC;
-+		d2i_NETSCAPE_SPKI;
-+		d2i_Netscape_RSA;
-+		d2i_PKCS7;
-+		d2i_PKCS7_DIGEST;
-+		d2i_PKCS7_ENCRYPT;
-+		d2i_PKCS7_ENC_CONTENT;
-+		d2i_PKCS7_ENVELOPE;
-+		d2i_PKCS7_ISSUER_AND_SERIAL;
-+		d2i_PKCS7_RECIP_INFO;
-+		d2i_PKCS7_SIGNED;
-+		d2i_PKCS7_SIGNER_INFO;
-+		d2i_PKCS7_SIGN_ENVELOPE;
-+		d2i_PKCS7_bio;
-+		d2i_PKCS7_fp;
-+		d2i_PrivateKey;
-+		d2i_PublicKey;
-+		d2i_RSAPrivateKey;
-+		d2i_RSAPrivateKey_bio;
-+		d2i_RSAPrivateKey_fp;
-+		d2i_RSAPublicKey;
-+		d2i_X509;
-+		d2i_X509_ALGOR;
-+		d2i_X509_ATTRIBUTE;
-+		d2i_X509_CINF;
-+		d2i_X509_CRL;
-+		d2i_X509_CRL_INFO;
-+		d2i_X509_CRL_bio;
-+		d2i_X509_CRL_fp;
-+		d2i_X509_EXTENSION;
-+		d2i_X509_NAME;
-+		d2i_X509_NAME_ENTRY;
-+		d2i_X509_PKEY;
-+		d2i_X509_PUBKEY;
-+		d2i_X509_REQ;
-+		d2i_X509_REQ_INFO;
-+		d2i_X509_REQ_bio;
-+		d2i_X509_REQ_fp;
-+		d2i_X509_REVOKED;
-+		d2i_X509_SIG;
-+		d2i_X509_VAL;
-+		d2i_X509_bio;
-+		d2i_X509_fp;
-+		DES_cbc_cksum;
-+		DES_cbc_encrypt;
-+		DES_cblock_print_file;
-+		DES_cfb64_encrypt;
-+		DES_cfb_encrypt;
-+		DES_decrypt3;
-+		DES_ecb3_encrypt;
-+		DES_ecb_encrypt;
-+		DES_ede3_cbc_encrypt;
-+		DES_ede3_cfb64_encrypt;
-+		DES_ede3_ofb64_encrypt;
-+		DES_enc_read;
-+		DES_enc_write;
-+		DES_encrypt1;
-+		DES_encrypt2;
-+		DES_encrypt3;
-+		DES_fcrypt;
-+		DES_is_weak_key;
-+		DES_key_sched;
-+		DES_ncbc_encrypt;
-+		DES_ofb64_encrypt;
-+		DES_ofb_encrypt;
-+		DES_options;
-+		DES_pcbc_encrypt;
-+		DES_quad_cksum;
-+		DES_random_key;
-+		_ossl_old_des_random_seed;
-+		_ossl_old_des_read_2passwords;
-+		_ossl_old_des_read_password;
-+		_ossl_old_des_read_pw;
-+		_ossl_old_des_read_pw_string;
-+		DES_set_key;
-+		DES_set_odd_parity;
-+		DES_string_to_2keys;
-+		DES_string_to_key;
-+		DES_xcbc_encrypt;
-+		DES_xwhite_in2out;
-+		fcrypt_body;
-+		i2a_ASN1_INTEGER;
-+		i2a_ASN1_OBJECT;
-+		i2a_ASN1_STRING;
-+		i2d_ASN1_BIT_STRING;
-+		i2d_ASN1_BOOLEAN;
-+		i2d_ASN1_HEADER;
-+		i2d_ASN1_IA5STRING;
-+		i2d_ASN1_INTEGER;
-+		i2d_ASN1_OBJECT;
-+		i2d_ASN1_OCTET_STRING;
-+		i2d_ASN1_PRINTABLE;
-+		i2d_ASN1_SET;
-+		i2d_ASN1_TYPE;
-+		i2d_ASN1_UTCTIME;
-+		i2d_ASN1_bytes;
-+		i2d_DHparams;
-+		i2d_DSAPrivateKey;
-+		i2d_DSAPrivateKey_bio;
-+		i2d_DSAPrivateKey_fp;
-+		i2d_DSAPublicKey;
-+		i2d_DSAparams;
-+		i2d_NETSCAPE_SPKAC;
-+		i2d_NETSCAPE_SPKI;
-+		i2d_Netscape_RSA;
-+		i2d_PKCS7;
-+		i2d_PKCS7_DIGEST;
-+		i2d_PKCS7_ENCRYPT;
-+		i2d_PKCS7_ENC_CONTENT;
-+		i2d_PKCS7_ENVELOPE;
-+		i2d_PKCS7_ISSUER_AND_SERIAL;
-+		i2d_PKCS7_RECIP_INFO;
-+		i2d_PKCS7_SIGNED;
-+		i2d_PKCS7_SIGNER_INFO;
-+		i2d_PKCS7_SIGN_ENVELOPE;
-+		i2d_PKCS7_bio;
-+		i2d_PKCS7_fp;
-+		i2d_PrivateKey;
-+		i2d_PublicKey;
-+		i2d_RSAPrivateKey;
-+		i2d_RSAPrivateKey_bio;
-+		i2d_RSAPrivateKey_fp;
-+		i2d_RSAPublicKey;
-+		i2d_X509;
-+		i2d_X509_ALGOR;
-+		i2d_X509_ATTRIBUTE;
-+		i2d_X509_CINF;
-+		i2d_X509_CRL;
-+		i2d_X509_CRL_INFO;
-+		i2d_X509_CRL_bio;
-+		i2d_X509_CRL_fp;
-+		i2d_X509_EXTENSION;
-+		i2d_X509_NAME;
-+		i2d_X509_NAME_ENTRY;
-+		i2d_X509_PKEY;
-+		i2d_X509_PUBKEY;
-+		i2d_X509_REQ;
-+		i2d_X509_REQ_INFO;
-+		i2d_X509_REQ_bio;
-+		i2d_X509_REQ_fp;
-+		i2d_X509_REVOKED;
-+		i2d_X509_SIG;
-+		i2d_X509_VAL;
-+		i2d_X509_bio;
-+		i2d_X509_fp;
-+		idea_cbc_encrypt;
-+		idea_cfb64_encrypt;
-+		idea_ecb_encrypt;
-+		idea_encrypt;
-+		idea_ofb64_encrypt;
-+		idea_options;
-+		idea_set_decrypt_key;
-+		idea_set_encrypt_key;
-+		lh_delete;
-+		lh_doall;
-+		lh_doall_arg;
-+		lh_free;
-+		lh_insert;
-+		lh_new;
-+		lh_node_stats;
-+		lh_node_stats_bio;
-+		lh_node_usage_stats;
-+		lh_node_usage_stats_bio;
-+		lh_retrieve;
-+		lh_stats;
-+		lh_stats_bio;
-+		lh_strhash;
-+		sk_delete;
-+		sk_delete_ptr;
-+		sk_dup;
-+		sk_find;
-+		sk_free;
-+		sk_insert;
-+		sk_new;
-+		sk_pop;
-+		sk_pop_free;
-+		sk_push;
-+		sk_set_cmp_func;
-+		sk_shift;
-+		sk_unshift;
-+		sk_zero;
-+		BIO_f_nbio_test;
-+		ASN1_TYPE_get;
-+		ASN1_TYPE_set;
-+		PKCS7_content_free;
-+		ERR_load_PKCS7_strings;
-+		X509_find_by_issuer_and_serial;
-+		X509_find_by_subject;
-+		PKCS7_ctrl;
-+		PKCS7_set_type;
-+		PKCS7_set_content;
-+		PKCS7_SIGNER_INFO_set;
-+		PKCS7_add_signer;
-+		PKCS7_add_certificate;
-+		PKCS7_add_crl;
-+		PKCS7_content_new;
-+		PKCS7_dataSign;
-+		PKCS7_dataVerify;
-+		PKCS7_dataInit;
-+		PKCS7_add_signature;
-+		PKCS7_cert_from_signer_info;
-+		PKCS7_get_signer_info;
-+		EVP_delete_alias;
-+		EVP_mdc2;
-+		PEM_read_bio_RSAPublicKey;
-+		PEM_write_bio_RSAPublicKey;
-+		d2i_RSAPublicKey_bio;
-+		i2d_RSAPublicKey_bio;
-+		PEM_read_RSAPublicKey;
-+		PEM_write_RSAPublicKey;
-+		d2i_RSAPublicKey_fp;
-+		i2d_RSAPublicKey_fp;
-+		BIO_copy_next_retry;
-+		RSA_flags;
-+		X509_STORE_add_crl;
-+		X509_load_crl_file;
-+		EVP_rc2_40_cbc;
-+		EVP_rc4_40;
-+		EVP_CIPHER_CTX_init;
-+		HMAC;
-+		HMAC_Init;
-+		HMAC_Update;
-+		HMAC_Final;
-+		ERR_get_next_error_library;
-+		EVP_PKEY_cmp_parameters;
-+		HMAC_cleanup;
-+		BIO_ptr_ctrl;
-+		BIO_new_file_internal;
-+		BIO_new_fp_internal;
-+		BIO_s_file_internal;
-+		BN_BLINDING_convert;
-+		BN_BLINDING_invert;
-+		BN_BLINDING_update;
-+		RSA_blinding_on;
-+		RSA_blinding_off;
-+		i2t_ASN1_OBJECT;
-+		BN_BLINDING_new;
-+		BN_BLINDING_free;
-+		EVP_cast5_cbc;
-+		EVP_cast5_cfb64;
-+		EVP_cast5_ecb;
-+		EVP_cast5_ofb;
-+		BF_decrypt;
-+		CAST_set_key;
-+		CAST_encrypt;
-+		CAST_decrypt;
-+		CAST_ecb_encrypt;
-+		CAST_cbc_encrypt;
-+		CAST_cfb64_encrypt;
-+		CAST_ofb64_encrypt;
-+		RC2_decrypt;
-+		OBJ_create_objects;
-+		BN_exp;
-+		BN_mul_word;
-+		BN_sub_word;
-+		BN_dec2bn;
-+		BN_bn2dec;
-+		BIO_ghbn_ctrl;
-+		CRYPTO_free_ex_data;
-+		CRYPTO_get_ex_data;
-+		CRYPTO_set_ex_data;
-+		ERR_load_CRYPTO_strings;
-+		ERR_load_CRYPTOlib_strings;
-+		EVP_PKEY_bits;
-+		MD5_Transform;
-+		SHA1_Transform;
-+		SHA_Transform;
-+		X509_STORE_CTX_get_chain;
-+		X509_STORE_CTX_get_current_cert;
-+		X509_STORE_CTX_get_error;
-+		X509_STORE_CTX_get_error_depth;
-+		X509_STORE_CTX_get_ex_data;
-+		X509_STORE_CTX_set_cert;
-+		X509_STORE_CTX_set_chain;
-+		X509_STORE_CTX_set_error;
-+		X509_STORE_CTX_set_ex_data;
-+		CRYPTO_dup_ex_data;
-+		CRYPTO_get_new_lockid;
-+		CRYPTO_new_ex_data;
-+		RSA_set_ex_data;
-+		RSA_get_ex_data;
-+		RSA_get_ex_new_index;
-+		RSA_padding_add_PKCS1_type_1;
-+		RSA_padding_add_PKCS1_type_2;
-+		RSA_padding_add_SSLv23;
-+		RSA_padding_add_none;
-+		RSA_padding_check_PKCS1_type_1;
-+		RSA_padding_check_PKCS1_type_2;
-+		RSA_padding_check_SSLv23;
-+		RSA_padding_check_none;
-+		bn_add_words;
-+		d2i_Netscape_RSA_2;
-+		CRYPTO_get_ex_new_index;
-+		RIPEMD160_Init;
-+		RIPEMD160_Update;
-+		RIPEMD160_Final;
-+		RIPEMD160;
-+		RIPEMD160_Transform;
-+		RC5_32_set_key;
-+		RC5_32_ecb_encrypt;
-+		RC5_32_encrypt;
-+		RC5_32_decrypt;
-+		RC5_32_cbc_encrypt;
-+		RC5_32_cfb64_encrypt;
-+		RC5_32_ofb64_encrypt;
-+		BN_bn2mpi;
-+		BN_mpi2bn;
-+		ASN1_BIT_STRING_get_bit;
-+		ASN1_BIT_STRING_set_bit;
-+		BIO_get_ex_data;
-+		BIO_get_ex_new_index;
-+		BIO_set_ex_data;
-+		X509v3_get_key_usage;
-+		X509v3_set_key_usage;
-+		a2i_X509v3_key_usage;
-+		i2a_X509v3_key_usage;
-+		EVP_PKEY_decrypt;
-+		EVP_PKEY_encrypt;
-+		PKCS7_RECIP_INFO_set;
-+		PKCS7_add_recipient;
-+		PKCS7_add_recipient_info;
-+		PKCS7_set_cipher;
-+		ASN1_TYPE_get_int_octetstring;
-+		ASN1_TYPE_get_octetstring;
-+		ASN1_TYPE_set_int_octetstring;
-+		ASN1_TYPE_set_octetstring;
-+		ASN1_UTCTIME_set_string;
-+		ERR_add_error_data;
-+		ERR_set_error_data;
-+		EVP_CIPHER_asn1_to_param;
-+		EVP_CIPHER_param_to_asn1;
-+		EVP_CIPHER_get_asn1_iv;
-+		EVP_CIPHER_set_asn1_iv;
-+		EVP_rc5_32_12_16_cbc;
-+		EVP_rc5_32_12_16_cfb64;
-+		EVP_rc5_32_12_16_ecb;
-+		EVP_rc5_32_12_16_ofb;
-+		asn1_add_error;
-+		d2i_ASN1_BMPSTRING;
-+		i2d_ASN1_BMPSTRING;
-+		BIO_f_ber;
-+		BN_init;
-+		COMP_CTX_new;
-+		COMP_CTX_free;
-+		COMP_CTX_compress_block;
-+		COMP_CTX_expand_block;
-+		X509_STORE_CTX_get_ex_new_index;
-+		OBJ_NAME_add;
-+		BIO_socket_nbio;
-+		EVP_rc2_64_cbc;
-+		OBJ_NAME_cleanup;
-+		OBJ_NAME_get;
-+		OBJ_NAME_init;
-+		OBJ_NAME_new_index;
-+		OBJ_NAME_remove;
-+		BN_MONT_CTX_copy;
-+		BIO_new_socks4a_connect;
-+		BIO_s_socks4a_connect;
-+		PROXY_set_connect_mode;
-+		RAND_SSLeay;
-+		RAND_set_rand_method;
-+		RSA_memory_lock;
-+		bn_sub_words;
-+		bn_mul_normal;
-+		bn_mul_comba8;
-+		bn_mul_comba4;
-+		bn_sqr_normal;
-+		bn_sqr_comba8;
-+		bn_sqr_comba4;
-+		bn_cmp_words;
-+		bn_mul_recursive;
-+		bn_mul_part_recursive;
-+		bn_sqr_recursive;
-+		bn_mul_low_normal;
-+		BN_RECP_CTX_init;
-+		BN_RECP_CTX_new;
-+		BN_RECP_CTX_free;
-+		BN_RECP_CTX_set;
-+		BN_mod_mul_reciprocal;
-+		BN_mod_exp_recp;
-+		BN_div_recp;
-+		BN_CTX_init;
-+		BN_MONT_CTX_init;
-+		RAND_get_rand_method;
-+		PKCS7_add_attribute;
-+		PKCS7_add_signed_attribute;
-+		PKCS7_digest_from_attributes;
-+		PKCS7_get_attribute;
-+		PKCS7_get_issuer_and_serial;
-+		PKCS7_get_signed_attribute;
-+		COMP_compress_block;
-+		COMP_expand_block;
-+		COMP_rle;
-+		COMP_zlib;
-+		ms_time_diff;
-+		ms_time_new;
-+		ms_time_free;
-+		ms_time_cmp;
-+		ms_time_get;
-+		PKCS7_set_attributes;
-+		PKCS7_set_signed_attributes;
-+		X509_ATTRIBUTE_create;
-+		X509_ATTRIBUTE_dup;
-+		ASN1_GENERALIZEDTIME_check;
-+		ASN1_GENERALIZEDTIME_print;
-+		ASN1_GENERALIZEDTIME_set;
-+		ASN1_GENERALIZEDTIME_set_string;
-+		ASN1_TIME_print;
-+		BASIC_CONSTRAINTS_free;
-+		BASIC_CONSTRAINTS_new;
-+		ERR_load_X509V3_strings;
-+		NETSCAPE_CERT_SEQUENCE_free;
-+		NETSCAPE_CERT_SEQUENCE_new;
-+		OBJ_txt2obj;
-+		PEM_read_NETSCAPE_CERT_SEQUENCE;
-+		PEM_read_NS_CERT_SEQ;
-+		PEM_read_bio_NETSCAPE_CERT_SEQUENCE;
-+		PEM_read_bio_NS_CERT_SEQ;
-+		PEM_write_NETSCAPE_CERT_SEQUENCE;
-+		PEM_write_NS_CERT_SEQ;
-+		PEM_write_bio_NETSCAPE_CERT_SEQUENCE;
-+		PEM_write_bio_NS_CERT_SEQ;
-+		X509V3_EXT_add;
-+		X509V3_EXT_add_alias;
-+		X509V3_EXT_add_conf;
-+		X509V3_EXT_cleanup;
-+		X509V3_EXT_conf;
-+		X509V3_EXT_conf_nid;
-+		X509V3_EXT_get;
-+		X509V3_EXT_get_nid;
-+		X509V3_EXT_print;
-+		X509V3_EXT_print_fp;
-+		X509V3_add_standard_extensions;
-+		X509V3_add_value;
-+		X509V3_add_value_bool;
-+		X509V3_add_value_int;
-+		X509V3_conf_free;
-+		X509V3_get_value_bool;
-+		X509V3_get_value_int;
-+		X509V3_parse_list;
-+		d2i_ASN1_GENERALIZEDTIME;
-+		d2i_ASN1_TIME;
-+		d2i_BASIC_CONSTRAINTS;
-+		d2i_NETSCAPE_CERT_SEQUENCE;
-+		d2i_ext_ku;
-+		ext_ku_free;
-+		ext_ku_new;
-+		i2d_ASN1_GENERALIZEDTIME;
-+		i2d_ASN1_TIME;
-+		i2d_BASIC_CONSTRAINTS;
-+		i2d_NETSCAPE_CERT_SEQUENCE;
-+		i2d_ext_ku;
-+		EVP_MD_CTX_copy;
-+		i2d_ASN1_ENUMERATED;
-+		d2i_ASN1_ENUMERATED;
-+		ASN1_ENUMERATED_set;
-+		ASN1_ENUMERATED_get;
-+		BN_to_ASN1_ENUMERATED;
-+		ASN1_ENUMERATED_to_BN;
-+		i2a_ASN1_ENUMERATED;
-+		a2i_ASN1_ENUMERATED;
-+		i2d_GENERAL_NAME;
-+		d2i_GENERAL_NAME;
-+		GENERAL_NAME_new;
-+		GENERAL_NAME_free;
-+		GENERAL_NAMES_new;
-+		GENERAL_NAMES_free;
-+		d2i_GENERAL_NAMES;
-+		i2d_GENERAL_NAMES;
-+		i2v_GENERAL_NAMES;
-+		i2s_ASN1_OCTET_STRING;
-+		s2i_ASN1_OCTET_STRING;
-+		X509V3_EXT_check_conf;
-+		hex_to_string;
-+		string_to_hex;
-+		DES_ede3_cbcm_encrypt;
-+		RSA_padding_add_PKCS1_OAEP;
-+		RSA_padding_check_PKCS1_OAEP;
-+		X509_CRL_print_fp;
-+		X509_CRL_print;
-+		i2v_GENERAL_NAME;
-+		v2i_GENERAL_NAME;
-+		i2d_PKEY_USAGE_PERIOD;
-+		d2i_PKEY_USAGE_PERIOD;
-+		PKEY_USAGE_PERIOD_new;
-+		PKEY_USAGE_PERIOD_free;
-+		v2i_GENERAL_NAMES;
-+		i2s_ASN1_INTEGER;
-+		X509V3_EXT_d2i;
-+		name_cmp;
-+		str_dup;
-+		i2s_ASN1_ENUMERATED;
-+		i2s_ASN1_ENUMERATED_TABLE;
-+		BIO_s_log;
-+		BIO_f_reliable;
-+		PKCS7_dataFinal;
-+		PKCS7_dataDecode;
-+		X509V3_EXT_CRL_add_conf;
-+		BN_set_params;
-+		BN_get_params;
-+		BIO_get_ex_num;
-+		BIO_set_ex_free_func;
-+		EVP_ripemd160;
-+		ASN1_TIME_set;
-+		i2d_AUTHORITY_KEYID;
-+		d2i_AUTHORITY_KEYID;
-+		AUTHORITY_KEYID_new;
-+		AUTHORITY_KEYID_free;
-+		ASN1_seq_unpack;
-+		ASN1_seq_pack;
-+		ASN1_unpack_string;
-+		ASN1_pack_string;
-+		PKCS12_pack_safebag;
-+		PKCS12_MAKE_KEYBAG;
-+		PKCS8_encrypt;
-+		PKCS12_MAKE_SHKEYBAG;
-+		PKCS12_pack_p7data;
-+		PKCS12_pack_p7encdata;
-+		PKCS12_add_localkeyid;
-+		PKCS12_add_friendlyname_asc;
-+		PKCS12_add_friendlyname_uni;
-+		PKCS12_get_friendlyname;
-+		PKCS12_pbe_crypt;
-+		PKCS12_decrypt_d2i;
-+		PKCS12_i2d_encrypt;
-+		PKCS12_init;
-+		PKCS12_key_gen_asc;
-+		PKCS12_key_gen_uni;
-+		PKCS12_gen_mac;
-+		PKCS12_verify_mac;
-+		PKCS12_set_mac;
-+		PKCS12_setup_mac;
-+		OPENSSL_asc2uni;
-+		OPENSSL_uni2asc;
-+		i2d_PKCS12_BAGS;
-+		PKCS12_BAGS_new;
-+		d2i_PKCS12_BAGS;
-+		PKCS12_BAGS_free;
-+		i2d_PKCS12;
-+		d2i_PKCS12;
-+		PKCS12_new;
-+		PKCS12_free;
-+		i2d_PKCS12_MAC_DATA;
-+		PKCS12_MAC_DATA_new;
-+		d2i_PKCS12_MAC_DATA;
-+		PKCS12_MAC_DATA_free;
-+		i2d_PKCS12_SAFEBAG;
-+		PKCS12_SAFEBAG_new;
-+		d2i_PKCS12_SAFEBAG;
-+		PKCS12_SAFEBAG_free;
-+		ERR_load_PKCS12_strings;
-+		PKCS12_PBE_add;
-+		PKCS8_add_keyusage;
-+		PKCS12_get_attr_gen;
-+		PKCS12_parse;
-+		PKCS12_create;
-+		i2d_PKCS12_bio;
-+		i2d_PKCS12_fp;
-+		d2i_PKCS12_bio;
-+		d2i_PKCS12_fp;
-+		i2d_PBEPARAM;
-+		PBEPARAM_new;
-+		d2i_PBEPARAM;
-+		PBEPARAM_free;
-+		i2d_PKCS8_PRIV_KEY_INFO;
-+		PKCS8_PRIV_KEY_INFO_new;
-+		d2i_PKCS8_PRIV_KEY_INFO;
-+		PKCS8_PRIV_KEY_INFO_free;
-+		EVP_PKCS82PKEY;
-+		EVP_PKEY2PKCS8;
-+		PKCS8_set_broken;
-+		EVP_PBE_ALGOR_CipherInit;
-+		EVP_PBE_alg_add;
-+		PKCS5_pbe_set;
-+		EVP_PBE_cleanup;
-+		i2d_SXNET;
-+		d2i_SXNET;
-+		SXNET_new;
-+		SXNET_free;
-+		i2d_SXNETID;
-+		d2i_SXNETID;
-+		SXNETID_new;
-+		SXNETID_free;
-+		DSA_SIG_new;
-+		DSA_SIG_free;
-+		DSA_do_sign;
-+		DSA_do_verify;
-+		d2i_DSA_SIG;
-+		i2d_DSA_SIG;
-+		i2d_ASN1_VISIBLESTRING;
-+		d2i_ASN1_VISIBLESTRING;
-+		i2d_ASN1_UTF8STRING;
-+		d2i_ASN1_UTF8STRING;
-+		i2d_DIRECTORYSTRING;
-+		d2i_DIRECTORYSTRING;
-+		i2d_DISPLAYTEXT;
-+		d2i_DISPLAYTEXT;
-+		d2i_ASN1_SET_OF_X509;
-+		i2d_ASN1_SET_OF_X509;
-+		i2d_PBKDF2PARAM;
-+		PBKDF2PARAM_new;
-+		d2i_PBKDF2PARAM;
-+		PBKDF2PARAM_free;
-+		i2d_PBE2PARAM;
-+		PBE2PARAM_new;
-+		d2i_PBE2PARAM;
-+		PBE2PARAM_free;
-+		d2i_ASN1_SET_OF_GENERAL_NAME;
-+		i2d_ASN1_SET_OF_GENERAL_NAME;
-+		d2i_ASN1_SET_OF_SXNETID;
-+		i2d_ASN1_SET_OF_SXNETID;
-+		d2i_ASN1_SET_OF_POLICYQUALINFO;
-+		i2d_ASN1_SET_OF_POLICYQUALINFO;
-+		d2i_ASN1_SET_OF_POLICYINFO;
-+		i2d_ASN1_SET_OF_POLICYINFO;
-+		SXNET_add_id_asc;
-+		SXNET_add_id_ulong;
-+		SXNET_add_id_INTEGER;
-+		SXNET_get_id_asc;
-+		SXNET_get_id_ulong;
-+		SXNET_get_id_INTEGER;
-+		X509V3_set_conf_lhash;
-+		i2d_CERTIFICATEPOLICIES;
-+		CERTIFICATEPOLICIES_new;
-+		CERTIFICATEPOLICIES_free;
-+		d2i_CERTIFICATEPOLICIES;
-+		i2d_POLICYINFO;
-+		POLICYINFO_new;
-+		d2i_POLICYINFO;
-+		POLICYINFO_free;
-+		i2d_POLICYQUALINFO;
-+		POLICYQUALINFO_new;
-+		d2i_POLICYQUALINFO;
-+		POLICYQUALINFO_free;
-+		i2d_USERNOTICE;
-+		USERNOTICE_new;
-+		d2i_USERNOTICE;
-+		USERNOTICE_free;
-+		i2d_NOTICEREF;
-+		NOTICEREF_new;
-+		d2i_NOTICEREF;
-+		NOTICEREF_free;
-+		X509V3_get_string;
-+		X509V3_get_section;
-+		X509V3_string_free;
-+		X509V3_section_free;
-+		X509V3_set_ctx;
-+		s2i_ASN1_INTEGER;
-+		CRYPTO_set_locked_mem_functions;
-+		CRYPTO_get_locked_mem_functions;
-+		CRYPTO_malloc_locked;
-+		CRYPTO_free_locked;
-+		BN_mod_exp2_mont;
-+		ERR_get_error_line_data;
-+		ERR_peek_error_line_data;
-+		PKCS12_PBE_keyivgen;
-+		X509_ALGOR_dup;
-+		d2i_ASN1_SET_OF_DIST_POINT;
-+		i2d_ASN1_SET_OF_DIST_POINT;
-+		i2d_CRL_DIST_POINTS;
-+		CRL_DIST_POINTS_new;
-+		CRL_DIST_POINTS_free;
-+		d2i_CRL_DIST_POINTS;
-+		i2d_DIST_POINT;
-+		DIST_POINT_new;
-+		d2i_DIST_POINT;
-+		DIST_POINT_free;
-+		i2d_DIST_POINT_NAME;
-+		DIST_POINT_NAME_new;
-+		DIST_POINT_NAME_free;
-+		d2i_DIST_POINT_NAME;
-+		X509V3_add_value_uchar;
-+		d2i_ASN1_SET_OF_X509_ATTRIBUTE;
-+		i2d_ASN1_SET_OF_ASN1_TYPE;
-+		d2i_ASN1_SET_OF_X509_EXTENSION;
-+		d2i_ASN1_SET_OF_X509_NAME_ENTRY;
-+		d2i_ASN1_SET_OF_ASN1_TYPE;
-+		i2d_ASN1_SET_OF_X509_ATTRIBUTE;
-+		i2d_ASN1_SET_OF_X509_EXTENSION;
-+		i2d_ASN1_SET_OF_X509_NAME_ENTRY;
-+		X509V3_EXT_i2d;
-+		X509V3_EXT_val_prn;
-+		X509V3_EXT_add_list;
-+		EVP_CIPHER_type;
-+		EVP_PBE_CipherInit;
-+		X509V3_add_value_bool_nf;
-+		d2i_ASN1_UINTEGER;
-+		sk_value;
-+		sk_num;
-+		sk_set;
-+		i2d_ASN1_SET_OF_X509_REVOKED;
-+		sk_sort;
-+		d2i_ASN1_SET_OF_X509_REVOKED;
-+		i2d_ASN1_SET_OF_X509_ALGOR;
-+		i2d_ASN1_SET_OF_X509_CRL;
-+		d2i_ASN1_SET_OF_X509_ALGOR;
-+		d2i_ASN1_SET_OF_X509_CRL;
-+		i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO;
-+		i2d_ASN1_SET_OF_PKCS7_RECIP_INFO;
-+		d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO;
-+		d2i_ASN1_SET_OF_PKCS7_RECIP_INFO;
-+		PKCS5_PBE_add;
-+		PEM_write_bio_PKCS8;
-+		i2d_PKCS8_fp;
-+		PEM_read_bio_PKCS8_PRIV_KEY_INFO;
-+		PEM_read_bio_P8_PRIV_KEY_INFO;
-+		d2i_PKCS8_bio;
-+		d2i_PKCS8_PRIV_KEY_INFO_fp;
-+		PEM_write_bio_PKCS8_PRIV_KEY_INFO;
-+		PEM_write_bio_P8_PRIV_KEY_INFO;
-+		PEM_read_PKCS8;
-+		d2i_PKCS8_PRIV_KEY_INFO_bio;
-+		d2i_PKCS8_fp;
-+		PEM_write_PKCS8;
-+		PEM_read_PKCS8_PRIV_KEY_INFO;
-+		PEM_read_P8_PRIV_KEY_INFO;
-+		PEM_read_bio_PKCS8;
-+		PEM_write_PKCS8_PRIV_KEY_INFO;
-+		PEM_write_P8_PRIV_KEY_INFO;
-+		PKCS5_PBE_keyivgen;
-+		i2d_PKCS8_bio;
-+		i2d_PKCS8_PRIV_KEY_INFO_fp;
-+		i2d_PKCS8_PRIV_KEY_INFO_bio;
-+		BIO_s_bio;
-+		PKCS5_pbe2_set;
-+		PKCS5_PBKDF2_HMAC_SHA1;
-+		PKCS5_v2_PBE_keyivgen;
-+		PEM_write_bio_PKCS8PrivateKey;
-+		PEM_write_PKCS8PrivateKey;
-+		BIO_ctrl_get_read_request;
-+		BIO_ctrl_pending;
-+		BIO_ctrl_wpending;
-+		BIO_new_bio_pair;
-+		BIO_ctrl_get_write_guarantee;
-+		CRYPTO_num_locks;
-+		CONF_load_bio;
-+		CONF_load_fp;
-+		i2d_ASN1_SET_OF_ASN1_OBJECT;
-+		d2i_ASN1_SET_OF_ASN1_OBJECT;
-+		PKCS7_signatureVerify;
-+		RSA_set_method;
-+		RSA_get_method;
-+		RSA_get_default_method;
-+		RSA_check_key;
-+		OBJ_obj2txt;
-+		DSA_dup_DH;
-+		X509_REQ_get_extensions;
-+		X509_REQ_set_extension_nids;
-+		BIO_nwrite;
-+		X509_REQ_extension_nid;
-+		BIO_nread;
-+		X509_REQ_get_extension_nids;
-+		BIO_nwrite0;
-+		X509_REQ_add_extensions_nid;
-+		BIO_nread0;
-+		X509_REQ_add_extensions;
-+		BIO_new_mem_buf;
-+		DH_set_ex_data;
-+		DH_set_method;
-+		DSA_OpenSSL;
-+		DH_get_ex_data;
-+		DH_get_ex_new_index;
-+		DSA_new_method;
-+		DH_new_method;
-+		DH_OpenSSL;
-+		DSA_get_ex_new_index;
-+		DH_get_default_method;
-+		DSA_set_ex_data;
-+		DH_set_default_method;
-+		DSA_get_ex_data;
-+		X509V3_EXT_REQ_add_conf;
-+		NETSCAPE_SPKI_print;
-+		NETSCAPE_SPKI_set_pubkey;
-+		NETSCAPE_SPKI_b64_encode;
-+		NETSCAPE_SPKI_get_pubkey;
-+		NETSCAPE_SPKI_b64_decode;
-+		UTF8_putc;
-+		UTF8_getc;
-+		RSA_null_method;
-+		ASN1_tag2str;
-+		BIO_ctrl_reset_read_request;
-+		DISPLAYTEXT_new;
-+		ASN1_GENERALIZEDTIME_free;
-+		X509_REVOKED_get_ext_d2i;
-+		X509_set_ex_data;
-+		X509_reject_set_bit_asc;
-+		X509_NAME_add_entry_by_txt;
-+		X509_NAME_add_entry_by_NID;
-+		X509_PURPOSE_get0;
-+		PEM_read_X509_AUX;
-+		d2i_AUTHORITY_INFO_ACCESS;
-+		PEM_write_PUBKEY;
-+		ACCESS_DESCRIPTION_new;
-+		X509_CERT_AUX_free;
-+		d2i_ACCESS_DESCRIPTION;
-+		X509_trust_clear;
-+		X509_TRUST_add;
-+		ASN1_VISIBLESTRING_new;
-+		X509_alias_set1;
-+		ASN1_PRINTABLESTRING_free;
-+		EVP_PKEY_get1_DSA;
-+		ASN1_BMPSTRING_new;
-+		ASN1_mbstring_copy;
-+		ASN1_UTF8STRING_new;
-+		DSA_get_default_method;
-+		i2d_ASN1_SET_OF_ACCESS_DESCRIPTION;
-+		ASN1_T61STRING_free;
-+		DSA_set_method;
-+		X509_get_ex_data;
-+		ASN1_STRING_type;
-+		X509_PURPOSE_get_by_sname;
-+		ASN1_TIME_free;
-+		ASN1_OCTET_STRING_cmp;
-+		ASN1_BIT_STRING_new;
-+		X509_get_ext_d2i;
-+		PEM_read_bio_X509_AUX;
-+		ASN1_STRING_set_default_mask_asc;
-+		ASN1_STRING_set_def_mask_asc;
-+		PEM_write_bio_RSA_PUBKEY;
-+		ASN1_INTEGER_cmp;
-+		d2i_RSA_PUBKEY_fp;
-+		X509_trust_set_bit_asc;
-+		PEM_write_bio_DSA_PUBKEY;
-+		X509_STORE_CTX_free;
-+		EVP_PKEY_set1_DSA;
-+		i2d_DSA_PUBKEY_fp;
-+		X509_load_cert_crl_file;
-+		ASN1_TIME_new;
-+		i2d_RSA_PUBKEY;
-+		X509_STORE_CTX_purpose_inherit;
-+		PEM_read_RSA_PUBKEY;
-+		d2i_X509_AUX;
-+		i2d_DSA_PUBKEY;
-+		X509_CERT_AUX_print;
-+		PEM_read_DSA_PUBKEY;
-+		i2d_RSA_PUBKEY_bio;
-+		ASN1_BIT_STRING_num_asc;
-+		i2d_PUBKEY;
-+		ASN1_UTCTIME_free;
-+		DSA_set_default_method;
-+		X509_PURPOSE_get_by_id;
-+		ACCESS_DESCRIPTION_free;
-+		PEM_read_bio_PUBKEY;
-+		ASN1_STRING_set_by_NID;
-+		X509_PURPOSE_get_id;
-+		DISPLAYTEXT_free;
-+		OTHERNAME_new;
-+		X509_CERT_AUX_new;
-+		X509_TRUST_cleanup;
-+		X509_NAME_add_entry_by_OBJ;
-+		X509_CRL_get_ext_d2i;
-+		X509_PURPOSE_get0_name;
-+		PEM_read_PUBKEY;
-+		i2d_DSA_PUBKEY_bio;
-+		i2d_OTHERNAME;
-+		ASN1_OCTET_STRING_free;
-+		ASN1_BIT_STRING_set_asc;
-+		X509_get_ex_new_index;
-+		ASN1_STRING_TABLE_cleanup;
-+		X509_TRUST_get_by_id;
-+		X509_PURPOSE_get_trust;
-+		ASN1_STRING_length;
-+		d2i_ASN1_SET_OF_ACCESS_DESCRIPTION;
-+		ASN1_PRINTABLESTRING_new;
-+		X509V3_get_d2i;
-+		ASN1_ENUMERATED_free;
-+		i2d_X509_CERT_AUX;
-+		X509_STORE_CTX_set_trust;
-+		ASN1_STRING_set_default_mask;
-+		X509_STORE_CTX_new;
-+		EVP_PKEY_get1_RSA;
-+		DIRECTORYSTRING_free;
-+		PEM_write_X509_AUX;
-+		ASN1_OCTET_STRING_set;
-+		d2i_DSA_PUBKEY_fp;
-+		d2i_RSA_PUBKEY;
-+		X509_TRUST_get0_name;
-+		X509_TRUST_get0;
-+		AUTHORITY_INFO_ACCESS_free;
-+		ASN1_IA5STRING_new;
-+		d2i_DSA_PUBKEY;
-+		X509_check_purpose;
-+		ASN1_ENUMERATED_new;
-+		d2i_RSA_PUBKEY_bio;
-+		d2i_PUBKEY;
-+		X509_TRUST_get_trust;
-+		X509_TRUST_get_flags;
-+		ASN1_BMPSTRING_free;
-+		ASN1_T61STRING_new;
-+		ASN1_UTCTIME_new;
-+		i2d_AUTHORITY_INFO_ACCESS;
-+		EVP_PKEY_set1_RSA;
-+		X509_STORE_CTX_set_purpose;
-+		ASN1_IA5STRING_free;
-+		PEM_write_bio_X509_AUX;
-+		X509_PURPOSE_get_count;
-+		CRYPTO_add_info;
-+		X509_NAME_ENTRY_create_by_txt;
-+		ASN1_STRING_get_default_mask;
-+		X509_alias_get0;
-+		ASN1_STRING_data;
-+		i2d_ACCESS_DESCRIPTION;
-+		X509_trust_set_bit;
-+		ASN1_BIT_STRING_free;
-+		PEM_read_bio_RSA_PUBKEY;
-+		X509_add1_reject_object;
-+		X509_check_trust;
-+		PEM_read_bio_DSA_PUBKEY;
-+		X509_PURPOSE_add;
-+		ASN1_STRING_TABLE_get;
-+		ASN1_UTF8STRING_free;
-+		d2i_DSA_PUBKEY_bio;
-+		PEM_write_RSA_PUBKEY;
-+		d2i_OTHERNAME;
-+		X509_reject_set_bit;
-+		PEM_write_DSA_PUBKEY;
-+		X509_PURPOSE_get0_sname;
-+		EVP_PKEY_set1_DH;
-+		ASN1_OCTET_STRING_dup;
-+		ASN1_BIT_STRING_set;
-+		X509_TRUST_get_count;
-+		ASN1_INTEGER_free;
-+		OTHERNAME_free;
-+		i2d_RSA_PUBKEY_fp;
-+		ASN1_INTEGER_dup;
-+		d2i_X509_CERT_AUX;
-+		PEM_write_bio_PUBKEY;
-+		ASN1_VISIBLESTRING_free;
-+		X509_PURPOSE_cleanup;
-+		ASN1_mbstring_ncopy;
-+		ASN1_GENERALIZEDTIME_new;
-+		EVP_PKEY_get1_DH;
-+		ASN1_OCTET_STRING_new;
-+		ASN1_INTEGER_new;
-+		i2d_X509_AUX;
-+		ASN1_BIT_STRING_name_print;
-+		X509_cmp;
-+		ASN1_STRING_length_set;
-+		DIRECTORYSTRING_new;
-+		X509_add1_trust_object;
-+		PKCS12_newpass;
-+		SMIME_write_PKCS7;
-+		SMIME_read_PKCS7;
-+		DES_set_key_checked;
-+		PKCS7_verify;
-+		PKCS7_encrypt;
-+		DES_set_key_unchecked;
-+		SMIME_crlf_copy;
-+		i2d_ASN1_PRINTABLESTRING;
-+		PKCS7_get0_signers;
-+		PKCS7_decrypt;
-+		SMIME_text;
-+		PKCS7_simple_smimecap;
-+		PKCS7_get_smimecap;
-+		PKCS7_sign;
-+		PKCS7_add_attrib_smimecap;
-+		CRYPTO_dbg_set_options;
-+		CRYPTO_remove_all_info;
-+		CRYPTO_get_mem_debug_functions;
-+		CRYPTO_is_mem_check_on;
-+		CRYPTO_set_mem_debug_functions;
-+		CRYPTO_pop_info;
-+		CRYPTO_push_info_;
-+		CRYPTO_set_mem_debug_options;
-+		PEM_write_PKCS8PrivateKey_nid;
-+		PEM_write_bio_PKCS8PrivateKey_nid;
-+		PEM_write_bio_PKCS8PrivKey_nid;
-+		d2i_PKCS8PrivateKey_bio;
-+		ASN1_NULL_free;
-+		d2i_ASN1_NULL;
-+		ASN1_NULL_new;
-+		i2d_PKCS8PrivateKey_bio;
-+		i2d_PKCS8PrivateKey_fp;
-+		i2d_ASN1_NULL;
-+		i2d_PKCS8PrivateKey_nid_fp;
-+		d2i_PKCS8PrivateKey_fp;
-+		i2d_PKCS8PrivateKey_nid_bio;
-+		i2d_PKCS8PrivateKeyInfo_fp;
-+		i2d_PKCS8PrivateKeyInfo_bio;
-+		PEM_cb;
-+		i2d_PrivateKey_fp;
-+		d2i_PrivateKey_bio;
-+		d2i_PrivateKey_fp;
-+		i2d_PrivateKey_bio;
-+		X509_reject_clear;
-+		X509_TRUST_set_default;
-+		d2i_AutoPrivateKey;
-+		X509_ATTRIBUTE_get0_type;
-+		X509_ATTRIBUTE_set1_data;
-+		X509at_get_attr;
-+		X509at_get_attr_count;
-+		X509_ATTRIBUTE_create_by_NID;
-+		X509_ATTRIBUTE_set1_object;
-+		X509_ATTRIBUTE_count;
-+		X509_ATTRIBUTE_create_by_OBJ;
-+		X509_ATTRIBUTE_get0_object;
-+		X509at_get_attr_by_NID;
-+		X509at_add1_attr;
-+		X509_ATTRIBUTE_get0_data;
-+		X509at_delete_attr;
-+		X509at_get_attr_by_OBJ;
-+		RAND_add;
-+		BIO_number_written;
-+		BIO_number_read;
-+		X509_STORE_CTX_get1_chain;
-+		ERR_load_RAND_strings;
-+		RAND_pseudo_bytes;
-+		X509_REQ_get_attr_by_NID;
-+		X509_REQ_get_attr;
-+		X509_REQ_add1_attr_by_NID;
-+		X509_REQ_get_attr_by_OBJ;
-+		X509at_add1_attr_by_NID;
-+		X509_REQ_add1_attr_by_OBJ;
-+		X509_REQ_get_attr_count;
-+		X509_REQ_add1_attr;
-+		X509_REQ_delete_attr;
-+		X509at_add1_attr_by_OBJ;
-+		X509_REQ_add1_attr_by_txt;
-+		X509_ATTRIBUTE_create_by_txt;
-+		X509at_add1_attr_by_txt;
-+		BN_pseudo_rand;
-+		BN_is_prime_fasttest;
-+		BN_CTX_end;
-+		BN_CTX_start;
-+		BN_CTX_get;
-+		EVP_PKEY2PKCS8_broken;
-+		ASN1_STRING_TABLE_add;
-+		CRYPTO_dbg_get_options;
-+		AUTHORITY_INFO_ACCESS_new;
-+		CRYPTO_get_mem_debug_options;
-+		DES_crypt;
-+		PEM_write_bio_X509_REQ_NEW;
-+		PEM_write_X509_REQ_NEW;
-+		BIO_callback_ctrl;
-+		RAND_egd;
-+		RAND_status;
-+		bn_dump1;
-+		DES_check_key_parity;
-+		lh_num_items;
-+		RAND_event;
-+		DSO_new;
-+		DSO_new_method;
-+		DSO_free;
-+		DSO_flags;
-+		DSO_up;
-+		DSO_set_default_method;
-+		DSO_get_default_method;
-+		DSO_get_method;
-+		DSO_set_method;
-+		DSO_load;
-+		DSO_bind_var;
-+		DSO_METHOD_null;
-+		DSO_METHOD_openssl;
-+		DSO_METHOD_dlfcn;
-+		DSO_METHOD_win32;
-+		ERR_load_DSO_strings;
-+		DSO_METHOD_dl;
-+		NCONF_load;
-+		NCONF_load_fp;
-+		NCONF_new;
-+		NCONF_get_string;
-+		NCONF_free;
-+		NCONF_get_number;
-+		CONF_dump_fp;
-+		NCONF_load_bio;
-+		NCONF_dump_fp;
-+		NCONF_get_section;
-+		NCONF_dump_bio;
-+		CONF_dump_bio;
-+		NCONF_free_data;
-+		CONF_set_default_method;
-+		ERR_error_string_n;
-+		BIO_snprintf;
-+		DSO_ctrl;
-+		i2d_ASN1_SET_OF_ASN1_INTEGER;
-+		i2d_ASN1_SET_OF_PKCS12_SAFEBAG;
-+		i2d_ASN1_SET_OF_PKCS7;
-+		BIO_vfree;
-+		d2i_ASN1_SET_OF_ASN1_INTEGER;
-+		d2i_ASN1_SET_OF_PKCS12_SAFEBAG;
-+		ASN1_UTCTIME_get;
-+		X509_REQ_digest;
-+		X509_CRL_digest;
-+		d2i_ASN1_SET_OF_PKCS7;
-+		EVP_CIPHER_CTX_set_key_length;
-+		EVP_CIPHER_CTX_ctrl;
-+		BN_mod_exp_mont_word;
-+		RAND_egd_bytes;
-+		X509_REQ_get1_email;
-+		X509_get1_email;
-+		X509_email_free;
-+		i2d_RSA_NET;
-+		d2i_RSA_NET_2;
-+		d2i_RSA_NET;
-+		DSO_bind_func;
-+		CRYPTO_get_new_dynlockid;
-+		sk_new_null;
-+		CRYPTO_set_dynlock_destroy_callback;
-+		CRYPTO_set_dynlock_destroy_cb;
-+		CRYPTO_destroy_dynlockid;
-+		CRYPTO_set_dynlock_size;
-+		CRYPTO_set_dynlock_create_callback;
-+		CRYPTO_set_dynlock_create_cb;
-+		CRYPTO_set_dynlock_lock_callback;
-+		CRYPTO_set_dynlock_lock_cb;
-+		CRYPTO_get_dynlock_lock_callback;
-+		CRYPTO_get_dynlock_lock_cb;
-+		CRYPTO_get_dynlock_destroy_callback;
-+		CRYPTO_get_dynlock_destroy_cb;
-+		CRYPTO_get_dynlock_value;
-+		CRYPTO_get_dynlock_create_callback;
-+		CRYPTO_get_dynlock_create_cb;
-+		c2i_ASN1_BIT_STRING;
-+		i2c_ASN1_BIT_STRING;
-+		RAND_poll;
-+		c2i_ASN1_INTEGER;
-+		i2c_ASN1_INTEGER;
-+		BIO_dump_indent;
-+		ASN1_parse_dump;
-+		c2i_ASN1_OBJECT;
-+		X509_NAME_print_ex_fp;
-+		ASN1_STRING_print_ex_fp;
-+		X509_NAME_print_ex;
-+		ASN1_STRING_print_ex;
-+		MD4;
-+		MD4_Transform;
-+		MD4_Final;
-+		MD4_Update;
-+		MD4_Init;
-+		EVP_md4;
-+		i2d_PUBKEY_bio;
-+		i2d_PUBKEY_fp;
-+		d2i_PUBKEY_bio;
-+		ASN1_STRING_to_UTF8;
-+		BIO_vprintf;
-+		BIO_vsnprintf;
-+		d2i_PUBKEY_fp;
-+		X509_cmp_time;
-+		X509_STORE_CTX_set_time;
-+		X509_STORE_CTX_get1_issuer;
-+		X509_OBJECT_retrieve_match;
-+		X509_OBJECT_idx_by_subject;
-+		X509_STORE_CTX_set_flags;
-+		X509_STORE_CTX_trusted_stack;
-+		X509_time_adj;
-+		X509_check_issued;
-+		ASN1_UTCTIME_cmp_time_t;
-+		DES_set_weak_key_flag;
-+		DES_check_key;
-+		DES_rw_mode;
-+		RSA_PKCS1_RSAref;
-+		X509_keyid_set1;
-+		BIO_next;
-+		DSO_METHOD_vms;
-+		BIO_f_linebuffer;
-+		BN_bntest_rand;
-+		OPENSSL_issetugid;
-+		BN_rand_range;
-+		ERR_load_ENGINE_strings;
-+		ENGINE_set_DSA;
-+		ENGINE_get_finish_function;
-+		ENGINE_get_default_RSA;
-+		ENGINE_get_BN_mod_exp;
-+		DSA_get_default_openssl_method;
-+		ENGINE_set_DH;
-+		ENGINE_set_def_BN_mod_exp_crt;
-+		ENGINE_set_default_BN_mod_exp_crt;
-+		ENGINE_init;
-+		DH_get_default_openssl_method;
-+		RSA_set_default_openssl_method;
-+		ENGINE_finish;
-+		ENGINE_load_public_key;
-+		ENGINE_get_DH;
-+		ENGINE_ctrl;
-+		ENGINE_get_init_function;
-+		ENGINE_set_init_function;
-+		ENGINE_set_default_DSA;
-+		ENGINE_get_name;
-+		ENGINE_get_last;
-+		ENGINE_get_prev;
-+		ENGINE_get_default_DH;
-+		ENGINE_get_RSA;
-+		ENGINE_set_default;
-+		ENGINE_get_RAND;
-+		ENGINE_get_first;
-+		ENGINE_by_id;
-+		ENGINE_set_finish_function;
-+		ENGINE_get_def_BN_mod_exp_crt;
-+		ENGINE_get_default_BN_mod_exp_crt;
-+		RSA_get_default_openssl_method;
-+		ENGINE_set_RSA;
-+		ENGINE_load_private_key;
-+		ENGINE_set_default_RAND;
-+		ENGINE_set_BN_mod_exp;
-+		ENGINE_remove;
-+		ENGINE_free;
-+		ENGINE_get_BN_mod_exp_crt;
-+		ENGINE_get_next;
-+		ENGINE_set_name;
-+		ENGINE_get_default_DSA;
-+		ENGINE_set_default_BN_mod_exp;
-+		ENGINE_set_default_RSA;
-+		ENGINE_get_default_RAND;
-+		ENGINE_get_default_BN_mod_exp;
-+		ENGINE_set_RAND;
-+		ENGINE_set_id;
-+		ENGINE_set_BN_mod_exp_crt;
-+		ENGINE_set_default_DH;
-+		ENGINE_new;
-+		ENGINE_get_id;
-+		DSA_set_default_openssl_method;
-+		ENGINE_add;
-+		DH_set_default_openssl_method;
-+		ENGINE_get_DSA;
-+		ENGINE_get_ctrl_function;
-+		ENGINE_set_ctrl_function;
-+		BN_pseudo_rand_range;
-+		X509_STORE_CTX_set_verify_cb;
-+		ERR_load_COMP_strings;
-+		PKCS12_item_decrypt_d2i;
-+		ASN1_UTF8STRING_it;
-+		ENGINE_unregister_ciphers;
-+		ENGINE_get_ciphers;
-+		d2i_OCSP_BASICRESP;
-+		KRB5_CHECKSUM_it;
-+		EC_POINT_add;
-+		ASN1_item_ex_i2d;
-+		OCSP_CERTID_it;
-+		d2i_OCSP_RESPBYTES;
-+		X509V3_add1_i2d;
-+		PKCS7_ENVELOPE_it;
-+		UI_add_input_boolean;
-+		ENGINE_unregister_RSA;
-+		X509V3_EXT_nconf;
-+		ASN1_GENERALSTRING_free;
-+		d2i_OCSP_CERTSTATUS;
-+		X509_REVOKED_set_serialNumber;
-+		X509_print_ex;
-+		OCSP_ONEREQ_get1_ext_d2i;
-+		ENGINE_register_all_RAND;
-+		ENGINE_load_dynamic;
-+		PBKDF2PARAM_it;
-+		EXTENDED_KEY_USAGE_new;
-+		EC_GROUP_clear_free;
-+		OCSP_sendreq_bio;
-+		ASN1_item_digest;
-+		OCSP_BASICRESP_delete_ext;
-+		OCSP_SIGNATURE_it;
-+		X509_CRL_it;
-+		OCSP_BASICRESP_add_ext;
-+		KRB5_ENCKEY_it;
-+		UI_method_set_closer;
-+		X509_STORE_set_purpose;
-+		i2d_ASN1_GENERALSTRING;
-+		OCSP_response_status;
-+		i2d_OCSP_SERVICELOC;
-+		ENGINE_get_digest_engine;
-+		EC_GROUP_set_curve_GFp;
-+		OCSP_REQUEST_get_ext_by_OBJ;
-+		_ossl_old_des_random_key;
-+		ASN1_T61STRING_it;
-+		EC_GROUP_method_of;
-+		i2d_KRB5_APREQ;
-+		_ossl_old_des_encrypt;
-+		ASN1_PRINTABLE_new;
-+		HMAC_Init_ex;
-+		d2i_KRB5_AUTHENT;
-+		OCSP_archive_cutoff_new;
-+		EC_POINT_set_Jprojective_coordinates_GFp;
-+		EC_POINT_set_Jproj_coords_GFp;
-+		_ossl_old_des_is_weak_key;
-+		OCSP_BASICRESP_get_ext_by_OBJ;
-+		EC_POINT_oct2point;
-+		OCSP_SINGLERESP_get_ext_count;
-+		UI_ctrl;
-+		_shadow_DES_rw_mode;
-+		asn1_do_adb;
-+		ASN1_template_i2d;
-+		ENGINE_register_DH;
-+		UI_construct_prompt;
-+		X509_STORE_set_trust;
-+		UI_dup_input_string;
-+		d2i_KRB5_APREQ;
-+		EVP_MD_CTX_copy_ex;
-+		OCSP_request_is_signed;
-+		i2d_OCSP_REQINFO;
-+		KRB5_ENCKEY_free;
-+		OCSP_resp_get0;
-+		GENERAL_NAME_it;
-+		ASN1_GENERALIZEDTIME_it;
-+		X509_STORE_set_flags;
-+		EC_POINT_set_compressed_coordinates_GFp;
-+		EC_POINT_set_compr_coords_GFp;
-+		OCSP_response_status_str;
-+		d2i_OCSP_REVOKEDINFO;
-+		OCSP_basic_add1_cert;
-+		ERR_get_implementation;
-+		EVP_CipherFinal_ex;
-+		OCSP_CERTSTATUS_new;
-+		CRYPTO_cleanup_all_ex_data;
-+		OCSP_resp_find;
-+		BN_nnmod;
-+		X509_CRL_sort;
-+		X509_REVOKED_set_revocationDate;
-+		ENGINE_register_RAND;
-+		OCSP_SERVICELOC_new;
-+		EC_POINT_set_affine_coordinates_GFp;
-+		EC_POINT_set_affine_coords_GFp;
-+		_ossl_old_des_options;
-+		SXNET_it;
-+		UI_dup_input_boolean;
-+		PKCS12_add_CSPName_asc;
-+		EC_POINT_is_at_infinity;
-+		ENGINE_load_cryptodev;
-+		DSO_convert_filename;
-+		POLICYQUALINFO_it;
-+		ENGINE_register_ciphers;
-+		BN_mod_lshift_quick;
-+		DSO_set_filename;
-+		ASN1_item_free;
-+		KRB5_TKTBODY_free;
-+		AUTHORITY_KEYID_it;
-+		KRB5_APREQBODY_new;
-+		X509V3_EXT_REQ_add_nconf;
-+		ENGINE_ctrl_cmd_string;
-+		i2d_OCSP_RESPDATA;
-+		EVP_MD_CTX_init;
-+		EXTENDED_KEY_USAGE_free;
-+		PKCS7_ATTR_SIGN_it;
-+		UI_add_error_string;
-+		KRB5_CHECKSUM_free;
-+		OCSP_REQUEST_get_ext;
-+		ENGINE_load_ubsec;
-+		ENGINE_register_all_digests;
-+		PKEY_USAGE_PERIOD_it;
-+		PKCS12_unpack_authsafes;
-+		ASN1_item_unpack;
-+		NETSCAPE_SPKAC_it;
-+		X509_REVOKED_it;
-+		ASN1_STRING_encode;
-+		EVP_aes_128_ecb;
-+		KRB5_AUTHENT_free;
-+		OCSP_BASICRESP_get_ext_by_critical;
-+		OCSP_BASICRESP_get_ext_by_crit;
-+		OCSP_cert_status_str;
-+		d2i_OCSP_REQUEST;
-+		UI_dup_info_string;
-+		_ossl_old_des_xwhite_in2out;
-+		PKCS12_it;
-+		OCSP_SINGLERESP_get_ext_by_critical;
-+		OCSP_SINGLERESP_get_ext_by_crit;
-+		OCSP_CERTSTATUS_free;
-+		_ossl_old_des_crypt;
-+		ASN1_item_i2d;
-+		EVP_DecryptFinal_ex;
-+		ENGINE_load_openssl;
-+		ENGINE_get_cmd_defns;
-+		ENGINE_set_load_privkey_function;
-+		ENGINE_set_load_privkey_fn;
-+		EVP_EncryptFinal_ex;
-+		ENGINE_set_default_digests;
-+		X509_get0_pubkey_bitstr;
-+		asn1_ex_i2c;
-+		ENGINE_register_RSA;
-+		ENGINE_unregister_DSA;
-+		_ossl_old_des_key_sched;
-+		X509_EXTENSION_it;
-+		i2d_KRB5_AUTHENT;
-+		SXNETID_it;
-+		d2i_OCSP_SINGLERESP;
-+		EDIPARTYNAME_new;
-+		PKCS12_certbag2x509;
-+		_ossl_old_des_ofb64_encrypt;
-+		d2i_EXTENDED_KEY_USAGE;
-+		ERR_print_errors_cb;
-+		ENGINE_set_ciphers;
-+		d2i_KRB5_APREQBODY;
-+		UI_method_get_flusher;
-+		X509_PUBKEY_it;
-+		_ossl_old_des_enc_read;
-+		PKCS7_ENCRYPT_it;
-+		i2d_OCSP_RESPONSE;
-+		EC_GROUP_get_cofactor;
-+		PKCS12_unpack_p7data;
-+		d2i_KRB5_AUTHDATA;
-+		OCSP_copy_nonce;
-+		KRB5_AUTHDATA_new;
-+		OCSP_RESPDATA_new;
-+		EC_GFp_mont_method;
-+		OCSP_REVOKEDINFO_free;
-+		UI_get_ex_data;
-+		KRB5_APREQBODY_free;
-+		EC_GROUP_get0_generator;
-+		UI_get_default_method;
-+		X509V3_set_nconf;
-+		PKCS12_item_i2d_encrypt;
-+		X509_add1_ext_i2d;
-+		PKCS7_SIGNER_INFO_it;
-+		KRB5_PRINCNAME_new;
-+		PKCS12_SAFEBAG_it;
-+		EC_GROUP_get_order;
-+		d2i_OCSP_RESPID;
-+		OCSP_request_verify;
-+		NCONF_get_number_e;
-+		_ossl_old_des_decrypt3;
-+		X509_signature_print;
-+		OCSP_SINGLERESP_free;
-+		ENGINE_load_builtin_engines;
-+		i2d_OCSP_ONEREQ;
-+		OCSP_REQUEST_add_ext;
-+		OCSP_RESPBYTES_new;
-+		EVP_MD_CTX_create;
-+		OCSP_resp_find_status;
-+		X509_ALGOR_it;
-+		ASN1_TIME_it;
-+		OCSP_request_set1_name;
-+		OCSP_ONEREQ_get_ext_count;
-+		UI_get0_result;
-+		PKCS12_AUTHSAFES_it;
-+		EVP_aes_256_ecb;
-+		PKCS12_pack_authsafes;
-+		ASN1_IA5STRING_it;
-+		UI_get_input_flags;
-+		EC_GROUP_set_generator;
-+		_ossl_old_des_string_to_2keys;
-+		OCSP_CERTID_free;
-+		X509_CERT_AUX_it;
-+		CERTIFICATEPOLICIES_it;
-+		_ossl_old_des_ede3_cbc_encrypt;
-+		RAND_set_rand_engine;
-+		DSO_get_loaded_filename;
-+		X509_ATTRIBUTE_it;
-+		OCSP_ONEREQ_get_ext_by_NID;
-+		PKCS12_decrypt_skey;
-+		KRB5_AUTHENT_it;
-+		UI_dup_error_string;
-+		RSAPublicKey_it;
-+		i2d_OCSP_REQUEST;
-+		PKCS12_x509crl2certbag;
-+		OCSP_SERVICELOC_it;
-+		ASN1_item_sign;
-+		X509_CRL_set_issuer_name;
-+		OBJ_NAME_do_all_sorted;
-+		i2d_OCSP_BASICRESP;
-+		i2d_OCSP_RESPBYTES;
-+		PKCS12_unpack_p7encdata;
-+		HMAC_CTX_init;
-+		ENGINE_get_digest;
-+		OCSP_RESPONSE_print;
-+		KRB5_TKTBODY_it;
-+		ACCESS_DESCRIPTION_it;
-+		PKCS7_ISSUER_AND_SERIAL_it;
-+		PBE2PARAM_it;
-+		PKCS12_certbag2x509crl;
-+		PKCS7_SIGNED_it;
-+		ENGINE_get_cipher;
-+		i2d_OCSP_CRLID;
-+		OCSP_SINGLERESP_new;
-+		ENGINE_cmd_is_executable;
-+		RSA_up_ref;
-+		ASN1_GENERALSTRING_it;
-+		ENGINE_register_DSA;
-+		X509V3_EXT_add_nconf_sk;
-+		ENGINE_set_load_pubkey_function;
-+		PKCS8_decrypt;
-+		PEM_bytes_read_bio;
-+		DIRECTORYSTRING_it;
-+		d2i_OCSP_CRLID;
-+		EC_POINT_is_on_curve;
-+		CRYPTO_set_locked_mem_ex_functions;
-+		CRYPTO_set_locked_mem_ex_funcs;
-+		d2i_KRB5_CHECKSUM;
-+		ASN1_item_dup;
-+		X509_it;
-+		BN_mod_add;
-+		KRB5_AUTHDATA_free;
-+		_ossl_old_des_cbc_cksum;
-+		ASN1_item_verify;
-+		CRYPTO_set_mem_ex_functions;
-+		EC_POINT_get_Jprojective_coordinates_GFp;
-+		EC_POINT_get_Jproj_coords_GFp;
-+		ZLONG_it;
-+		CRYPTO_get_locked_mem_ex_functions;
-+		CRYPTO_get_locked_mem_ex_funcs;
-+		ASN1_TIME_check;
-+		UI_get0_user_data;
-+		HMAC_CTX_cleanup;
-+		DSA_up_ref;
-+		_ossl_old_des_ede3_cfb64_encrypt;
-+		_ossl_odes_ede3_cfb64_encrypt;
-+		ASN1_BMPSTRING_it;
-+		ASN1_tag2bit;
-+		UI_method_set_flusher;
-+		X509_ocspid_print;
-+		KRB5_ENCDATA_it;
-+		ENGINE_get_load_pubkey_function;
-+		UI_add_user_data;
-+		OCSP_REQUEST_delete_ext;
-+		UI_get_method;
-+		OCSP_ONEREQ_free;
-+		ASN1_PRINTABLESTRING_it;
-+		X509_CRL_set_nextUpdate;
-+		OCSP_REQUEST_it;
-+		OCSP_BASICRESP_it;
-+		AES_ecb_encrypt;
-+		BN_mod_sqr;
-+		NETSCAPE_CERT_SEQUENCE_it;
-+		GENERAL_NAMES_it;
-+		AUTHORITY_INFO_ACCESS_it;
-+		ASN1_FBOOLEAN_it;
-+		UI_set_ex_data;
-+		_ossl_old_des_string_to_key;
-+		ENGINE_register_all_RSA;
-+		d2i_KRB5_PRINCNAME;
-+		OCSP_RESPBYTES_it;
-+		X509_CINF_it;
-+		ENGINE_unregister_digests;
-+		d2i_EDIPARTYNAME;
-+		d2i_OCSP_SERVICELOC;
-+		ENGINE_get_digests;
-+		_ossl_old_des_set_odd_parity;
-+		OCSP_RESPDATA_free;
-+		d2i_KRB5_TICKET;
-+		OTHERNAME_it;
-+		EVP_MD_CTX_cleanup;
-+		d2i_ASN1_GENERALSTRING;
-+		X509_CRL_set_version;
-+		BN_mod_sub;
-+		OCSP_SINGLERESP_get_ext_by_NID;
-+		ENGINE_get_ex_new_index;
-+		OCSP_REQUEST_free;
-+		OCSP_REQUEST_add1_ext_i2d;
-+		X509_VAL_it;
-+		EC_POINTs_make_affine;
-+		EC_POINT_mul;
-+		X509V3_EXT_add_nconf;
-+		X509_TRUST_set;
-+		X509_CRL_add1_ext_i2d;
-+		_ossl_old_des_fcrypt;
-+		DISPLAYTEXT_it;
-+		X509_CRL_set_lastUpdate;
-+		OCSP_BASICRESP_free;
-+		OCSP_BASICRESP_add1_ext_i2d;
-+		d2i_KRB5_AUTHENTBODY;
-+		CRYPTO_set_ex_data_implementation;
-+		CRYPTO_set_ex_data_impl;
-+		KRB5_ENCDATA_new;
-+		DSO_up_ref;
-+		OCSP_crl_reason_str;
-+		UI_get0_result_string;
-+		ASN1_GENERALSTRING_new;
-+		X509_SIG_it;
-+		ERR_set_implementation;
-+		ERR_load_EC_strings;
-+		UI_get0_action_string;
-+		OCSP_ONEREQ_get_ext;
-+		EC_POINT_method_of;
-+		i2d_KRB5_APREQBODY;
-+		_ossl_old_des_ecb3_encrypt;
-+		CRYPTO_get_mem_ex_functions;
-+		ENGINE_get_ex_data;
-+		UI_destroy_method;
-+		ASN1_item_i2d_bio;
-+		OCSP_ONEREQ_get_ext_by_OBJ;
-+		ASN1_primitive_new;
-+		ASN1_PRINTABLE_it;
-+		EVP_aes_192_ecb;
-+		OCSP_SIGNATURE_new;
-+		LONG_it;
-+		ASN1_VISIBLESTRING_it;
-+		OCSP_SINGLERESP_add1_ext_i2d;
-+		d2i_OCSP_CERTID;
-+		ASN1_item_d2i_fp;
-+		CRL_DIST_POINTS_it;
-+		GENERAL_NAME_print;
-+		OCSP_SINGLERESP_delete_ext;
-+		PKCS12_SAFEBAGS_it;
-+		d2i_OCSP_SIGNATURE;
-+		OCSP_request_add1_nonce;
-+		ENGINE_set_cmd_defns;
-+		OCSP_SERVICELOC_free;
-+		EC_GROUP_free;
-+		ASN1_BIT_STRING_it;
-+		X509_REQ_it;
-+		_ossl_old_des_cbc_encrypt;
-+		ERR_unload_strings;
-+		PKCS7_SIGN_ENVELOPE_it;
-+		EDIPARTYNAME_free;
-+		OCSP_REQINFO_free;
-+		EC_GROUP_new_curve_GFp;
-+		OCSP_REQUEST_get1_ext_d2i;
-+		PKCS12_item_pack_safebag;
-+		asn1_ex_c2i;
-+		ENGINE_register_digests;
-+		i2d_OCSP_REVOKEDINFO;
-+		asn1_enc_restore;
-+		UI_free;
-+		UI_new_method;
-+		EVP_EncryptInit_ex;
-+		X509_pubkey_digest;
-+		EC_POINT_invert;
-+		OCSP_basic_sign;
-+		i2d_OCSP_RESPID;
-+		OCSP_check_nonce;
-+		ENGINE_ctrl_cmd;
-+		d2i_KRB5_ENCKEY;
-+		OCSP_parse_url;
-+		OCSP_SINGLERESP_get_ext;
-+		OCSP_CRLID_free;
-+		OCSP_BASICRESP_get1_ext_d2i;
-+		RSAPrivateKey_it;
-+		ENGINE_register_all_DH;
-+		i2d_EDIPARTYNAME;
-+		EC_POINT_get_affine_coordinates_GFp;
-+		EC_POINT_get_affine_coords_GFp;
-+		OCSP_CRLID_new;
-+		ENGINE_get_flags;
-+		OCSP_ONEREQ_it;
-+		UI_process;
-+		ASN1_INTEGER_it;
-+		EVP_CipherInit_ex;
-+		UI_get_string_type;
-+		ENGINE_unregister_DH;
-+		ENGINE_register_all_DSA;
-+		OCSP_ONEREQ_get_ext_by_critical;
-+		bn_dup_expand;
-+		OCSP_cert_id_new;
-+		BASIC_CONSTRAINTS_it;
-+		BN_mod_add_quick;
-+		EC_POINT_new;
-+		EVP_MD_CTX_destroy;
-+		OCSP_RESPBYTES_free;
-+		EVP_aes_128_cbc;
-+		OCSP_SINGLERESP_get1_ext_d2i;
-+		EC_POINT_free;
-+		DH_up_ref;
-+		X509_NAME_ENTRY_it;
-+		UI_get_ex_new_index;
-+		BN_mod_sub_quick;
-+		OCSP_ONEREQ_add_ext;
-+		OCSP_request_sign;
-+		EVP_DigestFinal_ex;
-+		ENGINE_set_digests;
-+		OCSP_id_issuer_cmp;
-+		OBJ_NAME_do_all;
-+		EC_POINTs_mul;
-+		ENGINE_register_complete;
-+		X509V3_EXT_nconf_nid;
-+		ASN1_SEQUENCE_it;
-+		UI_set_default_method;
-+		RAND_query_egd_bytes;
-+		UI_method_get_writer;
-+		UI_OpenSSL;
-+		PEM_def_callback;
-+		ENGINE_cleanup;
-+		DIST_POINT_it;
-+		OCSP_SINGLERESP_it;
-+		d2i_KRB5_TKTBODY;
-+		EC_POINT_cmp;
-+		OCSP_REVOKEDINFO_new;
-+		i2d_OCSP_CERTSTATUS;
-+		OCSP_basic_add1_nonce;
-+		ASN1_item_ex_d2i;
-+		BN_mod_lshift1_quick;
-+		UI_set_method;
-+		OCSP_id_get0_info;
-+		BN_mod_sqrt;
-+		EC_GROUP_copy;
-+		KRB5_ENCDATA_free;
-+		_ossl_old_des_cfb_encrypt;
-+		OCSP_SINGLERESP_get_ext_by_OBJ;
-+		OCSP_cert_to_id;
-+		OCSP_RESPID_new;
-+		OCSP_RESPDATA_it;
-+		d2i_OCSP_RESPDATA;
-+		ENGINE_register_all_complete;
-+		OCSP_check_validity;
-+		PKCS12_BAGS_it;
-+		OCSP_url_svcloc_new;
-+		ASN1_template_free;
-+		OCSP_SINGLERESP_add_ext;
-+		KRB5_AUTHENTBODY_it;
-+		X509_supported_extension;
-+		i2d_KRB5_AUTHDATA;
-+		UI_method_get_opener;
-+		ENGINE_set_ex_data;
-+		OCSP_REQUEST_print;
-+		CBIGNUM_it;
-+		KRB5_TICKET_new;
-+		KRB5_APREQ_new;
-+		EC_GROUP_get_curve_GFp;
-+		KRB5_ENCKEY_new;
-+		ASN1_template_d2i;
-+		_ossl_old_des_quad_cksum;
-+		OCSP_single_get0_status;
-+		BN_swap;
-+		POLICYINFO_it;
-+		ENGINE_set_destroy_function;
-+		asn1_enc_free;
-+		OCSP_RESPID_it;
-+		EC_GROUP_new;
-+		EVP_aes_256_cbc;
-+		i2d_KRB5_PRINCNAME;
-+		_ossl_old_des_encrypt2;
-+		_ossl_old_des_encrypt3;
-+		PKCS8_PRIV_KEY_INFO_it;
-+		OCSP_REQINFO_it;
-+		PBEPARAM_it;
-+		KRB5_AUTHENTBODY_new;
-+		X509_CRL_add0_revoked;
-+		EDIPARTYNAME_it;
-+		NETSCAPE_SPKI_it;
-+		UI_get0_test_string;
-+		ENGINE_get_cipher_engine;
-+		ENGINE_register_all_ciphers;
-+		EC_POINT_copy;
-+		BN_kronecker;
-+		_ossl_old_des_ede3_ofb64_encrypt;
-+		_ossl_odes_ede3_ofb64_encrypt;
-+		UI_method_get_reader;
-+		OCSP_BASICRESP_get_ext_count;
-+		ASN1_ENUMERATED_it;
-+		UI_set_result;
-+		i2d_KRB5_TICKET;
-+		X509_print_ex_fp;
-+		EVP_CIPHER_CTX_set_padding;
-+		d2i_OCSP_RESPONSE;
-+		ASN1_UTCTIME_it;
-+		_ossl_old_des_enc_write;
-+		OCSP_RESPONSE_new;
-+		AES_set_encrypt_key;
-+		OCSP_resp_count;
-+		KRB5_CHECKSUM_new;
-+		ENGINE_load_cswift;
-+		OCSP_onereq_get0_id;
-+		ENGINE_set_default_ciphers;
-+		NOTICEREF_it;
-+		X509V3_EXT_CRL_add_nconf;
-+		OCSP_REVOKEDINFO_it;
-+		AES_encrypt;
-+		OCSP_REQUEST_new;
-+		ASN1_ANY_it;
-+		CRYPTO_ex_data_new_class;
-+		_ossl_old_des_ncbc_encrypt;
-+		i2d_KRB5_TKTBODY;
-+		EC_POINT_clear_free;
-+		AES_decrypt;
-+		asn1_enc_init;
-+		UI_get_result_maxsize;
-+		OCSP_CERTID_new;
-+		ENGINE_unregister_RAND;
-+		UI_method_get_closer;
-+		d2i_KRB5_ENCDATA;
-+		OCSP_request_onereq_count;
-+		OCSP_basic_verify;
-+		KRB5_AUTHENTBODY_free;
-+		ASN1_item_d2i;
-+		ASN1_primitive_free;
-+		i2d_EXTENDED_KEY_USAGE;
-+		i2d_OCSP_SIGNATURE;
-+		asn1_enc_save;
-+		ENGINE_load_nuron;
-+		_ossl_old_des_pcbc_encrypt;
-+		PKCS12_MAC_DATA_it;
-+		OCSP_accept_responses_new;
-+		asn1_do_lock;
-+		PKCS7_ATTR_VERIFY_it;
-+		KRB5_APREQBODY_it;
-+		i2d_OCSP_SINGLERESP;
-+		ASN1_item_ex_new;
-+		UI_add_verify_string;
-+		_ossl_old_des_set_key;
-+		KRB5_PRINCNAME_it;
-+		EVP_DecryptInit_ex;
-+		i2d_OCSP_CERTID;
-+		ASN1_item_d2i_bio;
-+		EC_POINT_dbl;
-+		asn1_get_choice_selector;
-+		i2d_KRB5_CHECKSUM;
-+		ENGINE_set_table_flags;
-+		AES_options;
-+		ENGINE_load_chil;
-+		OCSP_id_cmp;
-+		OCSP_BASICRESP_new;
-+		OCSP_REQUEST_get_ext_by_NID;
-+		KRB5_APREQ_it;
-+		ENGINE_get_destroy_function;
-+		CONF_set_nconf;
-+		ASN1_PRINTABLE_free;
-+		OCSP_BASICRESP_get_ext_by_NID;
-+		DIST_POINT_NAME_it;
-+		X509V3_extensions_print;
-+		_ossl_old_des_cfb64_encrypt;
-+		X509_REVOKED_add1_ext_i2d;
-+		_ossl_old_des_ofb_encrypt;
-+		KRB5_TKTBODY_new;
-+		ASN1_OCTET_STRING_it;
-+		ERR_load_UI_strings;
-+		i2d_KRB5_ENCKEY;
-+		ASN1_template_new;
-+		OCSP_SIGNATURE_free;
-+		ASN1_item_i2d_fp;
-+		KRB5_PRINCNAME_free;
-+		PKCS7_RECIP_INFO_it;
-+		EXTENDED_KEY_USAGE_it;
-+		EC_GFp_simple_method;
-+		EC_GROUP_precompute_mult;
-+		OCSP_request_onereq_get0;
-+		UI_method_set_writer;
-+		KRB5_AUTHENT_new;
-+		X509_CRL_INFO_it;
-+		DSO_set_name_converter;
-+		AES_set_decrypt_key;
-+		PKCS7_DIGEST_it;
-+		PKCS12_x5092certbag;
-+		EVP_DigestInit_ex;
-+		i2a_ACCESS_DESCRIPTION;
-+		OCSP_RESPONSE_it;
-+		PKCS7_ENC_CONTENT_it;
-+		OCSP_request_add0_id;
-+		EC_POINT_make_affine;
-+		DSO_get_filename;
-+		OCSP_CERTSTATUS_it;
-+		OCSP_request_add1_cert;
-+		UI_get0_output_string;
-+		UI_dup_verify_string;
-+		BN_mod_lshift;
-+		KRB5_AUTHDATA_it;
-+		asn1_set_choice_selector;
-+		OCSP_basic_add1_status;
-+		OCSP_RESPID_free;
-+		asn1_get_field_ptr;
-+		UI_add_input_string;
-+		OCSP_CRLID_it;
-+		i2d_KRB5_AUTHENTBODY;
-+		OCSP_REQUEST_get_ext_count;
-+		ENGINE_load_atalla;
-+		X509_NAME_it;
-+		USERNOTICE_it;
-+		OCSP_REQINFO_new;
-+		OCSP_BASICRESP_get_ext;
-+		CRYPTO_get_ex_data_implementation;
-+		CRYPTO_get_ex_data_impl;
-+		ASN1_item_pack;
-+		i2d_KRB5_ENCDATA;
-+		X509_PURPOSE_set;
-+		X509_REQ_INFO_it;
-+		UI_method_set_opener;
-+		ASN1_item_ex_free;
-+		ASN1_BOOLEAN_it;
-+		ENGINE_get_table_flags;
-+		UI_create_method;
-+		OCSP_ONEREQ_add1_ext_i2d;
-+		_shadow_DES_check_key;
-+		d2i_OCSP_REQINFO;
-+		UI_add_info_string;
-+		UI_get_result_minsize;
-+		ASN1_NULL_it;
-+		BN_mod_lshift1;
-+		d2i_OCSP_ONEREQ;
-+		OCSP_ONEREQ_new;
-+		KRB5_TICKET_it;
-+		EVP_aes_192_cbc;
-+		KRB5_TICKET_free;
-+		UI_new;
-+		OCSP_response_create;
-+		_ossl_old_des_xcbc_encrypt;
-+		PKCS7_it;
-+		OCSP_REQUEST_get_ext_by_critical;
-+		OCSP_REQUEST_get_ext_by_crit;
-+		ENGINE_set_flags;
-+		_ossl_old_des_ecb_encrypt;
-+		OCSP_response_get1_basic;
-+		EVP_Digest;
-+		OCSP_ONEREQ_delete_ext;
-+		ASN1_TBOOLEAN_it;
-+		ASN1_item_new;
-+		ASN1_TIME_to_generalizedtime;
-+		BIGNUM_it;
-+		AES_cbc_encrypt;
-+		ENGINE_get_load_privkey_function;
-+		ENGINE_get_load_privkey_fn;
-+		OCSP_RESPONSE_free;
-+		UI_method_set_reader;
-+		i2d_ASN1_T61STRING;
-+		EC_POINT_set_to_infinity;
-+		ERR_load_OCSP_strings;
-+		EC_POINT_point2oct;
-+		KRB5_APREQ_free;
-+		ASN1_OBJECT_it;
-+		OCSP_crlID_new;
-+		OCSP_crlID2_new;
-+		CONF_modules_load_file;
-+		CONF_imodule_set_usr_data;
-+		ENGINE_set_default_string;
-+		CONF_module_get_usr_data;
-+		ASN1_add_oid_module;
-+		CONF_modules_finish;
-+		OPENSSL_config;
-+		CONF_modules_unload;
-+		CONF_imodule_get_value;
-+		CONF_module_set_usr_data;
-+		CONF_parse_list;
-+		CONF_module_add;
-+		CONF_get1_default_config_file;
-+		CONF_imodule_get_flags;
-+		CONF_imodule_get_module;
-+		CONF_modules_load;
-+		CONF_imodule_get_name;
-+		ERR_peek_top_error;
-+		CONF_imodule_get_usr_data;
-+		CONF_imodule_set_flags;
-+		ENGINE_add_conf_module;
-+		ERR_peek_last_error_line;
-+		ERR_peek_last_error_line_data;
-+		ERR_peek_last_error;
-+		DES_read_2passwords;
-+		DES_read_password;
-+		UI_UTIL_read_pw;
-+		UI_UTIL_read_pw_string;
-+		ENGINE_load_aep;
-+		ENGINE_load_sureware;
-+		OPENSSL_add_all_algorithms_noconf;
-+		OPENSSL_add_all_algo_noconf;
-+		OPENSSL_add_all_algorithms_conf;
-+		OPENSSL_add_all_algo_conf;
-+		OPENSSL_load_builtin_modules;
-+		AES_ofb128_encrypt;
-+		AES_ctr128_encrypt;
-+		AES_cfb128_encrypt;
-+		ENGINE_load_4758cca;
-+		_ossl_096_des_random_seed;
-+		EVP_aes_256_ofb;
-+		EVP_aes_192_ofb;
-+		EVP_aes_128_cfb128;
-+		EVP_aes_256_cfb128;
-+		EVP_aes_128_ofb;
-+		EVP_aes_192_cfb128;
-+		CONF_modules_free;
-+		NCONF_default;
-+		OPENSSL_no_config;
-+		NCONF_WIN32;
-+		ASN1_UNIVERSALSTRING_new;
-+		EVP_des_ede_ecb;
-+		i2d_ASN1_UNIVERSALSTRING;
-+		ASN1_UNIVERSALSTRING_free;
-+		ASN1_UNIVERSALSTRING_it;
-+		d2i_ASN1_UNIVERSALSTRING;
-+		EVP_des_ede3_ecb;
-+		X509_REQ_print_ex;
-+		ENGINE_up_ref;
-+		BUF_MEM_grow_clean;
-+		CRYPTO_realloc_clean;
-+		BUF_strlcat;
-+		BIO_indent;
-+		BUF_strlcpy;
-+		OpenSSLDie;
-+		OPENSSL_cleanse;
-+		ENGINE_setup_bsd_cryptodev;
-+		ERR_release_err_state_table;
-+		EVP_aes_128_cfb8;
-+		FIPS_corrupt_rsa;
-+		FIPS_selftest_des;
-+		EVP_aes_128_cfb1;
-+		EVP_aes_192_cfb8;
-+		FIPS_mode_set;
-+		FIPS_selftest_dsa;
-+		EVP_aes_256_cfb8;
-+		FIPS_allow_md5;
-+		DES_ede3_cfb_encrypt;
-+		EVP_des_ede3_cfb8;
-+		FIPS_rand_seeded;
-+		AES_cfbr_encrypt_block;
-+		AES_cfb8_encrypt;
-+		FIPS_rand_seed;
-+		FIPS_corrupt_des;
-+		EVP_aes_192_cfb1;
-+		FIPS_selftest_aes;
-+		FIPS_set_prng_key;
-+		EVP_des_cfb8;
-+		FIPS_corrupt_dsa;
-+		FIPS_test_mode;
-+		FIPS_rand_method;
-+		EVP_aes_256_cfb1;
-+		ERR_load_FIPS_strings;
-+		FIPS_corrupt_aes;
-+		FIPS_selftest_sha1;
-+		FIPS_selftest_rsa;
-+		FIPS_corrupt_sha1;
-+		EVP_des_cfb1;
-+		FIPS_dsa_check;
-+		AES_cfb1_encrypt;
-+		EVP_des_ede3_cfb1;
-+		FIPS_rand_check;
-+		FIPS_md5_allowed;
-+		FIPS_mode;
-+		FIPS_selftest_failed;
-+		sk_is_sorted;
-+		X509_check_ca;
-+		HMAC_CTX_set_flags;
-+		d2i_PROXY_CERT_INFO_EXTENSION;
-+		PROXY_POLICY_it;
-+		i2d_PROXY_POLICY;
-+		i2d_PROXY_CERT_INFO_EXTENSION;
-+		d2i_PROXY_POLICY;
-+		PROXY_CERT_INFO_EXTENSION_new;
-+		PROXY_CERT_INFO_EXTENSION_free;
-+		PROXY_CERT_INFO_EXTENSION_it;
-+		PROXY_POLICY_free;
-+		PROXY_POLICY_new;
-+		BN_MONT_CTX_set_locked;
-+		FIPS_selftest_rng;
-+		EVP_sha384;
-+		EVP_sha512;
-+		EVP_sha224;
-+		EVP_sha256;
-+		FIPS_selftest_hmac;
-+		FIPS_corrupt_rng;
-+		BN_mod_exp_mont_consttime;
-+		RSA_X931_hash_id;
-+		RSA_padding_check_X931;
-+		RSA_verify_PKCS1_PSS;
-+		RSA_padding_add_X931;
-+		RSA_padding_add_PKCS1_PSS;
-+		PKCS1_MGF1;
-+		BN_X931_generate_Xpq;
-+		RSA_X931_generate_key;
-+		BN_X931_derive_prime;
-+		BN_X931_generate_prime;
-+		RSA_X931_derive;
-+		BIO_new_dgram;
-+		BN_get0_nist_prime_384;
-+		ERR_set_mark;
-+		X509_STORE_CTX_set0_crls;
-+		ENGINE_set_STORE;
-+		ENGINE_register_ECDSA;
-+		STORE_meth_set_list_start_fn;
-+		STORE_method_set_list_start_function;
-+		BN_BLINDING_invert_ex;
-+		NAME_CONSTRAINTS_free;
-+		STORE_ATTR_INFO_set_number;
-+		BN_BLINDING_get_thread_id;
-+		X509_STORE_CTX_set0_param;
-+		POLICY_MAPPING_it;
-+		STORE_parse_attrs_start;
-+		POLICY_CONSTRAINTS_free;
-+		EVP_PKEY_add1_attr_by_NID;
-+		BN_nist_mod_192;
-+		EC_GROUP_get_trinomial_basis;
-+		STORE_set_method;
-+		GENERAL_SUBTREE_free;
-+		NAME_CONSTRAINTS_it;
-+		ECDH_get_default_method;
-+		PKCS12_add_safe;
-+		EC_KEY_new_by_curve_name;
-+		STORE_meth_get_update_store_fn;
-+		STORE_method_get_update_store_function;
-+		ENGINE_register_ECDH;
-+		SHA512_Update;
-+		i2d_ECPrivateKey;
-+		BN_get0_nist_prime_192;
-+		STORE_modify_certificate;
-+		EC_POINT_set_affine_coordinates_GF2m;
-+		EC_POINT_set_affine_coords_GF2m;
-+		BN_GF2m_mod_exp_arr;
-+		STORE_ATTR_INFO_modify_number;
-+		X509_keyid_get0;
-+		ENGINE_load_gmp;
-+		pitem_new;
-+		BN_GF2m_mod_mul_arr;
-+		STORE_list_public_key_endp;
-+		o2i_ECPublicKey;
-+		EC_KEY_copy;
-+		BIO_dump_fp;
-+		X509_policy_node_get0_parent;
-+		EC_GROUP_check_discriminant;
-+		i2o_ECPublicKey;
-+		EC_KEY_precompute_mult;
-+		a2i_IPADDRESS;
-+		STORE_meth_set_initialise_fn;
-+		STORE_method_set_initialise_function;
-+		X509_STORE_CTX_set_depth;
-+		X509_VERIFY_PARAM_inherit;
-+		EC_POINT_point2bn;
-+		STORE_ATTR_INFO_set_dn;
-+		X509_policy_tree_get0_policies;
-+		EC_GROUP_new_curve_GF2m;
-+		STORE_destroy_method;
-+		ENGINE_unregister_STORE;
-+		EVP_PKEY_get1_EC_KEY;
-+		STORE_ATTR_INFO_get0_number;
-+		ENGINE_get_default_ECDH;
-+		EC_KEY_get_conv_form;
-+		ASN1_OCTET_STRING_NDEF_it;
-+		STORE_delete_public_key;
-+		STORE_get_public_key;
-+		STORE_modify_arbitrary;
-+		ENGINE_get_static_state;
-+		pqueue_iterator;
-+		ECDSA_SIG_new;
-+		OPENSSL_DIR_end;
-+		BN_GF2m_mod_sqr;
-+		EC_POINT_bn2point;
-+		X509_VERIFY_PARAM_set_depth;
-+		EC_KEY_set_asn1_flag;
-+		STORE_get_method;
-+		EC_KEY_get_key_method_data;
-+		ECDSA_sign_ex;
-+		STORE_parse_attrs_end;
-+		EC_GROUP_get_point_conversion_form;
-+		EC_GROUP_get_point_conv_form;
-+		STORE_method_set_store_function;
-+		STORE_ATTR_INFO_in;
-+		PEM_read_bio_ECPKParameters;
-+		EC_GROUP_get_pentanomial_basis;
-+		EVP_PKEY_add1_attr_by_txt;
-+		BN_BLINDING_set_flags;
-+		X509_VERIFY_PARAM_set1_policies;
-+		X509_VERIFY_PARAM_set1_name;
-+		X509_VERIFY_PARAM_set_purpose;
-+		STORE_get_number;
-+		ECDSA_sign_setup;
-+		BN_GF2m_mod_solve_quad_arr;
-+		EC_KEY_up_ref;
-+		POLICY_MAPPING_free;
-+		BN_GF2m_mod_div;
-+		X509_VERIFY_PARAM_set_flags;
-+		EC_KEY_free;
-+		STORE_meth_set_list_next_fn;
-+		STORE_method_set_list_next_function;
-+		PEM_write_bio_ECPrivateKey;
-+		d2i_EC_PUBKEY;
-+		STORE_meth_get_generate_fn;
-+		STORE_method_get_generate_function;
-+		STORE_meth_set_list_end_fn;
-+		STORE_method_set_list_end_function;
-+		pqueue_print;
-+		EC_GROUP_have_precompute_mult;
-+		EC_KEY_print_fp;
-+		BN_GF2m_mod_arr;
-+		PEM_write_bio_X509_CERT_PAIR;
-+		EVP_PKEY_cmp;
-+		X509_policy_level_node_count;
-+		STORE_new_engine;
-+		STORE_list_public_key_start;
-+		X509_VERIFY_PARAM_new;
-+		ECDH_get_ex_data;
-+		EVP_PKEY_get_attr;
-+		ECDSA_do_sign;
-+		ENGINE_unregister_ECDH;
-+		ECDH_OpenSSL;
-+		EC_KEY_set_conv_form;
-+		EC_POINT_dup;
-+		GENERAL_SUBTREE_new;
-+		STORE_list_crl_endp;
-+		EC_get_builtin_curves;
-+		X509_policy_node_get0_qualifiers;
-+		X509_pcy_node_get0_qualifiers;
-+		STORE_list_crl_end;
-+		EVP_PKEY_set1_EC_KEY;
-+		BN_GF2m_mod_sqrt_arr;
-+		i2d_ECPrivateKey_bio;
-+		ECPKParameters_print_fp;
-+		pqueue_find;
-+		ECDSA_SIG_free;
-+		PEM_write_bio_ECPKParameters;
-+		STORE_method_set_ctrl_function;
-+		STORE_list_public_key_end;
-+		EC_KEY_set_private_key;
-+		pqueue_peek;
-+		STORE_get_arbitrary;
-+		STORE_store_crl;
-+		X509_policy_node_get0_policy;
-+		PKCS12_add_safes;
-+		BN_BLINDING_convert_ex;
-+		X509_policy_tree_free;
-+		OPENSSL_ia32cap_loc;
-+		BN_GF2m_poly2arr;
-+		STORE_ctrl;
-+		STORE_ATTR_INFO_compare;
-+		BN_get0_nist_prime_224;
-+		i2d_ECParameters;
-+		i2d_ECPKParameters;
-+		BN_GENCB_call;
-+		d2i_ECPKParameters;
-+		STORE_meth_set_generate_fn;
-+		STORE_method_set_generate_function;
-+		ENGINE_set_ECDH;
-+		NAME_CONSTRAINTS_new;
-+		SHA256_Init;
-+		EC_KEY_get0_public_key;
-+		PEM_write_bio_EC_PUBKEY;
-+		STORE_ATTR_INFO_set_cstr;
-+		STORE_list_crl_next;
-+		STORE_ATTR_INFO_in_range;
-+		ECParameters_print;
-+		STORE_meth_set_delete_fn;
-+		STORE_method_set_delete_function;
-+		STORE_list_certificate_next;
-+		ASN1_generate_nconf;
-+		BUF_memdup;
-+		BN_GF2m_mod_mul;
-+		STORE_meth_get_list_next_fn;
-+		STORE_method_get_list_next_function;
-+		STORE_ATTR_INFO_get0_dn;
-+		STORE_list_private_key_next;
-+		EC_GROUP_set_seed;
-+		X509_VERIFY_PARAM_set_trust;
-+		STORE_ATTR_INFO_free;
-+		STORE_get_private_key;
-+		EVP_PKEY_get_attr_count;
-+		STORE_ATTR_INFO_new;
-+		EC_GROUP_get_curve_GF2m;
-+		STORE_meth_set_revoke_fn;
-+		STORE_method_set_revoke_function;
-+		STORE_store_number;
-+		BN_is_prime_ex;
-+		STORE_revoke_public_key;
-+		X509_STORE_CTX_get0_param;
-+		STORE_delete_arbitrary;
-+		PEM_read_X509_CERT_PAIR;
-+		X509_STORE_set_depth;
-+		ECDSA_get_ex_data;
-+		SHA224;
-+		BIO_dump_indent_fp;
-+		EC_KEY_set_group;
-+		BUF_strndup;
-+		STORE_list_certificate_start;
-+		BN_GF2m_mod;
-+		X509_REQ_check_private_key;
-+		EC_GROUP_get_seed_len;
-+		ERR_load_STORE_strings;
-+		PEM_read_bio_EC_PUBKEY;
-+		STORE_list_private_key_end;
-+		i2d_EC_PUBKEY;
-+		ECDSA_get_default_method;
-+		ASN1_put_eoc;
-+		X509_STORE_CTX_get_explicit_policy;
-+		X509_STORE_CTX_get_expl_policy;
-+		X509_VERIFY_PARAM_table_cleanup;
-+		STORE_modify_private_key;
-+		X509_VERIFY_PARAM_free;
-+		EC_METHOD_get_field_type;
-+		EC_GFp_nist_method;
-+		STORE_meth_set_modify_fn;
-+		STORE_method_set_modify_function;
-+		STORE_parse_attrs_next;
-+		ENGINE_load_padlock;
-+		EC_GROUP_set_curve_name;
-+		X509_CERT_PAIR_it;
-+		STORE_meth_get_revoke_fn;
-+		STORE_method_get_revoke_function;
-+		STORE_method_set_get_function;
-+		STORE_modify_number;
-+		STORE_method_get_store_function;
-+		STORE_store_private_key;
-+		BN_GF2m_mod_sqr_arr;
-+		RSA_setup_blinding;
-+		BIO_s_datagram;
-+		STORE_Memory;
-+		sk_find_ex;
-+		EC_GROUP_set_curve_GF2m;
-+		ENGINE_set_default_ECDSA;
-+		POLICY_CONSTRAINTS_new;
-+		BN_GF2m_mod_sqrt;
-+		ECDH_set_default_method;
-+		EC_KEY_generate_key;
-+		SHA384_Update;
-+		BN_GF2m_arr2poly;
-+		STORE_method_get_get_function;
-+		STORE_meth_set_cleanup_fn;
-+		STORE_method_set_cleanup_function;
-+		EC_GROUP_check;
-+		d2i_ECPrivateKey_bio;
-+		EC_KEY_insert_key_method_data;
-+		STORE_meth_get_lock_store_fn;
-+		STORE_method_get_lock_store_function;
-+		X509_VERIFY_PARAM_get_depth;
-+		SHA224_Final;
-+		STORE_meth_set_update_store_fn;
-+		STORE_method_set_update_store_function;
-+		SHA224_Update;
-+		d2i_ECPrivateKey;
-+		ASN1_item_ndef_i2d;
-+		STORE_delete_private_key;
-+		ERR_pop_to_mark;
-+		ENGINE_register_all_STORE;
-+		X509_policy_level_get0_node;
-+		i2d_PKCS7_NDEF;
-+		EC_GROUP_get_degree;
-+		ASN1_generate_v3;
-+		STORE_ATTR_INFO_modify_cstr;
-+		X509_policy_tree_level_count;
-+		BN_GF2m_add;
-+		EC_KEY_get0_group;
-+		STORE_generate_crl;
-+		STORE_store_public_key;
-+		X509_CERT_PAIR_free;
-+		STORE_revoke_private_key;
-+		BN_nist_mod_224;
-+		SHA512_Final;
-+		STORE_ATTR_INFO_modify_dn;
-+		STORE_meth_get_initialise_fn;
-+		STORE_method_get_initialise_function;
-+		STORE_delete_number;
-+		i2d_EC_PUBKEY_bio;
-+		BIO_dgram_non_fatal_error;
-+		EC_GROUP_get_asn1_flag;
-+		STORE_ATTR_INFO_in_ex;
-+		STORE_list_crl_start;
-+		ECDH_get_ex_new_index;
-+		STORE_meth_get_modify_fn;
-+		STORE_method_get_modify_function;
-+		v2i_ASN1_BIT_STRING;
-+		STORE_store_certificate;
-+		OBJ_bsearch_ex;
-+		X509_STORE_CTX_set_default;
-+		STORE_ATTR_INFO_set_sha1str;
-+		BN_GF2m_mod_inv;
-+		BN_GF2m_mod_exp;
-+		STORE_modify_public_key;
-+		STORE_meth_get_list_start_fn;
-+		STORE_method_get_list_start_function;
-+		EC_GROUP_get0_seed;
-+		STORE_store_arbitrary;
-+		STORE_meth_set_unlock_store_fn;
-+		STORE_method_set_unlock_store_function;
-+		BN_GF2m_mod_div_arr;
-+		ENGINE_set_ECDSA;
-+		STORE_create_method;
-+		ECPKParameters_print;
-+		EC_KEY_get0_private_key;
-+		PEM_write_EC_PUBKEY;
-+		X509_VERIFY_PARAM_set1;
-+		ECDH_set_method;
-+		v2i_GENERAL_NAME_ex;
-+		ECDH_set_ex_data;
-+		STORE_generate_key;
-+		BN_nist_mod_521;
-+		X509_policy_tree_get0_level;
-+		EC_GROUP_set_point_conversion_form;
-+		EC_GROUP_set_point_conv_form;
-+		PEM_read_EC_PUBKEY;
-+		i2d_ECDSA_SIG;
-+		ECDSA_OpenSSL;
-+		STORE_delete_crl;
-+		EC_KEY_get_enc_flags;
-+		ASN1_const_check_infinite_end;
-+		EVP_PKEY_delete_attr;
-+		ECDSA_set_default_method;
-+		EC_POINT_set_compressed_coordinates_GF2m;
-+		EC_POINT_set_compr_coords_GF2m;
-+		EC_GROUP_cmp;
-+		STORE_revoke_certificate;
-+		BN_get0_nist_prime_256;
-+		STORE_meth_get_delete_fn;
-+		STORE_method_get_delete_function;
-+		SHA224_Init;
-+		PEM_read_ECPrivateKey;
-+		SHA512_Init;
-+		STORE_parse_attrs_endp;
-+		BN_set_negative;
-+		ERR_load_ECDSA_strings;
-+		EC_GROUP_get_basis_type;
-+		STORE_list_public_key_next;
-+		i2v_ASN1_BIT_STRING;
-+		STORE_OBJECT_free;
-+		BN_nist_mod_384;
-+		i2d_X509_CERT_PAIR;
-+		PEM_write_ECPKParameters;
-+		ECDH_compute_key;
-+		STORE_ATTR_INFO_get0_sha1str;
-+		ENGINE_register_all_ECDH;
-+		pqueue_pop;
-+		STORE_ATTR_INFO_get0_cstr;
-+		POLICY_CONSTRAINTS_it;
-+		STORE_get_ex_new_index;
-+		EVP_PKEY_get_attr_by_OBJ;
-+		X509_VERIFY_PARAM_add0_policy;
-+		BN_GF2m_mod_solve_quad;
-+		SHA256;
-+		i2d_ECPrivateKey_fp;
-+		X509_policy_tree_get0_user_policies;
-+		X509_pcy_tree_get0_usr_policies;
-+		OPENSSL_DIR_read;
-+		ENGINE_register_all_ECDSA;
-+		X509_VERIFY_PARAM_lookup;
-+		EC_POINT_get_affine_coordinates_GF2m;
-+		EC_POINT_get_affine_coords_GF2m;
-+		EC_GROUP_dup;
-+		ENGINE_get_default_ECDSA;
-+		EC_KEY_new;
-+		SHA256_Transform;
-+		EC_KEY_set_enc_flags;
-+		ECDSA_verify;
-+		EC_POINT_point2hex;
-+		ENGINE_get_STORE;
-+		SHA512;
-+		STORE_get_certificate;
-+		ECDSA_do_sign_ex;
-+		ECDSA_do_verify;
-+		d2i_ECPrivateKey_fp;
-+		STORE_delete_certificate;
-+		SHA512_Transform;
-+		X509_STORE_set1_param;
-+		STORE_method_get_ctrl_function;
-+		STORE_free;
-+		PEM_write_ECPrivateKey;
-+		STORE_meth_get_unlock_store_fn;
-+		STORE_method_get_unlock_store_function;
-+		STORE_get_ex_data;
-+		EC_KEY_set_public_key;
-+		PEM_read_ECPKParameters;
-+		X509_CERT_PAIR_new;
-+		ENGINE_register_STORE;
-+		RSA_generate_key_ex;
-+		DSA_generate_parameters_ex;
-+		ECParameters_print_fp;
-+		X509V3_NAME_from_section;
-+		EVP_PKEY_add1_attr;
-+		STORE_modify_crl;
-+		STORE_list_private_key_start;
-+		POLICY_MAPPINGS_it;
-+		GENERAL_SUBTREE_it;
-+		EC_GROUP_get_curve_name;
-+		PEM_write_X509_CERT_PAIR;
-+		BIO_dump_indent_cb;
-+		d2i_X509_CERT_PAIR;
-+		STORE_list_private_key_endp;
-+		asn1_const_Finish;
-+		i2d_EC_PUBKEY_fp;
-+		BN_nist_mod_256;
-+		X509_VERIFY_PARAM_add0_table;
-+		pqueue_free;
-+		BN_BLINDING_create_param;
-+		ECDSA_size;
-+		d2i_EC_PUBKEY_bio;
-+		BN_get0_nist_prime_521;
-+		STORE_ATTR_INFO_modify_sha1str;
-+		BN_generate_prime_ex;
-+		EC_GROUP_new_by_curve_name;
-+		SHA256_Final;
-+		DH_generate_parameters_ex;
-+		PEM_read_bio_ECPrivateKey;
-+		STORE_meth_get_cleanup_fn;
-+		STORE_method_get_cleanup_function;
-+		ENGINE_get_ECDH;
-+		d2i_ECDSA_SIG;
-+		BN_is_prime_fasttest_ex;
-+		ECDSA_sign;
-+		X509_policy_check;
-+		EVP_PKEY_get_attr_by_NID;
-+		STORE_set_ex_data;
-+		ENGINE_get_ECDSA;
-+		EVP_ecdsa;
-+		BN_BLINDING_get_flags;
-+		PKCS12_add_cert;
-+		STORE_OBJECT_new;
-+		ERR_load_ECDH_strings;
-+		EC_KEY_dup;
-+		EVP_CIPHER_CTX_rand_key;
-+		ECDSA_set_method;
-+		a2i_IPADDRESS_NC;
-+		d2i_ECParameters;
-+		STORE_list_certificate_end;
-+		STORE_get_crl;
-+		X509_POLICY_NODE_print;
-+		SHA384_Init;
-+		EC_GF2m_simple_method;
-+		ECDSA_set_ex_data;
-+		SHA384_Final;
-+		PKCS7_set_digest;
-+		EC_KEY_print;
-+		STORE_meth_set_lock_store_fn;
-+		STORE_method_set_lock_store_function;
-+		ECDSA_get_ex_new_index;
-+		SHA384;
-+		POLICY_MAPPING_new;
-+		STORE_list_certificate_endp;
-+		X509_STORE_CTX_get0_policy_tree;
-+		EC_GROUP_set_asn1_flag;
-+		EC_KEY_check_key;
-+		d2i_EC_PUBKEY_fp;
-+		PKCS7_set0_type_other;
-+		PEM_read_bio_X509_CERT_PAIR;
-+		pqueue_next;
-+		STORE_meth_get_list_end_fn;
-+		STORE_method_get_list_end_function;
-+		EVP_PKEY_add1_attr_by_OBJ;
-+		X509_VERIFY_PARAM_set_time;
-+		pqueue_new;
-+		ENGINE_set_default_ECDH;
-+		STORE_new_method;
-+		PKCS12_add_key;
-+		DSO_merge;
-+		EC_POINT_hex2point;
-+		BIO_dump_cb;
-+		SHA256_Update;
-+		pqueue_insert;
-+		pitem_free;
-+		BN_GF2m_mod_inv_arr;
-+		ENGINE_unregister_ECDSA;
-+		BN_BLINDING_set_thread_id;
-+		get_rfc3526_prime_8192;
-+		X509_VERIFY_PARAM_clear_flags;
-+		get_rfc2409_prime_1024;
-+		DH_check_pub_key;
-+		get_rfc3526_prime_2048;
-+		get_rfc3526_prime_6144;
-+		get_rfc3526_prime_1536;
-+		get_rfc3526_prime_3072;
-+		get_rfc3526_prime_4096;
-+		get_rfc2409_prime_768;
-+		X509_VERIFY_PARAM_get_flags;
-+		EVP_CIPHER_CTX_new;
-+		EVP_CIPHER_CTX_free;
-+		Camellia_cbc_encrypt;
-+		Camellia_cfb128_encrypt;
-+		Camellia_cfb1_encrypt;
-+		Camellia_cfb8_encrypt;
-+		Camellia_ctr128_encrypt;
-+		Camellia_cfbr_encrypt_block;
-+		Camellia_decrypt;
-+		Camellia_ecb_encrypt;
-+		Camellia_encrypt;
-+		Camellia_ofb128_encrypt;
-+		Camellia_set_key;
-+		EVP_camellia_128_cbc;
-+		EVP_camellia_128_cfb128;
-+		EVP_camellia_128_cfb1;
-+		EVP_camellia_128_cfb8;
-+		EVP_camellia_128_ecb;
-+		EVP_camellia_128_ofb;
-+		EVP_camellia_192_cbc;
-+		EVP_camellia_192_cfb128;
-+		EVP_camellia_192_cfb1;
-+		EVP_camellia_192_cfb8;
-+		EVP_camellia_192_ecb;
-+		EVP_camellia_192_ofb;
-+		EVP_camellia_256_cbc;
-+		EVP_camellia_256_cfb128;
-+		EVP_camellia_256_cfb1;
-+		EVP_camellia_256_cfb8;
-+		EVP_camellia_256_ecb;
-+		EVP_camellia_256_ofb;
-+		a2i_ipadd;
-+		ASIdentifiers_free;
-+		i2d_ASIdOrRange;
-+		EVP_CIPHER_block_size;
-+		v3_asid_is_canonical;
-+		IPAddressChoice_free;
-+		EVP_CIPHER_CTX_set_app_data;
-+		BIO_set_callback_arg;
-+		v3_addr_add_prefix;
-+		IPAddressOrRange_it;
-+		BIO_set_flags;
-+		ASIdentifiers_it;
-+		v3_addr_get_range;
-+		BIO_method_type;
-+		v3_addr_inherits;
-+		IPAddressChoice_it;
-+		AES_ige_encrypt;
-+		v3_addr_add_range;
-+		EVP_CIPHER_CTX_nid;
-+		d2i_ASRange;
-+		v3_addr_add_inherit;
-+		v3_asid_add_id_or_range;
-+		v3_addr_validate_resource_set;
-+		EVP_CIPHER_iv_length;
-+		EVP_MD_type;
-+		v3_asid_canonize;
-+		IPAddressRange_free;
-+		v3_asid_add_inherit;
-+		EVP_CIPHER_CTX_key_length;
-+		IPAddressRange_new;
-+		ASIdOrRange_new;
-+		EVP_MD_size;
-+		EVP_MD_CTX_test_flags;
-+		BIO_clear_flags;
-+		i2d_ASRange;
-+		IPAddressRange_it;
-+		IPAddressChoice_new;
-+		ASIdentifierChoice_new;
-+		ASRange_free;
-+		EVP_MD_pkey_type;
-+		EVP_MD_CTX_clear_flags;
-+		IPAddressFamily_free;
-+		i2d_IPAddressFamily;
-+		IPAddressOrRange_new;
-+		EVP_CIPHER_flags;
-+		v3_asid_validate_resource_set;
-+		d2i_IPAddressRange;
-+		AES_bi_ige_encrypt;
-+		BIO_get_callback;
-+		IPAddressOrRange_free;
-+		v3_addr_subset;
-+		d2i_IPAddressFamily;
-+		v3_asid_subset;
-+		BIO_test_flags;
-+		i2d_ASIdentifierChoice;
-+		ASRange_it;
-+		d2i_ASIdentifiers;
-+		ASRange_new;
-+		d2i_IPAddressChoice;
-+		v3_addr_get_afi;
-+		EVP_CIPHER_key_length;
-+		EVP_Cipher;
-+		i2d_IPAddressOrRange;
-+		ASIdOrRange_it;
-+		EVP_CIPHER_nid;
-+		i2d_IPAddressChoice;
-+		EVP_CIPHER_CTX_block_size;
-+		ASIdentifiers_new;
-+		v3_addr_validate_path;
-+		IPAddressFamily_new;
-+		EVP_MD_CTX_set_flags;
-+		v3_addr_is_canonical;
-+		i2d_IPAddressRange;
-+		IPAddressFamily_it;
-+		v3_asid_inherits;
-+		EVP_CIPHER_CTX_cipher;
-+		EVP_CIPHER_CTX_get_app_data;
-+		EVP_MD_block_size;
-+		EVP_CIPHER_CTX_flags;
-+		v3_asid_validate_path;
-+		d2i_IPAddressOrRange;
-+		v3_addr_canonize;
-+		ASIdentifierChoice_it;
-+		EVP_MD_CTX_md;
-+		d2i_ASIdentifierChoice;
-+		BIO_method_name;
-+		EVP_CIPHER_CTX_iv_length;
-+		ASIdOrRange_free;
-+		ASIdentifierChoice_free;
-+		BIO_get_callback_arg;
-+		BIO_set_callback;
-+		d2i_ASIdOrRange;
-+		i2d_ASIdentifiers;
-+		SEED_decrypt;
-+		SEED_encrypt;
-+		SEED_cbc_encrypt;
-+		EVP_seed_ofb;
-+		SEED_cfb128_encrypt;
-+		SEED_ofb128_encrypt;
-+		EVP_seed_cbc;
-+		SEED_ecb_encrypt;
-+		EVP_seed_ecb;
-+		SEED_set_key;
-+		EVP_seed_cfb128;
-+		X509_EXTENSIONS_it;
-+		X509_get1_ocsp;
-+		OCSP_REQ_CTX_free;
-+		i2d_X509_EXTENSIONS;
-+		OCSP_sendreq_nbio;
-+		OCSP_sendreq_new;
-+		d2i_X509_EXTENSIONS;
-+		X509_ALGORS_it;
-+		X509_ALGOR_get0;
-+		X509_ALGOR_set0;
-+		AES_unwrap_key;
-+		AES_wrap_key;
-+		X509at_get0_data_by_OBJ;
-+		ASN1_TYPE_set1;
-+		ASN1_STRING_set0;
-+		i2d_X509_ALGORS;
-+		BIO_f_zlib;
-+		COMP_zlib_cleanup;
-+		d2i_X509_ALGORS;
-+		CMS_ReceiptRequest_free;
-+		PEM_write_CMS;
-+		CMS_add0_CertificateChoices;
-+		CMS_unsigned_add1_attr_by_OBJ;
-+		ERR_load_CMS_strings;
-+		CMS_sign_receipt;
-+		i2d_CMS_ContentInfo;
-+		CMS_signed_delete_attr;
-+		d2i_CMS_bio;
-+		CMS_unsigned_get_attr_by_NID;
-+		CMS_verify;
-+		SMIME_read_CMS;
-+		CMS_decrypt_set1_key;
-+		CMS_SignerInfo_get0_algs;
-+		CMS_add1_cert;
-+		CMS_set_detached;
-+		CMS_encrypt;
-+		CMS_EnvelopedData_create;
-+		CMS_uncompress;
-+		CMS_add0_crl;
-+		CMS_SignerInfo_verify_content;
-+		CMS_unsigned_get0_data_by_OBJ;
-+		PEM_write_bio_CMS;
-+		CMS_unsigned_get_attr;
-+		CMS_RecipientInfo_ktri_cert_cmp;
-+		CMS_RecipientInfo_ktri_get0_algs;
-+		CMS_RecipInfo_ktri_get0_algs;
-+		CMS_ContentInfo_free;
-+		CMS_final;
-+		CMS_add_simple_smimecap;
-+		CMS_SignerInfo_verify;
-+		CMS_data;
-+		CMS_ContentInfo_it;
-+		d2i_CMS_ReceiptRequest;
-+		CMS_compress;
-+		CMS_digest_create;
-+		CMS_SignerInfo_cert_cmp;
-+		CMS_SignerInfo_sign;
-+		CMS_data_create;
-+		i2d_CMS_bio;
-+		CMS_EncryptedData_set1_key;
-+		CMS_decrypt;
-+		int_smime_write_ASN1;
-+		CMS_unsigned_delete_attr;
-+		CMS_unsigned_get_attr_count;
-+		CMS_add_smimecap;
-+		PEM_read_CMS;
-+		CMS_signed_get_attr_by_OBJ;
-+		d2i_CMS_ContentInfo;
-+		CMS_add_standard_smimecap;
-+		CMS_ContentInfo_new;
-+		CMS_RecipientInfo_type;
-+		CMS_get0_type;
-+		CMS_is_detached;
-+		CMS_sign;
-+		CMS_signed_add1_attr;
-+		CMS_unsigned_get_attr_by_OBJ;
-+		SMIME_write_CMS;
-+		CMS_EncryptedData_decrypt;
-+		CMS_get0_RecipientInfos;
-+		CMS_add0_RevocationInfoChoice;
-+		CMS_decrypt_set1_pkey;
-+		CMS_SignerInfo_set1_signer_cert;
-+		CMS_get0_signers;
-+		CMS_ReceiptRequest_get0_values;
-+		CMS_signed_get0_data_by_OBJ;
-+		CMS_get0_SignerInfos;
-+		CMS_add0_cert;
-+		CMS_EncryptedData_encrypt;
-+		CMS_digest_verify;
-+		CMS_set1_signers_certs;
-+		CMS_signed_get_attr;
-+		CMS_RecipientInfo_set0_key;
-+		CMS_SignedData_init;
-+		CMS_RecipientInfo_kekri_get0_id;
-+		CMS_verify_receipt;
-+		CMS_ReceiptRequest_it;
-+		PEM_read_bio_CMS;
-+		CMS_get1_crls;
-+		CMS_add0_recipient_key;
-+		SMIME_read_ASN1;
-+		CMS_ReceiptRequest_new;
-+		CMS_get0_content;
-+		CMS_get1_ReceiptRequest;
-+		CMS_signed_add1_attr_by_OBJ;
-+		CMS_RecipientInfo_kekri_id_cmp;
-+		CMS_add1_ReceiptRequest;
-+		CMS_SignerInfo_get0_signer_id;
-+		CMS_unsigned_add1_attr_by_NID;
-+		CMS_unsigned_add1_attr;
-+		CMS_signed_get_attr_by_NID;
-+		CMS_get1_certs;
-+		CMS_signed_add1_attr_by_NID;
-+		CMS_unsigned_add1_attr_by_txt;
-+		CMS_dataFinal;
-+		CMS_RecipientInfo_ktri_get0_signer_id;
-+		CMS_RecipInfo_ktri_get0_sigr_id;
-+		i2d_CMS_ReceiptRequest;
-+		CMS_add1_recipient_cert;
-+		CMS_dataInit;
-+		CMS_signed_add1_attr_by_txt;
-+		CMS_RecipientInfo_decrypt;
-+		CMS_signed_get_attr_count;
-+		CMS_get0_eContentType;
-+		CMS_set1_eContentType;
-+		CMS_ReceiptRequest_create0;
-+		CMS_add1_signer;
-+		CMS_RecipientInfo_set0_pkey;
-+		ENGINE_set_load_ssl_client_cert_function;
-+		ENGINE_set_ld_ssl_clnt_cert_fn;
-+		ENGINE_get_ssl_client_cert_function;
-+		ENGINE_get_ssl_client_cert_fn;
-+		ENGINE_load_ssl_client_cert;
-+		ENGINE_load_capi;
-+		OPENSSL_isservice;
-+		FIPS_dsa_sig_decode;
-+		EVP_CIPHER_CTX_clear_flags;
-+		FIPS_rand_status;
-+		FIPS_rand_set_key;
-+		CRYPTO_set_mem_info_functions;
-+		RSA_X931_generate_key_ex;
-+		int_ERR_set_state_func;
-+		int_EVP_MD_set_engine_callbacks;
-+		int_CRYPTO_set_do_dynlock_callback;
-+		FIPS_rng_stick;
-+		EVP_CIPHER_CTX_set_flags;
-+		BN_X931_generate_prime_ex;
-+		FIPS_selftest_check;
-+		FIPS_rand_set_dt;
-+		CRYPTO_dbg_pop_info;
-+		FIPS_dsa_free;
-+		RSA_X931_derive_ex;
-+		FIPS_rsa_new;
-+		FIPS_rand_bytes;
-+		fips_cipher_test;
-+		EVP_CIPHER_CTX_test_flags;
-+		CRYPTO_malloc_debug_init;
-+		CRYPTO_dbg_push_info;
-+		FIPS_corrupt_rsa_keygen;
-+		FIPS_dh_new;
-+		FIPS_corrupt_dsa_keygen;
-+		FIPS_dh_free;
-+		fips_pkey_signature_test;
-+		EVP_add_alg_module;
-+		int_RAND_init_engine_callbacks;
-+		int_EVP_CIPHER_set_engine_callbacks;
-+		int_EVP_MD_init_engine_callbacks;
-+		FIPS_rand_test_mode;
-+		FIPS_rand_reset;
-+		FIPS_dsa_new;
-+		int_RAND_set_callbacks;
-+		BN_X931_derive_prime_ex;
-+		int_ERR_lib_init;
-+		int_EVP_CIPHER_init_engine_callbacks;
-+		FIPS_rsa_free;
-+		FIPS_dsa_sig_encode;
-+		CRYPTO_dbg_remove_all_info;
-+		OPENSSL_init;
-+		CRYPTO_strdup;
-+		JPAKE_STEP3A_process;
-+		JPAKE_STEP1_release;
-+		JPAKE_get_shared_key;
-+		JPAKE_STEP3B_init;
-+		JPAKE_STEP1_generate;
-+		JPAKE_STEP1_init;
-+		JPAKE_STEP3B_process;
-+		JPAKE_STEP2_generate;
-+		JPAKE_CTX_new;
-+		JPAKE_CTX_free;
-+		JPAKE_STEP3B_release;
-+		JPAKE_STEP3A_release;
-+		JPAKE_STEP2_process;
-+		JPAKE_STEP3B_generate;
-+		JPAKE_STEP1_process;
-+		JPAKE_STEP3A_generate;
-+		JPAKE_STEP2_release;
-+		JPAKE_STEP3A_init;
-+		ERR_load_JPAKE_strings;
-+		JPAKE_STEP2_init;
-+		pqueue_size;
-+		i2d_TS_ACCURACY;
-+		i2d_TS_MSG_IMPRINT_fp;
-+		i2d_TS_MSG_IMPRINT;
-+		EVP_PKEY_print_public;
-+		EVP_PKEY_CTX_new;
-+		i2d_TS_TST_INFO;
-+		EVP_PKEY_asn1_find;
-+		DSO_METHOD_beos;
-+		TS_CONF_load_cert;
-+		TS_REQ_get_ext;
-+		EVP_PKEY_sign_init;
-+		ASN1_item_print;
-+		TS_TST_INFO_set_nonce;
-+		TS_RESP_dup;
-+		ENGINE_register_pkey_meths;
-+		EVP_PKEY_asn1_add0;
-+		PKCS7_add0_attrib_signing_time;
-+		i2d_TS_TST_INFO_fp;
-+		BIO_asn1_get_prefix;
-+		TS_TST_INFO_set_time;
-+		EVP_PKEY_meth_set_decrypt;
-+		EVP_PKEY_set_type_str;
-+		EVP_PKEY_CTX_get_keygen_info;
-+		TS_REQ_set_policy_id;
-+		d2i_TS_RESP_fp;
-+		ENGINE_get_pkey_asn1_meth_engine;
-+		ENGINE_get_pkey_asn1_meth_eng;
-+		WHIRLPOOL_Init;
-+		TS_RESP_set_status_info;
-+		EVP_PKEY_keygen;
-+		EVP_DigestSignInit;
-+		TS_ACCURACY_set_millis;
-+		TS_REQ_dup;
-+		GENERAL_NAME_dup;
-+		ASN1_SEQUENCE_ANY_it;
-+		WHIRLPOOL;
-+		X509_STORE_get1_crls;
-+		ENGINE_get_pkey_asn1_meth;
-+		EVP_PKEY_asn1_new;
-+		BIO_new_NDEF;
-+		ENGINE_get_pkey_meth;
-+		TS_MSG_IMPRINT_set_algo;
-+		i2d_TS_TST_INFO_bio;
-+		TS_TST_INFO_set_ordering;
-+		TS_TST_INFO_get_ext_by_OBJ;
-+		CRYPTO_THREADID_set_pointer;
-+		TS_CONF_get_tsa_section;
-+		SMIME_write_ASN1;
-+		TS_RESP_CTX_set_signer_key;
-+		EVP_PKEY_encrypt_old;
-+		EVP_PKEY_encrypt_init;
-+		CRYPTO_THREADID_cpy;
-+		ASN1_PCTX_get_cert_flags;
-+		i2d_ESS_SIGNING_CERT;
-+		TS_CONF_load_key;
-+		i2d_ASN1_SEQUENCE_ANY;
-+		d2i_TS_MSG_IMPRINT_bio;
-+		EVP_PKEY_asn1_set_public;
-+		b2i_PublicKey_bio;
-+		BIO_asn1_set_prefix;
-+		EVP_PKEY_new_mac_key;
-+		BIO_new_CMS;
-+		CRYPTO_THREADID_cmp;
-+		TS_REQ_ext_free;
-+		EVP_PKEY_asn1_set_free;
-+		EVP_PKEY_get0_asn1;
-+		d2i_NETSCAPE_X509;
-+		EVP_PKEY_verify_recover_init;
-+		EVP_PKEY_CTX_set_data;
-+		EVP_PKEY_keygen_init;
-+		TS_RESP_CTX_set_status_info;
-+		TS_MSG_IMPRINT_get_algo;
-+		TS_REQ_print_bio;
-+		EVP_PKEY_CTX_ctrl_str;
-+		EVP_PKEY_get_default_digest_nid;
-+		PEM_write_bio_PKCS7_stream;
-+		TS_MSG_IMPRINT_print_bio;
-+		BN_asc2bn;
-+		TS_REQ_get_policy_id;
-+		ENGINE_set_default_pkey_asn1_meths;
-+		ENGINE_set_def_pkey_asn1_meths;
-+		d2i_TS_ACCURACY;
-+		DSO_global_lookup;
-+		TS_CONF_set_tsa_name;
-+		i2d_ASN1_SET_ANY;
-+		ENGINE_load_gost;
-+		WHIRLPOOL_BitUpdate;
-+		ASN1_PCTX_get_flags;
-+		TS_TST_INFO_get_ext_by_NID;
-+		TS_RESP_new;
-+		ESS_CERT_ID_dup;
-+		TS_STATUS_INFO_dup;
-+		TS_REQ_delete_ext;
-+		EVP_DigestVerifyFinal;
-+		EVP_PKEY_print_params;
-+		i2d_CMS_bio_stream;
-+		TS_REQ_get_msg_imprint;
-+		OBJ_find_sigid_by_algs;
-+		TS_TST_INFO_get_serial;
-+		TS_REQ_get_nonce;
-+		X509_PUBKEY_set0_param;
-+		EVP_PKEY_CTX_set0_keygen_info;
-+		DIST_POINT_set_dpname;
-+		i2d_ISSUING_DIST_POINT;
-+		ASN1_SET_ANY_it;
-+		EVP_PKEY_CTX_get_data;
-+		TS_STATUS_INFO_print_bio;
-+		EVP_PKEY_derive_init;
-+		d2i_TS_TST_INFO;
-+		EVP_PKEY_asn1_add_alias;
-+		d2i_TS_RESP_bio;
-+		OTHERNAME_cmp;
-+		GENERAL_NAME_set0_value;
-+		PKCS7_RECIP_INFO_get0_alg;
-+		TS_RESP_CTX_new;
-+		TS_RESP_set_tst_info;
-+		PKCS7_final;
-+		EVP_PKEY_base_id;
-+		TS_RESP_CTX_set_signer_cert;
-+		TS_REQ_set_msg_imprint;
-+		EVP_PKEY_CTX_ctrl;
-+		TS_CONF_set_digests;
-+		d2i_TS_MSG_IMPRINT;
-+		EVP_PKEY_meth_set_ctrl;
-+		TS_REQ_get_ext_by_NID;
-+		PKCS5_pbe_set0_algor;
-+		BN_BLINDING_thread_id;
-+		TS_ACCURACY_new;
-+		X509_CRL_METHOD_free;
-+		ASN1_PCTX_get_nm_flags;
-+		EVP_PKEY_meth_set_sign;
-+		CRYPTO_THREADID_current;
-+		EVP_PKEY_decrypt_init;
-+		NETSCAPE_X509_free;
-+		i2b_PVK_bio;
-+		EVP_PKEY_print_private;
-+		GENERAL_NAME_get0_value;
-+		b2i_PVK_bio;
-+		ASN1_UTCTIME_adj;
-+		TS_TST_INFO_new;
-+		EVP_MD_do_all_sorted;
-+		TS_CONF_set_default_engine;
-+		TS_ACCURACY_set_seconds;
-+		TS_TST_INFO_get_time;
-+		PKCS8_pkey_get0;
-+		EVP_PKEY_asn1_get0;
-+		OBJ_add_sigid;
-+		PKCS7_SIGNER_INFO_sign;
-+		EVP_PKEY_paramgen_init;
-+		EVP_PKEY_sign;
-+		OBJ_sigid_free;
-+		EVP_PKEY_meth_set_init;
-+		d2i_ESS_ISSUER_SERIAL;
-+		ISSUING_DIST_POINT_new;
-+		ASN1_TIME_adj;
-+		TS_OBJ_print_bio;
-+		EVP_PKEY_meth_set_verify_recover;
-+		EVP_PKEY_meth_set_vrfy_recover;
-+		TS_RESP_get_status_info;
-+		CMS_stream;
-+		EVP_PKEY_CTX_set_cb;
-+		PKCS7_to_TS_TST_INFO;
-+		ASN1_PCTX_get_oid_flags;
-+		TS_TST_INFO_add_ext;
-+		EVP_PKEY_meth_set_derive;
-+		i2d_TS_RESP_fp;
-+		i2d_TS_MSG_IMPRINT_bio;
-+		TS_RESP_CTX_set_accuracy;
-+		TS_REQ_set_nonce;
-+		ESS_CERT_ID_new;
-+		ENGINE_pkey_asn1_find_str;
-+		TS_REQ_get_ext_count;
-+		BUF_reverse;
-+		TS_TST_INFO_print_bio;
-+		d2i_ISSUING_DIST_POINT;
-+		ENGINE_get_pkey_meths;
-+		i2b_PrivateKey_bio;
-+		i2d_TS_RESP;
-+		b2i_PublicKey;
-+		TS_VERIFY_CTX_cleanup;
-+		TS_STATUS_INFO_free;
-+		TS_RESP_verify_token;
-+		OBJ_bsearch_ex_;
-+		ASN1_bn_print;
-+		EVP_PKEY_asn1_get_count;
-+		ENGINE_register_pkey_asn1_meths;
-+		ASN1_PCTX_set_nm_flags;
-+		EVP_DigestVerifyInit;
-+		ENGINE_set_default_pkey_meths;
-+		TS_TST_INFO_get_policy_id;
-+		TS_REQ_get_cert_req;
-+		X509_CRL_set_meth_data;
-+		PKCS8_pkey_set0;
-+		ASN1_STRING_copy;
-+		d2i_TS_TST_INFO_fp;
-+		X509_CRL_match;
-+		EVP_PKEY_asn1_set_private;
-+		TS_TST_INFO_get_ext_d2i;
-+		TS_RESP_CTX_add_policy;
-+		d2i_TS_RESP;
-+		TS_CONF_load_certs;
-+		TS_TST_INFO_get_msg_imprint;
-+		ERR_load_TS_strings;
-+		TS_TST_INFO_get_version;
-+		EVP_PKEY_CTX_dup;
-+		EVP_PKEY_meth_set_verify;
-+		i2b_PublicKey_bio;
-+		TS_CONF_set_certs;
-+		EVP_PKEY_asn1_get0_info;
-+		TS_VERIFY_CTX_free;
-+		TS_REQ_get_ext_by_critical;
-+		TS_RESP_CTX_set_serial_cb;
-+		X509_CRL_get_meth_data;
-+		TS_RESP_CTX_set_time_cb;
-+		TS_MSG_IMPRINT_get_msg;
-+		TS_TST_INFO_ext_free;
-+		TS_REQ_get_version;
-+		TS_REQ_add_ext;
-+		EVP_PKEY_CTX_set_app_data;
-+		OBJ_bsearch_;
-+		EVP_PKEY_meth_set_verifyctx;
-+		i2d_PKCS7_bio_stream;
-+		CRYPTO_THREADID_set_numeric;
-+		PKCS7_sign_add_signer;
-+		d2i_TS_TST_INFO_bio;
-+		TS_TST_INFO_get_ordering;
-+		TS_RESP_print_bio;
-+		TS_TST_INFO_get_exts;
-+		HMAC_CTX_copy;
-+		PKCS5_pbe2_set_iv;
-+		ENGINE_get_pkey_asn1_meths;
-+		b2i_PrivateKey;
-+		EVP_PKEY_CTX_get_app_data;
-+		TS_REQ_set_cert_req;
-+		CRYPTO_THREADID_set_callback;
-+		TS_CONF_set_serial;
-+		TS_TST_INFO_free;
-+		d2i_TS_REQ_fp;
-+		TS_RESP_verify_response;
-+		i2d_ESS_ISSUER_SERIAL;
-+		TS_ACCURACY_get_seconds;
-+		EVP_CIPHER_do_all;
-+		b2i_PrivateKey_bio;
-+		OCSP_CERTID_dup;
-+		X509_PUBKEY_get0_param;
-+		TS_MSG_IMPRINT_dup;
-+		PKCS7_print_ctx;
-+		i2d_TS_REQ_bio;
-+		EVP_whirlpool;
-+		EVP_PKEY_asn1_set_param;
-+		EVP_PKEY_meth_set_encrypt;
-+		ASN1_PCTX_set_flags;
-+		i2d_ESS_CERT_ID;
-+		TS_VERIFY_CTX_new;
-+		TS_RESP_CTX_set_extension_cb;
-+		ENGINE_register_all_pkey_meths;
-+		TS_RESP_CTX_set_status_info_cond;
-+		TS_RESP_CTX_set_stat_info_cond;
-+		EVP_PKEY_verify;
-+		WHIRLPOOL_Final;
-+		X509_CRL_METHOD_new;
-+		EVP_DigestSignFinal;
-+		TS_RESP_CTX_set_def_policy;
-+		NETSCAPE_X509_it;
-+		TS_RESP_create_response;
-+		PKCS7_SIGNER_INFO_get0_algs;
-+		TS_TST_INFO_get_nonce;
-+		EVP_PKEY_decrypt_old;
-+		TS_TST_INFO_set_policy_id;
-+		TS_CONF_set_ess_cert_id_chain;
-+		EVP_PKEY_CTX_get0_pkey;
-+		d2i_TS_REQ;
-+		EVP_PKEY_asn1_find_str;
-+		BIO_f_asn1;
-+		ESS_SIGNING_CERT_new;
-+		EVP_PBE_find;
-+		X509_CRL_get0_by_cert;
-+		EVP_PKEY_derive;
-+		i2d_TS_REQ;
-+		TS_TST_INFO_delete_ext;
-+		ESS_ISSUER_SERIAL_free;
-+		ASN1_PCTX_set_str_flags;
-+		ENGINE_get_pkey_asn1_meth_str;
-+		TS_CONF_set_signer_key;
-+		TS_ACCURACY_get_millis;
-+		TS_RESP_get_token;
-+		TS_ACCURACY_dup;
-+		ENGINE_register_all_pkey_asn1_meths;
-+		ENGINE_reg_all_pkey_asn1_meths;
-+		X509_CRL_set_default_method;
-+		CRYPTO_THREADID_hash;
-+		CMS_ContentInfo_print_ctx;
-+		TS_RESP_free;
-+		ISSUING_DIST_POINT_free;
-+		ESS_ISSUER_SERIAL_new;
-+		CMS_add1_crl;
-+		PKCS7_add1_attrib_digest;
-+		TS_RESP_CTX_add_md;
-+		TS_TST_INFO_dup;
-+		ENGINE_set_pkey_asn1_meths;
-+		PEM_write_bio_Parameters;
-+		TS_TST_INFO_get_accuracy;
-+		X509_CRL_get0_by_serial;
-+		TS_TST_INFO_set_version;
-+		TS_RESP_CTX_get_tst_info;
-+		TS_RESP_verify_signature;
-+		CRYPTO_THREADID_get_callback;
-+		TS_TST_INFO_get_tsa;
-+		TS_STATUS_INFO_new;
-+		EVP_PKEY_CTX_get_cb;
-+		TS_REQ_get_ext_d2i;
-+		GENERAL_NAME_set0_othername;
-+		TS_TST_INFO_get_ext_count;
-+		TS_RESP_CTX_get_request;
-+		i2d_NETSCAPE_X509;
-+		ENGINE_get_pkey_meth_engine;
-+		EVP_PKEY_meth_set_signctx;
-+		EVP_PKEY_asn1_copy;
-+		ASN1_TYPE_cmp;
-+		EVP_CIPHER_do_all_sorted;
-+		EVP_PKEY_CTX_free;
-+		ISSUING_DIST_POINT_it;
-+		d2i_TS_MSG_IMPRINT_fp;
-+		X509_STORE_get1_certs;
-+		EVP_PKEY_CTX_get_operation;
-+		d2i_ESS_SIGNING_CERT;
-+		TS_CONF_set_ordering;
-+		EVP_PBE_alg_add_type;
-+		TS_REQ_set_version;
-+		EVP_PKEY_get0;
-+		BIO_asn1_set_suffix;
-+		i2d_TS_STATUS_INFO;
-+		EVP_MD_do_all;
-+		TS_TST_INFO_set_accuracy;
-+		PKCS7_add_attrib_content_type;
-+		ERR_remove_thread_state;
-+		EVP_PKEY_meth_add0;
-+		TS_TST_INFO_set_tsa;
-+		EVP_PKEY_meth_new;
-+		WHIRLPOOL_Update;
-+		TS_CONF_set_accuracy;
-+		ASN1_PCTX_set_oid_flags;
-+		ESS_SIGNING_CERT_dup;
-+		d2i_TS_REQ_bio;
-+		X509_time_adj_ex;
-+		TS_RESP_CTX_add_flags;
-+		d2i_TS_STATUS_INFO;
-+		TS_MSG_IMPRINT_set_msg;
-+		BIO_asn1_get_suffix;
-+		TS_REQ_free;
-+		EVP_PKEY_meth_free;
-+		TS_REQ_get_exts;
-+		TS_RESP_CTX_set_clock_precision_digits;
-+		TS_RESP_CTX_set_clk_prec_digits;
-+		TS_RESP_CTX_add_failure_info;
-+		i2d_TS_RESP_bio;
-+		EVP_PKEY_CTX_get0_peerkey;
-+		PEM_write_bio_CMS_stream;
-+		TS_REQ_new;
-+		TS_MSG_IMPRINT_new;
-+		EVP_PKEY_meth_find;
-+		EVP_PKEY_id;
-+		TS_TST_INFO_set_serial;
-+		a2i_GENERAL_NAME;
-+		TS_CONF_set_crypto_device;
-+		EVP_PKEY_verify_init;
-+		TS_CONF_set_policies;
-+		ASN1_PCTX_new;
-+		ESS_CERT_ID_free;
-+		ENGINE_unregister_pkey_meths;
-+		TS_MSG_IMPRINT_free;
-+		TS_VERIFY_CTX_init;
-+		PKCS7_stream;
-+		TS_RESP_CTX_set_certs;
-+		TS_CONF_set_def_policy;
-+		ASN1_GENERALIZEDTIME_adj;
-+		NETSCAPE_X509_new;
-+		TS_ACCURACY_free;
-+		TS_RESP_get_tst_info;
-+		EVP_PKEY_derive_set_peer;
-+		PEM_read_bio_Parameters;
-+		TS_CONF_set_clock_precision_digits;
-+		TS_CONF_set_clk_prec_digits;
-+		ESS_ISSUER_SERIAL_dup;
-+		TS_ACCURACY_get_micros;
-+		ASN1_PCTX_get_str_flags;
-+		NAME_CONSTRAINTS_check;
-+		ASN1_BIT_STRING_check;
-+		X509_check_akid;
-+		ENGINE_unregister_pkey_asn1_meths;
-+		ENGINE_unreg_pkey_asn1_meths;
-+		ASN1_PCTX_free;
-+		PEM_write_bio_ASN1_stream;
-+		i2d_ASN1_bio_stream;
-+		TS_X509_ALGOR_print_bio;
-+		EVP_PKEY_meth_set_cleanup;
-+		EVP_PKEY_asn1_free;
-+		ESS_SIGNING_CERT_free;
-+		TS_TST_INFO_set_msg_imprint;
-+		GENERAL_NAME_cmp;
-+		d2i_ASN1_SET_ANY;
-+		ENGINE_set_pkey_meths;
-+		i2d_TS_REQ_fp;
-+		d2i_ASN1_SEQUENCE_ANY;
-+		GENERAL_NAME_get0_otherName;
-+		d2i_ESS_CERT_ID;
-+		OBJ_find_sigid_algs;
-+		EVP_PKEY_meth_set_keygen;
-+		PKCS5_PBKDF2_HMAC;
-+		EVP_PKEY_paramgen;
-+		EVP_PKEY_meth_set_paramgen;
-+		BIO_new_PKCS7;
-+		EVP_PKEY_verify_recover;
-+		TS_ext_print_bio;
-+		TS_ASN1_INTEGER_print_bio;
-+		check_defer;
-+		DSO_pathbyaddr;
-+		EVP_PKEY_set_type;
-+		TS_ACCURACY_set_micros;
-+		TS_REQ_to_TS_VERIFY_CTX;
-+		EVP_PKEY_meth_set_copy;
-+		ASN1_PCTX_set_cert_flags;
-+		TS_TST_INFO_get_ext;
-+		EVP_PKEY_asn1_set_ctrl;
-+		TS_TST_INFO_get_ext_by_critical;
-+		EVP_PKEY_CTX_new_id;
-+		TS_REQ_get_ext_by_OBJ;
-+		TS_CONF_set_signer_cert;
-+		X509_NAME_hash_old;
-+		ASN1_TIME_set_string;
-+		EVP_MD_flags;
-+		TS_RESP_CTX_free;
-+		DSAparams_dup;
-+		DHparams_dup;
-+		OCSP_REQ_CTX_add1_header;
-+		OCSP_REQ_CTX_set1_req;
-+		X509_STORE_set_verify_cb;
-+		X509_STORE_CTX_get0_current_crl;
-+		X509_STORE_CTX_get0_parent_ctx;
-+		X509_STORE_CTX_get0_current_issuer;
-+		X509_STORE_CTX_get0_cur_issuer;
-+		X509_issuer_name_hash_old;
-+		X509_subject_name_hash_old;
-+		EVP_CIPHER_CTX_copy;
-+		UI_method_get_prompt_constructor;
-+		UI_method_get_prompt_constructr;
-+		UI_method_set_prompt_constructor;
-+		UI_method_set_prompt_constructr;
-+		EVP_read_pw_string_min;
-+		CRYPTO_cts128_encrypt;
-+		CRYPTO_cts128_decrypt_block;
-+		CRYPTO_cfb128_1_encrypt;
-+		CRYPTO_cbc128_encrypt;
-+		CRYPTO_ctr128_encrypt;
-+		CRYPTO_ofb128_encrypt;
-+		CRYPTO_cts128_decrypt;
-+		CRYPTO_cts128_encrypt_block;
-+		CRYPTO_cbc128_decrypt;
-+		CRYPTO_cfb128_encrypt;
-+		CRYPTO_cfb128_8_encrypt;
-+		SSL_renegotiate_abbreviated;
-+		TLSv1_1_method;
-+		TLSv1_1_client_method;
-+		TLSv1_1_server_method;
-+		SSL_CTX_set_srp_client_pwd_callback;
-+		SSL_CTX_set_srp_client_pwd_cb;
-+		SSL_get_srp_g;
-+		SSL_CTX_set_srp_username_callback;
-+		SSL_CTX_set_srp_un_cb;
-+		SSL_get_srp_userinfo;
-+		SSL_set_srp_server_param;
-+		SSL_set_srp_server_param_pw;
-+		SSL_get_srp_N;
-+		SSL_get_srp_username;
-+		SSL_CTX_set_srp_password;
-+		SSL_CTX_set_srp_strength;
-+		SSL_CTX_set_srp_verify_param_callback;
-+		SSL_CTX_set_srp_vfy_param_cb;
-+		SSL_CTX_set_srp_cb_arg;
-+		SSL_CTX_set_srp_username;
-+		SSL_CTX_SRP_CTX_init;
-+		SSL_SRP_CTX_init;
-+		SRP_Calc_A_param;
-+		SRP_generate_server_master_secret;
-+		SRP_gen_server_master_secret;
-+		SSL_CTX_SRP_CTX_free;
-+		SRP_generate_client_master_secret;
-+		SRP_gen_client_master_secret;
-+		SSL_srp_server_param_with_username;
-+		SSL_srp_server_param_with_un;
-+		SSL_SRP_CTX_free;
-+		SSL_set_debug;
-+		SSL_SESSION_get0_peer;
-+		TLSv1_2_client_method;
-+		SSL_SESSION_set1_id_context;
-+		TLSv1_2_server_method;
-+		SSL_cache_hit;
-+		SSL_get0_kssl_ctx;
-+		SSL_set0_kssl_ctx;
-+		SSL_set_state;
-+		SSL_CIPHER_get_id;
-+		TLSv1_2_method;
-+		kssl_ctx_get0_client_princ;
-+		SSL_export_keying_material;
-+		SSL_set_tlsext_use_srtp;
-+		SSL_CTX_set_next_protos_advertised_cb;
-+		SSL_CTX_set_next_protos_adv_cb;
-+		SSL_get0_next_proto_negotiated;
-+		SSL_get_selected_srtp_profile;
-+		SSL_CTX_set_tlsext_use_srtp;
-+		SSL_select_next_proto;
-+		SSL_get_srtp_profiles;
-+		SSL_CTX_set_next_proto_select_cb;
-+		SSL_CTX_set_next_proto_sel_cb;
-+		SSL_SESSION_get_compress_id;
-+
-+		SRP_VBASE_get_by_user;
-+		SRP_Calc_server_key;
-+		SRP_create_verifier;
-+		SRP_create_verifier_BN;
-+		SRP_Calc_u;
-+		SRP_VBASE_free;
-+		SRP_Calc_client_key;
-+		SRP_get_default_gN;
-+		SRP_Calc_x;
-+		SRP_Calc_B;
-+		SRP_VBASE_new;
-+		SRP_check_known_gN_param;
-+		SRP_Calc_A;
-+		SRP_Verify_A_mod_N;
-+		SRP_VBASE_init;
-+		SRP_Verify_B_mod_N;
-+		EC_KEY_set_public_key_affine_coordinates;
-+		EC_KEY_set_pub_key_aff_coords;
-+		EVP_aes_192_ctr;
-+		EVP_PKEY_meth_get0_info;
-+		EVP_PKEY_meth_copy;
-+		ERR_add_error_vdata;
-+		EVP_aes_128_ctr;
-+		EVP_aes_256_ctr;
-+		EC_GFp_nistp224_method;
-+		EC_KEY_get_flags;
-+		RSA_padding_add_PKCS1_PSS_mgf1;
-+		EVP_aes_128_xts;
-+		EVP_aes_256_xts;
-+		EVP_aes_128_gcm;
-+		EC_KEY_clear_flags;
-+		EC_KEY_set_flags;
-+		EVP_aes_256_ccm;
-+		RSA_verify_PKCS1_PSS_mgf1;
-+		EVP_aes_128_ccm;
-+		EVP_aes_192_gcm;
-+		X509_ALGOR_set_md;
-+		RAND_init_fips;
-+		EVP_aes_256_gcm;
-+		EVP_aes_192_ccm;
-+		CMAC_CTX_copy;
-+		CMAC_CTX_free;
-+		CMAC_CTX_get0_cipher_ctx;
-+		CMAC_CTX_cleanup;
-+		CMAC_Init;
-+		CMAC_Update;
-+		CMAC_resume;
-+		CMAC_CTX_new;
-+		CMAC_Final;
-+		CRYPTO_ctr128_encrypt_ctr32;
-+		CRYPTO_gcm128_release;
-+		CRYPTO_ccm128_decrypt_ccm64;
-+		CRYPTO_ccm128_encrypt;
-+		CRYPTO_gcm128_encrypt;
-+		CRYPTO_xts128_encrypt;
-+		EVP_rc4_hmac_md5;
-+		CRYPTO_nistcts128_decrypt_block;
-+		CRYPTO_gcm128_setiv;
-+		CRYPTO_nistcts128_encrypt;
-+		EVP_aes_128_cbc_hmac_sha1;
-+		CRYPTO_gcm128_tag;
-+		CRYPTO_ccm128_encrypt_ccm64;
-+		ENGINE_load_rdrand;
-+		CRYPTO_ccm128_setiv;
-+		CRYPTO_nistcts128_encrypt_block;
-+		CRYPTO_gcm128_aad;
-+		CRYPTO_ccm128_init;
-+		CRYPTO_nistcts128_decrypt;
-+		CRYPTO_gcm128_new;
-+		CRYPTO_ccm128_tag;
-+		CRYPTO_ccm128_decrypt;
-+		CRYPTO_ccm128_aad;
-+		CRYPTO_gcm128_init;
-+		CRYPTO_gcm128_decrypt;
-+		ENGINE_load_rsax;
-+		CRYPTO_gcm128_decrypt_ctr32;
-+		CRYPTO_gcm128_encrypt_ctr32;
-+		CRYPTO_gcm128_finish;
-+		EVP_aes_256_cbc_hmac_sha1;
-+		PKCS5_pbkdf2_set;
-+		CMS_add0_recipient_password;
-+		CMS_decrypt_set1_password;
-+		CMS_RecipientInfo_set0_password;
-+		RAND_set_fips_drbg_type;
-+		X509_REQ_sign_ctx;
-+		RSA_PSS_PARAMS_new;
-+		X509_CRL_sign_ctx;
-+		X509_signature_dump;
-+		d2i_RSA_PSS_PARAMS;
-+		RSA_PSS_PARAMS_it;
-+		RSA_PSS_PARAMS_free;
-+		X509_sign_ctx;
-+		i2d_RSA_PSS_PARAMS;
-+		ASN1_item_sign_ctx;
-+		EC_GFp_nistp521_method;
-+		EC_GFp_nistp256_method;
-+		OPENSSL_stderr;
-+		OPENSSL_cpuid_setup;
-+		OPENSSL_showfatal;
-+		BIO_new_dgram_sctp;
-+		BIO_dgram_sctp_msg_waiting;
-+		BIO_dgram_sctp_wait_for_dry;
-+		BIO_s_datagram_sctp;
-+		BIO_dgram_is_sctp;
-+		BIO_dgram_sctp_notification_cb;
-+		CRYPTO_memcmp;
-+		SSL_CTX_set_alpn_protos;
-+		SSL_set_alpn_protos;
-+		SSL_CTX_set_alpn_select_cb;
-+		SSL_get0_alpn_selected;
-+		SSL_CTX_set_custom_cli_ext;
-+		SSL_CTX_set_custom_srv_ext;
-+		SSL_CTX_set_srv_supp_data;
-+		SSL_CTX_set_cli_supp_data;
-+		SSL_set_cert_cb;
-+		SSL_CTX_use_serverinfo;
-+		SSL_CTX_use_serverinfo_file;
-+		SSL_CTX_set_cert_cb;
-+		SSL_CTX_get0_param;
-+		SSL_get0_param;
-+		SSL_certs_clear;
-+		DTLSv1_2_method;
-+		DTLSv1_2_server_method;
-+		DTLSv1_2_client_method;
-+		DTLS_method;
-+		DTLS_server_method;
-+		DTLS_client_method;
-+		SSL_CTX_get_ssl_method;
-+		SSL_CTX_get0_certificate;
-+		SSL_CTX_get0_privatekey;
-+		SSL_COMP_set0_compression_methods;
-+		SSL_COMP_free_compression_methods;
-+		SSL_CIPHER_find;
-+		SSL_is_server;
-+		SSL_CONF_CTX_new;
-+		SSL_CONF_CTX_finish;
-+		SSL_CONF_CTX_free;
-+		SSL_CONF_CTX_set_flags;
-+		SSL_CONF_CTX_clear_flags;
-+		SSL_CONF_CTX_set1_prefix;
-+		SSL_CONF_CTX_set_ssl;
-+		SSL_CONF_CTX_set_ssl_ctx;
-+		SSL_CONF_cmd;
-+		SSL_CONF_cmd_argv;
-+		SSL_CONF_cmd_value_type;
-+		SSL_trace;
-+		SSL_CIPHER_standard_name;
-+		SSL_get_tlsa_record_byname;
-+		ASN1_TIME_diff;
-+		BIO_hex_string;
-+		CMS_RecipientInfo_get0_pkey_ctx;
-+		CMS_RecipientInfo_encrypt;
-+		CMS_SignerInfo_get0_pkey_ctx;
-+		CMS_SignerInfo_get0_md_ctx;
-+		CMS_SignerInfo_get0_signature;
-+		CMS_RecipientInfo_kari_get0_alg;
-+		CMS_RecipientInfo_kari_get0_reks;
-+		CMS_RecipientInfo_kari_get0_orig_id;
-+		CMS_RecipientInfo_kari_orig_id_cmp;
-+		CMS_RecipientEncryptedKey_get0_id;
-+		CMS_RecipientEncryptedKey_cert_cmp;
-+		CMS_RecipientInfo_kari_set0_pkey;
-+		CMS_RecipientInfo_kari_get0_ctx;
-+		CMS_RecipientInfo_kari_decrypt;
-+		CMS_SharedInfo_encode;
-+		DH_compute_key_padded;
-+		d2i_DHxparams;
-+		i2d_DHxparams;
-+		DH_get_1024_160;
-+		DH_get_2048_224;
-+		DH_get_2048_256;
-+		DH_KDF_X9_42;
-+		ECDH_KDF_X9_62;
-+		ECDSA_METHOD_new;
-+		ECDSA_METHOD_free;
-+		ECDSA_METHOD_set_app_data;
-+		ECDSA_METHOD_get_app_data;
-+		ECDSA_METHOD_set_sign;
-+		ECDSA_METHOD_set_sign_setup;
-+		ECDSA_METHOD_set_verify;
-+		ECDSA_METHOD_set_flags;
-+		ECDSA_METHOD_set_name;
-+		EVP_des_ede3_wrap;
-+		EVP_aes_128_wrap;
-+		EVP_aes_192_wrap;
-+		EVP_aes_256_wrap;
-+		EVP_aes_128_cbc_hmac_sha256;
-+		EVP_aes_256_cbc_hmac_sha256;
-+		CRYPTO_128_wrap;
-+		CRYPTO_128_unwrap;
-+		OCSP_REQ_CTX_nbio;
-+		OCSP_REQ_CTX_new;
-+		OCSP_set_max_response_length;
-+		OCSP_REQ_CTX_i2d;
-+		OCSP_REQ_CTX_nbio_d2i;
-+		OCSP_REQ_CTX_get0_mem_bio;
-+		OCSP_REQ_CTX_http;
-+		RSA_padding_add_PKCS1_OAEP_mgf1;
-+		RSA_padding_check_PKCS1_OAEP_mgf1;
-+		RSA_OAEP_PARAMS_free;
-+		RSA_OAEP_PARAMS_it;
-+		RSA_OAEP_PARAMS_new;
-+		SSL_get_sigalgs;
-+		SSL_get_shared_sigalgs;
-+		SSL_check_chain;
-+		X509_chain_up_ref;
-+		X509_http_nbio;
-+		X509_CRL_http_nbio;
-+		X509_REVOKED_dup;
-+		i2d_re_X509_tbs;
-+		X509_get0_signature;
-+		X509_get_signature_nid;
-+		X509_CRL_diff;
-+		X509_chain_check_suiteb;
-+		X509_CRL_check_suiteb;
-+		X509_check_host;
-+		X509_check_email;
-+		X509_check_ip;
-+		X509_check_ip_asc;
-+		X509_STORE_set_lookup_crls_cb;
-+		X509_STORE_CTX_get0_store;
-+		X509_VERIFY_PARAM_set1_host;
-+		X509_VERIFY_PARAM_add1_host;
-+		X509_VERIFY_PARAM_set_hostflags;
-+		X509_VERIFY_PARAM_get0_peername;
-+		X509_VERIFY_PARAM_set1_email;
-+		X509_VERIFY_PARAM_set1_ip;
-+		X509_VERIFY_PARAM_set1_ip_asc;
-+		X509_VERIFY_PARAM_get0_name;
-+		X509_VERIFY_PARAM_get_count;
-+		X509_VERIFY_PARAM_get0;
-+		X509V3_EXT_free;
-+		EC_GROUP_get_mont_data;
-+		EC_curve_nid2nist;
-+		EC_curve_nist2nid;
-+		PEM_write_bio_DHxparams;
-+		PEM_write_DHxparams;
-+		SSL_CTX_add_client_custom_ext;
-+		SSL_CTX_add_server_custom_ext;
-+		SSL_extension_supported;
-+		BUF_strnlen;
-+		sk_deep_copy;
-+		SSL_test_functions;
-+
-+	local:
-+		*;
-+};
-+
-+OPENSSL_1.0.2g {
-+       global:
-+               SRP_VBASE_get1_by_user;
-+               SRP_user_pwd_free;
-+} OPENSSL_1.0.2d;
-+
-Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/openssl.ld
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/openssl.ld	2014-02-24 21:02:30.000000000 +0100
-@@ -0,0 +1,10 @@
-+OPENSSL_1.0.2 {
-+	global:
-+		bind_engine;
-+		v_check;
-+		OPENSSL_init;
-+		OPENSSL_finish;
-+	local:
-+		*;
-+};
-+
-Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/ccgost/openssl.ld
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/ccgost/openssl.ld	2014-02-24 21:02:30.000000000 +0100
-@@ -0,0 +1,10 @@
-+OPENSSL_1.0.2 {
-+	global:
-+		bind_engine;
-+		v_check;
-+		OPENSSL_init;
-+		OPENSSL_finish;
-+	local:
-+		*;
-+};
-+
diff --git a/recipes-connectivity/openssl/openssl/debian_bpo8+1/Mark-3DES-and-RC4-ciphers-as-weak.patch b/recipes-connectivity/openssl/openssl/debian_bpo8+1/Mark-3DES-and-RC4-ciphers-as-weak.patch
deleted file mode 100644
index 31df8fc..0000000
--- a/recipes-connectivity/openssl/openssl/debian_bpo8+1/Mark-3DES-and-RC4-ciphers-as-weak.patch
+++ /dev/null
@@ -1,429 +0,0 @@
-From e9f3a3d6d707c5f9b8d67f44f8d7283296935415 Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Date: Sun, 18 Dec 2016 15:37:52 +0100
-Subject: [PATCH] Mark 3DES and RC4 ciphers as weak
-
-This disables RC4 and 3DES in our build
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
----
- ssl/s3_lib.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 58 insertions(+), 1 deletion(-)
-
-diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
-index 0385e039c8d4..cf785f994917 100644
---- a/ssl/s3_lib.c
-+++ b/ssl/s3_lib.c
-@@ -216,6 +216,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
- #endif
- 
- /* Cipher 04 */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      SSL3_TXT_RSA_RC4_128_MD5,
-@@ -230,8 +231,10 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      128,
-      128,
-      },
-+#endif
- 
- /* Cipher 05 */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      SSL3_TXT_RSA_RC4_128_SHA,
-@@ -246,7 +249,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      128,
-      128,
-      },
--
-+#endif
- /* Cipher 06 */
- #ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-@@ -320,6 +323,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
- #endif
- 
- /* Cipher 0A */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      SSL3_TXT_RSA_DES_192_CBC3_SHA,
-@@ -334,6 +338,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      112,
-      168,
-      },
-+#endif
- 
- /* The DH ciphers */
- /* Cipher 0B */
-@@ -373,6 +378,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
- #endif
- 
- /* Cipher 0D */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      SSL3_TXT_DH_DSS_DES_192_CBC3_SHA,
-@@ -387,6 +393,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      112,
-      168,
-      },
-+#endif
- 
- /* Cipher 0E */
- #ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-@@ -425,6 +432,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
- #endif
- 
- /* Cipher 10 */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      SSL3_TXT_DH_RSA_DES_192_CBC3_SHA,
-@@ -439,6 +447,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      112,
-      168,
-      },
-+#endif
- 
- /* The Ephemeral DH ciphers */
- /* Cipher 11 */
-@@ -478,6 +487,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
- #endif
- 
- /* Cipher 13 */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      SSL3_TXT_EDH_DSS_DES_192_CBC3_SHA,
-@@ -492,6 +502,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      112,
-      168,
-      },
-+#endif
- 
- /* Cipher 14 */
- #ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-@@ -530,6 +541,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
- #endif
- 
- /* Cipher 16 */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA,
-@@ -544,6 +556,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      112,
-      168,
-      },
-+#endif
- 
- /* Cipher 17 */
- #ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-@@ -564,6 +577,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
- #endif
- 
- /* Cipher 18 */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      SSL3_TXT_ADH_RC4_128_MD5,
-@@ -578,6 +592,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      128,
-      128,
-      },
-+#endif
- 
- /* Cipher 19 */
- #ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-@@ -616,6 +631,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
- #endif
- 
- /* Cipher 1B */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      SSL3_TXT_ADH_DES_192_CBC_SHA,
-@@ -630,6 +646,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      112,
-      168,
-      },
-+#endif
- 
- /* Fortezza ciphersuite from SSL 3.0 spec */
- #if 0
-@@ -703,6 +720,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
- # endif
- 
- /* Cipher 1F */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      SSL3_TXT_KRB5_DES_192_CBC3_SHA,
-@@ -717,8 +735,10 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      112,
-      168,
-      },
-+#endif
- 
- /* Cipher 20 */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      SSL3_TXT_KRB5_RC4_128_SHA,
-@@ -733,6 +753,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      128,
-      128,
-      },
-+#endif
- 
- /* Cipher 21 */
-     {
-@@ -769,6 +790,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
- # endif
- 
- /* Cipher 23 */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      SSL3_TXT_KRB5_DES_192_CBC3_MD5,
-@@ -783,8 +805,10 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      112,
-      168,
-      },
-+#endif
- 
- /* Cipher 24 */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      SSL3_TXT_KRB5_RC4_128_MD5,
-@@ -799,6 +823,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      128,
-      128,
-      },
-+#endif
- 
- /* Cipher 25 */
-     {
-@@ -1418,6 +1443,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
- # endif
- 
-     /* Cipher 66 */
-+# ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA,
-@@ -1433,6 +1459,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      128,
-      },
- #endif
-+#endif
- 
-     /* TLS v1.2 ciphersuites */
-     /* Cipher 67 */
-@@ -1703,6 +1730,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
- 
- #ifndef OPENSSL_NO_PSK
-     /* Cipher 8A */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      TLS1_TXT_PSK_WITH_RC4_128_SHA,
-@@ -1717,8 +1745,10 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      128,
-      128,
-      },
-+#endif
- 
-     /* Cipher 8B */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      TLS1_TXT_PSK_WITH_3DES_EDE_CBC_SHA,
-@@ -1733,6 +1763,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      112,
-      168,
-      },
-+#endif
- 
-     /* Cipher 8C */
-     {
-@@ -2095,6 +2126,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      },
- 
-     /* Cipher C002 */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      TLS1_TXT_ECDH_ECDSA_WITH_RC4_128_SHA,
-@@ -2109,8 +2141,10 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      128,
-      128,
-      },
-+#endif
- 
-     /* Cipher C003 */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      TLS1_TXT_ECDH_ECDSA_WITH_DES_192_CBC3_SHA,
-@@ -2125,6 +2159,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      112,
-      168,
-      },
-+#endif
- 
-     /* Cipher C004 */
-     {
-@@ -2175,6 +2210,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      },
- 
-     /* Cipher C007 */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      TLS1_TXT_ECDHE_ECDSA_WITH_RC4_128_SHA,
-@@ -2189,8 +2225,10 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      128,
-      128,
-      },
-+#endif
- 
-     /* Cipher C008 */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      TLS1_TXT_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA,
-@@ -2205,6 +2243,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      112,
-      168,
-      },
-+#endif
- 
-     /* Cipher C009 */
-     {
-@@ -2255,6 +2294,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      },
- 
-     /* Cipher C00C */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      TLS1_TXT_ECDH_RSA_WITH_RC4_128_SHA,
-@@ -2269,8 +2309,10 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      128,
-      128,
-      },
-+#endif
- 
-     /* Cipher C00D */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      TLS1_TXT_ECDH_RSA_WITH_DES_192_CBC3_SHA,
-@@ -2285,6 +2327,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      112,
-      168,
-      },
-+#endif
- 
-     /* Cipher C00E */
-     {
-@@ -2335,6 +2378,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      },
- 
-     /* Cipher C011 */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      TLS1_TXT_ECDHE_RSA_WITH_RC4_128_SHA,
-@@ -2349,8 +2393,10 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      128,
-      128,
-      },
-+#endif
- 
-     /* Cipher C012 */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      TLS1_TXT_ECDHE_RSA_WITH_DES_192_CBC3_SHA,
-@@ -2365,6 +2411,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      112,
-      168,
-      },
-+#endif
- 
-     /* Cipher C013 */
-     {
-@@ -2415,6 +2462,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      },
- 
-     /* Cipher C016 */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      TLS1_TXT_ECDH_anon_WITH_RC4_128_SHA,
-@@ -2429,8 +2477,10 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      128,
-      128,
-      },
-+#endif
- 
-     /* Cipher C017 */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      TLS1_TXT_ECDH_anon_WITH_DES_192_CBC3_SHA,
-@@ -2445,6 +2495,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      112,
-      168,
-      },
-+#endif
- 
-     /* Cipher C018 */
-     {
-@@ -2481,6 +2532,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
- 
- #ifndef OPENSSL_NO_SRP
-     /* Cipher C01A */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      TLS1_TXT_SRP_SHA_WITH_3DES_EDE_CBC_SHA,
-@@ -2495,8 +2547,10 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      112,
-      168,
-      },
-+#endif
- 
-     /* Cipher C01B */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      TLS1_TXT_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA,
-@@ -2511,8 +2565,10 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      112,
-      168,
-      },
-+#endif
- 
-     /* Cipher C01C */
-+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-     {
-      1,
-      TLS1_TXT_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA,
-@@ -2527,6 +2583,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
-      112,
-      168,
-      },
-+#endif
- 
-     /* Cipher C01D */
-     {
--- 
-2.1.4
-
diff --git a/recipes-connectivity/openssl/openssl/debian_bpo8+1/README b/recipes-connectivity/openssl/openssl/debian_bpo8+1/README
deleted file mode 100644
index 0053096..0000000
--- a/recipes-connectivity/openssl/openssl/debian_bpo8+1/README
+++ /dev/null
@@ -1,4 +0,0 @@
-This patch list is from jessie-backports:
-Package: openssl (1.0.2k-1~bpo8+1)
-Secure Sockets Layer toolkit - cryptographic utility
-https://packages.debian.org/jessie-backports/openssl
diff --git a/recipes-connectivity/openssl/openssl/debian_bpo8+1/block_digicert_malaysia.patch b/recipes-connectivity/openssl/openssl/debian_bpo8+1/block_digicert_malaysia.patch
deleted file mode 100644
index 877d534..0000000
--- a/recipes-connectivity/openssl/openssl/debian_bpo8+1/block_digicert_malaysia.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Raphael Geissert <geissert@debian.org>
-Description: make X509_verify_cert indicate that any certificate whose
- name contains "Digicert Sdn. Bhd." (from Malaysia) is revoked.
-Forwarded: not-needed
-Origin: vendor
-Last-Update: 2011-11-05
-
-Index: openssl-1.0.2~beta1/crypto/x509/x509_vfy.c
-===================================================================
---- openssl-1.0.2~beta1.orig/crypto/x509/x509_vfy.c	2014-02-25 00:16:12.488028844 +0100
-+++ openssl-1.0.2~beta1/crypto/x509/x509_vfy.c	2014-02-25 00:16:12.484028929 +0100
-@@ -964,10 +964,11 @@
- 	for (i = sk_X509_num(ctx->chain) - 1; i >= 0; i--)
- 		{
- 		x = sk_X509_value(ctx->chain, i);
--		/* Mark DigiNotar certificates as revoked, no matter
--		 * where in the chain they are.
-+		/* Mark certificates containing the following names as
-+		 * revoked, no matter where in the chain they are.
- 		 */
--		if (x->name && strstr(x->name, "DigiNotar"))
-+		if (x->name && (strstr(x->name, "DigiNotar") ||
-+			strstr(x->name, "Digicert Sdn. Bhd.")))
- 			{
- 			ctx->error = X509_V_ERR_CERT_REVOKED;
- 			ctx->error_depth = i;
diff --git a/recipes-connectivity/openssl/openssl/debian_bpo8+1/block_diginotar.patch b/recipes-connectivity/openssl/openssl/debian_bpo8+1/block_diginotar.patch
deleted file mode 100644
index 2cbbb10..0000000
--- a/recipes-connectivity/openssl/openssl/debian_bpo8+1/block_diginotar.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From: Raphael Geissert <geissert@debian.org>
-Description: make X509_verify_cert indicate that any certificate whose
- name contains "DigiNotar" is revoked.
-Forwarded: not-needed
-Origin: vendor
-Last-Update: 2011-09-08
-Bug: http://bugs.debian.org/639744
-Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
-Reviewed-by: Dr Stephen N Henson <shenson@drh-consultancy.co.uk>
-
-This is not meant as final patch.  
-
-Index: openssl-1.0.2g/crypto/x509/x509_vfy.c
-===================================================================
---- openssl-1.0.2g.orig/crypto/x509/x509_vfy.c
-+++ openssl-1.0.2g/crypto/x509/x509_vfy.c
-@@ -119,6 +119,7 @@ static int check_trust(X509_STORE_CTX *c
- static int check_revocation(X509_STORE_CTX *ctx);
- static int check_cert(X509_STORE_CTX *ctx);
- static int check_policy(X509_STORE_CTX *ctx);
-+static int check_ca_blacklist(X509_STORE_CTX *ctx);
- 
- static int get_crl_score(X509_STORE_CTX *ctx, X509 **pissuer,
-                          unsigned int *preasons, X509_CRL *crl, X509 *x);
-@@ -489,6 +490,9 @@ int X509_verify_cert(X509_STORE_CTX *ctx
-     if (!ok)
-         goto err;
- 
-+	ok = check_ca_blacklist(ctx);
-+	if(!ok) goto err;
-+
- #ifndef OPENSSL_NO_RFC3779
-     /* RFC 3779 path validation, now that CRL check has been done */
-     ok = v3_asid_validate_path(ctx);
-@@ -996,6 +1000,29 @@ static int check_crl_time(X509_STORE_CTX
-     return 1;
- }
- 
-+static int check_ca_blacklist(X509_STORE_CTX *ctx)
-+	{
-+	X509 *x;
-+	int i;
-+	/* Check all certificates against the blacklist */
-+	for (i = sk_X509_num(ctx->chain) - 1; i >= 0; i--)
-+		{
-+		x = sk_X509_value(ctx->chain, i);
-+		/* Mark DigiNotar certificates as revoked, no matter
-+		 * where in the chain they are.
-+		 */
-+		if (x->name && strstr(x->name, "DigiNotar"))
-+			{
-+			ctx->error = X509_V_ERR_CERT_REVOKED;
-+			ctx->error_depth = i;
-+			ctx->current_cert = x;
-+			if (!ctx->verify_cb(0,ctx))
-+				return 0;
-+			}
-+		}
-+	return 1;
-+	}
-+
- static int get_crl_sk(X509_STORE_CTX *ctx, X509_CRL **pcrl, X509_CRL **pdcrl,
-                       X509 **pissuer, int *pscore, unsigned int *preasons,
-                       STACK_OF(X509_CRL) *crls)
diff --git a/recipes-connectivity/openssl/openssl/debian_bpo8+1/c_rehash-compat.patch b/recipes-connectivity/openssl/openssl/debian_bpo8+1/c_rehash-compat.patch
deleted file mode 100644
index 102210a..0000000
--- a/recipes-connectivity/openssl/openssl/debian_bpo8+1/c_rehash-compat.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 83f318d68bbdab1ca898c94576a838cc97df4700 Mon Sep 17 00:00:00 2001
-From: Ludwig Nussel <ludwig.nussel@suse.de>
-Date: Wed, 21 Apr 2010 15:52:10 +0200
-Subject: [PATCH] also create old hash for compatibility
-
----
- tools/c_rehash.in |    8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
-
-Index: openssl-1.0.2b/tools/c_rehash.in
-===================================================================
---- openssl-1.0.2b.orig/tools/c_rehash.in
-+++ openssl-1.0.2b/tools/c_rehash.in
-@@ -8,8 +8,6 @@ my $prefix;
- 
- my $openssl = $ENV{OPENSSL} || "openssl";
- my $pwd;
--my $x509hash = "-subject_hash";
--my $crlhash = "-hash";
- my $verbose = 0;
- my $symlink_exists=eval {symlink("",""); 1};
- my $removelinks = 1;
-@@ -18,10 +16,7 @@ my $removelinks = 1;
- while ( $ARGV[0] =~ /^-/ ) {
-     my $flag = shift @ARGV;
-     last if ( $flag eq '--');
--    if ( $flag eq '-old') {
--	    $x509hash = "-subject_hash_old";
--	    $crlhash = "-hash_old";
--    } elsif ( $flag eq '-h') {
-+    if ( $flag eq '-h') {
- 	    help();
-     } elsif ( $flag eq '-n' ) {
- 	    $removelinks = 0;
-@@ -113,7 +108,9 @@ sub hash_dir {
- 			next;
- 		}
- 		link_hash_cert($fname) if($cert);
-+		link_hash_cert_old($fname) if($cert);
- 		link_hash_crl($fname) if($crl);
-+		link_hash_crl_old($fname) if($crl);
- 	}
- }
- 
-@@ -146,6 +143,7 @@ sub check_file {
- 
- sub link_hash_cert {
- 		my $fname = $_[0];
-+		my $x509hash = $_[1] || '-subject_hash';
- 		$fname =~ s/'/'\\''/g;
- 		my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`;
- 		chomp $hash;
-@@ -177,10 +175,20 @@ sub link_hash_cert {
- 		$hashlist{$hash} = $fprint;
- }
- 
-+sub link_hash_cert_old {
-+		link_hash_cert($_[0], '-subject_hash_old');
-+}
-+
-+sub link_hash_crl_old {
-+		link_hash_crl($_[0], '-hash_old');
-+}
-+
-+
- # Same as above except for a CRL. CRL links are of the form <hash>.r<n>
- 
- sub link_hash_crl {
- 		my $fname = $_[0];
-+		my $crlhash = $_[1] || "-hash";
- 		$fname =~ s/'/'\\''/g;
- 		my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fname'`;
- 		chomp $hash;
diff --git a/recipes-connectivity/openssl/openssl/debian_bpo8+1/config-hurd.patch b/recipes-connectivity/openssl/openssl/debian_bpo8+1/config-hurd.patch
deleted file mode 100644
index abe35f6..0000000
--- a/recipes-connectivity/openssl/openssl/debian_bpo8+1/config-hurd.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- config |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/config
-+++ b/config
-@@ -170,8 +170,8 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
- 	echo "${MACHINE}-whatever-linux1"; exit 0
- 	;;
- 
--    GNU*)
--	echo "hurd-x86"; exit 0;
-+    GNU:*|GNU/*:*)
-+	echo "${MACHINE}-gnuish"; exit 0;
- 	;;
- 
-     LynxOS:*)
diff --git a/recipes-connectivity/openssl/openssl/debian_bpo8+1/debian-targets.patch b/recipes-connectivity/openssl/openssl/debian_bpo8+1/debian-targets.patch
deleted file mode 100644
index d2f8420..0000000
--- a/recipes-connectivity/openssl/openssl/debian_bpo8+1/debian-targets.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Index: openssl-1.0.2g/Configure
-===================================================================
---- openssl-1.0.2g.orig/Configure
-+++ openssl-1.0.2g/Configure
-@@ -131,6 +131,10 @@ my $clang_devteam_warn = "-Wno-unused-pa
- # Warn that "make depend" should be run?
- my $warn_make_depend = 0;
- 
-+# There are no separate CFLAGS/CPPFLAGS/LDFLAGS, set everything in CFLAGS
-+my $debian_cflags = `dpkg-buildflags --get CFLAGS` . `dpkg-buildflags --get CPPFLAGS` . `dpkg-buildflags --get LDFLAGS` . "-Wa,--noexecstack -Wall";
-+$debian_cflags =~ s/\n/ /g;
-+
- my $strict_warnings = 0;
- 
- my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL";
-@@ -367,6 +371,56 @@ my %table=(
- "osf1-alpha-cc",  "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
- "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so",
- 
-+# Debian GNU/* (various architectures)
-+"debian-alpha","gcc:${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-alpha-ev4","gcc:${debian_cflags} -mcpu=ev4::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-alpha-ev5","gcc:${debian_cflags} -mcpu=ev5::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-arm64","gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-armel","gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-armhf","gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-amd64", "gcc:-m64 -DL_ENDIAN ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::",
-+"debian-avr32", "gcc:-DB_ENDIAN ${debian_cflags} -fomit-frame-pointer::-D_REENTRANT::-ldl:BN_LLONG_BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-kfreebsd-i386","gcc:-DL_ENDIAN ${debian_cflags} -march=i486::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-hppa","gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-hurd-i386","gcc:-DL_ENDIAN -O3 -Wa,--noexecstack -g -mtune=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-ia64","gcc:${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386","gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386-i486","gcc:-DL_ENDIAN ${debian_cflags} -march=i486::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386-i586","gcc:-DL_ENDIAN ${debian_cflags} -march=i586::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386-i686/cmov","gcc:-DL_ENDIAN ${debian_cflags} -march=i686::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-m68k","gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mips",   "gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mipsel",   "gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mipsn32",   "gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mipsn32el",   "gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mips64",   "gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mips64el",   "gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-i386",	"gcc:-DL_ENDIAN ${debian_cflags} -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-m68k",	"gcc:-DB_ENDIAN ${debian_cflags}::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-sparc",	"gcc:-DB_ENDIAN ${debian_cflags} -mv8::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-nios2", "gcc:-DB_ENDIAN ${debian_cflags}::(unknown)::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-alpha","gcc:${debian_cflags}::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-i386",  "gcc:-DL_ENDIAN ${debian_cflags} -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-mips","gcc:-DL_ENDIAN ${debian_cflags}::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-or1k", "gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-powerpc","gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-powerpcspe","gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-ppc64","gcc:-m64 -DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-ppc64el","gcc:-m64 -DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64le:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-s390","gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
-+"debian-s390x","gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh3",   "gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh4",   "gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh3eb",   "gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh4eb",   "gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-m32r","gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc","gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc-v8","gcc:-DB_ENDIAN ${debian_cflags} -mcpu=v8 -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc-v9","gcc:-DB_ENDIAN ${debian_cflags} -mcpu=v9 -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc64","gcc:-m64 -DB_ENDIAN ${debian_cflags} -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-x32","gcc:-mx32 -DL_ENDIAN ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::x32",
-+
- ####
- #### Variety of LINUX:-)
- ####
diff --git a/recipes-connectivity/openssl/openssl/debian_bpo8+1/disable_freelist.patch b/recipes-connectivity/openssl/openssl/debian_bpo8+1/disable_freelist.patch
deleted file mode 100644
index 354fed8..0000000
--- a/recipes-connectivity/openssl/openssl/debian_bpo8+1/disable_freelist.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Kurt Roeckx <kurt@roeckx.be>
-Subject: Disable the freelist
-
-We don't define OPENSSL_NO_BUF_FREELISTS globally sinc it changes structures and
-would break the ABI.  Instead we just do it in the .c files that try to do
-something with it.
-
-Index: openssl-1.0.2/ssl/s3_both.c
-===================================================================
---- openssl-1.0.2.orig/ssl/s3_both.c
-+++ openssl-1.0.2/ssl/s3_both.c
-@@ -573,6 +573,7 @@ int ssl_verify_alarm_type(long type)
-     return (al);
- }
- 
-+#define OPENSSL_NO_BUF_FREELISTS
- #ifndef OPENSSL_NO_BUF_FREELISTS
- /*-
-  * On some platforms, malloc() performance is bad enough that you can't just
-Index: openssl-1.0.2/ssl/ssl_lib.c
-===================================================================
---- openssl-1.0.2.orig/ssl/ssl_lib.c
-+++ openssl-1.0.2/ssl/ssl_lib.c
-@@ -162,6 +162,8 @@
- 
- const char *SSL_version_str = OPENSSL_VERSION_TEXT;
- 
-+#define OPENSSL_NO_BUF_FREELISTS
-+
- SSL3_ENC_METHOD ssl3_undef_enc_method = {
-     /*
-      * evil casts, but these functions are only called if there's a library
diff --git a/recipes-connectivity/openssl/openssl/debian_bpo8+1/engines-path.patch b/recipes-connectivity/openssl/openssl/debian_bpo8+1/engines-path.patch
deleted file mode 100644
index 9d5646f..0000000
--- a/recipes-connectivity/openssl/openssl/debian_bpo8+1/engines-path.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-Index: openssl-1.0.2i/Makefile.org
-===================================================================
---- openssl-1.0.2i.orig/Makefile.org
-+++ openssl-1.0.2i/Makefile.org
-@@ -368,7 +368,7 @@ libcrypto.pc: Makefile
- 	    echo 'exec_prefix=$${prefix}'; \
- 	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
- 	    echo 'includedir=$${prefix}/include'; \
--	    echo 'enginesdir=$${libdir}/engines'; \
-+	    echo 'enginesdir=$${libdir}/openssl-1.0.0/engines'; \
- 	    echo ''; \
- 	    echo 'Name: OpenSSL-libcrypto'; \
- 	    echo 'Description: OpenSSL cryptography library'; \
-@@ -536,7 +536,7 @@ install: all install_docs install_sw
- install_sw:
- 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
- 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
--		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
-+		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines \
- 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
- 		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
- 		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
-Index: openssl-1.0.2i/engines/Makefile
-===================================================================
---- openssl-1.0.2i.orig/engines/Makefile
-+++ openssl-1.0.2i/engines/Makefile
-@@ -107,13 +107,13 @@ install:
- 	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
- 	@if [ -n "$(SHARED_LIBS)" ]; then \
- 		set -e; \
--		$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines; \
-+		$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines; \
- 		for l in $(LIBNAMES); do \
- 			( echo installing $$l; \
- 			  pfx=lib; \
- 			  if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \
- 				sfx=".so"; \
--				cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
-+				cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$$pfx$$l$$sfx.new; \
- 			  else \
- 				case "$(CFLAGS)" in \
- 				*DSO_BEOS*)	sfx=".so";;	\
-@@ -122,10 +122,10 @@ install:
- 				*DSO_WIN32*)	sfx="eay32.dll"; pfx=;;	\
- 				*)		sfx=".bad";;	\
- 				esac; \
--				cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
-+				cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$$pfx$$l$$sfx.new; \
- 			  fi; \
--			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
--			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
-+			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$$pfx$$l$$sfx.new; \
-+			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$$pfx$$l$$sfx ); \
- 		done; \
- 	fi
- 	@target=install; $(RECURSIVE_MAKE)
-Index: openssl-1.0.2i/Configure
-===================================================================
---- openssl-1.0.2i.orig/Configure
-+++ openssl-1.0.2i/Configure
-@@ -1969,7 +1969,7 @@ while (<IN>)
- 		}
- 	elsif	(/^#define\s+ENGINESDIR/)
- 		{
--		my $foo = "$prefix/$libdir/engines";
-+		my $foo = "$prefix/$libdir/openssl-1.0.0/engines";
- 		$foo =~ s/\\/\\\\/g;
- 		print OUT "#define ENGINESDIR \"$foo\"\n";
- 		}
-Index: openssl-1.0.2i/engines/ccgost/Makefile
-===================================================================
---- openssl-1.0.2i.orig/engines/ccgost/Makefile
-+++ openssl-1.0.2i/engines/ccgost/Makefile
-@@ -47,7 +47,7 @@ install:
- 		pfx=lib; \
- 		if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \
- 			sfx=".so"; \
--			cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
-+			cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$${pfx}$(LIBNAME)$$sfx.new; \
- 		else \
- 			case "$(CFLAGS)" in \
- 			*DSO_BEOS*) sfx=".so";; \
-@@ -56,10 +56,10 @@ install:
- 			*DSO_WIN32*) sfx="eay32.dll"; pfx=;; \
- 			*) sfx=".bad";; \
- 			esac; \
--			cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
-+			cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$${pfx}$(LIBNAME)$$sfx.new; \
- 		fi; \
--		chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
--		mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \
-+		chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$${pfx}$(LIBNAME)$$sfx.new; \
-+		mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$${pfx}$(LIBNAME)$$sfx; \
- 	fi
- 
- links:
diff --git a/recipes-connectivity/openssl/openssl/debian_bpo8+1/man-dir.patch b/recipes-connectivity/openssl/openssl/debian_bpo8+1/man-dir.patch
deleted file mode 100644
index 157f087..0000000
--- a/recipes-connectivity/openssl/openssl/debian_bpo8+1/man-dir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
----
- Makefile.org |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/Makefile.org
-+++ b/Makefile.org
-@@ -157,7 +157,7 @@ TESTS = alltests
- 
- MAKEFILE= Makefile
- 
--MANDIR=$(OPENSSLDIR)/man
-+MANDIR=/usr/share/man
- MAN1=1
- MAN3=3
- MANSUFFIX=
diff --git a/recipes-connectivity/openssl/openssl/debian_bpo8+1/man-section.patch b/recipes-connectivity/openssl/openssl/debian_bpo8+1/man-section.patch
deleted file mode 100644
index d55de0c..0000000
--- a/recipes-connectivity/openssl/openssl/debian_bpo8+1/man-section.patch
+++ /dev/null
@@ -1,34 +0,0 @@
----
- Makefile.org |    7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
---- a/Makefile.org
-+++ b/Makefile.org
-@@ -160,7 +160,8 @@ MAKEFILE= Makefile
- MANDIR=/usr/share/man
- MAN1=1
- MAN3=3
--MANSUFFIX=
-+MANSUFFIX=ssl
-+MANSECTION=SSL
- HTMLSUFFIX=html
- HTMLDIR=$(OPENSSLDIR)/html
- SHELL=/bin/sh
-@@ -642,7 +643,7 @@ install: all install_docs install_sw
- 		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
- 		(cd `$(PERL) util/dirname.pl $$i`; \
- 		sh -c "$$pod2man \
--			--section=$$sec --center=OpenSSL \
-+			--section=$${sec}$(MANSECTION) --center=OpenSSL \
- 			--release=$(VERSION) `basename $$i`") \
- 			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
- 		$(PERL) util/extract-names.pl < $$i | \
-@@ -659,7 +660,7 @@ install: all install_docs install_sw
- 		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
- 		(cd `$(PERL) util/dirname.pl $$i`; \
- 		sh -c "$$pod2man \
--			--section=$$sec --center=OpenSSL \
-+			--section=$${sec}$(MANSECTION) --center=OpenSSL \
- 			--release=$(VERSION) `basename $$i`") \
- 			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
- 		$(PERL) util/extract-names.pl < $$i | \
diff --git a/recipes-connectivity/openssl/openssl/debian_bpo8+1/no-rpath.patch b/recipes-connectivity/openssl/openssl/debian_bpo8+1/no-rpath.patch
deleted file mode 100644
index b1c4b11..0000000
--- a/recipes-connectivity/openssl/openssl/debian_bpo8+1/no-rpath.patch
+++ /dev/null
@@ -1,15 +0,0 @@
----
- Makefile.shared |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/Makefile.shared
-+++ b/Makefile.shared
-@@ -153,7 +153,7 @@ DO_GNU_SO=$(CALC_VERSIONS); \
- 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
- 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
- 
--DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
-+DO_GNU_APP=LDFLAGS="$(CFLAGS)"
- 
- #This is rather special.  It's a special target with which one can link
- #applications without bothering with any features that have anything to
diff --git a/recipes-connectivity/openssl/openssl/debian_bpo8+1/no-symbolic.patch b/recipes-connectivity/openssl/openssl/debian_bpo8+1/no-symbolic.patch
deleted file mode 100644
index e9fc567..0000000
--- a/recipes-connectivity/openssl/openssl/debian_bpo8+1/no-symbolic.patch
+++ /dev/null
@@ -1,15 +0,0 @@
----
- Makefile.shared |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/Makefile.shared
-+++ b/Makefile.shared
-@@ -151,7 +151,7 @@ DO_GNU_SO=$(CALC_VERSIONS); \
- 	SHLIB_SUFFIX=; \
- 	ALLSYMSFLAGS='-Wl,--whole-archive'; \
- 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
--	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
-+	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
- 
- DO_GNU_APP=LDFLAGS="$(CFLAGS)"
- 
diff --git a/recipes-connectivity/openssl/openssl/debian_bpo8+1/padlock_conf.patch b/recipes-connectivity/openssl/openssl/debian_bpo8+1/padlock_conf.patch
deleted file mode 100644
index da343d0..0000000
--- a/recipes-connectivity/openssl/openssl/debian_bpo8+1/padlock_conf.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- openssl/apps/openssl.cnf.orig	2012-06-06 00:45:56.000000000 +0200
-+++ openssl/apps/openssl.cnf	2012-06-06 00:46:46.000000000 +0200
-@@ -19,6 +19,8 @@
- # (Alternatively, use a configuration file that has only
- # X.509v3 extensions in its main [= default] section.)
- 
-+openssl_conf = openssl_def
-+
- [ new_oids ]
- 
- # We can add new OIDs in here for use by 'ca', 'req' and 'ts'.
-@@ -348,3 +350,16 @@
- 				# (optional, default: no)
- ess_cert_id_chain	= no	# Must the ESS cert id chain be included?
- 				# (optional, default: no)
-+
-+[openssl_def]
-+engines = engine_section
-+
-+[engine_section]
-+padlock = padlock_section
-+
-+[padlock_section]
-+soft_load=1
-+init=1
-+default_algorithms = ALL
-+dynamic_path=padlock
-+
diff --git a/recipes-connectivity/openssl/openssl/debian_bpo8+1/pic.patch b/recipes-connectivity/openssl/openssl/debian_bpo8+1/pic.patch
deleted file mode 100644
index 7a800aa..0000000
--- a/recipes-connectivity/openssl/openssl/debian_bpo8+1/pic.patch
+++ /dev/null
@@ -1,174 +0,0 @@
----
- crypto/des/asm/desboth.pl |   17 ++++++++++++++---
- crypto/perlasm/cbc.pl     |   24 ++++++++++++++++++++----
- crypto/perlasm/x86gas.pl  |   16 ++++++++++++++++
- crypto/x86cpuid.pl        |   10 +++++-----
- 4 files changed, 55 insertions(+), 12 deletions(-)
-
---- a/crypto/des/asm/desboth.pl
-+++ b/crypto/des/asm/desboth.pl
-@@ -16,6 +16,11 @@ sub DES_encrypt3
- 
- 	&push("edi");
- 
-+	&call   (&label("pic_point0"));
-+	&set_label("pic_point0");
-+	&blindpop("ebp");
-+	&add    ("ebp", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
-+
- 	&comment("");
- 	&comment("Load the data words");
- 	&mov($L,&DWP(0,"ebx","",0));
-@@ -47,15 +52,21 @@ sub DES_encrypt3
- 	&mov(&swtmp(2),	(DWC(($enc)?"1":"0")));
- 	&mov(&swtmp(1),	"eax");
- 	&mov(&swtmp(0),	"ebx");
--	&call("DES_encrypt2");
-+	&exch("ebx", "ebp");
-+	&call("DES_encrypt2\@PLT");
-+	&exch("ebx", "ebp");
- 	&mov(&swtmp(2),	(DWC(($enc)?"0":"1")));
- 	&mov(&swtmp(1),	"edi");
- 	&mov(&swtmp(0),	"ebx");
--	&call("DES_encrypt2");
-+	&exch("ebx", "ebp");
-+	&call("DES_encrypt2\@PLT");
-+	&exch("ebx", "ebp");
- 	&mov(&swtmp(2),	(DWC(($enc)?"1":"0")));
- 	&mov(&swtmp(1),	"esi");
- 	&mov(&swtmp(0),	"ebx");
--	&call("DES_encrypt2");
-+	&exch("ebx", "ebp");
-+	&call("DES_encrypt2\@PLT");
-+	&exch("ebx", "ebp");
- 
- 	&stack_pop(3);
- 	&mov($L,&DWP(0,"ebx","",0));
---- a/crypto/perlasm/cbc.pl
-+++ b/crypto/perlasm/cbc.pl
-@@ -122,7 +122,11 @@ sub cbc
- 	&mov(&DWP($data_off,"esp","",0),	"eax");	# put in array for call
- 	&mov(&DWP($data_off+4,"esp","",0),	"ebx");	#
- 
--	&call($enc_func);
-+	&call	(&label("pic_point0"));
-+	&set_label("pic_point0");
-+	&blindpop("ebx");
-+	&add	("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
-+	&call("$enc_func\@PLT");
- 
- 	&mov("eax",	&DWP($data_off,"esp","",0));
- 	&mov("ebx",	&DWP($data_off+4,"esp","",0));
-@@ -185,7 +189,11 @@ sub cbc
- 	&mov(&DWP($data_off,"esp","",0),	"eax");	# put in array for call
- 	&mov(&DWP($data_off+4,"esp","",0),	"ebx");	#
- 
--	&call($enc_func);
-+	&call	(&label("pic_point1"));
-+	&set_label("pic_point1");
-+	&blindpop("ebx");
-+	&add	("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point1") . "]");
-+	&call("$enc_func\@PLT");
- 
- 	&mov("eax",	&DWP($data_off,"esp","",0));
- 	&mov("ebx",	&DWP($data_off+4,"esp","",0));
-@@ -218,7 +226,11 @@ sub cbc
- 	&mov(&DWP($data_off,"esp","",0),	"eax");	# put back
- 	&mov(&DWP($data_off+4,"esp","",0),	"ebx");	#
- 
--	&call($dec_func);
-+	&call	(&label("pic_point2"));
-+	&set_label("pic_point2");
-+	&blindpop("ebx");
-+	&add	("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point2") . "]");
-+	&call("$dec_func\@PLT");
- 
- 	&mov("eax",	&DWP($data_off,"esp","",0));	# get return
- 	&mov("ebx",	&DWP($data_off+4,"esp","",0));	#
-@@ -261,7 +273,11 @@ sub cbc
- 	&mov(&DWP($data_off,"esp","",0),	"eax");	# put back
- 	&mov(&DWP($data_off+4,"esp","",0),	"ebx");	#
- 
--	&call($dec_func);
-+	&call	(&label("pic_point3"));
-+	&set_label("pic_point3");
-+	&blindpop("ebx");
-+	&add	("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point3") . "]");
-+	&call("$dec_func\@PLT");
- 
- 	&mov("eax",	&DWP($data_off,"esp","",0));	# get return
- 	&mov("ebx",	&DWP($data_off+4,"esp","",0));	#
---- a/crypto/perlasm/x86gas.pl
-+++ b/crypto/perlasm/x86gas.pl
-@@ -161,6 +161,7 @@ sub ::file_end
- 	if ($::macosx)	{ push (@out,"$tmp,2\n"); }
- 	elsif ($::elf)	{ push (@out,"$tmp,4\n"); }
- 	else		{ push (@out,"$tmp\n"); }
-+	if ($::elf)	{ push (@out,".hidden\tOPENSSL_ia32cap_P\n"); }
-     }
-     push(@out,$initseg) if ($initseg);
- }
-@@ -218,8 +219,23 @@ sub ::initseg
-     elsif ($::elf)
-     {	$initseg.=<<___;
- .section	.init
-+___
-+        if ($::pic)
-+	{   $initseg.=<<___;
-+	pushl	%ebx
-+	call	.pic_point0
-+.pic_point0:
-+	popl	%ebx
-+	addl	\$_GLOBAL_OFFSET_TABLE_+[.-.pic_point0],%ebx
-+	call	$f\@PLT
-+	popl	%ebx
-+___
-+	}
-+	else
-+	{   $initseg.=<<___;
- 	call	$f
- ___
-+	}
-     }
-     elsif ($::coff)
-     {   $initseg.=<<___;	# applies to both Cygwin and Mingw
---- a/crypto/x86cpuid.pl
-+++ b/crypto/x86cpuid.pl
-@@ -8,6 +8,8 @@ require "x86asm.pl";
- 
- for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
- 
-+push(@out, ".hidden OPENSSL_ia32cap_P\n");
-+
- &function_begin("OPENSSL_ia32_cpuid");
- 	&xor	("edx","edx");
- 	&pushf	();
-@@ -141,9 +143,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA3
- &set_label("nocpuid");
- &function_end("OPENSSL_ia32_cpuid");
- 
--&external_label("OPENSSL_ia32cap_P");
--
--&function_begin_B("OPENSSL_rdtsc","EXTRN\t_OPENSSL_ia32cap_P:DWORD");
-+&function_begin_B("OPENSSL_rdtsc");
- 	&xor	("eax","eax");
- 	&xor	("edx","edx");
- 	&picmeup("ecx","OPENSSL_ia32cap_P");
-@@ -157,7 +157,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA3
- # This works in Ring 0 only [read DJGPP+MS-DOS+privileged DPMI host],
- # but it's safe to call it on any [supported] 32-bit platform...
- # Just check for [non-]zero return value...
--&function_begin_B("OPENSSL_instrument_halt","EXTRN\t_OPENSSL_ia32cap_P:DWORD");
-+&function_begin_B("OPENSSL_instrument_halt");
- 	&picmeup("ecx","OPENSSL_ia32cap_P");
- 	&bt	(&DWP(0,"ecx"),4);
- 	&jnc	(&label("nohalt"));	# no TSC
-@@ -224,7 +224,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA3
- 	&ret	();
- &function_end_B("OPENSSL_far_spin");
- 
--&function_begin_B("OPENSSL_wipe_cpu","EXTRN\t_OPENSSL_ia32cap_P:DWORD");
-+&function_begin_B("OPENSSL_wipe_cpu");
- 	&xor	("eax","eax");
- 	&xor	("edx","edx");
- 	&picmeup("ecx","OPENSSL_ia32cap_P");
diff --git a/recipes-connectivity/openssl/openssl/debian_bpo8+1/series b/recipes-connectivity/openssl/openssl/debian_bpo8+1/series
deleted file mode 100644
index efe0c2d..0000000
--- a/recipes-connectivity/openssl/openssl/debian_bpo8+1/series
+++ /dev/null
@@ -1,18 +0,0 @@
-config-hurd.patch
-debian-targets.patch
-engines-path.patch
-man-dir.patch
-man-section.patch
-no-rpath.patch
-no-symbolic.patch
-pic.patch
-valgrind.patch
-shared-lib-ext.patch
-stddef.patch
-version-script.patch
-c_rehash-compat.patch
-block_diginotar.patch
-block_digicert_malaysia.patch
-#padlock_conf.patch
-disable_freelist.patch
-Mark-3DES-and-RC4-ciphers-as-weak.patch
diff --git a/recipes-connectivity/openssl/openssl/debian_bpo8+1/shared-lib-ext.patch b/recipes-connectivity/openssl/openssl/debian_bpo8+1/shared-lib-ext.patch
deleted file mode 100644
index 96edd07..0000000
--- a/recipes-connectivity/openssl/openssl/debian_bpo8+1/shared-lib-ext.patch
+++ /dev/null
@@ -1,16 +0,0 @@
----
- Configure |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/Configure
-+++ b/Configure
-@@ -1733,7 +1733,8 @@ while (<IN>)
- 	elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
- 		{
- 		my $sotmp = $1;
--		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
-+#		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
-+		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/;
- 		}
- 	elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
- 		{
diff --git a/recipes-connectivity/openssl/openssl/debian_bpo8+1/sources.list b/recipes-connectivity/openssl/openssl/debian_bpo8+1/sources.list
deleted file mode 100644
index c9d480d..0000000
--- a/recipes-connectivity/openssl/openssl/debian_bpo8+1/sources.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ftp.us.debian.org/debian/ jessie-backports main restricted universe multiverse
-deb-src http://ftp.us.debian.org/debian/ jessie-backports main restricted universe multiverse
diff --git a/recipes-connectivity/openssl/openssl/debian_bpo8+1/stddef.patch b/recipes-connectivity/openssl/openssl/debian_bpo8+1/stddef.patch
deleted file mode 100644
index b70c614..0000000
--- a/recipes-connectivity/openssl/openssl/debian_bpo8+1/stddef.patch
+++ /dev/null
@@ -1,16 +0,0 @@
----
- crypto/sha/sha.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/crypto/sha/sha.h
-+++ b/crypto/sha/sha.h
-@@ -59,8 +59,8 @@
- #ifndef HEADER_SHA_H
- # define HEADER_SHA_H
- 
--# include <openssl/e_os2.h>
- # include <stddef.h>
-+# include <openssl/e_os2.h>
- 
- #ifdef  __cplusplus
- extern "C" {
diff --git a/recipes-connectivity/openssl/openssl/debian_bpo8+1/valgrind.patch b/recipes-connectivity/openssl/openssl/debian_bpo8+1/valgrind.patch
deleted file mode 100644
index 2b7ec8c..0000000
--- a/recipes-connectivity/openssl/openssl/debian_bpo8+1/valgrind.patch
+++ /dev/null
@@ -1,22 +0,0 @@
----
- crypto/rand/md_rand.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/crypto/rand/md_rand.c
-+++ b/crypto/rand/md_rand.c
-@@ -480,6 +480,7 @@ int ssleay_rand_bytes(unsigned char *buf
-         MD_Update(&m, (unsigned char *)&(md_c[0]), sizeof(md_c));
- 
- #ifndef PURIFY                  /* purify complains */
-+#if 0
-         /*
-          * The following line uses the supplied buffer as a small source of
-          * entropy: since this buffer is often uninitialised it may cause
-@@ -489,6 +490,7 @@ int ssleay_rand_bytes(unsigned char *buf
-          */
-         MD_Update(&m, buf, j);
- #endif
-+#endif
- 
-         k = (st_idx + MD_DIGEST_LENGTH / 2) - st_num;
-         if (k > 0) {
diff --git a/recipes-connectivity/openssl/openssl/debian_bpo8+1/version-script.patch b/recipes-connectivity/openssl/openssl/debian_bpo8+1/version-script.patch
deleted file mode 100644
index 71759a9..0000000
--- a/recipes-connectivity/openssl/openssl/debian_bpo8+1/version-script.patch
+++ /dev/null
@@ -1,4667 +0,0 @@
----
- Configure                 |    2 
- engines/ccgost/openssl.ld |   10 
- engines/openssl.ld        |   10 
- openssl.ld                | 4620 ++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 4642 insertions(+)
-
---- a/Configure
-+++ b/Configure
-@@ -1730,6 +1730,8 @@ if ($strict_warnings)
- 		}
- 	}
- 
-+$shared_ldflag .= " -Wl,--version-script=openssl.ld";
-+
- open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";
- unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new";
- open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n";
---- /dev/null
-+++ b/engines/ccgost/openssl.ld
-@@ -0,0 +1,10 @@
-+OPENSSL_1.0.0 {
-+	global:
-+		bind_engine;
-+		v_check;
-+		OPENSSL_init;
-+		OPENSSL_finish;
-+	local:
-+		*;
-+};
-+
---- /dev/null
-+++ b/engines/openssl.ld
-@@ -0,0 +1,10 @@
-+OPENSSL_1.0.0 {
-+	global:
-+		bind_engine;
-+		v_check;
-+		OPENSSL_init;
-+		OPENSSL_finish;
-+	local:
-+		*;
-+};
-+
---- /dev/null
-+++ b/openssl.ld
-@@ -0,0 +1,4620 @@
-+OPENSSL_1.0.0 {
-+	global:
-+		BIO_f_ssl;
-+		BIO_new_buffer_ssl_connect;
-+		BIO_new_ssl;
-+		BIO_new_ssl_connect;
-+		BIO_proxy_ssl_copy_session_id;
-+		BIO_ssl_copy_session_id;
-+		BIO_ssl_shutdown;
-+		d2i_SSL_SESSION;
-+		DTLSv1_client_method;
-+		DTLSv1_method;
-+		DTLSv1_server_method;
-+		ERR_load_SSL_strings;
-+		i2d_SSL_SESSION;
-+		kssl_build_principal_2;
-+		kssl_cget_tkt;
-+		kssl_check_authent;
-+		kssl_ctx_free;
-+		kssl_ctx_new;
-+		kssl_ctx_setkey;
-+		kssl_ctx_setprinc;
-+		kssl_ctx_setstring;
-+		kssl_ctx_show;
-+		kssl_err_set;
-+		kssl_krb5_free_data_contents;
-+		kssl_sget_tkt;
-+		kssl_skip_confound;
-+		kssl_validate_times;
-+		PEM_read_bio_SSL_SESSION;
-+		PEM_read_SSL_SESSION;
-+		PEM_write_bio_SSL_SESSION;
-+		PEM_write_SSL_SESSION;
-+		SSL_accept;
-+		SSL_add_client_CA;
-+		SSL_add_dir_cert_subjects_to_stack;
-+		SSL_add_dir_cert_subjs_to_stk;
-+		SSL_add_file_cert_subjects_to_stack;
-+		SSL_add_file_cert_subjs_to_stk;
-+		SSL_alert_desc_string;
-+		SSL_alert_desc_string_long;
-+		SSL_alert_type_string;
-+		SSL_alert_type_string_long;
-+		SSL_callback_ctrl;
-+		SSL_check_private_key;
-+		SSL_CIPHER_description;
-+		SSL_CIPHER_get_bits;
-+		SSL_CIPHER_get_name;
-+		SSL_CIPHER_get_version;
-+		SSL_clear;
-+		SSL_COMP_add_compression_method;
-+		SSL_COMP_get_compression_methods;
-+		SSL_COMP_get_compress_methods;
-+		SSL_COMP_get_name;
-+		SSL_connect;
-+		SSL_copy_session_id;
-+		SSL_ctrl;
-+		SSL_CTX_add_client_CA;
-+		SSL_CTX_add_session;
-+		SSL_CTX_callback_ctrl;
-+		SSL_CTX_check_private_key;
-+		SSL_CTX_ctrl;
-+		SSL_CTX_flush_sessions;
-+		SSL_CTX_free;
-+		SSL_CTX_get_cert_store;
-+		SSL_CTX_get_client_CA_list;
-+		SSL_CTX_get_client_cert_cb;
-+		SSL_CTX_get_ex_data;
-+		SSL_CTX_get_ex_new_index;
-+		SSL_CTX_get_info_callback;
-+		SSL_CTX_get_quiet_shutdown;
-+		SSL_CTX_get_timeout;
-+		SSL_CTX_get_verify_callback;
-+		SSL_CTX_get_verify_depth;
-+		SSL_CTX_get_verify_mode;
-+		SSL_CTX_load_verify_locations;
-+		SSL_CTX_new;
-+		SSL_CTX_remove_session;
-+		SSL_CTX_sess_get_get_cb;
-+		SSL_CTX_sess_get_new_cb;
-+		SSL_CTX_sess_get_remove_cb;
-+		SSL_CTX_sessions;
-+		SSL_CTX_sess_set_get_cb;
-+		SSL_CTX_sess_set_new_cb;
-+		SSL_CTX_sess_set_remove_cb;
-+		SSL_CTX_set1_param;
-+		SSL_CTX_set_cert_store;
-+		SSL_CTX_set_cert_verify_callback;
-+		SSL_CTX_set_cert_verify_cb;
-+		SSL_CTX_set_cipher_list;
-+		SSL_CTX_set_client_CA_list;
-+		SSL_CTX_set_client_cert_cb;
-+		SSL_CTX_set_client_cert_engine;
-+		SSL_CTX_set_cookie_generate_cb;
-+		SSL_CTX_set_cookie_verify_cb;
-+		SSL_CTX_set_default_passwd_cb;
-+		SSL_CTX_set_default_passwd_cb_userdata;
-+		SSL_CTX_set_default_verify_paths;
-+		SSL_CTX_set_def_passwd_cb_ud;
-+		SSL_CTX_set_def_verify_paths;
-+		SSL_CTX_set_ex_data;
-+		SSL_CTX_set_generate_session_id;
-+		SSL_CTX_set_info_callback;
-+		SSL_CTX_set_msg_callback;
-+		SSL_CTX_set_psk_client_callback;
-+		SSL_CTX_set_psk_server_callback;
-+		SSL_CTX_set_purpose;
-+		SSL_CTX_set_quiet_shutdown;
-+		SSL_CTX_set_session_id_context;
-+		SSL_CTX_set_ssl_version;
-+		SSL_CTX_set_timeout;
-+		SSL_CTX_set_tmp_dh_callback;
-+		SSL_CTX_set_tmp_ecdh_callback;
-+		SSL_CTX_set_tmp_rsa_callback;
-+		SSL_CTX_set_trust;
-+		SSL_CTX_set_verify;
-+		SSL_CTX_set_verify_depth;
-+		SSL_CTX_use_cert_chain_file;
-+		SSL_CTX_use_certificate;
-+		SSL_CTX_use_certificate_ASN1;
-+		SSL_CTX_use_certificate_chain_file;
-+		SSL_CTX_use_certificate_file;
-+		SSL_CTX_use_PrivateKey;
-+		SSL_CTX_use_PrivateKey_ASN1;
-+		SSL_CTX_use_PrivateKey_file;
-+		SSL_CTX_use_psk_identity_hint;
-+		SSL_CTX_use_RSAPrivateKey;
-+		SSL_CTX_use_RSAPrivateKey_ASN1;
-+		SSL_CTX_use_RSAPrivateKey_file;
-+		SSL_do_handshake;
-+		SSL_dup;
-+		SSL_dup_CA_list;
-+		SSLeay_add_ssl_algorithms;
-+		SSL_free;
-+		SSL_get1_session;
-+		SSL_get_certificate;
-+		SSL_get_cipher_list;
-+		SSL_get_ciphers;
-+		SSL_get_client_CA_list;
-+		SSL_get_current_cipher;
-+		SSL_get_current_compression;
-+		SSL_get_current_expansion;
-+		SSL_get_default_timeout;
-+		SSL_get_error;
-+		SSL_get_ex_data;
-+		SSL_get_ex_data_X509_STORE_CTX_idx;
-+		SSL_get_ex_d_X509_STORE_CTX_idx;
-+		SSL_get_ex_new_index;
-+		SSL_get_fd;
-+		SSL_get_finished;
-+		SSL_get_info_callback;
-+		SSL_get_peer_cert_chain;
-+		SSL_get_peer_certificate;
-+		SSL_get_peer_finished;
-+		SSL_get_privatekey;
-+		SSL_get_psk_identity;
-+		SSL_get_psk_identity_hint;
-+		SSL_get_quiet_shutdown;
-+		SSL_get_rbio;
-+		SSL_get_read_ahead;
-+		SSL_get_rfd;
-+		SSL_get_servername;
-+		SSL_get_servername_type;
-+		SSL_get_session;
-+		SSL_get_shared_ciphers;
-+		SSL_get_shutdown;
-+		SSL_get_SSL_CTX;
-+		SSL_get_ssl_method;
-+		SSL_get_verify_callback;
-+		SSL_get_verify_depth;
-+		SSL_get_verify_mode;
-+		SSL_get_verify_result;
-+		SSL_get_version;
-+		SSL_get_wbio;
-+		SSL_get_wfd;
-+		SSL_has_matching_session_id;
-+		SSL_library_init;
-+		SSL_load_client_CA_file;
-+		SSL_load_error_strings;
-+		SSL_new;
-+		SSL_peek;
-+		SSL_pending;
-+		SSL_read;
-+		SSL_renegotiate;
-+		SSL_renegotiate_pending;
-+		SSL_rstate_string;
-+		SSL_rstate_string_long;
-+		SSL_SESSION_cmp;
-+		SSL_SESSION_free;
-+		SSL_SESSION_get_ex_data;
-+		SSL_SESSION_get_ex_new_index;
-+		SSL_SESSION_get_id;
-+		SSL_SESSION_get_time;
-+		SSL_SESSION_get_timeout;
-+		SSL_SESSION_hash;
-+		SSL_SESSION_new;
-+		SSL_SESSION_print;
-+		SSL_SESSION_print_fp;
-+		SSL_SESSION_set_ex_data;
-+		SSL_SESSION_set_time;
-+		SSL_SESSION_set_timeout;
-+		SSL_set1_param;
-+		SSL_set_accept_state;
-+		SSL_set_bio;
-+		SSL_set_cipher_list;
-+		SSL_set_client_CA_list;
-+		SSL_set_connect_state;
-+		SSL_set_ex_data;
-+		SSL_set_fd;
-+		SSL_set_generate_session_id;
-+		SSL_set_info_callback;
-+		SSL_set_msg_callback;
-+		SSL_set_psk_client_callback;
-+		SSL_set_psk_server_callback;
-+		SSL_set_purpose;
-+		SSL_set_quiet_shutdown;
-+		SSL_set_read_ahead;
-+		SSL_set_rfd;
-+		SSL_set_session;
-+		SSL_set_session_id_context;
-+		SSL_set_session_secret_cb;
-+		SSL_set_session_ticket_ext;
-+		SSL_set_session_ticket_ext_cb;
-+		SSL_set_shutdown;
-+		SSL_set_SSL_CTX;
-+		SSL_set_ssl_method;
-+		SSL_set_tmp_dh_callback;
-+		SSL_set_tmp_ecdh_callback;
-+		SSL_set_tmp_rsa_callback;
-+		SSL_set_trust;
-+		SSL_set_verify;
-+		SSL_set_verify_depth;
-+		SSL_set_verify_result;
-+		SSL_set_wfd;
-+		SSL_shutdown;
-+		SSL_state;
-+		SSL_state_string;
-+		SSL_state_string_long;
-+		SSL_use_certificate;
-+		SSL_use_certificate_ASN1;
-+		SSL_use_certificate_file;
-+		SSL_use_PrivateKey;
-+		SSL_use_PrivateKey_ASN1;
-+		SSL_use_PrivateKey_file;
-+		SSL_use_psk_identity_hint;
-+		SSL_use_RSAPrivateKey;
-+		SSL_use_RSAPrivateKey_ASN1;
-+		SSL_use_RSAPrivateKey_file;
-+		SSLv23_client_method;
-+		SSLv23_method;
-+		SSLv23_server_method;
-+		SSLv2_client_method;
-+		SSLv2_method;
-+		SSLv2_server_method;
-+		SSLv3_client_method;
-+		SSLv3_method;
-+		SSLv3_server_method;
-+		SSL_version;
-+		SSL_want;
-+		SSL_write;
-+		TLSv1_client_method;
-+		TLSv1_method;
-+		TLSv1_server_method;
-+
-+
-+		SSLeay;
-+		SSLeay_version;
-+		ASN1_BIT_STRING_asn1_meth;
-+		ASN1_HEADER_free;
-+		ASN1_HEADER_new;
-+		ASN1_IA5STRING_asn1_meth;
-+		ASN1_INTEGER_get;
-+		ASN1_INTEGER_set;
-+		ASN1_INTEGER_to_BN;
-+		ASN1_OBJECT_create;
-+		ASN1_OBJECT_free;
-+		ASN1_OBJECT_new;
-+		ASN1_PRINTABLE_type;
-+		ASN1_STRING_cmp;
-+		ASN1_STRING_dup;
-+		ASN1_STRING_free;
-+		ASN1_STRING_new;
-+		ASN1_STRING_print;
-+		ASN1_STRING_set;
-+		ASN1_STRING_type_new;
-+		ASN1_TYPE_free;
-+		ASN1_TYPE_new;
-+		ASN1_UNIVERSALSTRING_to_string;
-+		ASN1_UTCTIME_check;
-+		ASN1_UTCTIME_print;
-+		ASN1_UTCTIME_set;
-+		ASN1_check_infinite_end;
-+		ASN1_d2i_bio;
-+		ASN1_d2i_fp;
-+		ASN1_digest;
-+		ASN1_dup;
-+		ASN1_get_object;
-+		ASN1_i2d_bio;
-+		ASN1_i2d_fp;
-+		ASN1_object_size;
-+		ASN1_parse;
-+		ASN1_put_object;
-+		ASN1_sign;
-+		ASN1_verify;
-+		BF_cbc_encrypt;
-+		BF_cfb64_encrypt;
-+		BF_ecb_encrypt;
-+		BF_encrypt;
-+		BF_ofb64_encrypt;
-+		BF_options;
-+		BF_set_key;
-+		BIO_CONNECT_free;
-+		BIO_CONNECT_new;
-+		BIO_accept;
-+		BIO_ctrl;
-+		BIO_int_ctrl;
-+		BIO_debug_callback;
-+		BIO_dump;
-+		BIO_dup_chain;
-+		BIO_f_base64;
-+		BIO_f_buffer;
-+		BIO_f_cipher;
-+		BIO_f_md;
-+		BIO_f_null;
-+		BIO_f_proxy_server;
-+		BIO_fd_non_fatal_error;
-+		BIO_fd_should_retry;
-+		BIO_find_type;
-+		BIO_free;
-+		BIO_free_all;
-+		BIO_get_accept_socket;
-+		BIO_get_filter_bio;
-+		BIO_get_host_ip;
-+		BIO_get_port;
-+		BIO_get_retry_BIO;
-+		BIO_get_retry_reason;
-+		BIO_gethostbyname;
-+		BIO_gets;
-+		BIO_new;
-+		BIO_new_accept;
-+		BIO_new_connect;
-+		BIO_new_fd;
-+		BIO_new_file;
-+		BIO_new_fp;
-+		BIO_new_socket;
-+		BIO_pop;
-+		BIO_printf;
-+		BIO_push;
-+		BIO_puts;
-+		BIO_read;
-+		BIO_s_accept;
-+		BIO_s_connect;
-+		BIO_s_fd;
-+		BIO_s_file;
-+		BIO_s_mem;
-+		BIO_s_null;
-+		BIO_s_proxy_client;
-+		BIO_s_socket;
-+		BIO_set;
-+		BIO_set_cipher;
-+		BIO_set_tcp_ndelay;
-+		BIO_sock_cleanup;
-+		BIO_sock_error;
-+		BIO_sock_init;
-+		BIO_sock_non_fatal_error;
-+		BIO_sock_should_retry;
-+		BIO_socket_ioctl;
-+		BIO_write;
-+		BN_CTX_free;
-+		BN_CTX_new;
-+		BN_MONT_CTX_free;
-+		BN_MONT_CTX_new;
-+		BN_MONT_CTX_set;
-+		BN_add;
-+		BN_add_word;
-+		BN_hex2bn;
-+		BN_bin2bn;
-+		BN_bn2hex;
-+		BN_bn2bin;
-+		BN_clear;
-+		BN_clear_bit;
-+		BN_clear_free;
-+		BN_cmp;
-+		BN_copy;
-+		BN_div;
-+		BN_div_word;
-+		BN_dup;
-+		BN_free;
-+		BN_from_montgomery;
-+		BN_gcd;
-+		BN_generate_prime;
-+		BN_get_word;
-+		BN_is_bit_set;
-+		BN_is_prime;
-+		BN_lshift;
-+		BN_lshift1;
-+		BN_mask_bits;
-+		BN_mod;
-+		BN_mod_exp;
-+		BN_mod_exp_mont;
-+		BN_mod_exp_simple;
-+		BN_mod_inverse;
-+		BN_mod_mul;
-+		BN_mod_mul_montgomery;
-+		BN_mod_word;
-+		BN_mul;
-+		BN_new;
-+		BN_num_bits;
-+		BN_num_bits_word;
-+		BN_options;
-+		BN_print;
-+		BN_print_fp;
-+		BN_rand;
-+		BN_reciprocal;
-+		BN_rshift;
-+		BN_rshift1;
-+		BN_set_bit;
-+		BN_set_word;
-+		BN_sqr;
-+		BN_sub;
-+		BN_to_ASN1_INTEGER;
-+		BN_ucmp;
-+		BN_value_one;
-+		BUF_MEM_free;
-+		BUF_MEM_grow;
-+		BUF_MEM_new;
-+		BUF_strdup;
-+		CONF_free;
-+		CONF_get_number;
-+		CONF_get_section;
-+		CONF_get_string;
-+		CONF_load;
-+		CRYPTO_add_lock;
-+		CRYPTO_dbg_free;
-+		CRYPTO_dbg_malloc;
-+		CRYPTO_dbg_realloc;
-+		CRYPTO_dbg_remalloc;
-+		CRYPTO_free;
-+		CRYPTO_get_add_lock_callback;
-+		CRYPTO_get_id_callback;
-+		CRYPTO_get_lock_name;
-+		CRYPTO_get_locking_callback;
-+		CRYPTO_get_mem_functions;
-+		CRYPTO_lock;
-+		CRYPTO_malloc;
-+		CRYPTO_mem_ctrl;
-+		CRYPTO_mem_leaks;
-+		CRYPTO_mem_leaks_cb;
-+		CRYPTO_mem_leaks_fp;
-+		CRYPTO_realloc;
-+		CRYPTO_remalloc;
-+		CRYPTO_set_add_lock_callback;
-+		CRYPTO_set_id_callback;
-+		CRYPTO_set_locking_callback;
-+		CRYPTO_set_mem_functions;
-+		CRYPTO_thread_id;
-+		DH_check;
-+		DH_compute_key;
-+		DH_free;
-+		DH_generate_key;
-+		DH_generate_parameters;
-+		DH_new;
-+		DH_size;
-+		DHparams_print;
-+		DHparams_print_fp;
-+		DSA_free;
-+		DSA_generate_key;
-+		DSA_generate_parameters;
-+		DSA_is_prime;
-+		DSA_new;
-+		DSA_print;
-+		DSA_print_fp;
-+		DSA_sign;
-+		DSA_sign_setup;
-+		DSA_size;
-+		DSA_verify;
-+		DSAparams_print;
-+		DSAparams_print_fp;
-+		ERR_clear_error;
-+		ERR_error_string;
-+		ERR_free_strings;
-+		ERR_func_error_string;
-+		ERR_get_err_state_table;
-+		ERR_get_error;
-+		ERR_get_error_line;
-+		ERR_get_state;
-+		ERR_get_string_table;
-+		ERR_lib_error_string;
-+		ERR_load_ASN1_strings;
-+		ERR_load_BIO_strings;
-+		ERR_load_BN_strings;
-+		ERR_load_BUF_strings;
-+		ERR_load_CONF_strings;
-+		ERR_load_DH_strings;
-+		ERR_load_DSA_strings;
-+		ERR_load_ERR_strings;
-+		ERR_load_EVP_strings;
-+		ERR_load_OBJ_strings;
-+		ERR_load_PEM_strings;
-+		ERR_load_PROXY_strings;
-+		ERR_load_RSA_strings;
-+		ERR_load_X509_strings;
-+		ERR_load_crypto_strings;
-+		ERR_load_strings;
-+		ERR_peek_error;
-+		ERR_peek_error_line;
-+		ERR_print_errors;
-+		ERR_print_errors_fp;
-+		ERR_put_error;
-+		ERR_reason_error_string;
-+		ERR_remove_state;
-+		EVP_BytesToKey;
-+		EVP_CIPHER_CTX_cleanup;
-+		EVP_CipherFinal;
-+		EVP_CipherInit;
-+		EVP_CipherUpdate;
-+		EVP_DecodeBlock;
-+		EVP_DecodeFinal;
-+		EVP_DecodeInit;
-+		EVP_DecodeUpdate;
-+		EVP_DecryptFinal;
-+		EVP_DecryptInit;
-+		EVP_DecryptUpdate;
-+		EVP_DigestFinal;
-+		EVP_DigestInit;
-+		EVP_DigestUpdate;
-+		EVP_EncodeBlock;
-+		EVP_EncodeFinal;
-+		EVP_EncodeInit;
-+		EVP_EncodeUpdate;
-+		EVP_EncryptFinal;
-+		EVP_EncryptInit;
-+		EVP_EncryptUpdate;
-+		EVP_OpenFinal;
-+		EVP_OpenInit;
-+		EVP_PKEY_assign;
-+		EVP_PKEY_copy_parameters;
-+		EVP_PKEY_free;
-+		EVP_PKEY_missing_parameters;
-+		EVP_PKEY_new;
-+		EVP_PKEY_save_parameters;
-+		EVP_PKEY_size;
-+		EVP_PKEY_type;
-+		EVP_SealFinal;
-+		EVP_SealInit;
-+		EVP_SignFinal;
-+		EVP_VerifyFinal;
-+		EVP_add_alias;
-+		EVP_add_cipher;
-+		EVP_add_digest;
-+		EVP_bf_cbc;
-+		EVP_bf_cfb64;
-+		EVP_bf_ecb;
-+		EVP_bf_ofb;
-+		EVP_cleanup;
-+		EVP_des_cbc;
-+		EVP_des_cfb64;
-+		EVP_des_ecb;
-+		EVP_des_ede;
-+		EVP_des_ede3;
-+		EVP_des_ede3_cbc;
-+		EVP_des_ede3_cfb64;
-+		EVP_des_ede3_ofb;
-+		EVP_des_ede_cbc;
-+		EVP_des_ede_cfb64;
-+		EVP_des_ede_ofb;
-+		EVP_des_ofb;
-+		EVP_desx_cbc;
-+		EVP_dss;
-+		EVP_dss1;
-+		EVP_enc_null;
-+		EVP_get_cipherbyname;
-+		EVP_get_digestbyname;
-+		EVP_get_pw_prompt;
-+		EVP_idea_cbc;
-+		EVP_idea_cfb64;
-+		EVP_idea_ecb;
-+		EVP_idea_ofb;
-+		EVP_md2;
-+		EVP_md5;
-+		EVP_md_null;
-+		EVP_rc2_cbc;
-+		EVP_rc2_cfb64;
-+		EVP_rc2_ecb;
-+		EVP_rc2_ofb;
-+		EVP_rc4;
-+		EVP_read_pw_string;
-+		EVP_set_pw_prompt;
-+		EVP_sha;
-+		EVP_sha1;
-+		MD2;
-+		MD2_Final;
-+		MD2_Init;
-+		MD2_Update;
-+		MD2_options;
-+		MD5;
-+		MD5_Final;
-+		MD5_Init;
-+		MD5_Update;
-+		MDC2;
-+		MDC2_Final;
-+		MDC2_Init;
-+		MDC2_Update;
-+		NETSCAPE_SPKAC_free;
-+		NETSCAPE_SPKAC_new;
-+		NETSCAPE_SPKI_free;
-+		NETSCAPE_SPKI_new;
-+		NETSCAPE_SPKI_sign;
-+		NETSCAPE_SPKI_verify;
-+		OBJ_add_object;
-+		OBJ_bsearch;
-+		OBJ_cleanup;
-+		OBJ_cmp;
-+		OBJ_create;
-+		OBJ_dup;
-+		OBJ_ln2nid;
-+		OBJ_new_nid;
-+		OBJ_nid2ln;
-+		OBJ_nid2obj;
-+		OBJ_nid2sn;
-+		OBJ_obj2nid;
-+		OBJ_sn2nid;
-+		OBJ_txt2nid;
-+		PEM_ASN1_read;
-+		PEM_ASN1_read_bio;
-+		PEM_ASN1_write;
-+		PEM_ASN1_write_bio;
-+		PEM_SealFinal;
-+		PEM_SealInit;
-+		PEM_SealUpdate;
-+		PEM_SignFinal;
-+		PEM_SignInit;
-+		PEM_SignUpdate;
-+		PEM_X509_INFO_read;
-+		PEM_X509_INFO_read_bio;
-+		PEM_X509_INFO_write_bio;
-+		PEM_dek_info;
-+		PEM_do_header;
-+		PEM_get_EVP_CIPHER_INFO;
-+		PEM_proc_type;
-+		PEM_read;
-+		PEM_read_DHparams;
-+		PEM_read_DSAPrivateKey;
-+		PEM_read_DSAparams;
-+		PEM_read_PKCS7;
-+		PEM_read_PrivateKey;
-+		PEM_read_RSAPrivateKey;
-+		PEM_read_X509;
-+		PEM_read_X509_CRL;
-+		PEM_read_X509_REQ;
-+		PEM_read_bio;
-+		PEM_read_bio_DHparams;
-+		PEM_read_bio_DSAPrivateKey;
-+		PEM_read_bio_DSAparams;
-+		PEM_read_bio_PKCS7;
-+		PEM_read_bio_PrivateKey;
-+		PEM_read_bio_RSAPrivateKey;
-+		PEM_read_bio_X509;
-+		PEM_read_bio_X509_CRL;
-+		PEM_read_bio_X509_REQ;
-+		PEM_write;
-+		PEM_write_DHparams;
-+		PEM_write_DSAPrivateKey;
-+		PEM_write_DSAparams;
-+		PEM_write_PKCS7;
-+		PEM_write_PrivateKey;
-+		PEM_write_RSAPrivateKey;
-+		PEM_write_X509;
-+		PEM_write_X509_CRL;
-+		PEM_write_X509_REQ;
-+		PEM_write_bio;
-+		PEM_write_bio_DHparams;
-+		PEM_write_bio_DSAPrivateKey;
-+		PEM_write_bio_DSAparams;
-+		PEM_write_bio_PKCS7;
-+		PEM_write_bio_PrivateKey;
-+		PEM_write_bio_RSAPrivateKey;
-+		PEM_write_bio_X509;
-+		PEM_write_bio_X509_CRL;
-+		PEM_write_bio_X509_REQ;
-+		PKCS7_DIGEST_free;
-+		PKCS7_DIGEST_new;
-+		PKCS7_ENCRYPT_free;
-+		PKCS7_ENCRYPT_new;
-+		PKCS7_ENC_CONTENT_free;
-+		PKCS7_ENC_CONTENT_new;
-+		PKCS7_ENVELOPE_free;
-+		PKCS7_ENVELOPE_new;
-+		PKCS7_ISSUER_AND_SERIAL_digest;
-+		PKCS7_ISSUER_AND_SERIAL_free;
-+		PKCS7_ISSUER_AND_SERIAL_new;
-+		PKCS7_RECIP_INFO_free;
-+		PKCS7_RECIP_INFO_new;
-+		PKCS7_SIGNED_free;
-+		PKCS7_SIGNED_new;
-+		PKCS7_SIGNER_INFO_free;
-+		PKCS7_SIGNER_INFO_new;
-+		PKCS7_SIGN_ENVELOPE_free;
-+		PKCS7_SIGN_ENVELOPE_new;
-+		PKCS7_dup;
-+		PKCS7_free;
-+		PKCS7_new;
-+		PROXY_ENTRY_add_noproxy;
-+		PROXY_ENTRY_clear_noproxy;
-+		PROXY_ENTRY_free;
-+		PROXY_ENTRY_get_noproxy;
-+		PROXY_ENTRY_new;
-+		PROXY_ENTRY_set_server;
-+		PROXY_add_noproxy;
-+		PROXY_add_server;
-+		PROXY_check_by_host;
-+		PROXY_check_url;
-+		PROXY_clear_noproxy;
-+		PROXY_free;
-+		PROXY_get_noproxy;
-+		PROXY_get_proxies;
-+		PROXY_get_proxy_entry;
-+		PROXY_load_conf;
-+		PROXY_new;
-+		PROXY_print;
-+		RAND_bytes;
-+		RAND_cleanup;
-+		RAND_file_name;
-+		RAND_load_file;
-+		RAND_screen;
-+		RAND_seed;
-+		RAND_write_file;
-+		RC2_cbc_encrypt;
-+		RC2_cfb64_encrypt;
-+		RC2_ecb_encrypt;
-+		RC2_encrypt;
-+		RC2_ofb64_encrypt;
-+		RC2_set_key;
-+		RC4;
-+		RC4_options;
-+		RC4_set_key;
-+		RSAPrivateKey_asn1_meth;
-+		RSAPrivateKey_dup;
-+		RSAPublicKey_dup;
-+		RSA_PKCS1_SSLeay;
-+		RSA_free;
-+		RSA_generate_key;
-+		RSA_new;
-+		RSA_new_method;
-+		RSA_print;
-+		RSA_print_fp;
-+		RSA_private_decrypt;
-+		RSA_private_encrypt;
-+		RSA_public_decrypt;
-+		RSA_public_encrypt;
-+		RSA_set_default_method;
-+		RSA_sign;
-+		RSA_sign_ASN1_OCTET_STRING;
-+		RSA_size;
-+		RSA_verify;
-+		RSA_verify_ASN1_OCTET_STRING;
-+		SHA;
-+		SHA1;
-+		SHA1_Final;
-+		SHA1_Init;
-+		SHA1_Update;
-+		SHA_Final;
-+		SHA_Init;
-+		SHA_Update;
-+		OpenSSL_add_all_algorithms;
-+		OpenSSL_add_all_ciphers;
-+		OpenSSL_add_all_digests;
-+		TXT_DB_create_index;
-+		TXT_DB_free;
-+		TXT_DB_get_by_index;
-+		TXT_DB_insert;
-+		TXT_DB_read;
-+		TXT_DB_write;
-+		X509_ALGOR_free;
-+		X509_ALGOR_new;
-+		X509_ATTRIBUTE_free;
-+		X509_ATTRIBUTE_new;
-+		X509_CINF_free;
-+		X509_CINF_new;
-+		X509_CRL_INFO_free;
-+		X509_CRL_INFO_new;
-+		X509_CRL_add_ext;
-+		X509_CRL_cmp;
-+		X509_CRL_delete_ext;
-+		X509_CRL_dup;
-+		X509_CRL_free;
-+		X509_CRL_get_ext;
-+		X509_CRL_get_ext_by_NID;
-+		X509_CRL_get_ext_by_OBJ;
-+		X509_CRL_get_ext_by_critical;
-+		X509_CRL_get_ext_count;
-+		X509_CRL_new;
-+		X509_CRL_sign;
-+		X509_CRL_verify;
-+		X509_EXTENSION_create_by_NID;
-+		X509_EXTENSION_create_by_OBJ;
-+		X509_EXTENSION_dup;
-+		X509_EXTENSION_free;
-+		X509_EXTENSION_get_critical;
-+		X509_EXTENSION_get_data;
-+		X509_EXTENSION_get_object;
-+		X509_EXTENSION_new;
-+		X509_EXTENSION_set_critical;
-+		X509_EXTENSION_set_data;
-+		X509_EXTENSION_set_object;
-+		X509_INFO_free;
-+		X509_INFO_new;
-+		X509_LOOKUP_by_alias;
-+		X509_LOOKUP_by_fingerprint;
-+		X509_LOOKUP_by_issuer_serial;
-+		X509_LOOKUP_by_subject;
-+		X509_LOOKUP_ctrl;
-+		X509_LOOKUP_file;
-+		X509_LOOKUP_free;
-+		X509_LOOKUP_hash_dir;
-+		X509_LOOKUP_init;
-+		X509_LOOKUP_new;
-+		X509_LOOKUP_shutdown;
-+		X509_NAME_ENTRY_create_by_NID;
-+		X509_NAME_ENTRY_create_by_OBJ;
-+		X509_NAME_ENTRY_dup;
-+		X509_NAME_ENTRY_free;
-+		X509_NAME_ENTRY_get_data;
-+		X509_NAME_ENTRY_get_object;
-+		X509_NAME_ENTRY_new;
-+		X509_NAME_ENTRY_set_data;
-+		X509_NAME_ENTRY_set_object;
-+		X509_NAME_add_entry;
-+		X509_NAME_cmp;
-+		X509_NAME_delete_entry;
-+		X509_NAME_digest;
-+		X509_NAME_dup;
-+		X509_NAME_entry_count;
-+		X509_NAME_free;
-+		X509_NAME_get_entry;
-+		X509_NAME_get_index_by_NID;
-+		X509_NAME_get_index_by_OBJ;
-+		X509_NAME_get_text_by_NID;
-+		X509_NAME_get_text_by_OBJ;
-+		X509_NAME_hash;
-+		X509_NAME_new;
-+		X509_NAME_oneline;
-+		X509_NAME_print;
-+		X509_NAME_set;
-+		X509_OBJECT_free_contents;
-+		X509_OBJECT_retrieve_by_subject;
-+		X509_OBJECT_up_ref_count;
-+		X509_PKEY_free;
-+		X509_PKEY_new;
-+		X509_PUBKEY_free;
-+		X509_PUBKEY_get;
-+		X509_PUBKEY_new;
-+		X509_PUBKEY_set;
-+		X509_REQ_INFO_free;
-+		X509_REQ_INFO_new;
-+		X509_REQ_dup;
-+		X509_REQ_free;
-+		X509_REQ_get_pubkey;
-+		X509_REQ_new;
-+		X509_REQ_print;
-+		X509_REQ_print_fp;
-+		X509_REQ_set_pubkey;
-+		X509_REQ_set_subject_name;
-+		X509_REQ_set_version;
-+		X509_REQ_sign;
-+		X509_REQ_to_X509;
-+		X509_REQ_verify;
-+		X509_REVOKED_add_ext;
-+		X509_REVOKED_delete_ext;
-+		X509_REVOKED_free;
-+		X509_REVOKED_get_ext;
-+		X509_REVOKED_get_ext_by_NID;
-+		X509_REVOKED_get_ext_by_OBJ;
-+		X509_REVOKED_get_ext_by_critical;
-+		X509_REVOKED_get_ext_by_critic;
-+		X509_REVOKED_get_ext_count;
-+		X509_REVOKED_new;
-+		X509_SIG_free;
-+		X509_SIG_new;
-+		X509_STORE_CTX_cleanup;
-+		X509_STORE_CTX_init;
-+		X509_STORE_add_cert;
-+		X509_STORE_add_lookup;
-+		X509_STORE_free;
-+		X509_STORE_get_by_subject;
-+		X509_STORE_load_locations;
-+		X509_STORE_new;
-+		X509_STORE_set_default_paths;
-+		X509_VAL_free;
-+		X509_VAL_new;
-+		X509_add_ext;
-+		X509_asn1_meth;
-+		X509_certificate_type;
-+		X509_check_private_key;
-+		X509_cmp_current_time;
-+		X509_delete_ext;
-+		X509_digest;
-+		X509_dup;
-+		X509_free;
-+		X509_get_default_cert_area;
-+		X509_get_default_cert_dir;
-+		X509_get_default_cert_dir_env;
-+		X509_get_default_cert_file;
-+		X509_get_default_cert_file_env;
-+		X509_get_default_private_dir;
-+		X509_get_ext;
-+		X509_get_ext_by_NID;
-+		X509_get_ext_by_OBJ;
-+		X509_get_ext_by_critical;
-+		X509_get_ext_count;
-+		X509_get_issuer_name;
-+		X509_get_pubkey;
-+		X509_get_pubkey_parameters;
-+		X509_get_serialNumber;
-+		X509_get_subject_name;
-+		X509_gmtime_adj;
-+		X509_issuer_and_serial_cmp;
-+		X509_issuer_and_serial_hash;
-+		X509_issuer_name_cmp;
-+		X509_issuer_name_hash;
-+		X509_load_cert_file;
-+		X509_new;
-+		X509_print;
-+		X509_print_fp;
-+		X509_set_issuer_name;
-+		X509_set_notAfter;
-+		X509_set_notBefore;
-+		X509_set_pubkey;
-+		X509_set_serialNumber;
-+		X509_set_subject_name;
-+		X509_set_version;
-+		X509_sign;
-+		X509_subject_name_cmp;
-+		X509_subject_name_hash;
-+		X509_to_X509_REQ;
-+		X509_verify;
-+		X509_verify_cert;
-+		X509_verify_cert_error_string;
-+		X509v3_add_ext;
-+		X509v3_add_extension;
-+		X509v3_add_netscape_extensions;
-+		X509v3_add_standard_extensions;
-+		X509v3_cleanup_extensions;
-+		X509v3_data_type_by_NID;
-+		X509v3_data_type_by_OBJ;
-+		X509v3_delete_ext;
-+		X509v3_get_ext;
-+		X509v3_get_ext_by_NID;
-+		X509v3_get_ext_by_OBJ;
-+		X509v3_get_ext_by_critical;
-+		X509v3_get_ext_count;
-+		X509v3_pack_string;
-+		X509v3_pack_type_by_NID;
-+		X509v3_pack_type_by_OBJ;
-+		X509v3_unpack_string;
-+		_des_crypt;
-+		a2d_ASN1_OBJECT;
-+		a2i_ASN1_INTEGER;
-+		a2i_ASN1_STRING;
-+		asn1_Finish;
-+		asn1_GetSequence;
-+		bn_div_words;
-+		bn_expand2;
-+		bn_mul_add_words;
-+		bn_mul_words;
-+		BN_uadd;
-+		BN_usub;
-+		bn_sqr_words;
-+		_ossl_old_crypt;
-+		d2i_ASN1_BIT_STRING;
-+		d2i_ASN1_BOOLEAN;
-+		d2i_ASN1_HEADER;
-+		d2i_ASN1_IA5STRING;
-+		d2i_ASN1_INTEGER;
-+		d2i_ASN1_OBJECT;
-+		d2i_ASN1_OCTET_STRING;
-+		d2i_ASN1_PRINTABLE;
-+		d2i_ASN1_PRINTABLESTRING;
-+		d2i_ASN1_SET;
-+		d2i_ASN1_T61STRING;
-+		d2i_ASN1_TYPE;
-+		d2i_ASN1_UTCTIME;
-+		d2i_ASN1_bytes;
-+		d2i_ASN1_type_bytes;
-+		d2i_DHparams;
-+		d2i_DSAPrivateKey;
-+		d2i_DSAPrivateKey_bio;
-+		d2i_DSAPrivateKey_fp;
-+		d2i_DSAPublicKey;
-+		d2i_DSAparams;
-+		d2i_NETSCAPE_SPKAC;
-+		d2i_NETSCAPE_SPKI;
-+		d2i_Netscape_RSA;
-+		d2i_PKCS7;
-+		d2i_PKCS7_DIGEST;
-+		d2i_PKCS7_ENCRYPT;
-+		d2i_PKCS7_ENC_CONTENT;
-+		d2i_PKCS7_ENVELOPE;
-+		d2i_PKCS7_ISSUER_AND_SERIAL;
-+		d2i_PKCS7_RECIP_INFO;
-+		d2i_PKCS7_SIGNED;
-+		d2i_PKCS7_SIGNER_INFO;
-+		d2i_PKCS7_SIGN_ENVELOPE;
-+		d2i_PKCS7_bio;
-+		d2i_PKCS7_fp;
-+		d2i_PrivateKey;
-+		d2i_PublicKey;
-+		d2i_RSAPrivateKey;
-+		d2i_RSAPrivateKey_bio;
-+		d2i_RSAPrivateKey_fp;
-+		d2i_RSAPublicKey;
-+		d2i_X509;
-+		d2i_X509_ALGOR;
-+		d2i_X509_ATTRIBUTE;
-+		d2i_X509_CINF;
-+		d2i_X509_CRL;
-+		d2i_X509_CRL_INFO;
-+		d2i_X509_CRL_bio;
-+		d2i_X509_CRL_fp;
-+		d2i_X509_EXTENSION;
-+		d2i_X509_NAME;
-+		d2i_X509_NAME_ENTRY;
-+		d2i_X509_PKEY;
-+		d2i_X509_PUBKEY;
-+		d2i_X509_REQ;
-+		d2i_X509_REQ_INFO;
-+		d2i_X509_REQ_bio;
-+		d2i_X509_REQ_fp;
-+		d2i_X509_REVOKED;
-+		d2i_X509_SIG;
-+		d2i_X509_VAL;
-+		d2i_X509_bio;
-+		d2i_X509_fp;
-+		DES_cbc_cksum;
-+		DES_cbc_encrypt;
-+		DES_cblock_print_file;
-+		DES_cfb64_encrypt;
-+		DES_cfb_encrypt;
-+		DES_decrypt3;
-+		DES_ecb3_encrypt;
-+		DES_ecb_encrypt;
-+		DES_ede3_cbc_encrypt;
-+		DES_ede3_cfb64_encrypt;
-+		DES_ede3_ofb64_encrypt;
-+		DES_enc_read;
-+		DES_enc_write;
-+		DES_encrypt1;
-+		DES_encrypt2;
-+		DES_encrypt3;
-+		DES_fcrypt;
-+		DES_is_weak_key;
-+		DES_key_sched;
-+		DES_ncbc_encrypt;
-+		DES_ofb64_encrypt;
-+		DES_ofb_encrypt;
-+		DES_options;
-+		DES_pcbc_encrypt;
-+		DES_quad_cksum;
-+		DES_random_key;
-+		_ossl_old_des_random_seed;
-+		_ossl_old_des_read_2passwords;
-+		_ossl_old_des_read_password;
-+		_ossl_old_des_read_pw;
-+		_ossl_old_des_read_pw_string;
-+		DES_set_key;
-+		DES_set_odd_parity;
-+		DES_string_to_2keys;
-+		DES_string_to_key;
-+		DES_xcbc_encrypt;
-+		DES_xwhite_in2out;
-+		fcrypt_body;
-+		i2a_ASN1_INTEGER;
-+		i2a_ASN1_OBJECT;
-+		i2a_ASN1_STRING;
-+		i2d_ASN1_BIT_STRING;
-+		i2d_ASN1_BOOLEAN;
-+		i2d_ASN1_HEADER;
-+		i2d_ASN1_IA5STRING;
-+		i2d_ASN1_INTEGER;
-+		i2d_ASN1_OBJECT;
-+		i2d_ASN1_OCTET_STRING;
-+		i2d_ASN1_PRINTABLE;
-+		i2d_ASN1_SET;
-+		i2d_ASN1_TYPE;
-+		i2d_ASN1_UTCTIME;
-+		i2d_ASN1_bytes;
-+		i2d_DHparams;
-+		i2d_DSAPrivateKey;
-+		i2d_DSAPrivateKey_bio;
-+		i2d_DSAPrivateKey_fp;
-+		i2d_DSAPublicKey;
-+		i2d_DSAparams;
-+		i2d_NETSCAPE_SPKAC;
-+		i2d_NETSCAPE_SPKI;
-+		i2d_Netscape_RSA;
-+		i2d_PKCS7;
-+		i2d_PKCS7_DIGEST;
-+		i2d_PKCS7_ENCRYPT;
-+		i2d_PKCS7_ENC_CONTENT;
-+		i2d_PKCS7_ENVELOPE;
-+		i2d_PKCS7_ISSUER_AND_SERIAL;
-+		i2d_PKCS7_RECIP_INFO;
-+		i2d_PKCS7_SIGNED;
-+		i2d_PKCS7_SIGNER_INFO;
-+		i2d_PKCS7_SIGN_ENVELOPE;
-+		i2d_PKCS7_bio;
-+		i2d_PKCS7_fp;
-+		i2d_PrivateKey;
-+		i2d_PublicKey;
-+		i2d_RSAPrivateKey;
-+		i2d_RSAPrivateKey_bio;
-+		i2d_RSAPrivateKey_fp;
-+		i2d_RSAPublicKey;
-+		i2d_X509;
-+		i2d_X509_ALGOR;
-+		i2d_X509_ATTRIBUTE;
-+		i2d_X509_CINF;
-+		i2d_X509_CRL;
-+		i2d_X509_CRL_INFO;
-+		i2d_X509_CRL_bio;
-+		i2d_X509_CRL_fp;
-+		i2d_X509_EXTENSION;
-+		i2d_X509_NAME;
-+		i2d_X509_NAME_ENTRY;
-+		i2d_X509_PKEY;
-+		i2d_X509_PUBKEY;
-+		i2d_X509_REQ;
-+		i2d_X509_REQ_INFO;
-+		i2d_X509_REQ_bio;
-+		i2d_X509_REQ_fp;
-+		i2d_X509_REVOKED;
-+		i2d_X509_SIG;
-+		i2d_X509_VAL;
-+		i2d_X509_bio;
-+		i2d_X509_fp;
-+		idea_cbc_encrypt;
-+		idea_cfb64_encrypt;
-+		idea_ecb_encrypt;
-+		idea_encrypt;
-+		idea_ofb64_encrypt;
-+		idea_options;
-+		idea_set_decrypt_key;
-+		idea_set_encrypt_key;
-+		lh_delete;
-+		lh_doall;
-+		lh_doall_arg;
-+		lh_free;
-+		lh_insert;
-+		lh_new;
-+		lh_node_stats;
-+		lh_node_stats_bio;
-+		lh_node_usage_stats;
-+		lh_node_usage_stats_bio;
-+		lh_retrieve;
-+		lh_stats;
-+		lh_stats_bio;
-+		lh_strhash;
-+		sk_delete;
-+		sk_delete_ptr;
-+		sk_dup;
-+		sk_find;
-+		sk_free;
-+		sk_insert;
-+		sk_new;
-+		sk_pop;
-+		sk_pop_free;
-+		sk_push;
-+		sk_set_cmp_func;
-+		sk_shift;
-+		sk_unshift;
-+		sk_zero;
-+		BIO_f_nbio_test;
-+		ASN1_TYPE_get;
-+		ASN1_TYPE_set;
-+		PKCS7_content_free;
-+		ERR_load_PKCS7_strings;
-+		X509_find_by_issuer_and_serial;
-+		X509_find_by_subject;
-+		PKCS7_ctrl;
-+		PKCS7_set_type;
-+		PKCS7_set_content;
-+		PKCS7_SIGNER_INFO_set;
-+		PKCS7_add_signer;
-+		PKCS7_add_certificate;
-+		PKCS7_add_crl;
-+		PKCS7_content_new;
-+		PKCS7_dataSign;
-+		PKCS7_dataVerify;
-+		PKCS7_dataInit;
-+		PKCS7_add_signature;
-+		PKCS7_cert_from_signer_info;
-+		PKCS7_get_signer_info;
-+		EVP_delete_alias;
-+		EVP_mdc2;
-+		PEM_read_bio_RSAPublicKey;
-+		PEM_write_bio_RSAPublicKey;
-+		d2i_RSAPublicKey_bio;
-+		i2d_RSAPublicKey_bio;
-+		PEM_read_RSAPublicKey;
-+		PEM_write_RSAPublicKey;
-+		d2i_RSAPublicKey_fp;
-+		i2d_RSAPublicKey_fp;
-+		BIO_copy_next_retry;
-+		RSA_flags;
-+		X509_STORE_add_crl;
-+		X509_load_crl_file;
-+		EVP_rc2_40_cbc;
-+		EVP_rc4_40;
-+		EVP_CIPHER_CTX_init;
-+		HMAC;
-+		HMAC_Init;
-+		HMAC_Update;
-+		HMAC_Final;
-+		ERR_get_next_error_library;
-+		EVP_PKEY_cmp_parameters;
-+		HMAC_cleanup;
-+		BIO_ptr_ctrl;
-+		BIO_new_file_internal;
-+		BIO_new_fp_internal;
-+		BIO_s_file_internal;
-+		BN_BLINDING_convert;
-+		BN_BLINDING_invert;
-+		BN_BLINDING_update;
-+		RSA_blinding_on;
-+		RSA_blinding_off;
-+		i2t_ASN1_OBJECT;
-+		BN_BLINDING_new;
-+		BN_BLINDING_free;
-+		EVP_cast5_cbc;
-+		EVP_cast5_cfb64;
-+		EVP_cast5_ecb;
-+		EVP_cast5_ofb;
-+		BF_decrypt;
-+		CAST_set_key;
-+		CAST_encrypt;
-+		CAST_decrypt;
-+		CAST_ecb_encrypt;
-+		CAST_cbc_encrypt;
-+		CAST_cfb64_encrypt;
-+		CAST_ofb64_encrypt;
-+		RC2_decrypt;
-+		OBJ_create_objects;
-+		BN_exp;
-+		BN_mul_word;
-+		BN_sub_word;
-+		BN_dec2bn;
-+		BN_bn2dec;
-+		BIO_ghbn_ctrl;
-+		CRYPTO_free_ex_data;
-+		CRYPTO_get_ex_data;
-+		CRYPTO_set_ex_data;
-+		ERR_load_CRYPTO_strings;
-+		ERR_load_CRYPTOlib_strings;
-+		EVP_PKEY_bits;
-+		MD5_Transform;
-+		SHA1_Transform;
-+		SHA_Transform;
-+		X509_STORE_CTX_get_chain;
-+		X509_STORE_CTX_get_current_cert;
-+		X509_STORE_CTX_get_error;
-+		X509_STORE_CTX_get_error_depth;
-+		X509_STORE_CTX_get_ex_data;
-+		X509_STORE_CTX_set_cert;
-+		X509_STORE_CTX_set_chain;
-+		X509_STORE_CTX_set_error;
-+		X509_STORE_CTX_set_ex_data;
-+		CRYPTO_dup_ex_data;
-+		CRYPTO_get_new_lockid;
-+		CRYPTO_new_ex_data;
-+		RSA_set_ex_data;
-+		RSA_get_ex_data;
-+		RSA_get_ex_new_index;
-+		RSA_padding_add_PKCS1_type_1;
-+		RSA_padding_add_PKCS1_type_2;
-+		RSA_padding_add_SSLv23;
-+		RSA_padding_add_none;
-+		RSA_padding_check_PKCS1_type_1;
-+		RSA_padding_check_PKCS1_type_2;
-+		RSA_padding_check_SSLv23;
-+		RSA_padding_check_none;
-+		bn_add_words;
-+		d2i_Netscape_RSA_2;
-+		CRYPTO_get_ex_new_index;
-+		RIPEMD160_Init;
-+		RIPEMD160_Update;
-+		RIPEMD160_Final;
-+		RIPEMD160;
-+		RIPEMD160_Transform;
-+		RC5_32_set_key;
-+		RC5_32_ecb_encrypt;
-+		RC5_32_encrypt;
-+		RC5_32_decrypt;
-+		RC5_32_cbc_encrypt;
-+		RC5_32_cfb64_encrypt;
-+		RC5_32_ofb64_encrypt;
-+		BN_bn2mpi;
-+		BN_mpi2bn;
-+		ASN1_BIT_STRING_get_bit;
-+		ASN1_BIT_STRING_set_bit;
-+		BIO_get_ex_data;
-+		BIO_get_ex_new_index;
-+		BIO_set_ex_data;
-+		X509v3_get_key_usage;
-+		X509v3_set_key_usage;
-+		a2i_X509v3_key_usage;
-+		i2a_X509v3_key_usage;
-+		EVP_PKEY_decrypt;
-+		EVP_PKEY_encrypt;
-+		PKCS7_RECIP_INFO_set;
-+		PKCS7_add_recipient;
-+		PKCS7_add_recipient_info;
-+		PKCS7_set_cipher;
-+		ASN1_TYPE_get_int_octetstring;
-+		ASN1_TYPE_get_octetstring;
-+		ASN1_TYPE_set_int_octetstring;
-+		ASN1_TYPE_set_octetstring;
-+		ASN1_UTCTIME_set_string;
-+		ERR_add_error_data;
-+		ERR_set_error_data;
-+		EVP_CIPHER_asn1_to_param;
-+		EVP_CIPHER_param_to_asn1;
-+		EVP_CIPHER_get_asn1_iv;
-+		EVP_CIPHER_set_asn1_iv;
-+		EVP_rc5_32_12_16_cbc;
-+		EVP_rc5_32_12_16_cfb64;
-+		EVP_rc5_32_12_16_ecb;
-+		EVP_rc5_32_12_16_ofb;
-+		asn1_add_error;
-+		d2i_ASN1_BMPSTRING;
-+		i2d_ASN1_BMPSTRING;
-+		BIO_f_ber;
-+		BN_init;
-+		COMP_CTX_new;
-+		COMP_CTX_free;
-+		COMP_CTX_compress_block;
-+		COMP_CTX_expand_block;
-+		X509_STORE_CTX_get_ex_new_index;
-+		OBJ_NAME_add;
-+		BIO_socket_nbio;
-+		EVP_rc2_64_cbc;
-+		OBJ_NAME_cleanup;
-+		OBJ_NAME_get;
-+		OBJ_NAME_init;
-+		OBJ_NAME_new_index;
-+		OBJ_NAME_remove;
-+		BN_MONT_CTX_copy;
-+		BIO_new_socks4a_connect;
-+		BIO_s_socks4a_connect;
-+		PROXY_set_connect_mode;
-+		RAND_SSLeay;
-+		RAND_set_rand_method;
-+		RSA_memory_lock;
-+		bn_sub_words;
-+		bn_mul_normal;
-+		bn_mul_comba8;
-+		bn_mul_comba4;
-+		bn_sqr_normal;
-+		bn_sqr_comba8;
-+		bn_sqr_comba4;
-+		bn_cmp_words;
-+		bn_mul_recursive;
-+		bn_mul_part_recursive;
-+		bn_sqr_recursive;
-+		bn_mul_low_normal;
-+		BN_RECP_CTX_init;
-+		BN_RECP_CTX_new;
-+		BN_RECP_CTX_free;
-+		BN_RECP_CTX_set;
-+		BN_mod_mul_reciprocal;
-+		BN_mod_exp_recp;
-+		BN_div_recp;
-+		BN_CTX_init;
-+		BN_MONT_CTX_init;
-+		RAND_get_rand_method;
-+		PKCS7_add_attribute;
-+		PKCS7_add_signed_attribute;
-+		PKCS7_digest_from_attributes;
-+		PKCS7_get_attribute;
-+		PKCS7_get_issuer_and_serial;
-+		PKCS7_get_signed_attribute;
-+		COMP_compress_block;
-+		COMP_expand_block;
-+		COMP_rle;
-+		COMP_zlib;
-+		ms_time_diff;
-+		ms_time_new;
-+		ms_time_free;
-+		ms_time_cmp;
-+		ms_time_get;
-+		PKCS7_set_attributes;
-+		PKCS7_set_signed_attributes;
-+		X509_ATTRIBUTE_create;
-+		X509_ATTRIBUTE_dup;
-+		ASN1_GENERALIZEDTIME_check;
-+		ASN1_GENERALIZEDTIME_print;
-+		ASN1_GENERALIZEDTIME_set;
-+		ASN1_GENERALIZEDTIME_set_string;
-+		ASN1_TIME_print;
-+		BASIC_CONSTRAINTS_free;
-+		BASIC_CONSTRAINTS_new;
-+		ERR_load_X509V3_strings;
-+		NETSCAPE_CERT_SEQUENCE_free;
-+		NETSCAPE_CERT_SEQUENCE_new;
-+		OBJ_txt2obj;
-+		PEM_read_NETSCAPE_CERT_SEQUENCE;
-+		PEM_read_NS_CERT_SEQ;
-+		PEM_read_bio_NETSCAPE_CERT_SEQUENCE;
-+		PEM_read_bio_NS_CERT_SEQ;
-+		PEM_write_NETSCAPE_CERT_SEQUENCE;
-+		PEM_write_NS_CERT_SEQ;
-+		PEM_write_bio_NETSCAPE_CERT_SEQUENCE;
-+		PEM_write_bio_NS_CERT_SEQ;
-+		X509V3_EXT_add;
-+		X509V3_EXT_add_alias;
-+		X509V3_EXT_add_conf;
-+		X509V3_EXT_cleanup;
-+		X509V3_EXT_conf;
-+		X509V3_EXT_conf_nid;
-+		X509V3_EXT_get;
-+		X509V3_EXT_get_nid;
-+		X509V3_EXT_print;
-+		X509V3_EXT_print_fp;
-+		X509V3_add_standard_extensions;
-+		X509V3_add_value;
-+		X509V3_add_value_bool;
-+		X509V3_add_value_int;
-+		X509V3_conf_free;
-+		X509V3_get_value_bool;
-+		X509V3_get_value_int;
-+		X509V3_parse_list;
-+		d2i_ASN1_GENERALIZEDTIME;
-+		d2i_ASN1_TIME;
-+		d2i_BASIC_CONSTRAINTS;
-+		d2i_NETSCAPE_CERT_SEQUENCE;
-+		d2i_ext_ku;
-+		ext_ku_free;
-+		ext_ku_new;
-+		i2d_ASN1_GENERALIZEDTIME;
-+		i2d_ASN1_TIME;
-+		i2d_BASIC_CONSTRAINTS;
-+		i2d_NETSCAPE_CERT_SEQUENCE;
-+		i2d_ext_ku;
-+		EVP_MD_CTX_copy;
-+		i2d_ASN1_ENUMERATED;
-+		d2i_ASN1_ENUMERATED;
-+		ASN1_ENUMERATED_set;
-+		ASN1_ENUMERATED_get;
-+		BN_to_ASN1_ENUMERATED;
-+		ASN1_ENUMERATED_to_BN;
-+		i2a_ASN1_ENUMERATED;
-+		a2i_ASN1_ENUMERATED;
-+		i2d_GENERAL_NAME;
-+		d2i_GENERAL_NAME;
-+		GENERAL_NAME_new;
-+		GENERAL_NAME_free;
-+		GENERAL_NAMES_new;
-+		GENERAL_NAMES_free;
-+		d2i_GENERAL_NAMES;
-+		i2d_GENERAL_NAMES;
-+		i2v_GENERAL_NAMES;
-+		i2s_ASN1_OCTET_STRING;
-+		s2i_ASN1_OCTET_STRING;
-+		X509V3_EXT_check_conf;
-+		hex_to_string;
-+		string_to_hex;
-+		DES_ede3_cbcm_encrypt;
-+		RSA_padding_add_PKCS1_OAEP;
-+		RSA_padding_check_PKCS1_OAEP;
-+		X509_CRL_print_fp;
-+		X509_CRL_print;
-+		i2v_GENERAL_NAME;
-+		v2i_GENERAL_NAME;
-+		i2d_PKEY_USAGE_PERIOD;
-+		d2i_PKEY_USAGE_PERIOD;
-+		PKEY_USAGE_PERIOD_new;
-+		PKEY_USAGE_PERIOD_free;
-+		v2i_GENERAL_NAMES;
-+		i2s_ASN1_INTEGER;
-+		X509V3_EXT_d2i;
-+		name_cmp;
-+		str_dup;
-+		i2s_ASN1_ENUMERATED;
-+		i2s_ASN1_ENUMERATED_TABLE;
-+		BIO_s_log;
-+		BIO_f_reliable;
-+		PKCS7_dataFinal;
-+		PKCS7_dataDecode;
-+		X509V3_EXT_CRL_add_conf;
-+		BN_set_params;
-+		BN_get_params;
-+		BIO_get_ex_num;
-+		BIO_set_ex_free_func;
-+		EVP_ripemd160;
-+		ASN1_TIME_set;
-+		i2d_AUTHORITY_KEYID;
-+		d2i_AUTHORITY_KEYID;
-+		AUTHORITY_KEYID_new;
-+		AUTHORITY_KEYID_free;
-+		ASN1_seq_unpack;
-+		ASN1_seq_pack;
-+		ASN1_unpack_string;
-+		ASN1_pack_string;
-+		PKCS12_pack_safebag;
-+		PKCS12_MAKE_KEYBAG;
-+		PKCS8_encrypt;
-+		PKCS12_MAKE_SHKEYBAG;
-+		PKCS12_pack_p7data;
-+		PKCS12_pack_p7encdata;
-+		PKCS12_add_localkeyid;
-+		PKCS12_add_friendlyname_asc;
-+		PKCS12_add_friendlyname_uni;
-+		PKCS12_get_friendlyname;
-+		PKCS12_pbe_crypt;
-+		PKCS12_decrypt_d2i;
-+		PKCS12_i2d_encrypt;
-+		PKCS12_init;
-+		PKCS12_key_gen_asc;
-+		PKCS12_key_gen_uni;
-+		PKCS12_gen_mac;
-+		PKCS12_verify_mac;
-+		PKCS12_set_mac;
-+		PKCS12_setup_mac;
-+		OPENSSL_asc2uni;
-+		OPENSSL_uni2asc;
-+		i2d_PKCS12_BAGS;
-+		PKCS12_BAGS_new;
-+		d2i_PKCS12_BAGS;
-+		PKCS12_BAGS_free;
-+		i2d_PKCS12;
-+		d2i_PKCS12;
-+		PKCS12_new;
-+		PKCS12_free;
-+		i2d_PKCS12_MAC_DATA;
-+		PKCS12_MAC_DATA_new;
-+		d2i_PKCS12_MAC_DATA;
-+		PKCS12_MAC_DATA_free;
-+		i2d_PKCS12_SAFEBAG;
-+		PKCS12_SAFEBAG_new;
-+		d2i_PKCS12_SAFEBAG;
-+		PKCS12_SAFEBAG_free;
-+		ERR_load_PKCS12_strings;
-+		PKCS12_PBE_add;
-+		PKCS8_add_keyusage;
-+		PKCS12_get_attr_gen;
-+		PKCS12_parse;
-+		PKCS12_create;
-+		i2d_PKCS12_bio;
-+		i2d_PKCS12_fp;
-+		d2i_PKCS12_bio;
-+		d2i_PKCS12_fp;
-+		i2d_PBEPARAM;
-+		PBEPARAM_new;
-+		d2i_PBEPARAM;
-+		PBEPARAM_free;
-+		i2d_PKCS8_PRIV_KEY_INFO;
-+		PKCS8_PRIV_KEY_INFO_new;
-+		d2i_PKCS8_PRIV_KEY_INFO;
-+		PKCS8_PRIV_KEY_INFO_free;
-+		EVP_PKCS82PKEY;
-+		EVP_PKEY2PKCS8;
-+		PKCS8_set_broken;
-+		EVP_PBE_ALGOR_CipherInit;
-+		EVP_PBE_alg_add;
-+		PKCS5_pbe_set;
-+		EVP_PBE_cleanup;
-+		i2d_SXNET;
-+		d2i_SXNET;
-+		SXNET_new;
-+		SXNET_free;
-+		i2d_SXNETID;
-+		d2i_SXNETID;
-+		SXNETID_new;
-+		SXNETID_free;
-+		DSA_SIG_new;
-+		DSA_SIG_free;
-+		DSA_do_sign;
-+		DSA_do_verify;
-+		d2i_DSA_SIG;
-+		i2d_DSA_SIG;
-+		i2d_ASN1_VISIBLESTRING;
-+		d2i_ASN1_VISIBLESTRING;
-+		i2d_ASN1_UTF8STRING;
-+		d2i_ASN1_UTF8STRING;
-+		i2d_DIRECTORYSTRING;
-+		d2i_DIRECTORYSTRING;
-+		i2d_DISPLAYTEXT;
-+		d2i_DISPLAYTEXT;
-+		d2i_ASN1_SET_OF_X509;
-+		i2d_ASN1_SET_OF_X509;
-+		i2d_PBKDF2PARAM;
-+		PBKDF2PARAM_new;
-+		d2i_PBKDF2PARAM;
-+		PBKDF2PARAM_free;
-+		i2d_PBE2PARAM;
-+		PBE2PARAM_new;
-+		d2i_PBE2PARAM;
-+		PBE2PARAM_free;
-+		d2i_ASN1_SET_OF_GENERAL_NAME;
-+		i2d_ASN1_SET_OF_GENERAL_NAME;
-+		d2i_ASN1_SET_OF_SXNETID;
-+		i2d_ASN1_SET_OF_SXNETID;
-+		d2i_ASN1_SET_OF_POLICYQUALINFO;
-+		i2d_ASN1_SET_OF_POLICYQUALINFO;
-+		d2i_ASN1_SET_OF_POLICYINFO;
-+		i2d_ASN1_SET_OF_POLICYINFO;
-+		SXNET_add_id_asc;
-+		SXNET_add_id_ulong;
-+		SXNET_add_id_INTEGER;
-+		SXNET_get_id_asc;
-+		SXNET_get_id_ulong;
-+		SXNET_get_id_INTEGER;
-+		X509V3_set_conf_lhash;
-+		i2d_CERTIFICATEPOLICIES;
-+		CERTIFICATEPOLICIES_new;
-+		CERTIFICATEPOLICIES_free;
-+		d2i_CERTIFICATEPOLICIES;
-+		i2d_POLICYINFO;
-+		POLICYINFO_new;
-+		d2i_POLICYINFO;
-+		POLICYINFO_free;
-+		i2d_POLICYQUALINFO;
-+		POLICYQUALINFO_new;
-+		d2i_POLICYQUALINFO;
-+		POLICYQUALINFO_free;
-+		i2d_USERNOTICE;
-+		USERNOTICE_new;
-+		d2i_USERNOTICE;
-+		USERNOTICE_free;
-+		i2d_NOTICEREF;
-+		NOTICEREF_new;
-+		d2i_NOTICEREF;
-+		NOTICEREF_free;
-+		X509V3_get_string;
-+		X509V3_get_section;
-+		X509V3_string_free;
-+		X509V3_section_free;
-+		X509V3_set_ctx;
-+		s2i_ASN1_INTEGER;
-+		CRYPTO_set_locked_mem_functions;
-+		CRYPTO_get_locked_mem_functions;
-+		CRYPTO_malloc_locked;
-+		CRYPTO_free_locked;
-+		BN_mod_exp2_mont;
-+		ERR_get_error_line_data;
-+		ERR_peek_error_line_data;
-+		PKCS12_PBE_keyivgen;
-+		X509_ALGOR_dup;
-+		d2i_ASN1_SET_OF_DIST_POINT;
-+		i2d_ASN1_SET_OF_DIST_POINT;
-+		i2d_CRL_DIST_POINTS;
-+		CRL_DIST_POINTS_new;
-+		CRL_DIST_POINTS_free;
-+		d2i_CRL_DIST_POINTS;
-+		i2d_DIST_POINT;
-+		DIST_POINT_new;
-+		d2i_DIST_POINT;
-+		DIST_POINT_free;
-+		i2d_DIST_POINT_NAME;
-+		DIST_POINT_NAME_new;
-+		DIST_POINT_NAME_free;
-+		d2i_DIST_POINT_NAME;
-+		X509V3_add_value_uchar;
-+		d2i_ASN1_SET_OF_X509_ATTRIBUTE;
-+		i2d_ASN1_SET_OF_ASN1_TYPE;
-+		d2i_ASN1_SET_OF_X509_EXTENSION;
-+		d2i_ASN1_SET_OF_X509_NAME_ENTRY;
-+		d2i_ASN1_SET_OF_ASN1_TYPE;
-+		i2d_ASN1_SET_OF_X509_ATTRIBUTE;
-+		i2d_ASN1_SET_OF_X509_EXTENSION;
-+		i2d_ASN1_SET_OF_X509_NAME_ENTRY;
-+		X509V3_EXT_i2d;
-+		X509V3_EXT_val_prn;
-+		X509V3_EXT_add_list;
-+		EVP_CIPHER_type;
-+		EVP_PBE_CipherInit;
-+		X509V3_add_value_bool_nf;
-+		d2i_ASN1_UINTEGER;
-+		sk_value;
-+		sk_num;
-+		sk_set;
-+		i2d_ASN1_SET_OF_X509_REVOKED;
-+		sk_sort;
-+		d2i_ASN1_SET_OF_X509_REVOKED;
-+		i2d_ASN1_SET_OF_X509_ALGOR;
-+		i2d_ASN1_SET_OF_X509_CRL;
-+		d2i_ASN1_SET_OF_X509_ALGOR;
-+		d2i_ASN1_SET_OF_X509_CRL;
-+		i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO;
-+		i2d_ASN1_SET_OF_PKCS7_RECIP_INFO;
-+		d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO;
-+		d2i_ASN1_SET_OF_PKCS7_RECIP_INFO;
-+		PKCS5_PBE_add;
-+		PEM_write_bio_PKCS8;
-+		i2d_PKCS8_fp;
-+		PEM_read_bio_PKCS8_PRIV_KEY_INFO;
-+		PEM_read_bio_P8_PRIV_KEY_INFO;
-+		d2i_PKCS8_bio;
-+		d2i_PKCS8_PRIV_KEY_INFO_fp;
-+		PEM_write_bio_PKCS8_PRIV_KEY_INFO;
-+		PEM_write_bio_P8_PRIV_KEY_INFO;
-+		PEM_read_PKCS8;
-+		d2i_PKCS8_PRIV_KEY_INFO_bio;
-+		d2i_PKCS8_fp;
-+		PEM_write_PKCS8;
-+		PEM_read_PKCS8_PRIV_KEY_INFO;
-+		PEM_read_P8_PRIV_KEY_INFO;
-+		PEM_read_bio_PKCS8;
-+		PEM_write_PKCS8_PRIV_KEY_INFO;
-+		PEM_write_P8_PRIV_KEY_INFO;
-+		PKCS5_PBE_keyivgen;
-+		i2d_PKCS8_bio;
-+		i2d_PKCS8_PRIV_KEY_INFO_fp;
-+		i2d_PKCS8_PRIV_KEY_INFO_bio;
-+		BIO_s_bio;
-+		PKCS5_pbe2_set;
-+		PKCS5_PBKDF2_HMAC_SHA1;
-+		PKCS5_v2_PBE_keyivgen;
-+		PEM_write_bio_PKCS8PrivateKey;
-+		PEM_write_PKCS8PrivateKey;
-+		BIO_ctrl_get_read_request;
-+		BIO_ctrl_pending;
-+		BIO_ctrl_wpending;
-+		BIO_new_bio_pair;
-+		BIO_ctrl_get_write_guarantee;
-+		CRYPTO_num_locks;
-+		CONF_load_bio;
-+		CONF_load_fp;
-+		i2d_ASN1_SET_OF_ASN1_OBJECT;
-+		d2i_ASN1_SET_OF_ASN1_OBJECT;
-+		PKCS7_signatureVerify;
-+		RSA_set_method;
-+		RSA_get_method;
-+		RSA_get_default_method;
-+		RSA_check_key;
-+		OBJ_obj2txt;
-+		DSA_dup_DH;
-+		X509_REQ_get_extensions;
-+		X509_REQ_set_extension_nids;
-+		BIO_nwrite;
-+		X509_REQ_extension_nid;
-+		BIO_nread;
-+		X509_REQ_get_extension_nids;
-+		BIO_nwrite0;
-+		X509_REQ_add_extensions_nid;
-+		BIO_nread0;
-+		X509_REQ_add_extensions;
-+		BIO_new_mem_buf;
-+		DH_set_ex_data;
-+		DH_set_method;
-+		DSA_OpenSSL;
-+		DH_get_ex_data;
-+		DH_get_ex_new_index;
-+		DSA_new_method;
-+		DH_new_method;
-+		DH_OpenSSL;
-+		DSA_get_ex_new_index;
-+		DH_get_default_method;
-+		DSA_set_ex_data;
-+		DH_set_default_method;
-+		DSA_get_ex_data;
-+		X509V3_EXT_REQ_add_conf;
-+		NETSCAPE_SPKI_print;
-+		NETSCAPE_SPKI_set_pubkey;
-+		NETSCAPE_SPKI_b64_encode;
-+		NETSCAPE_SPKI_get_pubkey;
-+		NETSCAPE_SPKI_b64_decode;
-+		UTF8_putc;
-+		UTF8_getc;
-+		RSA_null_method;
-+		ASN1_tag2str;
-+		BIO_ctrl_reset_read_request;
-+		DISPLAYTEXT_new;
-+		ASN1_GENERALIZEDTIME_free;
-+		X509_REVOKED_get_ext_d2i;
-+		X509_set_ex_data;
-+		X509_reject_set_bit_asc;
-+		X509_NAME_add_entry_by_txt;
-+		X509_NAME_add_entry_by_NID;
-+		X509_PURPOSE_get0;
-+		PEM_read_X509_AUX;
-+		d2i_AUTHORITY_INFO_ACCESS;
-+		PEM_write_PUBKEY;
-+		ACCESS_DESCRIPTION_new;
-+		X509_CERT_AUX_free;
-+		d2i_ACCESS_DESCRIPTION;
-+		X509_trust_clear;
-+		X509_TRUST_add;
-+		ASN1_VISIBLESTRING_new;
-+		X509_alias_set1;
-+		ASN1_PRINTABLESTRING_free;
-+		EVP_PKEY_get1_DSA;
-+		ASN1_BMPSTRING_new;
-+		ASN1_mbstring_copy;
-+		ASN1_UTF8STRING_new;
-+		DSA_get_default_method;
-+		i2d_ASN1_SET_OF_ACCESS_DESCRIPTION;
-+		ASN1_T61STRING_free;
-+		DSA_set_method;
-+		X509_get_ex_data;
-+		ASN1_STRING_type;
-+		X509_PURPOSE_get_by_sname;
-+		ASN1_TIME_free;
-+		ASN1_OCTET_STRING_cmp;
-+		ASN1_BIT_STRING_new;
-+		X509_get_ext_d2i;
-+		PEM_read_bio_X509_AUX;
-+		ASN1_STRING_set_default_mask_asc;
-+		ASN1_STRING_set_def_mask_asc;
-+		PEM_write_bio_RSA_PUBKEY;
-+		ASN1_INTEGER_cmp;
-+		d2i_RSA_PUBKEY_fp;
-+		X509_trust_set_bit_asc;
-+		PEM_write_bio_DSA_PUBKEY;
-+		X509_STORE_CTX_free;
-+		EVP_PKEY_set1_DSA;
-+		i2d_DSA_PUBKEY_fp;
-+		X509_load_cert_crl_file;
-+		ASN1_TIME_new;
-+		i2d_RSA_PUBKEY;
-+		X509_STORE_CTX_purpose_inherit;
-+		PEM_read_RSA_PUBKEY;
-+		d2i_X509_AUX;
-+		i2d_DSA_PUBKEY;
-+		X509_CERT_AUX_print;
-+		PEM_read_DSA_PUBKEY;
-+		i2d_RSA_PUBKEY_bio;
-+		ASN1_BIT_STRING_num_asc;
-+		i2d_PUBKEY;
-+		ASN1_UTCTIME_free;
-+		DSA_set_default_method;
-+		X509_PURPOSE_get_by_id;
-+		ACCESS_DESCRIPTION_free;
-+		PEM_read_bio_PUBKEY;
-+		ASN1_STRING_set_by_NID;
-+		X509_PURPOSE_get_id;
-+		DISPLAYTEXT_free;
-+		OTHERNAME_new;
-+		X509_CERT_AUX_new;
-+		X509_TRUST_cleanup;
-+		X509_NAME_add_entry_by_OBJ;
-+		X509_CRL_get_ext_d2i;
-+		X509_PURPOSE_get0_name;
-+		PEM_read_PUBKEY;
-+		i2d_DSA_PUBKEY_bio;
-+		i2d_OTHERNAME;
-+		ASN1_OCTET_STRING_free;
-+		ASN1_BIT_STRING_set_asc;
-+		X509_get_ex_new_index;
-+		ASN1_STRING_TABLE_cleanup;
-+		X509_TRUST_get_by_id;
-+		X509_PURPOSE_get_trust;
-+		ASN1_STRING_length;
-+		d2i_ASN1_SET_OF_ACCESS_DESCRIPTION;
-+		ASN1_PRINTABLESTRING_new;
-+		X509V3_get_d2i;
-+		ASN1_ENUMERATED_free;
-+		i2d_X509_CERT_AUX;
-+		X509_STORE_CTX_set_trust;
-+		ASN1_STRING_set_default_mask;
-+		X509_STORE_CTX_new;
-+		EVP_PKEY_get1_RSA;
-+		DIRECTORYSTRING_free;
-+		PEM_write_X509_AUX;
-+		ASN1_OCTET_STRING_set;
-+		d2i_DSA_PUBKEY_fp;
-+		d2i_RSA_PUBKEY;
-+		X509_TRUST_get0_name;
-+		X509_TRUST_get0;
-+		AUTHORITY_INFO_ACCESS_free;
-+		ASN1_IA5STRING_new;
-+		d2i_DSA_PUBKEY;
-+		X509_check_purpose;
-+		ASN1_ENUMERATED_new;
-+		d2i_RSA_PUBKEY_bio;
-+		d2i_PUBKEY;
-+		X509_TRUST_get_trust;
-+		X509_TRUST_get_flags;
-+		ASN1_BMPSTRING_free;
-+		ASN1_T61STRING_new;
-+		ASN1_UTCTIME_new;
-+		i2d_AUTHORITY_INFO_ACCESS;
-+		EVP_PKEY_set1_RSA;
-+		X509_STORE_CTX_set_purpose;
-+		ASN1_IA5STRING_free;
-+		PEM_write_bio_X509_AUX;
-+		X509_PURPOSE_get_count;
-+		CRYPTO_add_info;
-+		X509_NAME_ENTRY_create_by_txt;
-+		ASN1_STRING_get_default_mask;
-+		X509_alias_get0;
-+		ASN1_STRING_data;
-+		i2d_ACCESS_DESCRIPTION;
-+		X509_trust_set_bit;
-+		ASN1_BIT_STRING_free;
-+		PEM_read_bio_RSA_PUBKEY;
-+		X509_add1_reject_object;
-+		X509_check_trust;
-+		PEM_read_bio_DSA_PUBKEY;
-+		X509_PURPOSE_add;
-+		ASN1_STRING_TABLE_get;
-+		ASN1_UTF8STRING_free;
-+		d2i_DSA_PUBKEY_bio;
-+		PEM_write_RSA_PUBKEY;
-+		d2i_OTHERNAME;
-+		X509_reject_set_bit;
-+		PEM_write_DSA_PUBKEY;
-+		X509_PURPOSE_get0_sname;
-+		EVP_PKEY_set1_DH;
-+		ASN1_OCTET_STRING_dup;
-+		ASN1_BIT_STRING_set;
-+		X509_TRUST_get_count;
-+		ASN1_INTEGER_free;
-+		OTHERNAME_free;
-+		i2d_RSA_PUBKEY_fp;
-+		ASN1_INTEGER_dup;
-+		d2i_X509_CERT_AUX;
-+		PEM_write_bio_PUBKEY;
-+		ASN1_VISIBLESTRING_free;
-+		X509_PURPOSE_cleanup;
-+		ASN1_mbstring_ncopy;
-+		ASN1_GENERALIZEDTIME_new;
-+		EVP_PKEY_get1_DH;
-+		ASN1_OCTET_STRING_new;
-+		ASN1_INTEGER_new;
-+		i2d_X509_AUX;
-+		ASN1_BIT_STRING_name_print;
-+		X509_cmp;
-+		ASN1_STRING_length_set;
-+		DIRECTORYSTRING_new;
-+		X509_add1_trust_object;
-+		PKCS12_newpass;
-+		SMIME_write_PKCS7;
-+		SMIME_read_PKCS7;
-+		DES_set_key_checked;
-+		PKCS7_verify;
-+		PKCS7_encrypt;
-+		DES_set_key_unchecked;
-+		SMIME_crlf_copy;
-+		i2d_ASN1_PRINTABLESTRING;
-+		PKCS7_get0_signers;
-+		PKCS7_decrypt;
-+		SMIME_text;
-+		PKCS7_simple_smimecap;
-+		PKCS7_get_smimecap;
-+		PKCS7_sign;
-+		PKCS7_add_attrib_smimecap;
-+		CRYPTO_dbg_set_options;
-+		CRYPTO_remove_all_info;
-+		CRYPTO_get_mem_debug_functions;
-+		CRYPTO_is_mem_check_on;
-+		CRYPTO_set_mem_debug_functions;
-+		CRYPTO_pop_info;
-+		CRYPTO_push_info_;
-+		CRYPTO_set_mem_debug_options;
-+		PEM_write_PKCS8PrivateKey_nid;
-+		PEM_write_bio_PKCS8PrivateKey_nid;
-+		PEM_write_bio_PKCS8PrivKey_nid;
-+		d2i_PKCS8PrivateKey_bio;
-+		ASN1_NULL_free;
-+		d2i_ASN1_NULL;
-+		ASN1_NULL_new;
-+		i2d_PKCS8PrivateKey_bio;
-+		i2d_PKCS8PrivateKey_fp;
-+		i2d_ASN1_NULL;
-+		i2d_PKCS8PrivateKey_nid_fp;
-+		d2i_PKCS8PrivateKey_fp;
-+		i2d_PKCS8PrivateKey_nid_bio;
-+		i2d_PKCS8PrivateKeyInfo_fp;
-+		i2d_PKCS8PrivateKeyInfo_bio;
-+		PEM_cb;
-+		i2d_PrivateKey_fp;
-+		d2i_PrivateKey_bio;
-+		d2i_PrivateKey_fp;
-+		i2d_PrivateKey_bio;
-+		X509_reject_clear;
-+		X509_TRUST_set_default;
-+		d2i_AutoPrivateKey;
-+		X509_ATTRIBUTE_get0_type;
-+		X509_ATTRIBUTE_set1_data;
-+		X509at_get_attr;
-+		X509at_get_attr_count;
-+		X509_ATTRIBUTE_create_by_NID;
-+		X509_ATTRIBUTE_set1_object;
-+		X509_ATTRIBUTE_count;
-+		X509_ATTRIBUTE_create_by_OBJ;
-+		X509_ATTRIBUTE_get0_object;
-+		X509at_get_attr_by_NID;
-+		X509at_add1_attr;
-+		X509_ATTRIBUTE_get0_data;
-+		X509at_delete_attr;
-+		X509at_get_attr_by_OBJ;
-+		RAND_add;
-+		BIO_number_written;
-+		BIO_number_read;
-+		X509_STORE_CTX_get1_chain;
-+		ERR_load_RAND_strings;
-+		RAND_pseudo_bytes;
-+		X509_REQ_get_attr_by_NID;
-+		X509_REQ_get_attr;
-+		X509_REQ_add1_attr_by_NID;
-+		X509_REQ_get_attr_by_OBJ;
-+		X509at_add1_attr_by_NID;
-+		X509_REQ_add1_attr_by_OBJ;
-+		X509_REQ_get_attr_count;
-+		X509_REQ_add1_attr;
-+		X509_REQ_delete_attr;
-+		X509at_add1_attr_by_OBJ;
-+		X509_REQ_add1_attr_by_txt;
-+		X509_ATTRIBUTE_create_by_txt;
-+		X509at_add1_attr_by_txt;
-+		BN_pseudo_rand;
-+		BN_is_prime_fasttest;
-+		BN_CTX_end;
-+		BN_CTX_start;
-+		BN_CTX_get;
-+		EVP_PKEY2PKCS8_broken;
-+		ASN1_STRING_TABLE_add;
-+		CRYPTO_dbg_get_options;
-+		AUTHORITY_INFO_ACCESS_new;
-+		CRYPTO_get_mem_debug_options;
-+		DES_crypt;
-+		PEM_write_bio_X509_REQ_NEW;
-+		PEM_write_X509_REQ_NEW;
-+		BIO_callback_ctrl;
-+		RAND_egd;
-+		RAND_status;
-+		bn_dump1;
-+		DES_check_key_parity;
-+		lh_num_items;
-+		RAND_event;
-+		DSO_new;
-+		DSO_new_method;
-+		DSO_free;
-+		DSO_flags;
-+		DSO_up;
-+		DSO_set_default_method;
-+		DSO_get_default_method;
-+		DSO_get_method;
-+		DSO_set_method;
-+		DSO_load;
-+		DSO_bind_var;
-+		DSO_METHOD_null;
-+		DSO_METHOD_openssl;
-+		DSO_METHOD_dlfcn;
-+		DSO_METHOD_win32;
-+		ERR_load_DSO_strings;
-+		DSO_METHOD_dl;
-+		NCONF_load;
-+		NCONF_load_fp;
-+		NCONF_new;
-+		NCONF_get_string;
-+		NCONF_free;
-+		NCONF_get_number;
-+		CONF_dump_fp;
-+		NCONF_load_bio;
-+		NCONF_dump_fp;
-+		NCONF_get_section;
-+		NCONF_dump_bio;
-+		CONF_dump_bio;
-+		NCONF_free_data;
-+		CONF_set_default_method;
-+		ERR_error_string_n;
-+		BIO_snprintf;
-+		DSO_ctrl;
-+		i2d_ASN1_SET_OF_ASN1_INTEGER;
-+		i2d_ASN1_SET_OF_PKCS12_SAFEBAG;
-+		i2d_ASN1_SET_OF_PKCS7;
-+		BIO_vfree;
-+		d2i_ASN1_SET_OF_ASN1_INTEGER;
-+		d2i_ASN1_SET_OF_PKCS12_SAFEBAG;
-+		ASN1_UTCTIME_get;
-+		X509_REQ_digest;
-+		X509_CRL_digest;
-+		d2i_ASN1_SET_OF_PKCS7;
-+		EVP_CIPHER_CTX_set_key_length;
-+		EVP_CIPHER_CTX_ctrl;
-+		BN_mod_exp_mont_word;
-+		RAND_egd_bytes;
-+		X509_REQ_get1_email;
-+		X509_get1_email;
-+		X509_email_free;
-+		i2d_RSA_NET;
-+		d2i_RSA_NET_2;
-+		d2i_RSA_NET;
-+		DSO_bind_func;
-+		CRYPTO_get_new_dynlockid;
-+		sk_new_null;
-+		CRYPTO_set_dynlock_destroy_callback;
-+		CRYPTO_set_dynlock_destroy_cb;
-+		CRYPTO_destroy_dynlockid;
-+		CRYPTO_set_dynlock_size;
-+		CRYPTO_set_dynlock_create_callback;
-+		CRYPTO_set_dynlock_create_cb;
-+		CRYPTO_set_dynlock_lock_callback;
-+		CRYPTO_set_dynlock_lock_cb;
-+		CRYPTO_get_dynlock_lock_callback;
-+		CRYPTO_get_dynlock_lock_cb;
-+		CRYPTO_get_dynlock_destroy_callback;
-+		CRYPTO_get_dynlock_destroy_cb;
-+		CRYPTO_get_dynlock_value;
-+		CRYPTO_get_dynlock_create_callback;
-+		CRYPTO_get_dynlock_create_cb;
-+		c2i_ASN1_BIT_STRING;
-+		i2c_ASN1_BIT_STRING;
-+		RAND_poll;
-+		c2i_ASN1_INTEGER;
-+		i2c_ASN1_INTEGER;
-+		BIO_dump_indent;
-+		ASN1_parse_dump;
-+		c2i_ASN1_OBJECT;
-+		X509_NAME_print_ex_fp;
-+		ASN1_STRING_print_ex_fp;
-+		X509_NAME_print_ex;
-+		ASN1_STRING_print_ex;
-+		MD4;
-+		MD4_Transform;
-+		MD4_Final;
-+		MD4_Update;
-+		MD4_Init;
-+		EVP_md4;
-+		i2d_PUBKEY_bio;
-+		i2d_PUBKEY_fp;
-+		d2i_PUBKEY_bio;
-+		ASN1_STRING_to_UTF8;
-+		BIO_vprintf;
-+		BIO_vsnprintf;
-+		d2i_PUBKEY_fp;
-+		X509_cmp_time;
-+		X509_STORE_CTX_set_time;
-+		X509_STORE_CTX_get1_issuer;
-+		X509_OBJECT_retrieve_match;
-+		X509_OBJECT_idx_by_subject;
-+		X509_STORE_CTX_set_flags;
-+		X509_STORE_CTX_trusted_stack;
-+		X509_time_adj;
-+		X509_check_issued;
-+		ASN1_UTCTIME_cmp_time_t;
-+		DES_set_weak_key_flag;
-+		DES_check_key;
-+		DES_rw_mode;
-+		RSA_PKCS1_RSAref;
-+		X509_keyid_set1;
-+		BIO_next;
-+		DSO_METHOD_vms;
-+		BIO_f_linebuffer;
-+		BN_bntest_rand;
-+		OPENSSL_issetugid;
-+		BN_rand_range;
-+		ERR_load_ENGINE_strings;
-+		ENGINE_set_DSA;
-+		ENGINE_get_finish_function;
-+		ENGINE_get_default_RSA;
-+		ENGINE_get_BN_mod_exp;
-+		DSA_get_default_openssl_method;
-+		ENGINE_set_DH;
-+		ENGINE_set_def_BN_mod_exp_crt;
-+		ENGINE_set_default_BN_mod_exp_crt;
-+		ENGINE_init;
-+		DH_get_default_openssl_method;
-+		RSA_set_default_openssl_method;
-+		ENGINE_finish;
-+		ENGINE_load_public_key;
-+		ENGINE_get_DH;
-+		ENGINE_ctrl;
-+		ENGINE_get_init_function;
-+		ENGINE_set_init_function;
-+		ENGINE_set_default_DSA;
-+		ENGINE_get_name;
-+		ENGINE_get_last;
-+		ENGINE_get_prev;
-+		ENGINE_get_default_DH;
-+		ENGINE_get_RSA;
-+		ENGINE_set_default;
-+		ENGINE_get_RAND;
-+		ENGINE_get_first;
-+		ENGINE_by_id;
-+		ENGINE_set_finish_function;
-+		ENGINE_get_def_BN_mod_exp_crt;
-+		ENGINE_get_default_BN_mod_exp_crt;
-+		RSA_get_default_openssl_method;
-+		ENGINE_set_RSA;
-+		ENGINE_load_private_key;
-+		ENGINE_set_default_RAND;
-+		ENGINE_set_BN_mod_exp;
-+		ENGINE_remove;
-+		ENGINE_free;
-+		ENGINE_get_BN_mod_exp_crt;
-+		ENGINE_get_next;
-+		ENGINE_set_name;
-+		ENGINE_get_default_DSA;
-+		ENGINE_set_default_BN_mod_exp;
-+		ENGINE_set_default_RSA;
-+		ENGINE_get_default_RAND;
-+		ENGINE_get_default_BN_mod_exp;
-+		ENGINE_set_RAND;
-+		ENGINE_set_id;
-+		ENGINE_set_BN_mod_exp_crt;
-+		ENGINE_set_default_DH;
-+		ENGINE_new;
-+		ENGINE_get_id;
-+		DSA_set_default_openssl_method;
-+		ENGINE_add;
-+		DH_set_default_openssl_method;
-+		ENGINE_get_DSA;
-+		ENGINE_get_ctrl_function;
-+		ENGINE_set_ctrl_function;
-+		BN_pseudo_rand_range;
-+		X509_STORE_CTX_set_verify_cb;
-+		ERR_load_COMP_strings;
-+		PKCS12_item_decrypt_d2i;
-+		ASN1_UTF8STRING_it;
-+		ENGINE_unregister_ciphers;
-+		ENGINE_get_ciphers;
-+		d2i_OCSP_BASICRESP;
-+		KRB5_CHECKSUM_it;
-+		EC_POINT_add;
-+		ASN1_item_ex_i2d;
-+		OCSP_CERTID_it;
-+		d2i_OCSP_RESPBYTES;
-+		X509V3_add1_i2d;
-+		PKCS7_ENVELOPE_it;
-+		UI_add_input_boolean;
-+		ENGINE_unregister_RSA;
-+		X509V3_EXT_nconf;
-+		ASN1_GENERALSTRING_free;
-+		d2i_OCSP_CERTSTATUS;
-+		X509_REVOKED_set_serialNumber;
-+		X509_print_ex;
-+		OCSP_ONEREQ_get1_ext_d2i;
-+		ENGINE_register_all_RAND;
-+		ENGINE_load_dynamic;
-+		PBKDF2PARAM_it;
-+		EXTENDED_KEY_USAGE_new;
-+		EC_GROUP_clear_free;
-+		OCSP_sendreq_bio;
-+		ASN1_item_digest;
-+		OCSP_BASICRESP_delete_ext;
-+		OCSP_SIGNATURE_it;
-+		X509_CRL_it;
-+		OCSP_BASICRESP_add_ext;
-+		KRB5_ENCKEY_it;
-+		UI_method_set_closer;
-+		X509_STORE_set_purpose;
-+		i2d_ASN1_GENERALSTRING;
-+		OCSP_response_status;
-+		i2d_OCSP_SERVICELOC;
-+		ENGINE_get_digest_engine;
-+		EC_GROUP_set_curve_GFp;
-+		OCSP_REQUEST_get_ext_by_OBJ;
-+		_ossl_old_des_random_key;
-+		ASN1_T61STRING_it;
-+		EC_GROUP_method_of;
-+		i2d_KRB5_APREQ;
-+		_ossl_old_des_encrypt;
-+		ASN1_PRINTABLE_new;
-+		HMAC_Init_ex;
-+		d2i_KRB5_AUTHENT;
-+		OCSP_archive_cutoff_new;
-+		EC_POINT_set_Jprojective_coordinates_GFp;
-+		EC_POINT_set_Jproj_coords_GFp;
-+		_ossl_old_des_is_weak_key;
-+		OCSP_BASICRESP_get_ext_by_OBJ;
-+		EC_POINT_oct2point;
-+		OCSP_SINGLERESP_get_ext_count;
-+		UI_ctrl;
-+		_shadow_DES_rw_mode;
-+		asn1_do_adb;
-+		ASN1_template_i2d;
-+		ENGINE_register_DH;
-+		UI_construct_prompt;
-+		X509_STORE_set_trust;
-+		UI_dup_input_string;
-+		d2i_KRB5_APREQ;
-+		EVP_MD_CTX_copy_ex;
-+		OCSP_request_is_signed;
-+		i2d_OCSP_REQINFO;
-+		KRB5_ENCKEY_free;
-+		OCSP_resp_get0;
-+		GENERAL_NAME_it;
-+		ASN1_GENERALIZEDTIME_it;
-+		X509_STORE_set_flags;
-+		EC_POINT_set_compressed_coordinates_GFp;
-+		EC_POINT_set_compr_coords_GFp;
-+		OCSP_response_status_str;
-+		d2i_OCSP_REVOKEDINFO;
-+		OCSP_basic_add1_cert;
-+		ERR_get_implementation;
-+		EVP_CipherFinal_ex;
-+		OCSP_CERTSTATUS_new;
-+		CRYPTO_cleanup_all_ex_data;
-+		OCSP_resp_find;
-+		BN_nnmod;
-+		X509_CRL_sort;
-+		X509_REVOKED_set_revocationDate;
-+		ENGINE_register_RAND;
-+		OCSP_SERVICELOC_new;
-+		EC_POINT_set_affine_coordinates_GFp;
-+		EC_POINT_set_affine_coords_GFp;
-+		_ossl_old_des_options;
-+		SXNET_it;
-+		UI_dup_input_boolean;
-+		PKCS12_add_CSPName_asc;
-+		EC_POINT_is_at_infinity;
-+		ENGINE_load_cryptodev;
-+		DSO_convert_filename;
-+		POLICYQUALINFO_it;
-+		ENGINE_register_ciphers;
-+		BN_mod_lshift_quick;
-+		DSO_set_filename;
-+		ASN1_item_free;
-+		KRB5_TKTBODY_free;
-+		AUTHORITY_KEYID_it;
-+		KRB5_APREQBODY_new;
-+		X509V3_EXT_REQ_add_nconf;
-+		ENGINE_ctrl_cmd_string;
-+		i2d_OCSP_RESPDATA;
-+		EVP_MD_CTX_init;
-+		EXTENDED_KEY_USAGE_free;
-+		PKCS7_ATTR_SIGN_it;
-+		UI_add_error_string;
-+		KRB5_CHECKSUM_free;
-+		OCSP_REQUEST_get_ext;
-+		ENGINE_load_ubsec;
-+		ENGINE_register_all_digests;
-+		PKEY_USAGE_PERIOD_it;
-+		PKCS12_unpack_authsafes;
-+		ASN1_item_unpack;
-+		NETSCAPE_SPKAC_it;
-+		X509_REVOKED_it;
-+		ASN1_STRING_encode;
-+		EVP_aes_128_ecb;
-+		KRB5_AUTHENT_free;
-+		OCSP_BASICRESP_get_ext_by_critical;
-+		OCSP_BASICRESP_get_ext_by_crit;
-+		OCSP_cert_status_str;
-+		d2i_OCSP_REQUEST;
-+		UI_dup_info_string;
-+		_ossl_old_des_xwhite_in2out;
-+		PKCS12_it;
-+		OCSP_SINGLERESP_get_ext_by_critical;
-+		OCSP_SINGLERESP_get_ext_by_crit;
-+		OCSP_CERTSTATUS_free;
-+		_ossl_old_des_crypt;
-+		ASN1_item_i2d;
-+		EVP_DecryptFinal_ex;
-+		ENGINE_load_openssl;
-+		ENGINE_get_cmd_defns;
-+		ENGINE_set_load_privkey_function;
-+		ENGINE_set_load_privkey_fn;
-+		EVP_EncryptFinal_ex;
-+		ENGINE_set_default_digests;
-+		X509_get0_pubkey_bitstr;
-+		asn1_ex_i2c;
-+		ENGINE_register_RSA;
-+		ENGINE_unregister_DSA;
-+		_ossl_old_des_key_sched;
-+		X509_EXTENSION_it;
-+		i2d_KRB5_AUTHENT;
-+		SXNETID_it;
-+		d2i_OCSP_SINGLERESP;
-+		EDIPARTYNAME_new;
-+		PKCS12_certbag2x509;
-+		_ossl_old_des_ofb64_encrypt;
-+		d2i_EXTENDED_KEY_USAGE;
-+		ERR_print_errors_cb;
-+		ENGINE_set_ciphers;
-+		d2i_KRB5_APREQBODY;
-+		UI_method_get_flusher;
-+		X509_PUBKEY_it;
-+		_ossl_old_des_enc_read;
-+		PKCS7_ENCRYPT_it;
-+		i2d_OCSP_RESPONSE;
-+		EC_GROUP_get_cofactor;
-+		PKCS12_unpack_p7data;
-+		d2i_KRB5_AUTHDATA;
-+		OCSP_copy_nonce;
-+		KRB5_AUTHDATA_new;
-+		OCSP_RESPDATA_new;
-+		EC_GFp_mont_method;
-+		OCSP_REVOKEDINFO_free;
-+		UI_get_ex_data;
-+		KRB5_APREQBODY_free;
-+		EC_GROUP_get0_generator;
-+		UI_get_default_method;
-+		X509V3_set_nconf;
-+		PKCS12_item_i2d_encrypt;
-+		X509_add1_ext_i2d;
-+		PKCS7_SIGNER_INFO_it;
-+		KRB5_PRINCNAME_new;
-+		PKCS12_SAFEBAG_it;
-+		EC_GROUP_get_order;
-+		d2i_OCSP_RESPID;
-+		OCSP_request_verify;
-+		NCONF_get_number_e;
-+		_ossl_old_des_decrypt3;
-+		X509_signature_print;
-+		OCSP_SINGLERESP_free;
-+		ENGINE_load_builtin_engines;
-+		i2d_OCSP_ONEREQ;
-+		OCSP_REQUEST_add_ext;
-+		OCSP_RESPBYTES_new;
-+		EVP_MD_CTX_create;
-+		OCSP_resp_find_status;
-+		X509_ALGOR_it;
-+		ASN1_TIME_it;
-+		OCSP_request_set1_name;
-+		OCSP_ONEREQ_get_ext_count;
-+		UI_get0_result;
-+		PKCS12_AUTHSAFES_it;
-+		EVP_aes_256_ecb;
-+		PKCS12_pack_authsafes;
-+		ASN1_IA5STRING_it;
-+		UI_get_input_flags;
-+		EC_GROUP_set_generator;
-+		_ossl_old_des_string_to_2keys;
-+		OCSP_CERTID_free;
-+		X509_CERT_AUX_it;
-+		CERTIFICATEPOLICIES_it;
-+		_ossl_old_des_ede3_cbc_encrypt;
-+		RAND_set_rand_engine;
-+		DSO_get_loaded_filename;
-+		X509_ATTRIBUTE_it;
-+		OCSP_ONEREQ_get_ext_by_NID;
-+		PKCS12_decrypt_skey;
-+		KRB5_AUTHENT_it;
-+		UI_dup_error_string;
-+		RSAPublicKey_it;
-+		i2d_OCSP_REQUEST;
-+		PKCS12_x509crl2certbag;
-+		OCSP_SERVICELOC_it;
-+		ASN1_item_sign;
-+		X509_CRL_set_issuer_name;
-+		OBJ_NAME_do_all_sorted;
-+		i2d_OCSP_BASICRESP;
-+		i2d_OCSP_RESPBYTES;
-+		PKCS12_unpack_p7encdata;
-+		HMAC_CTX_init;
-+		ENGINE_get_digest;
-+		OCSP_RESPONSE_print;
-+		KRB5_TKTBODY_it;
-+		ACCESS_DESCRIPTION_it;
-+		PKCS7_ISSUER_AND_SERIAL_it;
-+		PBE2PARAM_it;
-+		PKCS12_certbag2x509crl;
-+		PKCS7_SIGNED_it;
-+		ENGINE_get_cipher;
-+		i2d_OCSP_CRLID;
-+		OCSP_SINGLERESP_new;
-+		ENGINE_cmd_is_executable;
-+		RSA_up_ref;
-+		ASN1_GENERALSTRING_it;
-+		ENGINE_register_DSA;
-+		X509V3_EXT_add_nconf_sk;
-+		ENGINE_set_load_pubkey_function;
-+		PKCS8_decrypt;
-+		PEM_bytes_read_bio;
-+		DIRECTORYSTRING_it;
-+		d2i_OCSP_CRLID;
-+		EC_POINT_is_on_curve;
-+		CRYPTO_set_locked_mem_ex_functions;
-+		CRYPTO_set_locked_mem_ex_funcs;
-+		d2i_KRB5_CHECKSUM;
-+		ASN1_item_dup;
-+		X509_it;
-+		BN_mod_add;
-+		KRB5_AUTHDATA_free;
-+		_ossl_old_des_cbc_cksum;
-+		ASN1_item_verify;
-+		CRYPTO_set_mem_ex_functions;
-+		EC_POINT_get_Jprojective_coordinates_GFp;
-+		EC_POINT_get_Jproj_coords_GFp;
-+		ZLONG_it;
-+		CRYPTO_get_locked_mem_ex_functions;
-+		CRYPTO_get_locked_mem_ex_funcs;
-+		ASN1_TIME_check;
-+		UI_get0_user_data;
-+		HMAC_CTX_cleanup;
-+		DSA_up_ref;
-+		_ossl_old_des_ede3_cfb64_encrypt;
-+		_ossl_odes_ede3_cfb64_encrypt;
-+		ASN1_BMPSTRING_it;
-+		ASN1_tag2bit;
-+		UI_method_set_flusher;
-+		X509_ocspid_print;
-+		KRB5_ENCDATA_it;
-+		ENGINE_get_load_pubkey_function;
-+		UI_add_user_data;
-+		OCSP_REQUEST_delete_ext;
-+		UI_get_method;
-+		OCSP_ONEREQ_free;
-+		ASN1_PRINTABLESTRING_it;
-+		X509_CRL_set_nextUpdate;
-+		OCSP_REQUEST_it;
-+		OCSP_BASICRESP_it;
-+		AES_ecb_encrypt;
-+		BN_mod_sqr;
-+		NETSCAPE_CERT_SEQUENCE_it;
-+		GENERAL_NAMES_it;
-+		AUTHORITY_INFO_ACCESS_it;
-+		ASN1_FBOOLEAN_it;
-+		UI_set_ex_data;
-+		_ossl_old_des_string_to_key;
-+		ENGINE_register_all_RSA;
-+		d2i_KRB5_PRINCNAME;
-+		OCSP_RESPBYTES_it;
-+		X509_CINF_it;
-+		ENGINE_unregister_digests;
-+		d2i_EDIPARTYNAME;
-+		d2i_OCSP_SERVICELOC;
-+		ENGINE_get_digests;
-+		_ossl_old_des_set_odd_parity;
-+		OCSP_RESPDATA_free;
-+		d2i_KRB5_TICKET;
-+		OTHERNAME_it;
-+		EVP_MD_CTX_cleanup;
-+		d2i_ASN1_GENERALSTRING;
-+		X509_CRL_set_version;
-+		BN_mod_sub;
-+		OCSP_SINGLERESP_get_ext_by_NID;
-+		ENGINE_get_ex_new_index;
-+		OCSP_REQUEST_free;
-+		OCSP_REQUEST_add1_ext_i2d;
-+		X509_VAL_it;
-+		EC_POINTs_make_affine;
-+		EC_POINT_mul;
-+		X509V3_EXT_add_nconf;
-+		X509_TRUST_set;
-+		X509_CRL_add1_ext_i2d;
-+		_ossl_old_des_fcrypt;
-+		DISPLAYTEXT_it;
-+		X509_CRL_set_lastUpdate;
-+		OCSP_BASICRESP_free;
-+		OCSP_BASICRESP_add1_ext_i2d;
-+		d2i_KRB5_AUTHENTBODY;
-+		CRYPTO_set_ex_data_implementation;
-+		CRYPTO_set_ex_data_impl;
-+		KRB5_ENCDATA_new;
-+		DSO_up_ref;
-+		OCSP_crl_reason_str;
-+		UI_get0_result_string;
-+		ASN1_GENERALSTRING_new;
-+		X509_SIG_it;
-+		ERR_set_implementation;
-+		ERR_load_EC_strings;
-+		UI_get0_action_string;
-+		OCSP_ONEREQ_get_ext;
-+		EC_POINT_method_of;
-+		i2d_KRB5_APREQBODY;
-+		_ossl_old_des_ecb3_encrypt;
-+		CRYPTO_get_mem_ex_functions;
-+		ENGINE_get_ex_data;
-+		UI_destroy_method;
-+		ASN1_item_i2d_bio;
-+		OCSP_ONEREQ_get_ext_by_OBJ;
-+		ASN1_primitive_new;
-+		ASN1_PRINTABLE_it;
-+		EVP_aes_192_ecb;
-+		OCSP_SIGNATURE_new;
-+		LONG_it;
-+		ASN1_VISIBLESTRING_it;
-+		OCSP_SINGLERESP_add1_ext_i2d;
-+		d2i_OCSP_CERTID;
-+		ASN1_item_d2i_fp;
-+		CRL_DIST_POINTS_it;
-+		GENERAL_NAME_print;
-+		OCSP_SINGLERESP_delete_ext;
-+		PKCS12_SAFEBAGS_it;
-+		d2i_OCSP_SIGNATURE;
-+		OCSP_request_add1_nonce;
-+		ENGINE_set_cmd_defns;
-+		OCSP_SERVICELOC_free;
-+		EC_GROUP_free;
-+		ASN1_BIT_STRING_it;
-+		X509_REQ_it;
-+		_ossl_old_des_cbc_encrypt;
-+		ERR_unload_strings;
-+		PKCS7_SIGN_ENVELOPE_it;
-+		EDIPARTYNAME_free;
-+		OCSP_REQINFO_free;
-+		EC_GROUP_new_curve_GFp;
-+		OCSP_REQUEST_get1_ext_d2i;
-+		PKCS12_item_pack_safebag;
-+		asn1_ex_c2i;
-+		ENGINE_register_digests;
-+		i2d_OCSP_REVOKEDINFO;
-+		asn1_enc_restore;
-+		UI_free;
-+		UI_new_method;
-+		EVP_EncryptInit_ex;
-+		X509_pubkey_digest;
-+		EC_POINT_invert;
-+		OCSP_basic_sign;
-+		i2d_OCSP_RESPID;
-+		OCSP_check_nonce;
-+		ENGINE_ctrl_cmd;
-+		d2i_KRB5_ENCKEY;
-+		OCSP_parse_url;
-+		OCSP_SINGLERESP_get_ext;
-+		OCSP_CRLID_free;
-+		OCSP_BASICRESP_get1_ext_d2i;
-+		RSAPrivateKey_it;
-+		ENGINE_register_all_DH;
-+		i2d_EDIPARTYNAME;
-+		EC_POINT_get_affine_coordinates_GFp;
-+		EC_POINT_get_affine_coords_GFp;
-+		OCSP_CRLID_new;
-+		ENGINE_get_flags;
-+		OCSP_ONEREQ_it;
-+		UI_process;
-+		ASN1_INTEGER_it;
-+		EVP_CipherInit_ex;
-+		UI_get_string_type;
-+		ENGINE_unregister_DH;
-+		ENGINE_register_all_DSA;
-+		OCSP_ONEREQ_get_ext_by_critical;
-+		bn_dup_expand;
-+		OCSP_cert_id_new;
-+		BASIC_CONSTRAINTS_it;
-+		BN_mod_add_quick;
-+		EC_POINT_new;
-+		EVP_MD_CTX_destroy;
-+		OCSP_RESPBYTES_free;
-+		EVP_aes_128_cbc;
-+		OCSP_SINGLERESP_get1_ext_d2i;
-+		EC_POINT_free;
-+		DH_up_ref;
-+		X509_NAME_ENTRY_it;
-+		UI_get_ex_new_index;
-+		BN_mod_sub_quick;
-+		OCSP_ONEREQ_add_ext;
-+		OCSP_request_sign;
-+		EVP_DigestFinal_ex;
-+		ENGINE_set_digests;
-+		OCSP_id_issuer_cmp;
-+		OBJ_NAME_do_all;
-+		EC_POINTs_mul;
-+		ENGINE_register_complete;
-+		X509V3_EXT_nconf_nid;
-+		ASN1_SEQUENCE_it;
-+		UI_set_default_method;
-+		RAND_query_egd_bytes;
-+		UI_method_get_writer;
-+		UI_OpenSSL;
-+		PEM_def_callback;
-+		ENGINE_cleanup;
-+		DIST_POINT_it;
-+		OCSP_SINGLERESP_it;
-+		d2i_KRB5_TKTBODY;
-+		EC_POINT_cmp;
-+		OCSP_REVOKEDINFO_new;
-+		i2d_OCSP_CERTSTATUS;
-+		OCSP_basic_add1_nonce;
-+		ASN1_item_ex_d2i;
-+		BN_mod_lshift1_quick;
-+		UI_set_method;
-+		OCSP_id_get0_info;
-+		BN_mod_sqrt;
-+		EC_GROUP_copy;
-+		KRB5_ENCDATA_free;
-+		_ossl_old_des_cfb_encrypt;
-+		OCSP_SINGLERESP_get_ext_by_OBJ;
-+		OCSP_cert_to_id;
-+		OCSP_RESPID_new;
-+		OCSP_RESPDATA_it;
-+		d2i_OCSP_RESPDATA;
-+		ENGINE_register_all_complete;
-+		OCSP_check_validity;
-+		PKCS12_BAGS_it;
-+		OCSP_url_svcloc_new;
-+		ASN1_template_free;
-+		OCSP_SINGLERESP_add_ext;
-+		KRB5_AUTHENTBODY_it;
-+		X509_supported_extension;
-+		i2d_KRB5_AUTHDATA;
-+		UI_method_get_opener;
-+		ENGINE_set_ex_data;
-+		OCSP_REQUEST_print;
-+		CBIGNUM_it;
-+		KRB5_TICKET_new;
-+		KRB5_APREQ_new;
-+		EC_GROUP_get_curve_GFp;
-+		KRB5_ENCKEY_new;
-+		ASN1_template_d2i;
-+		_ossl_old_des_quad_cksum;
-+		OCSP_single_get0_status;
-+		BN_swap;
-+		POLICYINFO_it;
-+		ENGINE_set_destroy_function;
-+		asn1_enc_free;
-+		OCSP_RESPID_it;
-+		EC_GROUP_new;
-+		EVP_aes_256_cbc;
-+		i2d_KRB5_PRINCNAME;
-+		_ossl_old_des_encrypt2;
-+		_ossl_old_des_encrypt3;
-+		PKCS8_PRIV_KEY_INFO_it;
-+		OCSP_REQINFO_it;
-+		PBEPARAM_it;
-+		KRB5_AUTHENTBODY_new;
-+		X509_CRL_add0_revoked;
-+		EDIPARTYNAME_it;
-+		NETSCAPE_SPKI_it;
-+		UI_get0_test_string;
-+		ENGINE_get_cipher_engine;
-+		ENGINE_register_all_ciphers;
-+		EC_POINT_copy;
-+		BN_kronecker;
-+		_ossl_old_des_ede3_ofb64_encrypt;
-+		_ossl_odes_ede3_ofb64_encrypt;
-+		UI_method_get_reader;
-+		OCSP_BASICRESP_get_ext_count;
-+		ASN1_ENUMERATED_it;
-+		UI_set_result;
-+		i2d_KRB5_TICKET;
-+		X509_print_ex_fp;
-+		EVP_CIPHER_CTX_set_padding;
-+		d2i_OCSP_RESPONSE;
-+		ASN1_UTCTIME_it;
-+		_ossl_old_des_enc_write;
-+		OCSP_RESPONSE_new;
-+		AES_set_encrypt_key;
-+		OCSP_resp_count;
-+		KRB5_CHECKSUM_new;
-+		ENGINE_load_cswift;
-+		OCSP_onereq_get0_id;
-+		ENGINE_set_default_ciphers;
-+		NOTICEREF_it;
-+		X509V3_EXT_CRL_add_nconf;
-+		OCSP_REVOKEDINFO_it;
-+		AES_encrypt;
-+		OCSP_REQUEST_new;
-+		ASN1_ANY_it;
-+		CRYPTO_ex_data_new_class;
-+		_ossl_old_des_ncbc_encrypt;
-+		i2d_KRB5_TKTBODY;
-+		EC_POINT_clear_free;
-+		AES_decrypt;
-+		asn1_enc_init;
-+		UI_get_result_maxsize;
-+		OCSP_CERTID_new;
-+		ENGINE_unregister_RAND;
-+		UI_method_get_closer;
-+		d2i_KRB5_ENCDATA;
-+		OCSP_request_onereq_count;
-+		OCSP_basic_verify;
-+		KRB5_AUTHENTBODY_free;
-+		ASN1_item_d2i;
-+		ASN1_primitive_free;
-+		i2d_EXTENDED_KEY_USAGE;
-+		i2d_OCSP_SIGNATURE;
-+		asn1_enc_save;
-+		ENGINE_load_nuron;
-+		_ossl_old_des_pcbc_encrypt;
-+		PKCS12_MAC_DATA_it;
-+		OCSP_accept_responses_new;
-+		asn1_do_lock;
-+		PKCS7_ATTR_VERIFY_it;
-+		KRB5_APREQBODY_it;
-+		i2d_OCSP_SINGLERESP;
-+		ASN1_item_ex_new;
-+		UI_add_verify_string;
-+		_ossl_old_des_set_key;
-+		KRB5_PRINCNAME_it;
-+		EVP_DecryptInit_ex;
-+		i2d_OCSP_CERTID;
-+		ASN1_item_d2i_bio;
-+		EC_POINT_dbl;
-+		asn1_get_choice_selector;
-+		i2d_KRB5_CHECKSUM;
-+		ENGINE_set_table_flags;
-+		AES_options;
-+		ENGINE_load_chil;
-+		OCSP_id_cmp;
-+		OCSP_BASICRESP_new;
-+		OCSP_REQUEST_get_ext_by_NID;
-+		KRB5_APREQ_it;
-+		ENGINE_get_destroy_function;
-+		CONF_set_nconf;
-+		ASN1_PRINTABLE_free;
-+		OCSP_BASICRESP_get_ext_by_NID;
-+		DIST_POINT_NAME_it;
-+		X509V3_extensions_print;
-+		_ossl_old_des_cfb64_encrypt;
-+		X509_REVOKED_add1_ext_i2d;
-+		_ossl_old_des_ofb_encrypt;
-+		KRB5_TKTBODY_new;
-+		ASN1_OCTET_STRING_it;
-+		ERR_load_UI_strings;
-+		i2d_KRB5_ENCKEY;
-+		ASN1_template_new;
-+		OCSP_SIGNATURE_free;
-+		ASN1_item_i2d_fp;
-+		KRB5_PRINCNAME_free;
-+		PKCS7_RECIP_INFO_it;
-+		EXTENDED_KEY_USAGE_it;
-+		EC_GFp_simple_method;
-+		EC_GROUP_precompute_mult;
-+		OCSP_request_onereq_get0;
-+		UI_method_set_writer;
-+		KRB5_AUTHENT_new;
-+		X509_CRL_INFO_it;
-+		DSO_set_name_converter;
-+		AES_set_decrypt_key;
-+		PKCS7_DIGEST_it;
-+		PKCS12_x5092certbag;
-+		EVP_DigestInit_ex;
-+		i2a_ACCESS_DESCRIPTION;
-+		OCSP_RESPONSE_it;
-+		PKCS7_ENC_CONTENT_it;
-+		OCSP_request_add0_id;
-+		EC_POINT_make_affine;
-+		DSO_get_filename;
-+		OCSP_CERTSTATUS_it;
-+		OCSP_request_add1_cert;
-+		UI_get0_output_string;
-+		UI_dup_verify_string;
-+		BN_mod_lshift;
-+		KRB5_AUTHDATA_it;
-+		asn1_set_choice_selector;
-+		OCSP_basic_add1_status;
-+		OCSP_RESPID_free;
-+		asn1_get_field_ptr;
-+		UI_add_input_string;
-+		OCSP_CRLID_it;
-+		i2d_KRB5_AUTHENTBODY;
-+		OCSP_REQUEST_get_ext_count;
-+		ENGINE_load_atalla;
-+		X509_NAME_it;
-+		USERNOTICE_it;
-+		OCSP_REQINFO_new;
-+		OCSP_BASICRESP_get_ext;
-+		CRYPTO_get_ex_data_implementation;
-+		CRYPTO_get_ex_data_impl;
-+		ASN1_item_pack;
-+		i2d_KRB5_ENCDATA;
-+		X509_PURPOSE_set;
-+		X509_REQ_INFO_it;
-+		UI_method_set_opener;
-+		ASN1_item_ex_free;
-+		ASN1_BOOLEAN_it;
-+		ENGINE_get_table_flags;
-+		UI_create_method;
-+		OCSP_ONEREQ_add1_ext_i2d;
-+		_shadow_DES_check_key;
-+		d2i_OCSP_REQINFO;
-+		UI_add_info_string;
-+		UI_get_result_minsize;
-+		ASN1_NULL_it;
-+		BN_mod_lshift1;
-+		d2i_OCSP_ONEREQ;
-+		OCSP_ONEREQ_new;
-+		KRB5_TICKET_it;
-+		EVP_aes_192_cbc;
-+		KRB5_TICKET_free;
-+		UI_new;
-+		OCSP_response_create;
-+		_ossl_old_des_xcbc_encrypt;
-+		PKCS7_it;
-+		OCSP_REQUEST_get_ext_by_critical;
-+		OCSP_REQUEST_get_ext_by_crit;
-+		ENGINE_set_flags;
-+		_ossl_old_des_ecb_encrypt;
-+		OCSP_response_get1_basic;
-+		EVP_Digest;
-+		OCSP_ONEREQ_delete_ext;
-+		ASN1_TBOOLEAN_it;
-+		ASN1_item_new;
-+		ASN1_TIME_to_generalizedtime;
-+		BIGNUM_it;
-+		AES_cbc_encrypt;
-+		ENGINE_get_load_privkey_function;
-+		ENGINE_get_load_privkey_fn;
-+		OCSP_RESPONSE_free;
-+		UI_method_set_reader;
-+		i2d_ASN1_T61STRING;
-+		EC_POINT_set_to_infinity;
-+		ERR_load_OCSP_strings;
-+		EC_POINT_point2oct;
-+		KRB5_APREQ_free;
-+		ASN1_OBJECT_it;
-+		OCSP_crlID_new;
-+		OCSP_crlID2_new;
-+		CONF_modules_load_file;
-+		CONF_imodule_set_usr_data;
-+		ENGINE_set_default_string;
-+		CONF_module_get_usr_data;
-+		ASN1_add_oid_module;
-+		CONF_modules_finish;
-+		OPENSSL_config;
-+		CONF_modules_unload;
-+		CONF_imodule_get_value;
-+		CONF_module_set_usr_data;
-+		CONF_parse_list;
-+		CONF_module_add;
-+		CONF_get1_default_config_file;
-+		CONF_imodule_get_flags;
-+		CONF_imodule_get_module;
-+		CONF_modules_load;
-+		CONF_imodule_get_name;
-+		ERR_peek_top_error;
-+		CONF_imodule_get_usr_data;
-+		CONF_imodule_set_flags;
-+		ENGINE_add_conf_module;
-+		ERR_peek_last_error_line;
-+		ERR_peek_last_error_line_data;
-+		ERR_peek_last_error;
-+		DES_read_2passwords;
-+		DES_read_password;
-+		UI_UTIL_read_pw;
-+		UI_UTIL_read_pw_string;
-+		ENGINE_load_aep;
-+		ENGINE_load_sureware;
-+		OPENSSL_add_all_algorithms_noconf;
-+		OPENSSL_add_all_algo_noconf;
-+		OPENSSL_add_all_algorithms_conf;
-+		OPENSSL_add_all_algo_conf;
-+		OPENSSL_load_builtin_modules;
-+		AES_ofb128_encrypt;
-+		AES_ctr128_encrypt;
-+		AES_cfb128_encrypt;
-+		ENGINE_load_4758cca;
-+		_ossl_096_des_random_seed;
-+		EVP_aes_256_ofb;
-+		EVP_aes_192_ofb;
-+		EVP_aes_128_cfb128;
-+		EVP_aes_256_cfb128;
-+		EVP_aes_128_ofb;
-+		EVP_aes_192_cfb128;
-+		CONF_modules_free;
-+		NCONF_default;
-+		OPENSSL_no_config;
-+		NCONF_WIN32;
-+		ASN1_UNIVERSALSTRING_new;
-+		EVP_des_ede_ecb;
-+		i2d_ASN1_UNIVERSALSTRING;
-+		ASN1_UNIVERSALSTRING_free;
-+		ASN1_UNIVERSALSTRING_it;
-+		d2i_ASN1_UNIVERSALSTRING;
-+		EVP_des_ede3_ecb;
-+		X509_REQ_print_ex;
-+		ENGINE_up_ref;
-+		BUF_MEM_grow_clean;
-+		CRYPTO_realloc_clean;
-+		BUF_strlcat;
-+		BIO_indent;
-+		BUF_strlcpy;
-+		OpenSSLDie;
-+		OPENSSL_cleanse;
-+		ENGINE_setup_bsd_cryptodev;
-+		ERR_release_err_state_table;
-+		EVP_aes_128_cfb8;
-+		FIPS_corrupt_rsa;
-+		FIPS_selftest_des;
-+		EVP_aes_128_cfb1;
-+		EVP_aes_192_cfb8;
-+		FIPS_mode_set;
-+		FIPS_selftest_dsa;
-+		EVP_aes_256_cfb8;
-+		FIPS_allow_md5;
-+		DES_ede3_cfb_encrypt;
-+		EVP_des_ede3_cfb8;
-+		FIPS_rand_seeded;
-+		AES_cfbr_encrypt_block;
-+		AES_cfb8_encrypt;
-+		FIPS_rand_seed;
-+		FIPS_corrupt_des;
-+		EVP_aes_192_cfb1;
-+		FIPS_selftest_aes;
-+		FIPS_set_prng_key;
-+		EVP_des_cfb8;
-+		FIPS_corrupt_dsa;
-+		FIPS_test_mode;
-+		FIPS_rand_method;
-+		EVP_aes_256_cfb1;
-+		ERR_load_FIPS_strings;
-+		FIPS_corrupt_aes;
-+		FIPS_selftest_sha1;
-+		FIPS_selftest_rsa;
-+		FIPS_corrupt_sha1;
-+		EVP_des_cfb1;
-+		FIPS_dsa_check;
-+		AES_cfb1_encrypt;
-+		EVP_des_ede3_cfb1;
-+		FIPS_rand_check;
-+		FIPS_md5_allowed;
-+		FIPS_mode;
-+		FIPS_selftest_failed;
-+		sk_is_sorted;
-+		X509_check_ca;
-+		HMAC_CTX_set_flags;
-+		d2i_PROXY_CERT_INFO_EXTENSION;
-+		PROXY_POLICY_it;
-+		i2d_PROXY_POLICY;
-+		i2d_PROXY_CERT_INFO_EXTENSION;
-+		d2i_PROXY_POLICY;
-+		PROXY_CERT_INFO_EXTENSION_new;
-+		PROXY_CERT_INFO_EXTENSION_free;
-+		PROXY_CERT_INFO_EXTENSION_it;
-+		PROXY_POLICY_free;
-+		PROXY_POLICY_new;
-+		BN_MONT_CTX_set_locked;
-+		FIPS_selftest_rng;
-+		EVP_sha384;
-+		EVP_sha512;
-+		EVP_sha224;
-+		EVP_sha256;
-+		FIPS_selftest_hmac;
-+		FIPS_corrupt_rng;
-+		BN_mod_exp_mont_consttime;
-+		RSA_X931_hash_id;
-+		RSA_padding_check_X931;
-+		RSA_verify_PKCS1_PSS;
-+		RSA_padding_add_X931;
-+		RSA_padding_add_PKCS1_PSS;
-+		PKCS1_MGF1;
-+		BN_X931_generate_Xpq;
-+		RSA_X931_generate_key;
-+		BN_X931_derive_prime;
-+		BN_X931_generate_prime;
-+		RSA_X931_derive;
-+		BIO_new_dgram;
-+		BN_get0_nist_prime_384;
-+		ERR_set_mark;
-+		X509_STORE_CTX_set0_crls;
-+		ENGINE_set_STORE;
-+		ENGINE_register_ECDSA;
-+		STORE_meth_set_list_start_fn;
-+		STORE_method_set_list_start_function;
-+		BN_BLINDING_invert_ex;
-+		NAME_CONSTRAINTS_free;
-+		STORE_ATTR_INFO_set_number;
-+		BN_BLINDING_get_thread_id;
-+		X509_STORE_CTX_set0_param;
-+		POLICY_MAPPING_it;
-+		STORE_parse_attrs_start;
-+		POLICY_CONSTRAINTS_free;
-+		EVP_PKEY_add1_attr_by_NID;
-+		BN_nist_mod_192;
-+		EC_GROUP_get_trinomial_basis;
-+		STORE_set_method;
-+		GENERAL_SUBTREE_free;
-+		NAME_CONSTRAINTS_it;
-+		ECDH_get_default_method;
-+		PKCS12_add_safe;
-+		EC_KEY_new_by_curve_name;
-+		STORE_meth_get_update_store_fn;
-+		STORE_method_get_update_store_function;
-+		ENGINE_register_ECDH;
-+		SHA512_Update;
-+		i2d_ECPrivateKey;
-+		BN_get0_nist_prime_192;
-+		STORE_modify_certificate;
-+		EC_POINT_set_affine_coordinates_GF2m;
-+		EC_POINT_set_affine_coords_GF2m;
-+		BN_GF2m_mod_exp_arr;
-+		STORE_ATTR_INFO_modify_number;
-+		X509_keyid_get0;
-+		ENGINE_load_gmp;
-+		pitem_new;
-+		BN_GF2m_mod_mul_arr;
-+		STORE_list_public_key_endp;
-+		o2i_ECPublicKey;
-+		EC_KEY_copy;
-+		BIO_dump_fp;
-+		X509_policy_node_get0_parent;
-+		EC_GROUP_check_discriminant;
-+		i2o_ECPublicKey;
-+		EC_KEY_precompute_mult;
-+		a2i_IPADDRESS;
-+		STORE_meth_set_initialise_fn;
-+		STORE_method_set_initialise_function;
-+		X509_STORE_CTX_set_depth;
-+		X509_VERIFY_PARAM_inherit;
-+		EC_POINT_point2bn;
-+		STORE_ATTR_INFO_set_dn;
-+		X509_policy_tree_get0_policies;
-+		EC_GROUP_new_curve_GF2m;
-+		STORE_destroy_method;
-+		ENGINE_unregister_STORE;
-+		EVP_PKEY_get1_EC_KEY;
-+		STORE_ATTR_INFO_get0_number;
-+		ENGINE_get_default_ECDH;
-+		EC_KEY_get_conv_form;
-+		ASN1_OCTET_STRING_NDEF_it;
-+		STORE_delete_public_key;
-+		STORE_get_public_key;
-+		STORE_modify_arbitrary;
-+		ENGINE_get_static_state;
-+		pqueue_iterator;
-+		ECDSA_SIG_new;
-+		OPENSSL_DIR_end;
-+		BN_GF2m_mod_sqr;
-+		EC_POINT_bn2point;
-+		X509_VERIFY_PARAM_set_depth;
-+		EC_KEY_set_asn1_flag;
-+		STORE_get_method;
-+		EC_KEY_get_key_method_data;
-+		ECDSA_sign_ex;
-+		STORE_parse_attrs_end;
-+		EC_GROUP_get_point_conversion_form;
-+		EC_GROUP_get_point_conv_form;
-+		STORE_method_set_store_function;
-+		STORE_ATTR_INFO_in;
-+		PEM_read_bio_ECPKParameters;
-+		EC_GROUP_get_pentanomial_basis;
-+		EVP_PKEY_add1_attr_by_txt;
-+		BN_BLINDING_set_flags;
-+		X509_VERIFY_PARAM_set1_policies;
-+		X509_VERIFY_PARAM_set1_name;
-+		X509_VERIFY_PARAM_set_purpose;
-+		STORE_get_number;
-+		ECDSA_sign_setup;
-+		BN_GF2m_mod_solve_quad_arr;
-+		EC_KEY_up_ref;
-+		POLICY_MAPPING_free;
-+		BN_GF2m_mod_div;
-+		X509_VERIFY_PARAM_set_flags;
-+		EC_KEY_free;
-+		STORE_meth_set_list_next_fn;
-+		STORE_method_set_list_next_function;
-+		PEM_write_bio_ECPrivateKey;
-+		d2i_EC_PUBKEY;
-+		STORE_meth_get_generate_fn;
-+		STORE_method_get_generate_function;
-+		STORE_meth_set_list_end_fn;
-+		STORE_method_set_list_end_function;
-+		pqueue_print;
-+		EC_GROUP_have_precompute_mult;
-+		EC_KEY_print_fp;
-+		BN_GF2m_mod_arr;
-+		PEM_write_bio_X509_CERT_PAIR;
-+		EVP_PKEY_cmp;
-+		X509_policy_level_node_count;
-+		STORE_new_engine;
-+		STORE_list_public_key_start;
-+		X509_VERIFY_PARAM_new;
-+		ECDH_get_ex_data;
-+		EVP_PKEY_get_attr;
-+		ECDSA_do_sign;
-+		ENGINE_unregister_ECDH;
-+		ECDH_OpenSSL;
-+		EC_KEY_set_conv_form;
-+		EC_POINT_dup;
-+		GENERAL_SUBTREE_new;
-+		STORE_list_crl_endp;
-+		EC_get_builtin_curves;
-+		X509_policy_node_get0_qualifiers;
-+		X509_pcy_node_get0_qualifiers;
-+		STORE_list_crl_end;
-+		EVP_PKEY_set1_EC_KEY;
-+		BN_GF2m_mod_sqrt_arr;
-+		i2d_ECPrivateKey_bio;
-+		ECPKParameters_print_fp;
-+		pqueue_find;
-+		ECDSA_SIG_free;
-+		PEM_write_bio_ECPKParameters;
-+		STORE_method_set_ctrl_function;
-+		STORE_list_public_key_end;
-+		EC_KEY_set_private_key;
-+		pqueue_peek;
-+		STORE_get_arbitrary;
-+		STORE_store_crl;
-+		X509_policy_node_get0_policy;
-+		PKCS12_add_safes;
-+		BN_BLINDING_convert_ex;
-+		X509_policy_tree_free;
-+		OPENSSL_ia32cap_loc;
-+		BN_GF2m_poly2arr;
-+		STORE_ctrl;
-+		STORE_ATTR_INFO_compare;
-+		BN_get0_nist_prime_224;
-+		i2d_ECParameters;
-+		i2d_ECPKParameters;
-+		BN_GENCB_call;
-+		d2i_ECPKParameters;
-+		STORE_meth_set_generate_fn;
-+		STORE_method_set_generate_function;
-+		ENGINE_set_ECDH;
-+		NAME_CONSTRAINTS_new;
-+		SHA256_Init;
-+		EC_KEY_get0_public_key;
-+		PEM_write_bio_EC_PUBKEY;
-+		STORE_ATTR_INFO_set_cstr;
-+		STORE_list_crl_next;
-+		STORE_ATTR_INFO_in_range;
-+		ECParameters_print;
-+		STORE_meth_set_delete_fn;
-+		STORE_method_set_delete_function;
-+		STORE_list_certificate_next;
-+		ASN1_generate_nconf;
-+		BUF_memdup;
-+		BN_GF2m_mod_mul;
-+		STORE_meth_get_list_next_fn;
-+		STORE_method_get_list_next_function;
-+		STORE_ATTR_INFO_get0_dn;
-+		STORE_list_private_key_next;
-+		EC_GROUP_set_seed;
-+		X509_VERIFY_PARAM_set_trust;
-+		STORE_ATTR_INFO_free;
-+		STORE_get_private_key;
-+		EVP_PKEY_get_attr_count;
-+		STORE_ATTR_INFO_new;
-+		EC_GROUP_get_curve_GF2m;
-+		STORE_meth_set_revoke_fn;
-+		STORE_method_set_revoke_function;
-+		STORE_store_number;
-+		BN_is_prime_ex;
-+		STORE_revoke_public_key;
-+		X509_STORE_CTX_get0_param;
-+		STORE_delete_arbitrary;
-+		PEM_read_X509_CERT_PAIR;
-+		X509_STORE_set_depth;
-+		ECDSA_get_ex_data;
-+		SHA224;
-+		BIO_dump_indent_fp;
-+		EC_KEY_set_group;
-+		BUF_strndup;
-+		STORE_list_certificate_start;
-+		BN_GF2m_mod;
-+		X509_REQ_check_private_key;
-+		EC_GROUP_get_seed_len;
-+		ERR_load_STORE_strings;
-+		PEM_read_bio_EC_PUBKEY;
-+		STORE_list_private_key_end;
-+		i2d_EC_PUBKEY;
-+		ECDSA_get_default_method;
-+		ASN1_put_eoc;
-+		X509_STORE_CTX_get_explicit_policy;
-+		X509_STORE_CTX_get_expl_policy;
-+		X509_VERIFY_PARAM_table_cleanup;
-+		STORE_modify_private_key;
-+		X509_VERIFY_PARAM_free;
-+		EC_METHOD_get_field_type;
-+		EC_GFp_nist_method;
-+		STORE_meth_set_modify_fn;
-+		STORE_method_set_modify_function;
-+		STORE_parse_attrs_next;
-+		ENGINE_load_padlock;
-+		EC_GROUP_set_curve_name;
-+		X509_CERT_PAIR_it;
-+		STORE_meth_get_revoke_fn;
-+		STORE_method_get_revoke_function;
-+		STORE_method_set_get_function;
-+		STORE_modify_number;
-+		STORE_method_get_store_function;
-+		STORE_store_private_key;
-+		BN_GF2m_mod_sqr_arr;
-+		RSA_setup_blinding;
-+		BIO_s_datagram;
-+		STORE_Memory;
-+		sk_find_ex;
-+		EC_GROUP_set_curve_GF2m;
-+		ENGINE_set_default_ECDSA;
-+		POLICY_CONSTRAINTS_new;
-+		BN_GF2m_mod_sqrt;
-+		ECDH_set_default_method;
-+		EC_KEY_generate_key;
-+		SHA384_Update;
-+		BN_GF2m_arr2poly;
-+		STORE_method_get_get_function;
-+		STORE_meth_set_cleanup_fn;
-+		STORE_method_set_cleanup_function;
-+		EC_GROUP_check;
-+		d2i_ECPrivateKey_bio;
-+		EC_KEY_insert_key_method_data;
-+		STORE_meth_get_lock_store_fn;
-+		STORE_method_get_lock_store_function;
-+		X509_VERIFY_PARAM_get_depth;
-+		SHA224_Final;
-+		STORE_meth_set_update_store_fn;
-+		STORE_method_set_update_store_function;
-+		SHA224_Update;
-+		d2i_ECPrivateKey;
-+		ASN1_item_ndef_i2d;
-+		STORE_delete_private_key;
-+		ERR_pop_to_mark;
-+		ENGINE_register_all_STORE;
-+		X509_policy_level_get0_node;
-+		i2d_PKCS7_NDEF;
-+		EC_GROUP_get_degree;
-+		ASN1_generate_v3;
-+		STORE_ATTR_INFO_modify_cstr;
-+		X509_policy_tree_level_count;
-+		BN_GF2m_add;
-+		EC_KEY_get0_group;
-+		STORE_generate_crl;
-+		STORE_store_public_key;
-+		X509_CERT_PAIR_free;
-+		STORE_revoke_private_key;
-+		BN_nist_mod_224;
-+		SHA512_Final;
-+		STORE_ATTR_INFO_modify_dn;
-+		STORE_meth_get_initialise_fn;
-+		STORE_method_get_initialise_function;
-+		STORE_delete_number;
-+		i2d_EC_PUBKEY_bio;
-+		BIO_dgram_non_fatal_error;
-+		EC_GROUP_get_asn1_flag;
-+		STORE_ATTR_INFO_in_ex;
-+		STORE_list_crl_start;
-+		ECDH_get_ex_new_index;
-+		STORE_meth_get_modify_fn;
-+		STORE_method_get_modify_function;
-+		v2i_ASN1_BIT_STRING;
-+		STORE_store_certificate;
-+		OBJ_bsearch_ex;
-+		X509_STORE_CTX_set_default;
-+		STORE_ATTR_INFO_set_sha1str;
-+		BN_GF2m_mod_inv;
-+		BN_GF2m_mod_exp;
-+		STORE_modify_public_key;
-+		STORE_meth_get_list_start_fn;
-+		STORE_method_get_list_start_function;
-+		EC_GROUP_get0_seed;
-+		STORE_store_arbitrary;
-+		STORE_meth_set_unlock_store_fn;
-+		STORE_method_set_unlock_store_function;
-+		BN_GF2m_mod_div_arr;
-+		ENGINE_set_ECDSA;
-+		STORE_create_method;
-+		ECPKParameters_print;
-+		EC_KEY_get0_private_key;
-+		PEM_write_EC_PUBKEY;
-+		X509_VERIFY_PARAM_set1;
-+		ECDH_set_method;
-+		v2i_GENERAL_NAME_ex;
-+		ECDH_set_ex_data;
-+		STORE_generate_key;
-+		BN_nist_mod_521;
-+		X509_policy_tree_get0_level;
-+		EC_GROUP_set_point_conversion_form;
-+		EC_GROUP_set_point_conv_form;
-+		PEM_read_EC_PUBKEY;
-+		i2d_ECDSA_SIG;
-+		ECDSA_OpenSSL;
-+		STORE_delete_crl;
-+		EC_KEY_get_enc_flags;
-+		ASN1_const_check_infinite_end;
-+		EVP_PKEY_delete_attr;
-+		ECDSA_set_default_method;
-+		EC_POINT_set_compressed_coordinates_GF2m;
-+		EC_POINT_set_compr_coords_GF2m;
-+		EC_GROUP_cmp;
-+		STORE_revoke_certificate;
-+		BN_get0_nist_prime_256;
-+		STORE_meth_get_delete_fn;
-+		STORE_method_get_delete_function;
-+		SHA224_Init;
-+		PEM_read_ECPrivateKey;
-+		SHA512_Init;
-+		STORE_parse_attrs_endp;
-+		BN_set_negative;
-+		ERR_load_ECDSA_strings;
-+		EC_GROUP_get_basis_type;
-+		STORE_list_public_key_next;
-+		i2v_ASN1_BIT_STRING;
-+		STORE_OBJECT_free;
-+		BN_nist_mod_384;
-+		i2d_X509_CERT_PAIR;
-+		PEM_write_ECPKParameters;
-+		ECDH_compute_key;
-+		STORE_ATTR_INFO_get0_sha1str;
-+		ENGINE_register_all_ECDH;
-+		pqueue_pop;
-+		STORE_ATTR_INFO_get0_cstr;
-+		POLICY_CONSTRAINTS_it;
-+		STORE_get_ex_new_index;
-+		EVP_PKEY_get_attr_by_OBJ;
-+		X509_VERIFY_PARAM_add0_policy;
-+		BN_GF2m_mod_solve_quad;
-+		SHA256;
-+		i2d_ECPrivateKey_fp;
-+		X509_policy_tree_get0_user_policies;
-+		X509_pcy_tree_get0_usr_policies;
-+		OPENSSL_DIR_read;
-+		ENGINE_register_all_ECDSA;
-+		X509_VERIFY_PARAM_lookup;
-+		EC_POINT_get_affine_coordinates_GF2m;
-+		EC_POINT_get_affine_coords_GF2m;
-+		EC_GROUP_dup;
-+		ENGINE_get_default_ECDSA;
-+		EC_KEY_new;
-+		SHA256_Transform;
-+		EC_KEY_set_enc_flags;
-+		ECDSA_verify;
-+		EC_POINT_point2hex;
-+		ENGINE_get_STORE;
-+		SHA512;
-+		STORE_get_certificate;
-+		ECDSA_do_sign_ex;
-+		ECDSA_do_verify;
-+		d2i_ECPrivateKey_fp;
-+		STORE_delete_certificate;
-+		SHA512_Transform;
-+		X509_STORE_set1_param;
-+		STORE_method_get_ctrl_function;
-+		STORE_free;
-+		PEM_write_ECPrivateKey;
-+		STORE_meth_get_unlock_store_fn;
-+		STORE_method_get_unlock_store_function;
-+		STORE_get_ex_data;
-+		EC_KEY_set_public_key;
-+		PEM_read_ECPKParameters;
-+		X509_CERT_PAIR_new;
-+		ENGINE_register_STORE;
-+		RSA_generate_key_ex;
-+		DSA_generate_parameters_ex;
-+		ECParameters_print_fp;
-+		X509V3_NAME_from_section;
-+		EVP_PKEY_add1_attr;
-+		STORE_modify_crl;
-+		STORE_list_private_key_start;
-+		POLICY_MAPPINGS_it;
-+		GENERAL_SUBTREE_it;
-+		EC_GROUP_get_curve_name;
-+		PEM_write_X509_CERT_PAIR;
-+		BIO_dump_indent_cb;
-+		d2i_X509_CERT_PAIR;
-+		STORE_list_private_key_endp;
-+		asn1_const_Finish;
-+		i2d_EC_PUBKEY_fp;
-+		BN_nist_mod_256;
-+		X509_VERIFY_PARAM_add0_table;
-+		pqueue_free;
-+		BN_BLINDING_create_param;
-+		ECDSA_size;
-+		d2i_EC_PUBKEY_bio;
-+		BN_get0_nist_prime_521;
-+		STORE_ATTR_INFO_modify_sha1str;
-+		BN_generate_prime_ex;
-+		EC_GROUP_new_by_curve_name;
-+		SHA256_Final;
-+		DH_generate_parameters_ex;
-+		PEM_read_bio_ECPrivateKey;
-+		STORE_meth_get_cleanup_fn;
-+		STORE_method_get_cleanup_function;
-+		ENGINE_get_ECDH;
-+		d2i_ECDSA_SIG;
-+		BN_is_prime_fasttest_ex;
-+		ECDSA_sign;
-+		X509_policy_check;
-+		EVP_PKEY_get_attr_by_NID;
-+		STORE_set_ex_data;
-+		ENGINE_get_ECDSA;
-+		EVP_ecdsa;
-+		BN_BLINDING_get_flags;
-+		PKCS12_add_cert;
-+		STORE_OBJECT_new;
-+		ERR_load_ECDH_strings;
-+		EC_KEY_dup;
-+		EVP_CIPHER_CTX_rand_key;
-+		ECDSA_set_method;
-+		a2i_IPADDRESS_NC;
-+		d2i_ECParameters;
-+		STORE_list_certificate_end;
-+		STORE_get_crl;
-+		X509_POLICY_NODE_print;
-+		SHA384_Init;
-+		EC_GF2m_simple_method;
-+		ECDSA_set_ex_data;
-+		SHA384_Final;
-+		PKCS7_set_digest;
-+		EC_KEY_print;
-+		STORE_meth_set_lock_store_fn;
-+		STORE_method_set_lock_store_function;
-+		ECDSA_get_ex_new_index;
-+		SHA384;
-+		POLICY_MAPPING_new;
-+		STORE_list_certificate_endp;
-+		X509_STORE_CTX_get0_policy_tree;
-+		EC_GROUP_set_asn1_flag;
-+		EC_KEY_check_key;
-+		d2i_EC_PUBKEY_fp;
-+		PKCS7_set0_type_other;
-+		PEM_read_bio_X509_CERT_PAIR;
-+		pqueue_next;
-+		STORE_meth_get_list_end_fn;
-+		STORE_method_get_list_end_function;
-+		EVP_PKEY_add1_attr_by_OBJ;
-+		X509_VERIFY_PARAM_set_time;
-+		pqueue_new;
-+		ENGINE_set_default_ECDH;
-+		STORE_new_method;
-+		PKCS12_add_key;
-+		DSO_merge;
-+		EC_POINT_hex2point;
-+		BIO_dump_cb;
-+		SHA256_Update;
-+		pqueue_insert;
-+		pitem_free;
-+		BN_GF2m_mod_inv_arr;
-+		ENGINE_unregister_ECDSA;
-+		BN_BLINDING_set_thread_id;
-+		get_rfc3526_prime_8192;
-+		X509_VERIFY_PARAM_clear_flags;
-+		get_rfc2409_prime_1024;
-+		DH_check_pub_key;
-+		get_rfc3526_prime_2048;
-+		get_rfc3526_prime_6144;
-+		get_rfc3526_prime_1536;
-+		get_rfc3526_prime_3072;
-+		get_rfc3526_prime_4096;
-+		get_rfc2409_prime_768;
-+		X509_VERIFY_PARAM_get_flags;
-+		EVP_CIPHER_CTX_new;
-+		EVP_CIPHER_CTX_free;
-+		Camellia_cbc_encrypt;
-+		Camellia_cfb128_encrypt;
-+		Camellia_cfb1_encrypt;
-+		Camellia_cfb8_encrypt;
-+		Camellia_ctr128_encrypt;
-+		Camellia_cfbr_encrypt_block;
-+		Camellia_decrypt;
-+		Camellia_ecb_encrypt;
-+		Camellia_encrypt;
-+		Camellia_ofb128_encrypt;
-+		Camellia_set_key;
-+		EVP_camellia_128_cbc;
-+		EVP_camellia_128_cfb128;
-+		EVP_camellia_128_cfb1;
-+		EVP_camellia_128_cfb8;
-+		EVP_camellia_128_ecb;
-+		EVP_camellia_128_ofb;
-+		EVP_camellia_192_cbc;
-+		EVP_camellia_192_cfb128;
-+		EVP_camellia_192_cfb1;
-+		EVP_camellia_192_cfb8;
-+		EVP_camellia_192_ecb;
-+		EVP_camellia_192_ofb;
-+		EVP_camellia_256_cbc;
-+		EVP_camellia_256_cfb128;
-+		EVP_camellia_256_cfb1;
-+		EVP_camellia_256_cfb8;
-+		EVP_camellia_256_ecb;
-+		EVP_camellia_256_ofb;
-+		a2i_ipadd;
-+		ASIdentifiers_free;
-+		i2d_ASIdOrRange;
-+		EVP_CIPHER_block_size;
-+		v3_asid_is_canonical;
-+		IPAddressChoice_free;
-+		EVP_CIPHER_CTX_set_app_data;
-+		BIO_set_callback_arg;
-+		v3_addr_add_prefix;
-+		IPAddressOrRange_it;
-+		BIO_set_flags;
-+		ASIdentifiers_it;
-+		v3_addr_get_range;
-+		BIO_method_type;
-+		v3_addr_inherits;
-+		IPAddressChoice_it;
-+		AES_ige_encrypt;
-+		v3_addr_add_range;
-+		EVP_CIPHER_CTX_nid;
-+		d2i_ASRange;
-+		v3_addr_add_inherit;
-+		v3_asid_add_id_or_range;
-+		v3_addr_validate_resource_set;
-+		EVP_CIPHER_iv_length;
-+		EVP_MD_type;
-+		v3_asid_canonize;
-+		IPAddressRange_free;
-+		v3_asid_add_inherit;
-+		EVP_CIPHER_CTX_key_length;
-+		IPAddressRange_new;
-+		ASIdOrRange_new;
-+		EVP_MD_size;
-+		EVP_MD_CTX_test_flags;
-+		BIO_clear_flags;
-+		i2d_ASRange;
-+		IPAddressRange_it;
-+		IPAddressChoice_new;
-+		ASIdentifierChoice_new;
-+		ASRange_free;
-+		EVP_MD_pkey_type;
-+		EVP_MD_CTX_clear_flags;
-+		IPAddressFamily_free;
-+		i2d_IPAddressFamily;
-+		IPAddressOrRange_new;
-+		EVP_CIPHER_flags;
-+		v3_asid_validate_resource_set;
-+		d2i_IPAddressRange;
-+		AES_bi_ige_encrypt;
-+		BIO_get_callback;
-+		IPAddressOrRange_free;
-+		v3_addr_subset;
-+		d2i_IPAddressFamily;
-+		v3_asid_subset;
-+		BIO_test_flags;
-+		i2d_ASIdentifierChoice;
-+		ASRange_it;
-+		d2i_ASIdentifiers;
-+		ASRange_new;
-+		d2i_IPAddressChoice;
-+		v3_addr_get_afi;
-+		EVP_CIPHER_key_length;
-+		EVP_Cipher;
-+		i2d_IPAddressOrRange;
-+		ASIdOrRange_it;
-+		EVP_CIPHER_nid;
-+		i2d_IPAddressChoice;
-+		EVP_CIPHER_CTX_block_size;
-+		ASIdentifiers_new;
-+		v3_addr_validate_path;
-+		IPAddressFamily_new;
-+		EVP_MD_CTX_set_flags;
-+		v3_addr_is_canonical;
-+		i2d_IPAddressRange;
-+		IPAddressFamily_it;
-+		v3_asid_inherits;
-+		EVP_CIPHER_CTX_cipher;
-+		EVP_CIPHER_CTX_get_app_data;
-+		EVP_MD_block_size;
-+		EVP_CIPHER_CTX_flags;
-+		v3_asid_validate_path;
-+		d2i_IPAddressOrRange;
-+		v3_addr_canonize;
-+		ASIdentifierChoice_it;
-+		EVP_MD_CTX_md;
-+		d2i_ASIdentifierChoice;
-+		BIO_method_name;
-+		EVP_CIPHER_CTX_iv_length;
-+		ASIdOrRange_free;
-+		ASIdentifierChoice_free;
-+		BIO_get_callback_arg;
-+		BIO_set_callback;
-+		d2i_ASIdOrRange;
-+		i2d_ASIdentifiers;
-+		SEED_decrypt;
-+		SEED_encrypt;
-+		SEED_cbc_encrypt;
-+		EVP_seed_ofb;
-+		SEED_cfb128_encrypt;
-+		SEED_ofb128_encrypt;
-+		EVP_seed_cbc;
-+		SEED_ecb_encrypt;
-+		EVP_seed_ecb;
-+		SEED_set_key;
-+		EVP_seed_cfb128;
-+		X509_EXTENSIONS_it;
-+		X509_get1_ocsp;
-+		OCSP_REQ_CTX_free;
-+		i2d_X509_EXTENSIONS;
-+		OCSP_sendreq_nbio;
-+		OCSP_sendreq_new;
-+		d2i_X509_EXTENSIONS;
-+		X509_ALGORS_it;
-+		X509_ALGOR_get0;
-+		X509_ALGOR_set0;
-+		AES_unwrap_key;
-+		AES_wrap_key;
-+		X509at_get0_data_by_OBJ;
-+		ASN1_TYPE_set1;
-+		ASN1_STRING_set0;
-+		i2d_X509_ALGORS;
-+		BIO_f_zlib;
-+		COMP_zlib_cleanup;
-+		d2i_X509_ALGORS;
-+		CMS_ReceiptRequest_free;
-+		PEM_write_CMS;
-+		CMS_add0_CertificateChoices;
-+		CMS_unsigned_add1_attr_by_OBJ;
-+		ERR_load_CMS_strings;
-+		CMS_sign_receipt;
-+		i2d_CMS_ContentInfo;
-+		CMS_signed_delete_attr;
-+		d2i_CMS_bio;
-+		CMS_unsigned_get_attr_by_NID;
-+		CMS_verify;
-+		SMIME_read_CMS;
-+		CMS_decrypt_set1_key;
-+		CMS_SignerInfo_get0_algs;
-+		CMS_add1_cert;
-+		CMS_set_detached;
-+		CMS_encrypt;
-+		CMS_EnvelopedData_create;
-+		CMS_uncompress;
-+		CMS_add0_crl;
-+		CMS_SignerInfo_verify_content;
-+		CMS_unsigned_get0_data_by_OBJ;
-+		PEM_write_bio_CMS;
-+		CMS_unsigned_get_attr;
-+		CMS_RecipientInfo_ktri_cert_cmp;
-+		CMS_RecipientInfo_ktri_get0_algs;
-+		CMS_RecipInfo_ktri_get0_algs;
-+		CMS_ContentInfo_free;
-+		CMS_final;
-+		CMS_add_simple_smimecap;
-+		CMS_SignerInfo_verify;
-+		CMS_data;
-+		CMS_ContentInfo_it;
-+		d2i_CMS_ReceiptRequest;
-+		CMS_compress;
-+		CMS_digest_create;
-+		CMS_SignerInfo_cert_cmp;
-+		CMS_SignerInfo_sign;
-+		CMS_data_create;
-+		i2d_CMS_bio;
-+		CMS_EncryptedData_set1_key;
-+		CMS_decrypt;
-+		int_smime_write_ASN1;
-+		CMS_unsigned_delete_attr;
-+		CMS_unsigned_get_attr_count;
-+		CMS_add_smimecap;
-+		PEM_read_CMS;
-+		CMS_signed_get_attr_by_OBJ;
-+		d2i_CMS_ContentInfo;
-+		CMS_add_standard_smimecap;
-+		CMS_ContentInfo_new;
-+		CMS_RecipientInfo_type;
-+		CMS_get0_type;
-+		CMS_is_detached;
-+		CMS_sign;
-+		CMS_signed_add1_attr;
-+		CMS_unsigned_get_attr_by_OBJ;
-+		SMIME_write_CMS;
-+		CMS_EncryptedData_decrypt;
-+		CMS_get0_RecipientInfos;
-+		CMS_add0_RevocationInfoChoice;
-+		CMS_decrypt_set1_pkey;
-+		CMS_SignerInfo_set1_signer_cert;
-+		CMS_get0_signers;
-+		CMS_ReceiptRequest_get0_values;
-+		CMS_signed_get0_data_by_OBJ;
-+		CMS_get0_SignerInfos;
-+		CMS_add0_cert;
-+		CMS_EncryptedData_encrypt;
-+		CMS_digest_verify;
-+		CMS_set1_signers_certs;
-+		CMS_signed_get_attr;
-+		CMS_RecipientInfo_set0_key;
-+		CMS_SignedData_init;
-+		CMS_RecipientInfo_kekri_get0_id;
-+		CMS_verify_receipt;
-+		CMS_ReceiptRequest_it;
-+		PEM_read_bio_CMS;
-+		CMS_get1_crls;
-+		CMS_add0_recipient_key;
-+		SMIME_read_ASN1;
-+		CMS_ReceiptRequest_new;
-+		CMS_get0_content;
-+		CMS_get1_ReceiptRequest;
-+		CMS_signed_add1_attr_by_OBJ;
-+		CMS_RecipientInfo_kekri_id_cmp;
-+		CMS_add1_ReceiptRequest;
-+		CMS_SignerInfo_get0_signer_id;
-+		CMS_unsigned_add1_attr_by_NID;
-+		CMS_unsigned_add1_attr;
-+		CMS_signed_get_attr_by_NID;
-+		CMS_get1_certs;
-+		CMS_signed_add1_attr_by_NID;
-+		CMS_unsigned_add1_attr_by_txt;
-+		CMS_dataFinal;
-+		CMS_RecipientInfo_ktri_get0_signer_id;
-+		CMS_RecipInfo_ktri_get0_sigr_id;
-+		i2d_CMS_ReceiptRequest;
-+		CMS_add1_recipient_cert;
-+		CMS_dataInit;
-+		CMS_signed_add1_attr_by_txt;
-+		CMS_RecipientInfo_decrypt;
-+		CMS_signed_get_attr_count;
-+		CMS_get0_eContentType;
-+		CMS_set1_eContentType;
-+		CMS_ReceiptRequest_create0;
-+		CMS_add1_signer;
-+		CMS_RecipientInfo_set0_pkey;
-+		ENGINE_set_load_ssl_client_cert_function;
-+		ENGINE_set_ld_ssl_clnt_cert_fn;
-+		ENGINE_get_ssl_client_cert_function;
-+		ENGINE_get_ssl_client_cert_fn;
-+		ENGINE_load_ssl_client_cert;
-+		ENGINE_load_capi;
-+		OPENSSL_isservice;
-+		FIPS_dsa_sig_decode;
-+		EVP_CIPHER_CTX_clear_flags;
-+		FIPS_rand_status;
-+		FIPS_rand_set_key;
-+		CRYPTO_set_mem_info_functions;
-+		RSA_X931_generate_key_ex;
-+		int_ERR_set_state_func;
-+		int_EVP_MD_set_engine_callbacks;
-+		int_CRYPTO_set_do_dynlock_callback;
-+		FIPS_rng_stick;
-+		EVP_CIPHER_CTX_set_flags;
-+		BN_X931_generate_prime_ex;
-+		FIPS_selftest_check;
-+		FIPS_rand_set_dt;
-+		CRYPTO_dbg_pop_info;
-+		FIPS_dsa_free;
-+		RSA_X931_derive_ex;
-+		FIPS_rsa_new;
-+		FIPS_rand_bytes;
-+		fips_cipher_test;
-+		EVP_CIPHER_CTX_test_flags;
-+		CRYPTO_malloc_debug_init;
-+		CRYPTO_dbg_push_info;
-+		FIPS_corrupt_rsa_keygen;
-+		FIPS_dh_new;
-+		FIPS_corrupt_dsa_keygen;
-+		FIPS_dh_free;
-+		fips_pkey_signature_test;
-+		EVP_add_alg_module;
-+		int_RAND_init_engine_callbacks;
-+		int_EVP_CIPHER_set_engine_callbacks;
-+		int_EVP_MD_init_engine_callbacks;
-+		FIPS_rand_test_mode;
-+		FIPS_rand_reset;
-+		FIPS_dsa_new;
-+		int_RAND_set_callbacks;
-+		BN_X931_derive_prime_ex;
-+		int_ERR_lib_init;
-+		int_EVP_CIPHER_init_engine_callbacks;
-+		FIPS_rsa_free;
-+		FIPS_dsa_sig_encode;
-+		CRYPTO_dbg_remove_all_info;
-+		OPENSSL_init;
-+		CRYPTO_strdup;
-+		JPAKE_STEP3A_process;
-+		JPAKE_STEP1_release;
-+		JPAKE_get_shared_key;
-+		JPAKE_STEP3B_init;
-+		JPAKE_STEP1_generate;
-+		JPAKE_STEP1_init;
-+		JPAKE_STEP3B_process;
-+		JPAKE_STEP2_generate;
-+		JPAKE_CTX_new;
-+		JPAKE_CTX_free;
-+		JPAKE_STEP3B_release;
-+		JPAKE_STEP3A_release;
-+		JPAKE_STEP2_process;
-+		JPAKE_STEP3B_generate;
-+		JPAKE_STEP1_process;
-+		JPAKE_STEP3A_generate;
-+		JPAKE_STEP2_release;
-+		JPAKE_STEP3A_init;
-+		ERR_load_JPAKE_strings;
-+		JPAKE_STEP2_init;
-+		pqueue_size;
-+		i2d_TS_ACCURACY;
-+		i2d_TS_MSG_IMPRINT_fp;
-+		i2d_TS_MSG_IMPRINT;
-+		EVP_PKEY_print_public;
-+		EVP_PKEY_CTX_new;
-+		i2d_TS_TST_INFO;
-+		EVP_PKEY_asn1_find;
-+		DSO_METHOD_beos;
-+		TS_CONF_load_cert;
-+		TS_REQ_get_ext;
-+		EVP_PKEY_sign_init;
-+		ASN1_item_print;
-+		TS_TST_INFO_set_nonce;
-+		TS_RESP_dup;
-+		ENGINE_register_pkey_meths;
-+		EVP_PKEY_asn1_add0;
-+		PKCS7_add0_attrib_signing_time;
-+		i2d_TS_TST_INFO_fp;
-+		BIO_asn1_get_prefix;
-+		TS_TST_INFO_set_time;
-+		EVP_PKEY_meth_set_decrypt;
-+		EVP_PKEY_set_type_str;
-+		EVP_PKEY_CTX_get_keygen_info;
-+		TS_REQ_set_policy_id;
-+		d2i_TS_RESP_fp;
-+		ENGINE_get_pkey_asn1_meth_engine;
-+		ENGINE_get_pkey_asn1_meth_eng;
-+		WHIRLPOOL_Init;
-+		TS_RESP_set_status_info;
-+		EVP_PKEY_keygen;
-+		EVP_DigestSignInit;
-+		TS_ACCURACY_set_millis;
-+		TS_REQ_dup;
-+		GENERAL_NAME_dup;
-+		ASN1_SEQUENCE_ANY_it;
-+		WHIRLPOOL;
-+		X509_STORE_get1_crls;
-+		ENGINE_get_pkey_asn1_meth;
-+		EVP_PKEY_asn1_new;
-+		BIO_new_NDEF;
-+		ENGINE_get_pkey_meth;
-+		TS_MSG_IMPRINT_set_algo;
-+		i2d_TS_TST_INFO_bio;
-+		TS_TST_INFO_set_ordering;
-+		TS_TST_INFO_get_ext_by_OBJ;
-+		CRYPTO_THREADID_set_pointer;
-+		TS_CONF_get_tsa_section;
-+		SMIME_write_ASN1;
-+		TS_RESP_CTX_set_signer_key;
-+		EVP_PKEY_encrypt_old;
-+		EVP_PKEY_encrypt_init;
-+		CRYPTO_THREADID_cpy;
-+		ASN1_PCTX_get_cert_flags;
-+		i2d_ESS_SIGNING_CERT;
-+		TS_CONF_load_key;
-+		i2d_ASN1_SEQUENCE_ANY;
-+		d2i_TS_MSG_IMPRINT_bio;
-+		EVP_PKEY_asn1_set_public;
-+		b2i_PublicKey_bio;
-+		BIO_asn1_set_prefix;
-+		EVP_PKEY_new_mac_key;
-+		BIO_new_CMS;
-+		CRYPTO_THREADID_cmp;
-+		TS_REQ_ext_free;
-+		EVP_PKEY_asn1_set_free;
-+		EVP_PKEY_get0_asn1;
-+		d2i_NETSCAPE_X509;
-+		EVP_PKEY_verify_recover_init;
-+		EVP_PKEY_CTX_set_data;
-+		EVP_PKEY_keygen_init;
-+		TS_RESP_CTX_set_status_info;
-+		TS_MSG_IMPRINT_get_algo;
-+		TS_REQ_print_bio;
-+		EVP_PKEY_CTX_ctrl_str;
-+		EVP_PKEY_get_default_digest_nid;
-+		PEM_write_bio_PKCS7_stream;
-+		TS_MSG_IMPRINT_print_bio;
-+		BN_asc2bn;
-+		TS_REQ_get_policy_id;
-+		ENGINE_set_default_pkey_asn1_meths;
-+		ENGINE_set_def_pkey_asn1_meths;
-+		d2i_TS_ACCURACY;
-+		DSO_global_lookup;
-+		TS_CONF_set_tsa_name;
-+		i2d_ASN1_SET_ANY;
-+		ENGINE_load_gost;
-+		WHIRLPOOL_BitUpdate;
-+		ASN1_PCTX_get_flags;
-+		TS_TST_INFO_get_ext_by_NID;
-+		TS_RESP_new;
-+		ESS_CERT_ID_dup;
-+		TS_STATUS_INFO_dup;
-+		TS_REQ_delete_ext;
-+		EVP_DigestVerifyFinal;
-+		EVP_PKEY_print_params;
-+		i2d_CMS_bio_stream;
-+		TS_REQ_get_msg_imprint;
-+		OBJ_find_sigid_by_algs;
-+		TS_TST_INFO_get_serial;
-+		TS_REQ_get_nonce;
-+		X509_PUBKEY_set0_param;
-+		EVP_PKEY_CTX_set0_keygen_info;
-+		DIST_POINT_set_dpname;
-+		i2d_ISSUING_DIST_POINT;
-+		ASN1_SET_ANY_it;
-+		EVP_PKEY_CTX_get_data;
-+		TS_STATUS_INFO_print_bio;
-+		EVP_PKEY_derive_init;
-+		d2i_TS_TST_INFO;
-+		EVP_PKEY_asn1_add_alias;
-+		d2i_TS_RESP_bio;
-+		OTHERNAME_cmp;
-+		GENERAL_NAME_set0_value;
-+		PKCS7_RECIP_INFO_get0_alg;
-+		TS_RESP_CTX_new;
-+		TS_RESP_set_tst_info;
-+		PKCS7_final;
-+		EVP_PKEY_base_id;
-+		TS_RESP_CTX_set_signer_cert;
-+		TS_REQ_set_msg_imprint;
-+		EVP_PKEY_CTX_ctrl;
-+		TS_CONF_set_digests;
-+		d2i_TS_MSG_IMPRINT;
-+		EVP_PKEY_meth_set_ctrl;
-+		TS_REQ_get_ext_by_NID;
-+		PKCS5_pbe_set0_algor;
-+		BN_BLINDING_thread_id;
-+		TS_ACCURACY_new;
-+		X509_CRL_METHOD_free;
-+		ASN1_PCTX_get_nm_flags;
-+		EVP_PKEY_meth_set_sign;
-+		CRYPTO_THREADID_current;
-+		EVP_PKEY_decrypt_init;
-+		NETSCAPE_X509_free;
-+		i2b_PVK_bio;
-+		EVP_PKEY_print_private;
-+		GENERAL_NAME_get0_value;
-+		b2i_PVK_bio;
-+		ASN1_UTCTIME_adj;
-+		TS_TST_INFO_new;
-+		EVP_MD_do_all_sorted;
-+		TS_CONF_set_default_engine;
-+		TS_ACCURACY_set_seconds;
-+		TS_TST_INFO_get_time;
-+		PKCS8_pkey_get0;
-+		EVP_PKEY_asn1_get0;
-+		OBJ_add_sigid;
-+		PKCS7_SIGNER_INFO_sign;
-+		EVP_PKEY_paramgen_init;
-+		EVP_PKEY_sign;
-+		OBJ_sigid_free;
-+		EVP_PKEY_meth_set_init;
-+		d2i_ESS_ISSUER_SERIAL;
-+		ISSUING_DIST_POINT_new;
-+		ASN1_TIME_adj;
-+		TS_OBJ_print_bio;
-+		EVP_PKEY_meth_set_verify_recover;
-+		EVP_PKEY_meth_set_vrfy_recover;
-+		TS_RESP_get_status_info;
-+		CMS_stream;
-+		EVP_PKEY_CTX_set_cb;
-+		PKCS7_to_TS_TST_INFO;
-+		ASN1_PCTX_get_oid_flags;
-+		TS_TST_INFO_add_ext;
-+		EVP_PKEY_meth_set_derive;
-+		i2d_TS_RESP_fp;
-+		i2d_TS_MSG_IMPRINT_bio;
-+		TS_RESP_CTX_set_accuracy;
-+		TS_REQ_set_nonce;
-+		ESS_CERT_ID_new;
-+		ENGINE_pkey_asn1_find_str;
-+		TS_REQ_get_ext_count;
-+		BUF_reverse;
-+		TS_TST_INFO_print_bio;
-+		d2i_ISSUING_DIST_POINT;
-+		ENGINE_get_pkey_meths;
-+		i2b_PrivateKey_bio;
-+		i2d_TS_RESP;
-+		b2i_PublicKey;
-+		TS_VERIFY_CTX_cleanup;
-+		TS_STATUS_INFO_free;
-+		TS_RESP_verify_token;
-+		OBJ_bsearch_ex_;
-+		ASN1_bn_print;
-+		EVP_PKEY_asn1_get_count;
-+		ENGINE_register_pkey_asn1_meths;
-+		ASN1_PCTX_set_nm_flags;
-+		EVP_DigestVerifyInit;
-+		ENGINE_set_default_pkey_meths;
-+		TS_TST_INFO_get_policy_id;
-+		TS_REQ_get_cert_req;
-+		X509_CRL_set_meth_data;
-+		PKCS8_pkey_set0;
-+		ASN1_STRING_copy;
-+		d2i_TS_TST_INFO_fp;
-+		X509_CRL_match;
-+		EVP_PKEY_asn1_set_private;
-+		TS_TST_INFO_get_ext_d2i;
-+		TS_RESP_CTX_add_policy;
-+		d2i_TS_RESP;
-+		TS_CONF_load_certs;
-+		TS_TST_INFO_get_msg_imprint;
-+		ERR_load_TS_strings;
-+		TS_TST_INFO_get_version;
-+		EVP_PKEY_CTX_dup;
-+		EVP_PKEY_meth_set_verify;
-+		i2b_PublicKey_bio;
-+		TS_CONF_set_certs;
-+		EVP_PKEY_asn1_get0_info;
-+		TS_VERIFY_CTX_free;
-+		TS_REQ_get_ext_by_critical;
-+		TS_RESP_CTX_set_serial_cb;
-+		X509_CRL_get_meth_data;
-+		TS_RESP_CTX_set_time_cb;
-+		TS_MSG_IMPRINT_get_msg;
-+		TS_TST_INFO_ext_free;
-+		TS_REQ_get_version;
-+		TS_REQ_add_ext;
-+		EVP_PKEY_CTX_set_app_data;
-+		OBJ_bsearch_;
-+		EVP_PKEY_meth_set_verifyctx;
-+		i2d_PKCS7_bio_stream;
-+		CRYPTO_THREADID_set_numeric;
-+		PKCS7_sign_add_signer;
-+		d2i_TS_TST_INFO_bio;
-+		TS_TST_INFO_get_ordering;
-+		TS_RESP_print_bio;
-+		TS_TST_INFO_get_exts;
-+		HMAC_CTX_copy;
-+		PKCS5_pbe2_set_iv;
-+		ENGINE_get_pkey_asn1_meths;
-+		b2i_PrivateKey;
-+		EVP_PKEY_CTX_get_app_data;
-+		TS_REQ_set_cert_req;
-+		CRYPTO_THREADID_set_callback;
-+		TS_CONF_set_serial;
-+		TS_TST_INFO_free;
-+		d2i_TS_REQ_fp;
-+		TS_RESP_verify_response;
-+		i2d_ESS_ISSUER_SERIAL;
-+		TS_ACCURACY_get_seconds;
-+		EVP_CIPHER_do_all;
-+		b2i_PrivateKey_bio;
-+		OCSP_CERTID_dup;
-+		X509_PUBKEY_get0_param;
-+		TS_MSG_IMPRINT_dup;
-+		PKCS7_print_ctx;
-+		i2d_TS_REQ_bio;
-+		EVP_whirlpool;
-+		EVP_PKEY_asn1_set_param;
-+		EVP_PKEY_meth_set_encrypt;
-+		ASN1_PCTX_set_flags;
-+		i2d_ESS_CERT_ID;
-+		TS_VERIFY_CTX_new;
-+		TS_RESP_CTX_set_extension_cb;
-+		ENGINE_register_all_pkey_meths;
-+		TS_RESP_CTX_set_status_info_cond;
-+		TS_RESP_CTX_set_stat_info_cond;
-+		EVP_PKEY_verify;
-+		WHIRLPOOL_Final;
-+		X509_CRL_METHOD_new;
-+		EVP_DigestSignFinal;
-+		TS_RESP_CTX_set_def_policy;
-+		NETSCAPE_X509_it;
-+		TS_RESP_create_response;
-+		PKCS7_SIGNER_INFO_get0_algs;
-+		TS_TST_INFO_get_nonce;
-+		EVP_PKEY_decrypt_old;
-+		TS_TST_INFO_set_policy_id;
-+		TS_CONF_set_ess_cert_id_chain;
-+		EVP_PKEY_CTX_get0_pkey;
-+		d2i_TS_REQ;
-+		EVP_PKEY_asn1_find_str;
-+		BIO_f_asn1;
-+		ESS_SIGNING_CERT_new;
-+		EVP_PBE_find;
-+		X509_CRL_get0_by_cert;
-+		EVP_PKEY_derive;
-+		i2d_TS_REQ;
-+		TS_TST_INFO_delete_ext;
-+		ESS_ISSUER_SERIAL_free;
-+		ASN1_PCTX_set_str_flags;
-+		ENGINE_get_pkey_asn1_meth_str;
-+		TS_CONF_set_signer_key;
-+		TS_ACCURACY_get_millis;
-+		TS_RESP_get_token;
-+		TS_ACCURACY_dup;
-+		ENGINE_register_all_pkey_asn1_meths;
-+		ENGINE_reg_all_pkey_asn1_meths;
-+		X509_CRL_set_default_method;
-+		CRYPTO_THREADID_hash;
-+		CMS_ContentInfo_print_ctx;
-+		TS_RESP_free;
-+		ISSUING_DIST_POINT_free;
-+		ESS_ISSUER_SERIAL_new;
-+		CMS_add1_crl;
-+		PKCS7_add1_attrib_digest;
-+		TS_RESP_CTX_add_md;
-+		TS_TST_INFO_dup;
-+		ENGINE_set_pkey_asn1_meths;
-+		PEM_write_bio_Parameters;
-+		TS_TST_INFO_get_accuracy;
-+		X509_CRL_get0_by_serial;
-+		TS_TST_INFO_set_version;
-+		TS_RESP_CTX_get_tst_info;
-+		TS_RESP_verify_signature;
-+		CRYPTO_THREADID_get_callback;
-+		TS_TST_INFO_get_tsa;
-+		TS_STATUS_INFO_new;
-+		EVP_PKEY_CTX_get_cb;
-+		TS_REQ_get_ext_d2i;
-+		GENERAL_NAME_set0_othername;
-+		TS_TST_INFO_get_ext_count;
-+		TS_RESP_CTX_get_request;
-+		i2d_NETSCAPE_X509;
-+		ENGINE_get_pkey_meth_engine;
-+		EVP_PKEY_meth_set_signctx;
-+		EVP_PKEY_asn1_copy;
-+		ASN1_TYPE_cmp;
-+		EVP_CIPHER_do_all_sorted;
-+		EVP_PKEY_CTX_free;
-+		ISSUING_DIST_POINT_it;
-+		d2i_TS_MSG_IMPRINT_fp;
-+		X509_STORE_get1_certs;
-+		EVP_PKEY_CTX_get_operation;
-+		d2i_ESS_SIGNING_CERT;
-+		TS_CONF_set_ordering;
-+		EVP_PBE_alg_add_type;
-+		TS_REQ_set_version;
-+		EVP_PKEY_get0;
-+		BIO_asn1_set_suffix;
-+		i2d_TS_STATUS_INFO;
-+		EVP_MD_do_all;
-+		TS_TST_INFO_set_accuracy;
-+		PKCS7_add_attrib_content_type;
-+		ERR_remove_thread_state;
-+		EVP_PKEY_meth_add0;
-+		TS_TST_INFO_set_tsa;
-+		EVP_PKEY_meth_new;
-+		WHIRLPOOL_Update;
-+		TS_CONF_set_accuracy;
-+		ASN1_PCTX_set_oid_flags;
-+		ESS_SIGNING_CERT_dup;
-+		d2i_TS_REQ_bio;
-+		X509_time_adj_ex;
-+		TS_RESP_CTX_add_flags;
-+		d2i_TS_STATUS_INFO;
-+		TS_MSG_IMPRINT_set_msg;
-+		BIO_asn1_get_suffix;
-+		TS_REQ_free;
-+		EVP_PKEY_meth_free;
-+		TS_REQ_get_exts;
-+		TS_RESP_CTX_set_clock_precision_digits;
-+		TS_RESP_CTX_set_clk_prec_digits;
-+		TS_RESP_CTX_add_failure_info;
-+		i2d_TS_RESP_bio;
-+		EVP_PKEY_CTX_get0_peerkey;
-+		PEM_write_bio_CMS_stream;
-+		TS_REQ_new;
-+		TS_MSG_IMPRINT_new;
-+		EVP_PKEY_meth_find;
-+		EVP_PKEY_id;
-+		TS_TST_INFO_set_serial;
-+		a2i_GENERAL_NAME;
-+		TS_CONF_set_crypto_device;
-+		EVP_PKEY_verify_init;
-+		TS_CONF_set_policies;
-+		ASN1_PCTX_new;
-+		ESS_CERT_ID_free;
-+		ENGINE_unregister_pkey_meths;
-+		TS_MSG_IMPRINT_free;
-+		TS_VERIFY_CTX_init;
-+		PKCS7_stream;
-+		TS_RESP_CTX_set_certs;
-+		TS_CONF_set_def_policy;
-+		ASN1_GENERALIZEDTIME_adj;
-+		NETSCAPE_X509_new;
-+		TS_ACCURACY_free;
-+		TS_RESP_get_tst_info;
-+		EVP_PKEY_derive_set_peer;
-+		PEM_read_bio_Parameters;
-+		TS_CONF_set_clock_precision_digits;
-+		TS_CONF_set_clk_prec_digits;
-+		ESS_ISSUER_SERIAL_dup;
-+		TS_ACCURACY_get_micros;
-+		ASN1_PCTX_get_str_flags;
-+		NAME_CONSTRAINTS_check;
-+		ASN1_BIT_STRING_check;
-+		X509_check_akid;
-+		ENGINE_unregister_pkey_asn1_meths;
-+		ENGINE_unreg_pkey_asn1_meths;
-+		ASN1_PCTX_free;
-+		PEM_write_bio_ASN1_stream;
-+		i2d_ASN1_bio_stream;
-+		TS_X509_ALGOR_print_bio;
-+		EVP_PKEY_meth_set_cleanup;
-+		EVP_PKEY_asn1_free;
-+		ESS_SIGNING_CERT_free;
-+		TS_TST_INFO_set_msg_imprint;
-+		GENERAL_NAME_cmp;
-+		d2i_ASN1_SET_ANY;
-+		ENGINE_set_pkey_meths;
-+		i2d_TS_REQ_fp;
-+		d2i_ASN1_SEQUENCE_ANY;
-+		GENERAL_NAME_get0_otherName;
-+		d2i_ESS_CERT_ID;
-+		OBJ_find_sigid_algs;
-+		EVP_PKEY_meth_set_keygen;
-+		PKCS5_PBKDF2_HMAC;
-+		EVP_PKEY_paramgen;
-+		EVP_PKEY_meth_set_paramgen;
-+		BIO_new_PKCS7;
-+		EVP_PKEY_verify_recover;
-+		TS_ext_print_bio;
-+		TS_ASN1_INTEGER_print_bio;
-+		check_defer;
-+		DSO_pathbyaddr;
-+		EVP_PKEY_set_type;
-+		TS_ACCURACY_set_micros;
-+		TS_REQ_to_TS_VERIFY_CTX;
-+		EVP_PKEY_meth_set_copy;
-+		ASN1_PCTX_set_cert_flags;
-+		TS_TST_INFO_get_ext;
-+		EVP_PKEY_asn1_set_ctrl;
-+		TS_TST_INFO_get_ext_by_critical;
-+		EVP_PKEY_CTX_new_id;
-+		TS_REQ_get_ext_by_OBJ;
-+		TS_CONF_set_signer_cert;
-+		X509_NAME_hash_old;
-+		ASN1_TIME_set_string;
-+		EVP_MD_flags;
-+		TS_RESP_CTX_free;
-+		DSAparams_dup;
-+		DHparams_dup;
-+		OCSP_REQ_CTX_add1_header;
-+		OCSP_REQ_CTX_set1_req;
-+		X509_STORE_set_verify_cb;
-+		X509_STORE_CTX_get0_current_crl;
-+		X509_STORE_CTX_get0_parent_ctx;
-+		X509_STORE_CTX_get0_current_issuer;
-+		X509_STORE_CTX_get0_cur_issuer;
-+		X509_issuer_name_hash_old;
-+		X509_subject_name_hash_old;
-+		EVP_CIPHER_CTX_copy;
-+		UI_method_get_prompt_constructor;
-+		UI_method_get_prompt_constructr;
-+		UI_method_set_prompt_constructor;
-+		UI_method_set_prompt_constructr;
-+		EVP_read_pw_string_min;
-+		CRYPTO_cts128_encrypt;
-+		CRYPTO_cts128_decrypt_block;
-+		CRYPTO_cfb128_1_encrypt;
-+		CRYPTO_cbc128_encrypt;
-+		CRYPTO_ctr128_encrypt;
-+		CRYPTO_ofb128_encrypt;
-+		CRYPTO_cts128_decrypt;
-+		CRYPTO_cts128_encrypt_block;
-+		CRYPTO_cbc128_decrypt;
-+		CRYPTO_cfb128_encrypt;
-+		CRYPTO_cfb128_8_encrypt;
-+
-+	local:
-+		*;
-+};
-+
-+
-+OPENSSL_1.0.1 {
-+	global:
-+		SSL_renegotiate_abbreviated;
-+		TLSv1_1_method;
-+		TLSv1_1_client_method;
-+		TLSv1_1_server_method;
-+		SSL_CTX_set_srp_client_pwd_callback;
-+		SSL_CTX_set_srp_client_pwd_cb;
-+		SSL_get_srp_g;
-+		SSL_CTX_set_srp_username_callback;
-+		SSL_CTX_set_srp_un_cb;
-+		SSL_get_srp_userinfo;
-+		SSL_set_srp_server_param;
-+		SSL_set_srp_server_param_pw;
-+		SSL_get_srp_N;
-+		SSL_get_srp_username;
-+		SSL_CTX_set_srp_password;
-+		SSL_CTX_set_srp_strength;
-+		SSL_CTX_set_srp_verify_param_callback;
-+		SSL_CTX_set_srp_vfy_param_cb;
-+		SSL_CTX_set_srp_cb_arg;
-+		SSL_CTX_set_srp_username;
-+		SSL_CTX_SRP_CTX_init;
-+		SSL_SRP_CTX_init;
-+		SRP_Calc_A_param;
-+		SRP_generate_server_master_secret;
-+		SRP_gen_server_master_secret;
-+		SSL_CTX_SRP_CTX_free;
-+		SRP_generate_client_master_secret;
-+		SRP_gen_client_master_secret;
-+		SSL_srp_server_param_with_username;
-+		SSL_srp_server_param_with_un;
-+		SSL_SRP_CTX_free;
-+		SSL_set_debug;
-+		SSL_SESSION_get0_peer;
-+		TLSv1_2_client_method;
-+		SSL_SESSION_set1_id_context;
-+		TLSv1_2_server_method;
-+		SSL_cache_hit;
-+		SSL_get0_kssl_ctx;
-+		SSL_set0_kssl_ctx;
-+		SSL_set_state;
-+		SSL_CIPHER_get_id;
-+		TLSv1_2_method;
-+		kssl_ctx_get0_client_princ;
-+		SSL_export_keying_material;
-+		SSL_set_tlsext_use_srtp;
-+		SSL_CTX_set_next_protos_advertised_cb;
-+		SSL_CTX_set_next_protos_adv_cb;
-+		SSL_get0_next_proto_negotiated;
-+		SSL_get_selected_srtp_profile;
-+		SSL_CTX_set_tlsext_use_srtp;
-+		SSL_select_next_proto;
-+		SSL_get_srtp_profiles;
-+		SSL_CTX_set_next_proto_select_cb;
-+		SSL_CTX_set_next_proto_sel_cb;
-+		SSL_SESSION_get_compress_id;
-+
-+		SRP_VBASE_get_by_user;
-+		SRP_Calc_server_key;
-+		SRP_create_verifier;
-+		SRP_create_verifier_BN;
-+		SRP_Calc_u;
-+		SRP_VBASE_free;
-+		SRP_Calc_client_key;
-+		SRP_get_default_gN;
-+		SRP_Calc_x;
-+		SRP_Calc_B;
-+		SRP_VBASE_new;
-+		SRP_check_known_gN_param;
-+		SRP_Calc_A;
-+		SRP_Verify_A_mod_N;
-+		SRP_VBASE_init;
-+		SRP_Verify_B_mod_N;
-+		EC_KEY_set_public_key_affine_coordinates;
-+		EC_KEY_set_pub_key_aff_coords;
-+		EVP_aes_192_ctr;
-+		EVP_PKEY_meth_get0_info;
-+		EVP_PKEY_meth_copy;
-+		ERR_add_error_vdata;
-+		EVP_aes_128_ctr;
-+		EVP_aes_256_ctr;
-+		EC_GFp_nistp224_method;
-+		EC_KEY_get_flags;
-+		RSA_padding_add_PKCS1_PSS_mgf1;
-+		EVP_aes_128_xts;
-+		EVP_aes_256_xts;
-+		EVP_aes_128_gcm;
-+		EC_KEY_clear_flags;
-+		EC_KEY_set_flags;
-+		EVP_aes_256_ccm;
-+		RSA_verify_PKCS1_PSS_mgf1;
-+		EVP_aes_128_ccm;
-+		EVP_aes_192_gcm;
-+		X509_ALGOR_set_md;
-+		RAND_init_fips;
-+		EVP_aes_256_gcm;
-+		EVP_aes_192_ccm;
-+		CMAC_CTX_copy;
-+		CMAC_CTX_free;
-+		CMAC_CTX_get0_cipher_ctx;
-+		CMAC_CTX_cleanup;
-+		CMAC_Init;
-+		CMAC_Update;
-+		CMAC_resume;
-+		CMAC_CTX_new;
-+		CMAC_Final;
-+		CRYPTO_ctr128_encrypt_ctr32;
-+		CRYPTO_gcm128_release;
-+		CRYPTO_ccm128_decrypt_ccm64;
-+		CRYPTO_ccm128_encrypt;
-+		CRYPTO_gcm128_encrypt;
-+		CRYPTO_xts128_encrypt;
-+		EVP_rc4_hmac_md5;
-+		CRYPTO_nistcts128_decrypt_block;
-+		CRYPTO_gcm128_setiv;
-+		CRYPTO_nistcts128_encrypt;
-+		EVP_aes_128_cbc_hmac_sha1;
-+		CRYPTO_gcm128_tag;
-+		CRYPTO_ccm128_encrypt_ccm64;
-+		ENGINE_load_rdrand;
-+		CRYPTO_ccm128_setiv;
-+		CRYPTO_nistcts128_encrypt_block;
-+		CRYPTO_gcm128_aad;
-+		CRYPTO_ccm128_init;
-+		CRYPTO_nistcts128_decrypt;
-+		CRYPTO_gcm128_new;
-+		CRYPTO_ccm128_tag;
-+		CRYPTO_ccm128_decrypt;
-+		CRYPTO_ccm128_aad;
-+		CRYPTO_gcm128_init;
-+		CRYPTO_gcm128_decrypt;
-+		ENGINE_load_rsax;
-+		CRYPTO_gcm128_decrypt_ctr32;
-+		CRYPTO_gcm128_encrypt_ctr32;
-+		CRYPTO_gcm128_finish;
-+		EVP_aes_256_cbc_hmac_sha1;
-+		PKCS5_pbkdf2_set;
-+		CMS_add0_recipient_password;
-+		CMS_decrypt_set1_password;
-+		CMS_RecipientInfo_set0_password;
-+		RAND_set_fips_drbg_type;
-+		X509_REQ_sign_ctx;
-+		RSA_PSS_PARAMS_new;
-+		X509_CRL_sign_ctx;
-+		X509_signature_dump;
-+		d2i_RSA_PSS_PARAMS;
-+		RSA_PSS_PARAMS_it;
-+		RSA_PSS_PARAMS_free;
-+		X509_sign_ctx;
-+		i2d_RSA_PSS_PARAMS;
-+		ASN1_item_sign_ctx;
-+		EC_GFp_nistp521_method;
-+		EC_GFp_nistp256_method;
-+		OPENSSL_stderr;
-+		OPENSSL_cpuid_setup;
-+		OPENSSL_showfatal;
-+		BIO_new_dgram_sctp;
-+		BIO_dgram_sctp_msg_waiting;
-+		BIO_dgram_sctp_wait_for_dry;
-+		BIO_s_datagram_sctp;
-+		BIO_dgram_is_sctp;
-+		BIO_dgram_sctp_notification_cb;
-+} OPENSSL_1.0.0;
-+
-+OPENSSL_1.0.1d {
-+	global:
-+		CRYPTO_memcmp;
-+} OPENSSL_1.0.1;
-+
-+OPENSSL_1.0.1s {
-+	global:
-+		SRP_VBASE_get1_by_user;
-+		SRP_user_pwd_free;
-+} OPENSSL_1.0.1d;
-+
-+OPENSSL_1.0.2 {
-+	global:
-+		SSL_CTX_set_alpn_protos;
-+		SSL_set_alpn_protos;
-+		SSL_CTX_set_alpn_select_cb;
-+		SSL_get0_alpn_selected;
-+		SSL_CTX_set_custom_cli_ext;
-+		SSL_CTX_set_custom_srv_ext;
-+		SSL_CTX_set_srv_supp_data;
-+		SSL_CTX_set_cli_supp_data;
-+		SSL_set_cert_cb;
-+		SSL_CTX_use_serverinfo;
-+		SSL_CTX_use_serverinfo_file;
-+		SSL_CTX_set_cert_cb;
-+		SSL_CTX_get0_param;
-+		SSL_get0_param;
-+		SSL_certs_clear;
-+		DTLSv1_2_method;
-+		DTLSv1_2_server_method;
-+		DTLSv1_2_client_method;
-+		DTLS_method;
-+		DTLS_server_method;
-+		DTLS_client_method;
-+		SSL_CTX_get_ssl_method;
-+		SSL_CTX_get0_certificate;
-+		SSL_CTX_get0_privatekey;
-+		SSL_COMP_set0_compression_methods;
-+		SSL_COMP_free_compression_methods;
-+		SSL_CIPHER_find;
-+		SSL_is_server;
-+		SSL_CONF_CTX_new;
-+		SSL_CONF_CTX_finish;
-+		SSL_CONF_CTX_free;
-+		SSL_CONF_CTX_set_flags;
-+		SSL_CONF_CTX_clear_flags;
-+		SSL_CONF_CTX_set1_prefix;
-+		SSL_CONF_CTX_set_ssl;
-+		SSL_CONF_CTX_set_ssl_ctx;
-+		SSL_CONF_cmd;
-+		SSL_CONF_cmd_argv;
-+		SSL_CONF_cmd_value_type;
-+		SSL_trace;
-+		SSL_CIPHER_standard_name;
-+		SSL_get_tlsa_record_byname;
-+		ASN1_TIME_diff;
-+		BIO_hex_string;
-+		CMS_RecipientInfo_get0_pkey_ctx;
-+		CMS_RecipientInfo_encrypt;
-+		CMS_SignerInfo_get0_pkey_ctx;
-+		CMS_SignerInfo_get0_md_ctx;
-+		CMS_SignerInfo_get0_signature;
-+		CMS_RecipientInfo_kari_get0_alg;
-+		CMS_RecipientInfo_kari_get0_reks;
-+		CMS_RecipientInfo_kari_get0_orig_id;
-+		CMS_RecipientInfo_kari_orig_id_cmp;
-+		CMS_RecipientEncryptedKey_get0_id;
-+		CMS_RecipientEncryptedKey_cert_cmp;
-+		CMS_RecipientInfo_kari_set0_pkey;
-+		CMS_RecipientInfo_kari_get0_ctx;
-+		CMS_RecipientInfo_kari_decrypt;
-+		CMS_SharedInfo_encode;
-+		DH_compute_key_padded;
-+		d2i_DHxparams;
-+		i2d_DHxparams;
-+		DH_get_1024_160;
-+		DH_get_2048_224;
-+		DH_get_2048_256;
-+		DH_KDF_X9_42;
-+		ECDH_KDF_X9_62;
-+		ECDSA_METHOD_new;
-+		ECDSA_METHOD_free;
-+		ECDSA_METHOD_set_app_data;
-+		ECDSA_METHOD_get_app_data;
-+		ECDSA_METHOD_set_sign;
-+		ECDSA_METHOD_set_sign_setup;
-+		ECDSA_METHOD_set_verify;
-+		ECDSA_METHOD_set_flags;
-+		ECDSA_METHOD_set_name;
-+		EVP_des_ede3_wrap;
-+		EVP_aes_128_wrap;
-+		EVP_aes_192_wrap;
-+		EVP_aes_256_wrap;
-+		EVP_aes_128_cbc_hmac_sha256;
-+		EVP_aes_256_cbc_hmac_sha256;
-+		CRYPTO_128_wrap;
-+		CRYPTO_128_unwrap;
-+		OCSP_REQ_CTX_nbio;
-+		OCSP_REQ_CTX_new;
-+		OCSP_set_max_response_length;
-+		OCSP_REQ_CTX_i2d;
-+		OCSP_REQ_CTX_nbio_d2i;
-+		OCSP_REQ_CTX_get0_mem_bio;
-+		OCSP_REQ_CTX_http;
-+		RSA_padding_add_PKCS1_OAEP_mgf1;
-+		RSA_padding_check_PKCS1_OAEP_mgf1;
-+		RSA_OAEP_PARAMS_free;
-+		RSA_OAEP_PARAMS_it;
-+		RSA_OAEP_PARAMS_new;
-+		SSL_get_sigalgs;
-+		SSL_get_shared_sigalgs;
-+		SSL_check_chain;
-+		X509_chain_up_ref;
-+		X509_http_nbio;
-+		X509_CRL_http_nbio;
-+		X509_REVOKED_dup;
-+		i2d_re_X509_tbs;
-+		X509_get0_signature;
-+		X509_get_signature_nid;
-+		X509_CRL_diff;
-+		X509_chain_check_suiteb;
-+		X509_CRL_check_suiteb;
-+		X509_check_host;
-+		X509_check_email;
-+		X509_check_ip;
-+		X509_check_ip_asc;
-+		X509_STORE_set_lookup_crls_cb;
-+		X509_STORE_CTX_get0_store;
-+		X509_VERIFY_PARAM_set1_host;
-+		X509_VERIFY_PARAM_add1_host;
-+		X509_VERIFY_PARAM_set_hostflags;
-+		X509_VERIFY_PARAM_get0_peername;
-+		X509_VERIFY_PARAM_set1_email;
-+		X509_VERIFY_PARAM_set1_ip;
-+		X509_VERIFY_PARAM_set1_ip_asc;
-+		X509_VERIFY_PARAM_get0_name;
-+		X509_VERIFY_PARAM_get_count;
-+		X509_VERIFY_PARAM_get0;
-+		X509V3_EXT_free;
-+		EC_GROUP_get_mont_data;
-+		EC_curve_nid2nist;
-+		EC_curve_nist2nid;
-+		PEM_write_bio_DHxparams;
-+		PEM_write_DHxparams;
-+		SSL_CTX_add_client_custom_ext;
-+		SSL_CTX_add_server_custom_ext;
-+		SSL_extension_supported;
-+		BUF_strnlen;
-+		sk_deep_copy;
-+		SSL_test_functions;
-+} OPENSSL_1.0.1d;
diff --git a/recipes-connectivity/openssl/openssl/engines-install-in-libdir-ssl.patch b/recipes-connectivity/openssl/openssl/engines-install-in-libdir-ssl.patch
deleted file mode 100644
index a574648..0000000
--- a/recipes-connectivity/openssl/openssl/engines-install-in-libdir-ssl.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-
-Index: openssl-1.0.2/engines/Makefile
-===================================================================
---- openssl-1.0.2.orig/engines/Makefile
-+++ openssl-1.0.2/engines/Makefile
-@@ -107,13 +107,13 @@ install:
- 	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
- 	@if [ -n "$(SHARED_LIBS)" ]; then \
- 		set -e; \
--		$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines; \
-+		$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines; \
- 		for l in $(LIBNAMES); do \
- 			( echo installing $$l; \
- 			  pfx=lib; \
- 			  if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \
- 				sfx=".so"; \
--				cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
-+				cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new; \
- 			  else \
- 				case "$(CFLAGS)" in \
- 				*DSO_BEOS*)	sfx=".so";;	\
-@@ -122,10 +122,10 @@ install:
- 				*DSO_WIN32*)	sfx="eay32.dll"; pfx=;;	\
- 				*)		sfx=".bad";;	\
- 				esac; \
--				cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
-+				cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new; \
- 			  fi; \
--			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
--			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
-+			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new; \
-+			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx ); \
- 		done; \
- 	fi
- 	@target=install; $(RECURSIVE_MAKE)
-Index: openssl-1.0.2/engines/ccgost/Makefile
-===================================================================
---- openssl-1.0.2.orig/engines/ccgost/Makefile
-+++ openssl-1.0.2/engines/ccgost/Makefile
-@@ -47,7 +47,7 @@ install:
- 		pfx=lib; \
- 		if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \
- 			sfx=".so"; \
--			cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
-+			cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx.new; \
- 		else \
- 			case "$(CFLAGS)" in \
- 			*DSO_BEOS*) sfx=".so";; \
-@@ -56,10 +56,10 @@ install:
- 			*DSO_WIN32*) sfx="eay32.dll"; pfx=;; \
- 			*) sfx=".bad";; \
- 			esac; \
--			cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
-+			cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx.new; \
- 		fi; \
--		chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
--		mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \
-+		chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx.new; \
-+		mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx; \
- 	fi
- 
- links:
diff --git a/recipes-connectivity/openssl/openssl/find.pl b/recipes-connectivity/openssl/openssl/find.pl
deleted file mode 100644
index 8e1b42c..0000000
--- a/recipes-connectivity/openssl/openssl/find.pl
+++ /dev/null
@@ -1,54 +0,0 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-
-# This library is deprecated and unmaintained. It is included for
-# compatibility with Perl 4 scripts which may use it, but it will be
-# removed in a future version of Perl. Please use the File::Find module
-# instead.
-
-# Usage:
-#	require "find.pl";
-#
-#	&find('/foo','/bar');
-#
-#	sub wanted { ... }
-#		where wanted does whatever you want.  $dir contains the
-#		current directory name, and $_ the current filename within
-#		that directory.  $name contains "$dir/$_".  You are cd'ed
-#		to $dir when the function is called.  The function may
-#		set $prune to prune the tree.
-#
-# For example,
-#
-#   find / -name .nfs\* -mtime +7 -exec rm -f {} \; -o -fstype nfs -prune
-#
-# corresponds to this
-#
-#	sub wanted {
-#	    /^\.nfs.*$/ &&
-#	    (($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_)) &&
-#	    int(-M _) > 7 &&
-#	    unlink($_)
-#	    ||
-#	    ($nlink || (($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_))) &&
-#	    $dev < 0 &&
-#	    ($prune = 1);
-#	}
-#
-# Set the variable $dont_use_nlink if you're using AFS, since AFS cheats.
-
-use File::Find ();
-
-*name		= *File::Find::name;
-*prune		= *File::Find::prune;
-*dir		= *File::Find::dir;
-*topdir		= *File::Find::topdir;
-*topdev		= *File::Find::topdev;
-*topino		= *File::Find::topino;
-*topmode	= *File::Find::topmode;
-*topnlink	= *File::Find::topnlink;
-
-sub find {
-    &File::Find::find(\&wanted, @_);
-}
-
-1;
diff --git a/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch b/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch
deleted file mode 100644
index 2a318a4..0000000
--- a/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Upstream-Status: Submitted
-
-This patch adds the fix for one of the ciphers used in openssl, namely
-the cipher des-ede3-cfb1. Complete bug log and patch is present here:
-http://rt.openssl.org/Ticket/Display.html?id=2867
-
-Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
-
-Index: openssl-1.0.2/crypto/evp/e_des3.c
-===================================================================
---- openssl-1.0.2.orig/crypto/evp/e_des3.c
-+++ openssl-1.0.2/crypto/evp/e_des3.c
-@@ -211,7 +211,7 @@ static int des_ede3_cfb1_cipher(EVP_CIPH
-     size_t n;
-     unsigned char c[1], d[1];
- 
--    for (n = 0; n < inl; ++n) {
-+    for (n = 0; n * 8 < inl; ++n) {
-         c[0] = (in[n / 8] & (1 << (7 - n % 8))) ? 0x80 : 0;
-         DES_ede3_cfb_encrypt(c, d, 1, 1,
-                              &data(ctx)->ks1, &data(ctx)->ks2,
diff --git a/recipes-connectivity/openssl/openssl/oe-ldflags.patch b/recipes-connectivity/openssl/openssl/oe-ldflags.patch
deleted file mode 100644
index 292e13d..0000000
--- a/recipes-connectivity/openssl/openssl/oe-ldflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Upstream-Status: Inappropriate [open-embedded]
-
-Index: openssl-1.0.0/Makefile.shared
-===================================================================
---- openssl-1.0.0.orig/Makefile.shared
-+++ openssl-1.0.0/Makefile.shared
-@@ -92,7 +92,7 @@
- LINK_APP=	\
-   ( $(SET_X);   \
-     LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \
--    LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \
-+    LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$(OE_LDFLAGS) $${LDFLAGS:-$(CFLAGS)}"; \
-     LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
-     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
-     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
-@@ -102,7 +102,7 @@
-   ( $(SET_X);   \
-     LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \
-     SHAREDCMD="$${SHAREDCMD:-$(CC)}"; \
--    SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
-+    SHAREDFLAGS="$(OE_LDFLAGS) $${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
-     LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
-     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
-     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
diff --git a/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.patch b/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.patch
deleted file mode 100644
index 1e5bfa1..0000000
--- a/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://rt.openssl.org/Ticket/Display.html?id=3759&user=guest&pass=guest
-
-From 6257d59b3a68d2feb9d64317a1c556dc3813ee61 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 21 Mar 2015 06:01:25 -0400
-Subject: [PATCH] crypto: use bigint in x86-64 perl
-
-Upstream-Status: Pending
-Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
-
-When building on x32 systems where the default type is 32bit, make sure
-we can transparently represent 64bit integers.  Otherwise we end up with
-build errors like:
-/usr/bin/perl asm/ghash-x86_64.pl elf > ghash-x86_64.s
-Integer overflow in hexadecimal number at asm/../../perlasm/x86_64-xlate.pl line 201, <> line 890.
-...
-ghash-x86_64.s: Assembler messages:
-ghash-x86_64.s:890: Error: junk '.15473355479995e+19' after expression
-
-We don't enable this globally as there are some cases where we'd get
-32bit values interpreted as unsigned when we need them as signed.
-
-Reported-by: Bertrand Jacquin <bertrand@jacquin.bzh>
-URL: https://bugs.gentoo.org/542618
----
- crypto/perlasm/x86_64-xlate.pl | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
-index aae8288..0bf9774 100755
---- a/crypto/perlasm/x86_64-xlate.pl
-+++ b/crypto/perlasm/x86_64-xlate.pl
-@@ -195,6 +195,10 @@ my %globals;
-     sub out {
-     	my $self = shift;
- 
-+	# When building on x32 ABIs, the expanded hex value might be too
-+	# big to fit into 32bits.  Enable transparent 64bit support here
-+	# so we can safely print it out.
-+	use bigint;
- 	if ($gas) {
- 	    # Solaris /usr/ccs/bin/as can't handle multiplications
- 	    # in $self->{value}
--- 
-2.3.3
-
diff --git a/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch b/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
deleted file mode 100644
index f736e5c..0000000
--- a/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-openssl: avoid NULL pointer dereference in EVP_DigestInit_ex()
-
-We should avoid accessing the type pointer if it's NULL,
-this could happen if ctx->digest is not NULL.
-
-Upstream-Status: Submitted
-http://www.mail-archive.com/openssl-dev@openssl.org/msg32860.html
-
-Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com>
----
-Index: openssl-1.0.2h/crypto/evp/digest.c
-===================================================================
---- openssl-1.0.2h.orig/crypto/evp/digest.c
-+++ openssl-1.0.2h/crypto/evp/digest.c
-@@ -211,7 +211,7 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, c
-         type = ctx->digest;
-     }
- #endif
--    if (ctx->digest != type) {
-+    if (type && (ctx->digest != type)) {
-         if (ctx->digest && ctx->digest->ctx_size) {
-             OPENSSL_free(ctx->md_data);
-             ctx->md_data = NULL;
diff --git a/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh b/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh
deleted file mode 100644
index 6620fdc..0000000
--- a/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh
+++ /dev/null
@@ -1,222 +0,0 @@
-#!/bin/sh
-#
-# Ben Secrest <blsecres@gmail.com>
-#
-# sh c_rehash script, scan all files in a directory
-# and add symbolic links to their hash values.
-#
-# based on the c_rehash perl script distributed with openssl
-#
-# LICENSE: See OpenSSL license
-# ^^acceptable?^^
-#
-
-# default certificate location
-DIR=/etc/openssl
-
-# for filetype bitfield
-IS_CERT=$(( 1 << 0 ))
-IS_CRL=$(( 1 << 1 ))
-
-
-# check to see if a file is a certificate file or a CRL file
-# arguments:
-#       1. the filename to be scanned
-# returns:
-#       bitfield of file type; uses ${IS_CERT} and ${IS_CRL}
-#
-check_file()
-{
-    local IS_TYPE=0
-
-    # make IFS a newline so we can process grep output line by line
-    local OLDIFS=${IFS}
-    IFS=$( printf "\n" )
-
-    # XXX: could be more efficient to have two 'grep -m' but is -m portable?
-    for LINE in $( grep '^-----BEGIN .*-----' ${1} )
-    do
-	if echo ${LINE} \
-	    | grep -q -E '^-----BEGIN (X509 |TRUSTED )?CERTIFICATE-----'
-	then
-	    IS_TYPE=$(( ${IS_TYPE} | ${IS_CERT} ))
-
-	    if [ $(( ${IS_TYPE} & ${IS_CRL} )) -ne 0 ]
-	    then
-	    	break
-	    fi
-	elif echo ${LINE} | grep -q '^-----BEGIN X509 CRL-----'
-	then
-	    IS_TYPE=$(( ${IS_TYPE} | ${IS_CRL} ))
-
-	    if [ $(( ${IS_TYPE} & ${IS_CERT} )) -ne 0 ]
-	    then
-	    	break
-	    fi
-	fi
-    done
-
-    # restore IFS
-    IFS=${OLDIFS}
-
-    return ${IS_TYPE}
-}
-
-
-#
-# use openssl to fingerprint a file
-#    arguments:
-#	1. the filename to fingerprint
-#	2. the method to use (x509, crl)
-#    returns:
-#	none
-#    assumptions:
-#	user will capture output from last stage of pipeline
-#
-fingerprint()
-{
-    ${SSL_CMD} ${2} -fingerprint -noout -in ${1} | sed 's/^.*=//' | tr -d ':'
-}
-
-
-#
-# link_hash - create links to certificate files
-#    arguments:
-#       1. the filename to create a link for
-#	2. the type of certificate being linked (x509, crl)
-#    returns:
-#	0 on success, 1 otherwise
-#
-link_hash()
-{
-    local FINGERPRINT=$( fingerprint ${1} ${2} )
-    local HASH=$( ${SSL_CMD} ${2} -hash -noout -in ${1} )
-    local SUFFIX=0
-    local LINKFILE=''
-    local TAG=''
-
-    if [ ${2} = "crl" ]
-    then
-    	TAG='r'
-    fi
-
-    LINKFILE=${HASH}.${TAG}${SUFFIX}
-
-    while [ -f ${LINKFILE} ]
-    do
-	if [ ${FINGERPRINT} = $( fingerprint ${LINKFILE} ${2} ) ]
-	then
-	    echo "NOTE: Skipping duplicate file ${1}" >&2
-	    return 1
-	fi	
-
-	SUFFIX=$(( ${SUFFIX} + 1 ))
-	LINKFILE=${HASH}.${TAG}${SUFFIX}
-    done
-
-    echo "${3} => ${LINKFILE}"
-
-    # assume any system with a POSIX shell will either support symlinks or
-    # do something to handle this gracefully
-    ln -s ${3} ${LINKFILE}
-
-    return 0
-}
-
-
-# hash_dir create hash links in a given directory
-hash_dir()
-{
-    echo "Doing ${1}"
-
-    cd ${1}
-
-    ls -1 * 2>/dev/null | while read FILE
-    do
-        if echo ${FILE} | grep -q -E '^[[:xdigit:]]{8}\.r?[[:digit:]]+$' \
-	    	&& [ -h "${FILE}" ]
-        then
-            rm ${FILE}
-        fi
-    done
-
-    ls -1 *.pem *.cer *.crt *.crl 2>/dev/null | while read FILE
-    do
-	REAL_FILE=${FILE}
-	# if we run on build host then get to the real files in rootfs
-	if [ -n "${SYSROOT}" -a -h ${FILE} ]
-	then
-	    FILE=$( readlink ${FILE} )
-	    # check the symlink is absolute (or dangling in other word)
-	    if [ "x/" = "x$( echo ${FILE} | cut -c1 -)" ]
-	    then
-		REAL_FILE=${SYSROOT}/${FILE}
-	    fi
-	fi
-
-	check_file ${REAL_FILE}
-        local FILE_TYPE=${?}
-	local TYPE_STR=''
-
-        if [ $(( ${FILE_TYPE} & ${IS_CERT} )) -ne 0 ]
-        then
-            TYPE_STR='x509'
-        elif [ $(( ${FILE_TYPE} & ${IS_CRL} )) -ne 0 ]
-        then
-            TYPE_STR='crl'
-        else
-            echo "NOTE: ${FILE} does not contain a certificate or CRL: skipping" >&2
-	    continue
-        fi
-
-	link_hash ${REAL_FILE} ${TYPE_STR} ${FILE}
-    done
-}
-
-
-# choose the name of an ssl application
-if [ -n "${OPENSSL}" ]
-then
-    SSL_CMD=$(which ${OPENSSL} 2>/dev/null)
-else
-    SSL_CMD=/usr/bin/openssl
-    OPENSSL=${SSL_CMD}
-    export OPENSSL
-fi
-
-# fix paths
-PATH=${PATH}:${DIR}/bin
-export PATH
-
-# confirm existance/executability of ssl command
-if ! [ -x ${SSL_CMD} ]
-then
-    echo "${0}: rehashing skipped ('openssl' program not available)" >&2
-    exit 0
-fi
-
-# determine which directories to process
-old_IFS=$IFS
-if [ ${#} -gt 0 ]
-then
-    IFS=':'
-    DIRLIST=${*}
-elif [ -n "${SSL_CERT_DIR}" ]
-then
-    DIRLIST=$SSL_CERT_DIR
-else
-    DIRLIST=${DIR}/certs
-fi
-
-IFS=':'
-
-# process directories
-for CERT_DIR in ${DIRLIST}
-do
-    if [ -d ${CERT_DIR} -a -w ${CERT_DIR} ]
-    then
-        IFS=$old_IFS
-        hash_dir ${CERT_DIR}
-        IFS=':'
-    fi
-done
diff --git a/recipes-connectivity/openssl/openssl/openssl-fix-des.pod-error.patch b/recipes-connectivity/openssl/openssl/openssl-fix-des.pod-error.patch
deleted file mode 100644
index de49729..0000000
--- a/recipes-connectivity/openssl/openssl/openssl-fix-des.pod-error.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-openssl: Fix pod2man des.pod error on Ubuntu 12.04
-
-This is a formatting fix, '=back' is required before
-'=head1' on Ubuntu 12.04.
-
-Upstream-Status: Pending
-Signed-off-by: Baogen Shang <baogen.shang@windriver.com>
-diff -urpN a_origin/des.pod b_modify/des.pod
---- a_origin/crypto/des/des.pod	2013-08-15 15:02:56.211674589 +0800
-+++ b_modify/crypto/des/des.pod	2013-08-15 15:04:14.439674580 +0800
-@@ -181,6 +181,8 @@ the uuencoded file to embed in the begin
- output.  If there is no name specified after the B<-u>, the name text.des
- will be embedded in the header.
- 
-+=back
-+
- =head1 SEE ALSO
- 
- ps(1),
diff --git a/recipes-connectivity/openssl/openssl/openssl-util-perlpath.pl-cwd.patch b/recipes-connectivity/openssl/openssl/openssl-util-perlpath.pl-cwd.patch
deleted file mode 100644
index 065b9b1..0000000
--- a/recipes-connectivity/openssl/openssl/openssl-util-perlpath.pl-cwd.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e427748f3bb5d37e78dc8d70a558c373aa8ababb Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Mon, 19 Sep 2016 22:06:28 -0700
-Subject: [PATCH] util/perlpath.pl: make it work when cwd is not in @INC
-
-Fixed when building on Debian-testing:
-| Can't locate find.pl in @INC (@INC contains: /etc/perl /usr/local/lib/x86_64-linux-gnu/perl/5.22.2 /usr/local/share/perl/5.22.2 /usr/lib/x86_64-linux-gnu/perl5/5.22 /usr/share/perl5 /usr/lib/x86_64-linux-gnu/perl/5.22 /usr/share/perl/5.22 /usr/local/lib/site_perl /usr/lib/x86_64-linux-gnu/perl-base) at perlpath.pl line 7.
-
-The find.pl is added by oe-core, so once openssl/find.pl is removed,
-then this patch can be dropped.
-
-Upstream-Status: Inappropriate [OE-Specific]
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- util/perlpath.pl | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/util/perlpath.pl b/util/perlpath.pl
-index a1f236b..5599892 100755
---- a/util/perlpath.pl
-+++ b/util/perlpath.pl
-@@ -4,6 +4,8 @@
- # line in all scripts that rely on perl.
- #
- 
-+BEGIN { unshift @INC, "."; }
-+
- require "find.pl";
- 
- $#ARGV == 0 || print STDERR "usage: perlpath newpath  (eg /usr/bin)\n";
--- 
-2.9.0
-
diff --git a/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch b/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch
deleted file mode 100644
index 0f08a64..0000000
--- a/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Upstream-Status: Pending
-
-Received from H J Liu @ Intel
-Make the assembly syntax compatible with x32 gcc. Othewise x32 gcc throws errors.
-Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/07/13
-
-ported the patch to the 1.0.0e version
-Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01
-Index: openssl-1.0.2/crypto/bn/bn.h
-===================================================================
---- openssl-1.0.2.orig/crypto/bn/bn.h
-+++ openssl-1.0.2/crypto/bn/bn.h
-@@ -173,6 +173,13 @@ extern "C" {
- #  endif
- # endif
- 
-+/* Address type.  */
-+#ifdef _WIN64
-+#define BN_ADDR unsigned long long
-+#else
-+#define BN_ADDR unsigned long
-+#endif
-+
- /*
-  * assuming long is 64bit - this is the DEC Alpha unsigned long long is only
-  * 64 bits :-(, don't define BN_LLONG for the DEC Alpha
-Index: openssl-1.0.2/crypto/bn/bn_exp.c
-===================================================================
---- openssl-1.0.2.orig/crypto/bn/bn_exp.c
-+++ openssl-1.0.2/crypto/bn/bn_exp.c
-@@ -638,7 +638,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBU
-  * multiple.
-  */
- #define MOD_EXP_CTIME_ALIGN(x_) \
--        ((unsigned char*)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((size_t)(x_)) & (MOD_EXP_CTIME_MIN_CACHE_LINE_MASK))))
-+	((unsigned char*)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((BN_ADDR)(x_)) & (MOD_EXP_CTIME_MIN_CACHE_LINE_MASK))))
- 
- /*
-  * This variant of BN_mod_exp_mont() uses fixed windows and the special
diff --git a/recipes-connectivity/openssl/openssl/parallel.patch b/recipes-connectivity/openssl/openssl/parallel.patch
deleted file mode 100644
index f3f4c99..0000000
--- a/recipes-connectivity/openssl/openssl/parallel.patch
+++ /dev/null
@@ -1,337 +0,0 @@
-Fix the parallel races in the Makefiles.
-
-This patch was taken from the Gentoo packaging:
-https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2g-parallel-build.patch
-
-Upstream-Status: Pending
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-Refreshed for 1.0.2i
-Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
-
---- openssl-1.0.2g/crypto/Makefile
-+++ openssl-1.0.2g/crypto/Makefile
-@@ -85,11 +85,11 @@
- 	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
- 
- subdirs:
--	@target=all; $(RECURSIVE_MAKE)
-+	+@target=all; $(RECURSIVE_MAKE)
- 
- files:
- 	$(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
--	@target=files; $(RECURSIVE_MAKE)
-+	+@target=files; $(RECURSIVE_MAKE)
- 
- links:
- 	@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
-@@ -100,7 +100,7 @@
- # lib: $(LIB): are splitted to avoid end-less loop
- lib:	$(LIB)
- 	@touch lib
--$(LIB):	$(LIBOBJ)
-+$(LIB):	$(LIBOBJ) | subdirs
- 	$(AR) $(LIB) $(LIBOBJ)
- 	test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
- 	$(RANLIB) $(LIB) || echo Never mind.
-@@ -111,7 +111,7 @@
- 	fi
- 
- libs:
--	@target=lib; $(RECURSIVE_MAKE)
-+	+@target=lib; $(RECURSIVE_MAKE)
- 
- install:
- 	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-@@ -120,7 +120,7 @@
- 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
- 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
- 	done;
--	@target=install; $(RECURSIVE_MAKE)
-+	+@target=install; $(RECURSIVE_MAKE)
- 
- lint:
- 	@target=lint; $(RECURSIVE_MAKE)
---- openssl-1.0.2g/engines/Makefile
-+++ openssl-1.0.2g/engines/Makefile
-@@ -72,7 +72,7 @@
- 
- all:	lib subdirs
- 
--lib:	$(LIBOBJ)
-+lib:	$(LIBOBJ) | subdirs
- 	@if [ -n "$(SHARED_LIBS)" ]; then \
- 		set -e; \
- 		for l in $(LIBNAMES); do \
-@@ -89,7 +89,7 @@
- 
- subdirs:
- 	echo $(EDIRS)
--	@target=all; $(RECURSIVE_MAKE)
-+	+@target=all; $(RECURSIVE_MAKE)
- 
- files:
- 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-@@ -128,7 +128,7 @@
- 			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
- 		done; \
- 	fi
--	@target=install; $(RECURSIVE_MAKE)
-+	+@target=install; $(RECURSIVE_MAKE)
- 
- tags:
- 	ctags $(SRC)
---- openssl-1.0.2g/Makefile.org
-+++ openssl-1.0.2g/Makefile.org
-@@ -279,17 +279,17 @@
- build_libssl: build_ssl libssl.pc
- 
- build_crypto:
--	@dir=crypto; target=all; $(BUILD_ONE_CMD)
-+	+@dir=crypto; target=all; $(BUILD_ONE_CMD)
- build_ssl: build_crypto
--	@dir=ssl; target=all; $(BUILD_ONE_CMD)
-+	+@dir=ssl; target=all; $(BUILD_ONE_CMD)
- build_engines: build_crypto
--	@dir=engines; target=all; $(BUILD_ONE_CMD)
-+	+@dir=engines; target=all; $(BUILD_ONE_CMD)
- build_apps: build_libs
--	@dir=apps; target=all; $(BUILD_ONE_CMD)
-+	+@dir=apps; target=all; $(BUILD_ONE_CMD)
- build_tests: build_libs
--	@dir=test; target=all; $(BUILD_ONE_CMD)
-+	+@dir=test; target=all; $(BUILD_ONE_CMD)
- build_tools: build_libs
--	@dir=tools; target=all; $(BUILD_ONE_CMD)
-+	+@dir=tools; target=all; $(BUILD_ONE_CMD)
- 
- all_testapps: build_libs build_testapps
- build_testapps:
-@@ -544,7 +544,7 @@
- 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
- 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
- 	done;
--	@set -e; target=install; $(RECURSIVE_BUILD_CMD)
-+	+@set -e; target=install; $(RECURSIVE_BUILD_CMD)
- 	@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
- 	do \
- 		if [ -f "$$i" ]; then \
---- openssl-1.0.2g/Makefile.shared
-+++ openssl-1.0.2g/Makefile.shared
-@@ -105,6 +105,7 @@
-     SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
-     LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
-     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
-+    [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
-     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
-     $${SHAREDCMD} $${SHAREDFLAGS} \
- 	-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
-@@ -122,6 +123,7 @@
- 			done; \
- 		fi; \
- 		if [ -n "$$SHLIB_SOVER" ]; then \
-+			[ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
- 			( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
- 			  ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
- 		fi; \
---- openssl-1.0.2g/test/Makefile
-+++ openssl-1.0.2g/test/Makefile
-@@ -144,7 +144,7 @@
- tags:
- 	ctags $(SRC)
- 
--tests:	exe apps $(TESTS)
-+tests:	exe $(TESTS)
- 
- apps:
- 	@(cd ..; $(MAKE) DIRS=apps all)
-@@ -438,136 +438,136 @@
- 		link_app.$${shlib_target}
- 
- $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
--	@target=$(RSATEST); $(BUILD_CMD)
-+	+@target=$(RSATEST); $(BUILD_CMD)
- 
- $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
--	@target=$(BNTEST); $(BUILD_CMD)
-+	+@target=$(BNTEST); $(BUILD_CMD)
- 
- $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
--	@target=$(ECTEST); $(BUILD_CMD)
-+	+@target=$(ECTEST); $(BUILD_CMD)
- 
- $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
--	@target=$(EXPTEST); $(BUILD_CMD)
-+	+@target=$(EXPTEST); $(BUILD_CMD)
- 
- $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
--	@target=$(IDEATEST); $(BUILD_CMD)
-+	+@target=$(IDEATEST); $(BUILD_CMD)
- 
- $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
--	@target=$(MD2TEST); $(BUILD_CMD)
-+	+@target=$(MD2TEST); $(BUILD_CMD)
- 
- $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
--	@target=$(SHATEST); $(BUILD_CMD)
-+	+@target=$(SHATEST); $(BUILD_CMD)
- 
- $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
--	@target=$(SHA1TEST); $(BUILD_CMD)
-+	+@target=$(SHA1TEST); $(BUILD_CMD)
- 
- $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
--	@target=$(SHA256TEST); $(BUILD_CMD)
-+	+@target=$(SHA256TEST); $(BUILD_CMD)
- 
- $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
--	@target=$(SHA512TEST); $(BUILD_CMD)
-+	+@target=$(SHA512TEST); $(BUILD_CMD)
- 
- $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
--	@target=$(RMDTEST); $(BUILD_CMD)
-+	+@target=$(RMDTEST); $(BUILD_CMD)
- 
- $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
--	@target=$(MDC2TEST); $(BUILD_CMD)
-+	+@target=$(MDC2TEST); $(BUILD_CMD)
- 
- $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
--	@target=$(MD4TEST); $(BUILD_CMD)
-+	+@target=$(MD4TEST); $(BUILD_CMD)
- 
- $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
--	@target=$(MD5TEST); $(BUILD_CMD)
-+	+@target=$(MD5TEST); $(BUILD_CMD)
- 
- $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
--	@target=$(HMACTEST); $(BUILD_CMD)
-+	+@target=$(HMACTEST); $(BUILD_CMD)
- 
- $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
--	@target=$(WPTEST); $(BUILD_CMD)
-+	+@target=$(WPTEST); $(BUILD_CMD)
- 
- $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
--	@target=$(RC2TEST); $(BUILD_CMD)
-+	+@target=$(RC2TEST); $(BUILD_CMD)
- 
- $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
--	@target=$(BFTEST); $(BUILD_CMD)
-+	+@target=$(BFTEST); $(BUILD_CMD)
- 
- $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
--	@target=$(CASTTEST); $(BUILD_CMD)
-+	+@target=$(CASTTEST); $(BUILD_CMD)
- 
- $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
--	@target=$(RC4TEST); $(BUILD_CMD)
-+	+@target=$(RC4TEST); $(BUILD_CMD)
- 
- $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
--	@target=$(RC5TEST); $(BUILD_CMD)
-+	+@target=$(RC5TEST); $(BUILD_CMD)
- 
- $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
--	@target=$(DESTEST); $(BUILD_CMD)
-+	+@target=$(DESTEST); $(BUILD_CMD)
- 
- $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
--	@target=$(RANDTEST); $(BUILD_CMD)
-+	+@target=$(RANDTEST); $(BUILD_CMD)
- 
- $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
--	@target=$(DHTEST); $(BUILD_CMD)
-+	+@target=$(DHTEST); $(BUILD_CMD)
- 
- $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
--	@target=$(DSATEST); $(BUILD_CMD)
-+	+@target=$(DSATEST); $(BUILD_CMD)
- 
- $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
--	@target=$(METHTEST); $(BUILD_CMD)
-+	+@target=$(METHTEST); $(BUILD_CMD)
- 
- $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
--	@target=$(SSLTEST); $(FIPS_BUILD_CMD)
-+	+@target=$(SSLTEST); $(FIPS_BUILD_CMD)
- 
- $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
--	@target=$(ENGINETEST); $(BUILD_CMD)
-+	+@target=$(ENGINETEST); $(BUILD_CMD)
- 
- $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
--	@target=$(EVPTEST); $(BUILD_CMD)
-+	+@target=$(EVPTEST); $(BUILD_CMD)
- 
- $(EVPEXTRATEST)$(EXE_EXT): $(EVPEXTRATEST).o $(DLIBCRYPTO)
--	@target=$(EVPEXTRATEST); $(BUILD_CMD)
-+	+@target=$(EVPEXTRATEST); $(BUILD_CMD)
- 
- $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
--	@target=$(ECDSATEST); $(BUILD_CMD)
-+	+@target=$(ECDSATEST); $(BUILD_CMD)
- 
- $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
--	@target=$(ECDHTEST); $(BUILD_CMD)
-+	+@target=$(ECDHTEST); $(BUILD_CMD)
- 
- $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
--	@target=$(IGETEST); $(BUILD_CMD)
-+	+@target=$(IGETEST); $(BUILD_CMD)
- 
- $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
--	@target=$(JPAKETEST); $(BUILD_CMD)
-+	+@target=$(JPAKETEST); $(BUILD_CMD)
- 
- $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
--	@target=$(ASN1TEST); $(BUILD_CMD)
-+	+@target=$(ASN1TEST); $(BUILD_CMD)
- 
- $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
--	@target=$(SRPTEST); $(BUILD_CMD)
-+	+@target=$(SRPTEST); $(BUILD_CMD)
- 
- $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO)
--	@target=$(V3NAMETEST); $(BUILD_CMD)
-+	+@target=$(V3NAMETEST); $(BUILD_CMD)
- 
- $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO)
--	@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
-+	+@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
- 
- $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o
--	@target=$(CONSTTIMETEST) $(BUILD_CMD)
-+	+@target=$(CONSTTIMETEST) $(BUILD_CMD)
- 
- $(VERIFYEXTRATEST)$(EXE_EXT): $(VERIFYEXTRATEST).o
--	@target=$(VERIFYEXTRATEST) $(BUILD_CMD)
-+	+@target=$(VERIFYEXTRATEST) $(BUILD_CMD)
- 
- $(CLIENTHELLOTEST)$(EXE_EXT): $(CLIENTHELLOTEST).o
--	@target=$(CLIENTHELLOTEST) $(BUILD_CMD)
-+	+@target=$(CLIENTHELLOTEST) $(BUILD_CMD)
- 
- $(BADDTLSTEST)$(EXE_EXT): $(BADDTLSTEST).o
--	@target=$(BADDTLSTEST) $(BUILD_CMD)
-+	+@target=$(BADDTLSTEST) $(BUILD_CMD)
- 
- $(SSLV2CONFTEST)$(EXE_EXT): $(SSLV2CONFTEST).o
--	@target=$(SSLV2CONFTEST) $(BUILD_CMD)
-+	+@target=$(SSLV2CONFTEST) $(BUILD_CMD)
- 
- $(DTLSTEST)$(EXE_EXT): $(DTLSTEST).o ssltestlib.o $(DLIBSSL) $(DLIBCRYPTO)
--	@target=$(DTLSTEST); exobj=ssltestlib.o; $(BUILD_CMD)
-+	+@target=$(DTLSTEST); exobj=ssltestlib.o; $(BUILD_CMD)
- 
- #$(AESTEST).o: $(AESTEST).c
- #	$(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
-@@ -580,6 +580,6 @@
- #	fi
- 
- dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
--	@target=dummytest; $(BUILD_CMD)
-+	+@target=dummytest; $(BUILD_CMD)
- 
- # DO NOT DELETE THIS LINE -- make depend depends on it.
- 
\ No newline at end of file
diff --git a/recipes-connectivity/openssl/openssl/ptest-deps.patch b/recipes-connectivity/openssl/openssl/ptest-deps.patch
deleted file mode 100644
index ef6d179..0000000
--- a/recipes-connectivity/openssl/openssl/ptest-deps.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Remove Makefile dependencies for test targets
-
-These are probably here because the executables aren't always built for
-other platforms (e.g. Windows); however we can safely assume they'll
-always be there. None of the other test targets have such dependencies
-and if we don't remove them, make tries to rebuild the executables and
-fails during run-ptest.
-
-Upstream-Status: Inappropriate [config]
-
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-
-Index: openssl-1.0.2/test/Makefile
-===================================================================
---- openssl-1.0.2.orig/test/Makefile
-+++ openssl-1.0.2/test/Makefile
-@@ -330,7 +330,7 @@ test_cms: ../apps/openssl$(EXE_EXT) cms-
- 	@echo "CMS consistency test"
- 	$(PERL) cms-test.pl
- 
--test_srp: $(SRPTEST)$(EXE_EXT)
-+test_srp:
- 	@echo "Test SRP"
- 	../util/shlib_wrap.sh ./srptest
- 
-@@ -342,7 +342,7 @@ test_v3name: $(V3NAMETEST)$(EXE_EXT)
- 	@echo "Test X509v3_check_*"
- 	../util/shlib_wrap.sh ./$(V3NAMETEST)
- 
--test_heartbeat: $(HEARTBEATTEST)$(EXE_EXT)
-+test_heartbeat:
- 	../util/shlib_wrap.sh ./$(HEARTBEATTEST)
- 
- test_constant_time: $(CONSTTIMETEST)$(EXE_EXT)
diff --git a/recipes-connectivity/openssl/openssl/ptest_makefile_deps.patch b/recipes-connectivity/openssl/openssl/ptest_makefile_deps.patch
deleted file mode 100644
index 4202e61..0000000
--- a/recipes-connectivity/openssl/openssl/ptest_makefile_deps.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-Additional Makefile dependencies removal for test targets
-
-Removing the dependency check for test targets as these tests are
-causing a number of failures and "noise" during ptest execution.
-
-Upstream-Status: Inappropriate [config]
-
-Signed-off-by: Maxin B. John <maxin.john@intel.com>
-
-diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
---- openssl-1.0.2d-orig/test/Makefile	2015-09-28 12:50:41.530022979 +0300
-+++ openssl-1.0.2d/test/Makefile	2015-09-28 12:57:45.930717240 +0300
-@@ -155,67 +155,67 @@
- 	( $(MAKE) $$i && echo "PASS: $$i" ) || echo "FAIL: $$i"; \
- 	done)
- 
--test_evp: $(EVPTEST)$(EXE_EXT) evptests.txt
-+test_evp:
- 	../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt
- 
--test_evp_extra: $(EVPEXTRATEST)$(EXE_EXT)
-+test_evp_extra:
- 	../util/shlib_wrap.sh ./$(EVPEXTRATEST)
- 
--test_des: $(DESTEST)$(EXE_EXT)
-+test_des:
- 	../util/shlib_wrap.sh ./$(DESTEST)
- 
--test_idea: $(IDEATEST)$(EXE_EXT)
-+test_idea:
- 	../util/shlib_wrap.sh ./$(IDEATEST)
- 
--test_sha: $(SHATEST)$(EXE_EXT) $(SHA1TEST)$(EXE_EXT) $(SHA256TEST)$(EXE_EXT) $(SHA512TEST)$(EXE_EXT)
-+test_sha:
- 	../util/shlib_wrap.sh ./$(SHATEST)
- 	../util/shlib_wrap.sh ./$(SHA1TEST)
- 	../util/shlib_wrap.sh ./$(SHA256TEST)
- 	../util/shlib_wrap.sh ./$(SHA512TEST)
- 
--test_mdc2: $(MDC2TEST)$(EXE_EXT)
-+test_mdc2:
- 	../util/shlib_wrap.sh ./$(MDC2TEST)
- 
--test_md5: $(MD5TEST)$(EXE_EXT)
-+test_md5:
- 	../util/shlib_wrap.sh ./$(MD5TEST)
- 
--test_md4: $(MD4TEST)$(EXE_EXT)
-+test_md4:
- 	../util/shlib_wrap.sh ./$(MD4TEST)
- 
--test_hmac: $(HMACTEST)$(EXE_EXT)
-+test_hmac:
- 	../util/shlib_wrap.sh ./$(HMACTEST)
- 
--test_wp: $(WPTEST)$(EXE_EXT)
-+test_wp:
- 	../util/shlib_wrap.sh ./$(WPTEST)
- 
--test_md2: $(MD2TEST)$(EXE_EXT)
-+test_md2:
- 	../util/shlib_wrap.sh ./$(MD2TEST)
- 
--test_rmd: $(RMDTEST)$(EXE_EXT)
-+test_rmd:
- 	../util/shlib_wrap.sh ./$(RMDTEST)
- 
--test_bf: $(BFTEST)$(EXE_EXT)
-+test_bf:
- 	../util/shlib_wrap.sh ./$(BFTEST)
- 
--test_cast: $(CASTTEST)$(EXE_EXT)
-+test_cast:
- 	../util/shlib_wrap.sh ./$(CASTTEST)
- 
--test_rc2: $(RC2TEST)$(EXE_EXT)
-+test_rc2:
- 	../util/shlib_wrap.sh ./$(RC2TEST)
- 
--test_rc4: $(RC4TEST)$(EXE_EXT)
-+test_rc4:
- 	../util/shlib_wrap.sh ./$(RC4TEST)
- 
--test_rc5: $(RC5TEST)$(EXE_EXT)
-+test_rc5:
- 	../util/shlib_wrap.sh ./$(RC5TEST)
- 
--test_rand: $(RANDTEST)$(EXE_EXT)
-+test_rand:
- 	../util/shlib_wrap.sh ./$(RANDTEST)
- 
--test_enc: ../apps/openssl$(EXE_EXT) testenc
-+test_enc:
- 	@sh ./testenc
- 
--test_x509: ../apps/openssl$(EXE_EXT) tx509 testx509.pem v3-cert1.pem v3-cert2.pem
-+test_x509:
- 	echo test normal x509v1 certificate
- 	sh ./tx509 2>/dev/null
- 	echo test first x509v3 certificate
-@@ -223,25 +223,25 @@
- 	echo test second x509v3 certificate
- 	sh ./tx509 v3-cert2.pem 2>/dev/null
- 
--test_rsa: ../apps/openssl$(EXE_EXT) trsa testrsa.pem
-+test_rsa:
- 	@sh ./trsa 2>/dev/null
- 	../util/shlib_wrap.sh ./$(RSATEST)
- 
--test_crl: ../apps/openssl$(EXE_EXT) tcrl testcrl.pem
-+test_crl:
- 	@sh ./tcrl 2>/dev/null
- 
--test_sid: ../apps/openssl$(EXE_EXT) tsid testsid.pem
-+test_sid:
- 	@sh ./tsid 2>/dev/null
- 
--test_req: ../apps/openssl$(EXE_EXT) treq testreq.pem testreq2.pem
-+test_req:
- 	@sh ./treq 2>/dev/null
- 	@sh ./treq testreq2.pem 2>/dev/null
- 
--test_pkcs7: ../apps/openssl$(EXE_EXT) tpkcs7 tpkcs7d testp7.pem pkcs7-1.pem
-+test_pkcs7:
- 	@sh ./tpkcs7 2>/dev/null
- 	@sh ./tpkcs7d 2>/dev/null
- 
--test_bn: $(BNTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) bctest
-+test_bn:
- 	@echo starting big number library test, could take a while...
- 	@../util/shlib_wrap.sh ./$(BNTEST) >tmp.bntest
- 	@echo quit >>tmp.bntest
-@@ -250,33 +250,33 @@
- 	@echo 'test a^b%c implementations'
- 	../util/shlib_wrap.sh ./$(EXPTEST)
- 
--test_ec: $(ECTEST)$(EXE_EXT)
-+test_ec:
- 	@echo 'test elliptic curves'
- 	../util/shlib_wrap.sh ./$(ECTEST)
- 
--test_ecdsa: $(ECDSATEST)$(EXE_EXT)
-+test_ecdsa:
- 	@echo 'test ecdsa'
- 	../util/shlib_wrap.sh ./$(ECDSATEST)
- 
--test_ecdh: $(ECDHTEST)$(EXE_EXT)
-+test_ecdh:
- 	@echo 'test ecdh'
- 	../util/shlib_wrap.sh ./$(ECDHTEST)
- 
--test_verify: ../apps/openssl$(EXE_EXT)
-+test_verify:
- 	@echo "The following command should have some OK's and some failures"
- 	@echo "There are definitly a few expired certificates"
- 	../util/shlib_wrap.sh ../apps/openssl verify -CApath ../certs/demo ../certs/demo/*.pem
- 
--test_dh: $(DHTEST)$(EXE_EXT)
-+test_dh:
- 	@echo "Generate a set of DH parameters"
- 	../util/shlib_wrap.sh ./$(DHTEST)
- 
--test_dsa: $(DSATEST)$(EXE_EXT)
-+test_dsa:
- 	@echo "Generate a set of DSA parameters"
- 	../util/shlib_wrap.sh ./$(DSATEST)
- 	../util/shlib_wrap.sh ./$(DSATEST) -app2_1
- 
--test_gen testreq.pem: ../apps/openssl$(EXE_EXT) testgen test.cnf
-+test_gen testreq.pem:
- 	@echo "Generate and verify a certificate request"
- 	@sh ./testgen
- 
-@@ -288,13 +288,11 @@
- 	@cat certCA.ss certU.ss > intP1.ss
- 	@cat certCA.ss certU.ss certP1.ss > intP2.ss
- 
--test_engine:  $(ENGINETEST)$(EXE_EXT)
-+test_engine:
- 	@echo "Manipulate the ENGINE structures"
- 	../util/shlib_wrap.sh ./$(ENGINETEST)
- 
--test_ssl: keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
--		intP1.ss intP2.ss $(SSLTEST)$(EXE_EXT) testssl testsslproxy \
--		../apps/server2.pem serverinfo.pem
-+test_ssl:
- 	@echo "test SSL protocol"
- 	@if [ -n "$(FIPSCANLIB)" ]; then \
- 	  sh ./testfipsssl keyU.ss certU.ss certCA.ss; \
-@@ -304,7 +302,7 @@
- 	@sh ./testsslproxy keyP1.ss certP1.ss intP1.ss
- 	@sh ./testsslproxy keyP2.ss certP2.ss intP2.ss
- 
--test_ca: ../apps/openssl$(EXE_EXT) testca CAss.cnf Uss.cnf
-+test_ca:
- 	@if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \
- 	  echo "skipping CA.sh test -- requires RSA"; \
- 	else \
-@@ -312,11 +310,11 @@
- 	  sh ./testca; \
- 	fi
- 
--test_aes: #$(AESTEST)
-+test_aes:
- #	@echo "test Rijndael"
- #	../util/shlib_wrap.sh ./$(AESTEST)
- 
--test_tsa: ../apps/openssl$(EXE_EXT) testtsa CAtsa.cnf ../util/shlib_wrap.sh
-+test_tsa:
- 	@if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \
- 	  echo "skipping testtsa test -- requires RSA"; \
- 	else \
-@@ -331,7 +329,7 @@
- 	@echo "Test JPAKE"
- 	../util/shlib_wrap.sh ./$(JPAKETEST)
- 
--test_cms: ../apps/openssl$(EXE_EXT) cms-test.pl smcont.txt
-+test_cms:
- 	@echo "CMS consistency test"
- 	$(PERL) cms-test.pl
- 
-@@ -339,22 +337,22 @@
- 	@echo "Test SRP"
- 	../util/shlib_wrap.sh ./srptest
- 
--test_ocsp: ../apps/openssl$(EXE_EXT) tocsp
-+test_ocsp:
- 	@echo "Test OCSP"
- 	@sh ./tocsp
- 
--test_v3name: $(V3NAMETEST)$(EXE_EXT)
-+test_v3name:
- 	@echo "Test X509v3_check_*"
- 	../util/shlib_wrap.sh ./$(V3NAMETEST)
- 
- test_heartbeat:
- 	../util/shlib_wrap.sh ./$(HEARTBEATTEST)
- 
--test_constant_time: $(CONSTTIMETEST)$(EXE_EXT)
-+test_constant_time:
- 	@echo "Test constant time utilites"
- 	../util/shlib_wrap.sh ./$(CONSTTIMETEST)
- 
--test_verify_extra: $(VERIFYEXTRATEST)$(EXE_EXT)
-+test_verify_extra:
- 	@echo $(START) $@
- 	../util/shlib_wrap.sh ./$(VERIFYEXTRATEST)
- 
diff --git a/recipes-connectivity/openssl/openssl/run-ptest b/recipes-connectivity/openssl/openssl/run-ptest
deleted file mode 100755
index 3b20fce..0000000
--- a/recipes-connectivity/openssl/openssl/run-ptest
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-make -k runtest
diff --git a/recipes-connectivity/openssl/openssl/shared-libs.patch b/recipes-connectivity/openssl/openssl/shared-libs.patch
deleted file mode 100644
index a7ca0a3..0000000
--- a/recipes-connectivity/openssl/openssl/shared-libs.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: openssl-1.0.1e/crypto/Makefile
-===================================================================
---- openssl-1.0.1e.orig/crypto/Makefile
-+++ openssl-1.0.1e/crypto/Makefile
-@@ -108,7 +108,7 @@ $(LIB):	$(LIBOBJ)
- 
- shared: buildinf.h lib subdirs
- 	if [ -n "$(SHARED_LIBS)" ]; then \
--		(cd ..; $(MAKE) $(SHARED_LIB)); \
-+		(cd ..; $(MAKE) -e $(SHARED_LIB)); \
- 	fi
- 
- libs:
-Index: openssl-1.0.1e/Makefile.org
-===================================================================
---- openssl-1.0.1e.orig/Makefile.org
-+++ openssl-1.0.1e/Makefile.org
-@@ -310,7 +310,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a fips_
- 
- libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a
- 	@if [ "$(SHLIB_TARGET)" != "" ]; then \
--		$(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \
-+		$(MAKE) -e SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \
- 	else \
- 		echo "There's no support for shared libraries on this platform" >&2; \
- 		exit 1; \
-Index: openssl-1.0.1e/ssl/Makefile
-===================================================================
---- openssl-1.0.1e.orig/ssl/Makefile
-+++ openssl-1.0.1e/ssl/Makefile
-@@ -62,7 +62,7 @@ lib:	$(LIBOBJ)
- 
- shared: lib
- 	if [ -n "$(SHARED_LIBS)" ]; then \
--		(cd ..; $(MAKE) $(SHARED_LIB)); \
-+		(cd ..; $(MAKE) -e $(SHARED_LIB)); \
- 	fi
- 
- files:
diff --git a/recipes-connectivity/openssl/openssl_1.0.2k.bb b/recipes-connectivity/openssl/openssl_1.0.2k.bb
deleted file mode 100644
index 146f66d..0000000
--- a/recipes-connectivity/openssl/openssl_1.0.2k.bb
+++ /dev/null
@@ -1,74 +0,0 @@
-require openssl.inc
-
-# For target side versions of openssl enable support for OCF Linux driver
-# if they are available.
-DEPENDS += "cryptodev-linux"
-
-CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
-CFLAG_append_class-native = " -fPIC"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=27ffa5d74bb5a337056c14b2ef93fbf6"
-
-export DIRS = "crypto ssl apps engines"
-export OE_LDFLAGS="${LDFLAGS}"
-PR = "bpo8.1"
-SRC_URI += "file://run-ptest \
-            file://openssl-c_rehash.sh \
-            file://configure-targets.patch \
-            file://shared-libs.patch \
-            file://oe-ldflags.patch \
-            file://engines-install-in-libdir-ssl.patch \
-            file://debian_bpo8+1/debian-targets.patch \
-            file://debian_bpo8+1/man-dir.patch \
-            file://debian_bpo8+1/man-section.patch \
-            file://debian_bpo8+1/no-rpath.patch \
-            file://debian_bpo8+1/no-symbolic.patch \
-            file://debian_bpo8+1/pic.patch \
-            file://debian_bpo8+1/stddef.patch \
-            file://debian_bpo8+1/version-script.patch \
-            file://debian_bpo8+1/c_rehash-compat.patch \
-            file://debian_bpo8+1/block_diginotar.patch \
-            file://debian_bpo8+1/block_digicert_malaysia.patch \
-            file://debian_bpo8+1/disable_freelist.patch \
-            file://debian_bpo8+1/Mark-3DES-and-RC4-ciphers-as-weak.patch \
-            file://debian/ca.patch \
-            file://openssl_fix_for_x32.patch \
-            file://fix-cipher-des-ede3-cfb1.patch \
-            file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \
-            file://find.pl \
-            file://openssl-fix-des.pod-error.patch \
-            file://Makefiles-ptest.patch \
-            file://ptest-deps.patch \
-            file://openssl-1.0.2a-x32-asm.patch \
-            file://ptest_makefile_deps.patch  \
-            file://configure-musl-target.patch \
-            file://parallel.patch \
-            file://openssl-util-perlpath.pl-cwd.patch \
-           "
-SRC_URI[md5sum] = "f965fc0bf01bf882b31314b61391ae65"
-SRC_URI[sha256sum] = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0"
-
-PACKAGES =+ " \
-  ${PN}-engines \
-  ${PN}-engines-dbg \
-  "
-  
-FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines"
-FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug"
-
-PARALLEL_MAKE = ""
-PARALLEL_MAKEINST = ""
-
-do_configure_prepend() {
-  cp ${WORKDIR}/find.pl ${S}/util/find.pl
-}
-
-# The crypto_use_bigint patch means that perl's bignum module needs to be
-# installed, but some distributions (for example Fedora 23) don't ship it by
-# default.  As the resulting error is very misleading check for bignum before
-# building.
-do_configure_prepend() {
-	if ! perl -Mbigint -e true; then
-		bbfatal "The perl module 'bignum' was not found but this is required to build openssl.  Please install this module (often packaged as perl-bignum) and re-run bitbake."
-	fi
-}
diff --git a/recipes-connectivity/openssl/openssl_1.0.2k.bb.openembedded b/recipes-connectivity/openssl/openssl_1.0.2k.bb.openembedded
deleted file mode 100644
index 9b148b9..0000000
--- a/recipes-connectivity/openssl/openssl_1.0.2k.bb.openembedded
+++ /dev/null
@@ -1,71 +0,0 @@
-require openssl.inc
-
-# For target side versions of openssl enable support for OCF Linux driver
-# if they are available.
-DEPENDS += "cryptodev-linux"
-
-CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
-CFLAG_append_class-native = " -fPIC"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=27ffa5d74bb5a337056c14b2ef93fbf6"
-
-export DIRS = "crypto ssl apps engines"
-export OE_LDFLAGS="${LDFLAGS}"
-
-SRC_URI += "file://run-ptest \
-            file://openssl-c_rehash.sh \
-            file://configure-targets.patch \
-            file://shared-libs.patch \
-            file://oe-ldflags.patch \
-            file://engines-install-in-libdir-ssl.patch \
-            file://debian1.0.2/block_diginotar.patch \
-            file://debian1.0.2/block_digicert_malaysia.patch \
-            file://debian/ca.patch \
-            file://debian/c_rehash-compat.patch \
-            file://debian/debian-targets.patch \
-            file://debian/man-dir.patch \
-            file://debian/man-section.patch \
-            file://debian/no-rpath.patch \
-            file://debian/no-symbolic.patch \
-            file://debian/pic.patch \
-            file://debian1.0.2/version-script.patch \
-            file://openssl_fix_for_x32.patch \
-            file://fix-cipher-des-ede3-cfb1.patch \
-            file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \
-            file://find.pl \
-            file://openssl-fix-des.pod-error.patch \
-            file://Makefiles-ptest.patch \
-            file://ptest-deps.patch \
-            file://openssl-1.0.2a-x32-asm.patch \
-            file://ptest_makefile_deps.patch  \
-            file://configure-musl-target.patch \
-            file://parallel.patch \
-            file://openssl-util-perlpath.pl-cwd.patch \
-           "
-SRC_URI[md5sum] = "f965fc0bf01bf882b31314b61391ae65"
-SRC_URI[sha256sum] = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0"
-
-PACKAGES =+ " \
-  ${PN}-engines \
-  ${PN}-engines-dbg \
-  "
-  
-FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines"
-FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug"
-
-PARALLEL_MAKE = ""
-PARALLEL_MAKEINST = ""
-
-do_configure_prepend() {
-  cp ${WORKDIR}/find.pl ${S}/util/find.pl
-}
-
-# The crypto_use_bigint patch means that perl's bignum module needs to be
-# installed, but some distributions (for example Fedora 23) don't ship it by
-# default.  As the resulting error is very misleading check for bignum before
-# building.
-do_configure_prepend() {
-	if ! perl -Mbigint -e true; then
-		bbfatal "The perl module 'bignum' was not found but this is required to build openssl.  Please install this module (often packaged as perl-bignum) and re-run bitbake."
-	fi
-}
diff --git a/recipes-connectivity/ppp/files/default b/recipes-connectivity/ppp/files/default
deleted file mode 100644
index 6cc92df..0000000
--- a/recipes-connectivity/ppp/files/default
+++ /dev/null
@@ -1,8 +0,0 @@
-# Check to see if the SIM is registered before using ppp.
-# Need this if using a cellular connection.
-CHECKREGISTRATION=1
-# Note that boot will not complete until
-# ppp completes, and the PPPTIMEOUT is the
-# maximum wait time for the SIM to register
-# for cellular PPP.
-PPPTIMEOUT=60
diff --git a/recipes-connectivity/ppp/files/init.patch b/recipes-connectivity/ppp/files/init.patch
deleted file mode 100644
index e74e981..0000000
--- a/recipes-connectivity/ppp/files/init.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Naru old/init new/init
---- old/init	2017-09-05 19:07:19.810885424 -0500
-+++ new/init	2017-09-05 19:08:05.106884083 -0500
-@@ -8,11 +8,29 @@
- 
- test -x /usr/sbin/pppd -a -f /etc/ppp/ppp_on_boot || exit 0
- if [ -x /etc/ppp/ppp_on_boot ]; then RUNFILE=1; fi
--
-+: ${PPPTIMEOUT:=60}
-+logger timeout is $PPPTIMEOUT
-+[ -f /etc/default/ppp ] && . /etc/default/ppp
- case "$1" in
-   start)
-+      t0=($(cat /proc/uptime))                                                                                                                   
-+      if (( CHECKREGISTRATION == 1 )) ; then while : ; do
-+        REG=$(/usr/bin/radio-query --netreg)	
-+        [[ $REG == "REGISTERED" ]] && break
-+        t1=($(cat /proc/uptime))                                                                                                                   
-+        diff=$(awk "BEGIN{print int($t1-$t0)}")
-+        logger -s "Modem not ready. Waited $diff of $PPPTIMEOUT seconds"
-+        if ((diff > PPPTIMEOUT)) ; then
-+           logger -s "Timed out waiting for modem registration"
-+	   exit 1
-+        fi
-+        sleep 1
-+      done ; fi
-+
-+      logger "Starting up PPP link: pppd"
-       echo -n "Starting up PPP link: pppd"
-       if [ "$RUNFILE" = "1" ]; then
-+        logger "ppp_on_boot"
-         /etc/ppp/ppp_on_boot
-       else
-         pppd call provider
diff --git a/recipes-connectivity/ppp/files/poff.patch b/recipes-connectivity/ppp/files/poff.patch
deleted file mode 100644
index 2385886..0000000
--- a/recipes-connectivity/ppp/files/poff.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naru old/poff new/poff
---- old/poff	2017-09-05 19:07:11.630885666 -0500
-+++ new/poff	2017-09-05 19:08:09.586883950 -0500
-@@ -1,7 +1,7 @@
- #!/bin/sh
- 
- # Lets see how many pppds are running....
--set -- `cat /var/run/ppp*.pid 2>/dev/null`
-+set -- `cat /var/run/ppp[0-9]*.pid 2>/dev/null`
- 
- case $# in
-   0) # pppd only creates a pid file once ppp is up, so let's try killing pppd
diff --git a/recipes-connectivity/ppp/ppp_%.bbappend b/recipes-connectivity/ppp/ppp_%.bbappend
deleted file mode 100644
index 55c47df..0000000
--- a/recipes-connectivity/ppp/ppp_%.bbappend
+++ /dev/null
@@ -1,18 +0,0 @@
-SRC_URI_append = "\
-		    file://init.patch;patchdir=.. \
-                    file://poff.patch;patchdir=.. \
-                    file://default"
-
-PR = "r9"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-FILES_${PN} += "/etc/default/ppp"
-
-# AEP compatibility
-CONFFILES_${PN} += "${sysconfdir}/default/ppp ${sysconfdir}/init.d/ppp"
-
-do_install_append() {
-        install -d -m 0755  ${D}/${sysconfdir}/default/
-	install -m 644 ${WORKDIR}/default ${D}/${sysconfdir}/default/ppp
-}
diff --git a/recipes-connectivity/usb-gadget-mode/files/usb-gadget b/recipes-connectivity/usb-gadget-mode/files/usb-gadget
deleted file mode 100755
index 8da88ad..0000000
--- a/recipes-connectivity/usb-gadget-mode/files/usb-gadget
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
-#
-# Filename: usb-gadget
-# Date: 20070606 (YMD)
-#
-#################################################################################
-#
-# 20070606 - v0.0.1	- Initial release
-# 20070630 - v0.0.2	- Add forgotten host mode
-# 20090529 - add support for all gadgets in 2.6.29 (koen)
-
-CONF_FILE="/etc/default/usb-gadget"
-
-die() {
-	echo "ERROR: $1"
-	exit 1
-}
-
-go() {
-	test -e "$CONF_FILE" && . "$CONF_FILE" 
-	
-	case "$USB_MODE" in
-	networking)	setup_usb g_ether ;;
-	zero)		setup_usb g_zero ;;
-	midi)		setup_usb g_midi ;;
-	printer)	setup_usb g_printer ;;
-	gadgetfs) 	setup_usb gadgetfs ;;
-	composite)	setup_usb g_cdc ;;
-	serial)		setup_usb g_serial ;;
-	storage)	setup_usb g_file_storage ;;
-	hostmode)	unload_usb_gadgets
-			setup_usb ohci_hcd ;;
-	none)		unload_usb_gadgets ;;
-	esac		
-		
-}
-
-setup_usb() {
-	
-	if ! ( lsmod | grep -q "$1" )
-	then
-		unload_usb_gadgets
-		echo "Loading [$1]"
-		modprobe "$1" $MODULE_OPTIONS
-	else
-		echo "Already loaded: [$1]"
-	fi
-}
-
-unload_usb_gadgets() {
-	KERNEL_VERSION="`uname -r`"
-	GADGET_MODULES="`find /lib/modules/$KERNEL_VERSION/kernel/drivers/usb/gadget -name "*g_*"`"
-	
-	for module in $GADGET_MODULES
-	do
-		MODULE_NAME="`basename $module | sed "s/\.ko//"`"
-		
-		if ( lsmod | grep -q "$MODULE_NAME" )
-		then
-			echo "Unloading [$MODULE_NAME]"
-			rmmod "$module"
-		fi
-	done
-}
-
-go
diff --git a/recipes-connectivity/usb-gadget-mode/files/usb-gadget.conf b/recipes-connectivity/usb-gadget-mode/files/usb-gadget.conf
deleted file mode 100644
index f3a7a6b..0000000
--- a/recipes-connectivity/usb-gadget-mode/files/usb-gadget.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# set to "no" to disable usb-gadget
-ENABLED="yes"
-
-USB_MODE="serial"
-MODULE_OPTIONS=""
-
diff --git a/recipes-connectivity/usb-gadget-mode/files/usb-gadget.init b/recipes-connectivity/usb-gadget-mode/files/usb-gadget.init
deleted file mode 100755
index 403fd23..0000000
--- a/recipes-connectivity/usb-gadget-mode/files/usb-gadget.init
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
-#
-# Filename: usb-gadget.init
-# Date: 20070606 (YMD)
-#
-#################################################################################
-#
-# 20070606 - v0.0.1	- Initial release
-
-ENABLED="yes"
-
-[ -r /etc/default/usb-gadget ] && source /etc/default/usb-gadget
-[ "$ENABLED" == "yes" ] || exit 0
-
-case "$1" in 
-start)		usb-gadget ;;
-esac
-
diff --git a/recipes-connectivity/usb-gadget-mode/usb-gadget-mode.bb b/recipes-connectivity/usb-gadget-mode/usb-gadget-mode.bb
deleted file mode 100644
index 0f15830..0000000
--- a/recipes-connectivity/usb-gadget-mode/usb-gadget-mode.bb
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php
-#               for a copy of the license)
-#
-# Filename: usb-gadget-mode.bb
-# Date: 20070606 (YMD)
-
-DESCRIPTION = "Manage the default USB gadget mode"
-SECTION = "console/network"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-PV = "0.0.2"
-PR = "r3"
-
-SRC_URI = "\
-  file://usb-gadget.conf \
-  file://usb-gadget \
-  file://usb-gadget.init \
-"
-
-do_install() {
-	install -d ${D}${sysconfdir}
-	install -d ${D}${sysconfdir}/init.d
-	install -d ${D}${bindir}
-	install -d ${D}${sysconfdir}/default
-
-	install -m 0644 ${WORKDIR}/usb-gadget.conf ${D}${sysconfdir}/default/usb-gadget
-	install -m 0755 ${WORKDIR}/usb-gadget.init ${D}${sysconfdir}/init.d/usb-gadget
-	install -m 0755 ${WORKDIR}/usb-gadget ${D}${bindir}
-}
-
-# disbale usb-gadget for mtcap hardware
-do_install_append_mtcap() {
-    sed -i 's/ENABLED="yes"/ENABLED="no"/g' ${D}${sysconfdir}/default/usb-gadget
-}
-
-pkg_postinst_${PN}() {
-	test -n "$D" && opt="-r $D"
-	update-rc.d $opt usb-gadget defaults 50
-}
-
-pkg_postrm_${PN}() {
-	update-rc.d -f usb-gadget remove
-}
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-# disable usb-gadget on mtr
-do_install_append_mtr() {
-    sed -i 's/ENABLED="yes"/ENABLED="no"/g' ${D}${sysconfdir}/default/usb-gadget
-}
-
-# disable usb-gadget on mtrv1
-do_install_append_mtrv1() {
-    sed -i 's/ENABLED="yes"/ENABLED="no"/g' ${D}${sysconfdir}/default/usb-gadget
-}
diff --git a/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc b/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
deleted file mode 100644
index 0ab0a2b..0000000
--- a/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
+++ /dev/null
@@ -1,100 +0,0 @@
-SUMMARY = "Client for Wi-Fi Protected Access (WPA)"
-HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
-BUGTRACKER = "http://hostap.epitest.fi/bugz/"
-SECTION = "network"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=292eece3f2ebbaa25608eed8464018a3 \
-                    file://README;beginline=1;endline=56;md5=3f01d778be8f953962388307ee38ed2b \
-                    file://wpa_supplicant/wpa_supplicant.c;beginline=1;endline=11;md5=06180ad70fe4a9bed87faeb55519e0dc \
-                   "
-DEPENDS = "gnutls dbus libnl openssl libgcrypt"
-RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
-
-inherit systemd
-
-SYSTEMD_SERVICE_${PN} = "wpa_supplicant.service wpa_supplicant-nl80211@.service wpa_supplicant-wired@.service"
-SYSTEMD_AUTO_ENABLE = "disable"
-
-SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
-           file://defconfig-gnutls \
-           file://wpa-supplicant.sh \
-           file://wpa_supplicant.conf \
-           file://wpa_supplicant.conf-sane \
-           file://99_wpa_supplicant \
-           file://rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch \
-           file://rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch \
-           file://rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch \
-           file://rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch \
-           file://rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch \
-           file://rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch \
-           file://rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch \
-           file://rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch \
-           "
-SRC_URI[md5sum] = "091569eb4440b7d7f2b4276dbfc03c3c"
-SRC_URI[sha256sum] = "b4936d34c4e6cdd44954beba74296d964bc2c9668ecaa5255e499636fe2b1450"
-
-
-S = "${WORKDIR}/wpa_supplicant-${PV}"
-
-PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli "
-FILES_wpa-supplicant-passphrase = "${bindir}/wpa_passphrase"
-FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli"
-FILES_${PN} += "${datadir}/dbus-1/system-services/*"
-CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf"
-
-do_configure () {
-	install -m 0755 ${WORKDIR}/defconfig-gnutls wpa_supplicant/.config
-	echo "CFLAGS +=\"-I${STAGING_INCDIR}/libnl3\"" >> wpa_supplicant/.config
-}
-
-export EXTRA_CFLAGS = "${CFLAGS}"
-export BINDIR = "${sbindir}"
-
-do_compile () {
-	unset CFLAGS CPPFLAGS CXXFLAGS
-	sed -e "s:CFLAGS\ =.*:& \$(EXTRA_CFLAGS):g" -i ${S}/src/lib.rules
-	oe_runmake -C wpa_supplicant
-}
-
-do_install () {
-	install -d ${D}${sbindir}
-	install -m 755 wpa_supplicant/wpa_supplicant ${D}${sbindir}
-	install -m 755 wpa_supplicant/wpa_cli        ${D}${sbindir}
-
-	install -d ${D}${bindir}
-	install -m 755 wpa_supplicant/wpa_passphrase ${D}${bindir}
-
-	install -d ${D}${docdir}/wpa_supplicant
-	install -m 644 wpa_supplicant/README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant
-
-	install -d ${D}${sysconfdir}
-	install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf
-
-	install -d ${D}${sysconfdir}/network/if-pre-up.d/
-	install -d ${D}${sysconfdir}/network/if-post-down.d/
-	install -d ${D}${sysconfdir}/network/if-down.d/
-	install -m 755 ${WORKDIR}/wpa-supplicant.sh ${D}${sysconfdir}/network/if-pre-up.d/wpa-supplicant
-	cd ${D}${sysconfdir}/network/ && \
-	ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant
-
-	install -d ${D}/${sysconfdir}/dbus-1/system.d
-	install -m 644 ${S}/wpa_supplicant/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d
-	install -d ${D}/${datadir}/dbus-1/system-services
-	install -m 644 ${S}/wpa_supplicant/dbus/*.service ${D}/${datadir}/dbus-1/system-services
-
-	if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
-		install -d ${D}/${systemd_unitdir}/system
-		install -m 644 ${S}/wpa_supplicant/systemd/*.service ${D}/${systemd_unitdir}/system
-	fi
-
-	install -d ${D}/etc/default/volatiles
-	install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles
-}
-
-pkg_postinst_wpa-supplicant () {
-	# If we're offline, we don't need to do this.
-	if [ "x$D" = "x" ]; then
-		killall -q -HUP dbus-daemon || true
-	fi
-
-}
diff --git a/recipes-connectivity/wpa-supplicant/wpa-supplicant/99_wpa_supplicant b/recipes-connectivity/wpa-supplicant/wpa-supplicant/99_wpa_supplicant
deleted file mode 100644
index 6ff4dd8..0000000
--- a/recipes-connectivity/wpa-supplicant/wpa-supplicant/99_wpa_supplicant
+++ /dev/null
@@ -1 +0,0 @@
-d root root 0700 /var/run/wpa_supplicant none
diff --git a/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig-gnutls b/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig-gnutls
deleted file mode 100644
index 92ef823..0000000
--- a/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig-gnutls
+++ /dev/null
@@ -1,552 +0,0 @@
-# Example wpa_supplicant build time configuration
-#
-# This file lists the configuration options that are used when building the
-# hostapd binary. All lines starting with # are ignored. Configuration option
-# lines must be commented out complete, if they are not to be included, i.e.,
-# just setting VARIABLE=n is not disabling that variable.
-#
-# This file is included in Makefile, so variables like CFLAGS and LIBS can also
-# be modified from here. In most cases, these lines should use += in order not
-# to override previous values of the variables.
-
-
-# Uncomment following two lines and fix the paths if you have installed OpenSSL
-# or GnuTLS in non-default location
-#CFLAGS += -I/usr/local/openssl/include
-#LIBS += -L/usr/local/openssl/lib
-
-# Some Red Hat versions seem to include kerberos header files from OpenSSL, but
-# the kerberos files are not in the default include path. Following line can be
-# used to fix build issues on such systems (krb5.h not found).
-#CFLAGS += -I/usr/include/kerberos
-
-# Example configuration for various cross-compilation platforms
-
-#### sveasoft (e.g., for Linksys WRT54G) ######################################
-#CC=mipsel-uclibc-gcc
-#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
-#CFLAGS += -Os
-#CPPFLAGS += -I../src/include -I../../src/router/openssl/include
-#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl
-###############################################################################
-
-#### openwrt (e.g., for Linksys WRT54G) #######################################
-#CC=mipsel-uclibc-gcc
-#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
-#CFLAGS += -Os
-#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \
-#	-I../WRT54GS/release/src/include
-#LIBS = -lssl
-###############################################################################
-
-
-# Driver interface for Host AP driver
-CONFIG_DRIVER_HOSTAP=y
-
-# Driver interface for Agere driver
-#CONFIG_DRIVER_HERMES=y
-# Change include directories to match with the local setup
-#CFLAGS += -I../../hcf -I../../include -I../../include/hcf
-#CFLAGS += -I../../include/wireless
-
-# Driver interface for madwifi driver
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_MADWIFI=y
-# Set include directory to the madwifi source tree
-#CFLAGS += -I../../madwifi
-
-# Driver interface for ndiswrapper
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_NDISWRAPPER=y
-
-# Driver interface for Atmel driver
-# CONFIG_DRIVER_ATMEL=y
-
-# Driver interface for old Broadcom driver
-# Please note that the newer Broadcom driver ("hybrid Linux driver") supports
-# Linux wireless extensions and does not need (or even work) with the old
-# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver.
-#CONFIG_DRIVER_BROADCOM=y
-# Example path for wlioctl.h; change to match your configuration
-#CFLAGS += -I/opt/WRT54GS/release/src/include
-
-# Driver interface for Intel ipw2100/2200 driver
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_IPW=y
-
-# Driver interface for Ralink driver
-#CONFIG_DRIVER_RALINK=y
-
-# Driver interface for generic Linux wireless extensions
-# Note: WEXT is deprecated in the current Linux kernel version and no new
-# functionality is added to it. nl80211-based interface is the new
-# replacement for WEXT and its use allows wpa_supplicant to properly control
-# the driver to improve existing functionality like roaming and to support new
-# functionality.
-CONFIG_DRIVER_WEXT=y
-
-# Driver interface for Linux drivers using the nl80211 kernel interface
-CONFIG_DRIVER_NL80211=y
-
-# driver_nl80211.c requires libnl. If you are compiling it yourself
-# you may need to point hostapd to your version of libnl.
-#
-#CFLAGS += -I$<path to libnl include files>
-#LIBS += -L$<path to libnl library files>
-
-# Use libnl v2.0 (or 3.0) libraries.
-#CONFIG_LIBNL20=y
-
-# Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored)
-CONFIG_LIBNL32=y
-
-
-# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
-#CONFIG_DRIVER_BSD=y
-#CFLAGS += -I/usr/local/include
-#LIBS += -L/usr/local/lib
-#LIBS_p += -L/usr/local/lib
-#LIBS_c += -L/usr/local/lib
-
-# Driver interface for Windows NDIS
-#CONFIG_DRIVER_NDIS=y
-#CFLAGS += -I/usr/include/w32api/ddk
-#LIBS += -L/usr/local/lib
-# For native build using mingw
-#CONFIG_NATIVE_WINDOWS=y
-# Additional directories for cross-compilation on Linux host for mingw target
-#CFLAGS += -I/opt/mingw/mingw32/include/ddk
-#LIBS += -L/opt/mingw/mingw32/lib
-#CC=mingw32-gcc
-# By default, driver_ndis uses WinPcap for low-level operations. This can be
-# replaced with the following option which replaces WinPcap calls with NDISUIO.
-# However, this requires that WZC is disabled (net stop wzcsvc) before starting
-# wpa_supplicant.
-# CONFIG_USE_NDISUIO=y
-
-# Driver interface for development testing
-#CONFIG_DRIVER_TEST=y
-
-# Driver interface for wired Ethernet drivers
-CONFIG_DRIVER_WIRED=y
-
-# Driver interface for the Broadcom RoboSwitch family
-#CONFIG_DRIVER_ROBOSWITCH=y
-
-# Driver interface for no driver (e.g., WPS ER only)
-#CONFIG_DRIVER_NONE=y
-
-# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
-# included)
-CONFIG_IEEE8021X_EAPOL=y
-
-# EAP-MD5
-CONFIG_EAP_MD5=y
-
-# EAP-MSCHAPv2
-CONFIG_EAP_MSCHAPV2=y
-
-# EAP-TLS
-CONFIG_EAP_TLS=y
-
-# EAL-PEAP
-CONFIG_EAP_PEAP=y
-
-# EAP-TTLS
-CONFIG_EAP_TTLS=y
-
-# EAP-FAST
-# Note: If OpenSSL is used as the TLS library, OpenSSL 1.0 or newer is needed
-# for EAP-FAST support. Older OpenSSL releases would need to be patched, e.g.,
-# with openssl-0.9.8x-tls-extensions.patch, to add the needed functions.
-#CONFIG_EAP_FAST=y
-
-# EAP-GTC
-CONFIG_EAP_GTC=y
-
-# EAP-OTP
-CONFIG_EAP_OTP=y
-
-# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
-#CONFIG_EAP_SIM=y
-
-# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
-#CONFIG_EAP_PSK=y
-
-# EAP-pwd (secure authentication using only a password)
-#CONFIG_EAP_PWD=y
-
-# EAP-PAX
-#CONFIG_EAP_PAX=y
-
-# LEAP
-CONFIG_EAP_LEAP=y
-
-# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
-#CONFIG_EAP_AKA=y
-
-# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used).
-# This requires CONFIG_EAP_AKA to be enabled, too.
-#CONFIG_EAP_AKA_PRIME=y
-
-# Enable USIM simulator (Milenage) for EAP-AKA
-#CONFIG_USIM_SIMULATOR=y
-
-# EAP-SAKE
-#CONFIG_EAP_SAKE=y
-
-# EAP-GPSK
-#CONFIG_EAP_GPSK=y
-# Include support for optional SHA256 cipher suite in EAP-GPSK
-#CONFIG_EAP_GPSK_SHA256=y
-
-# EAP-TNC and related Trusted Network Connect support (experimental)
-#CONFIG_EAP_TNC=y
-
-# Wi-Fi Protected Setup (WPS)
-CONFIG_WPS=y
-# Enable WSC 2.0 support
-#CONFIG_WPS2=y
-# Enable WPS external registrar functionality
-#CONFIG_WPS_ER=y
-# Disable credentials for an open network by default when acting as a WPS
-# registrar.
-#CONFIG_WPS_REG_DISABLE_OPEN=y
-# Enable WPS support with NFC config method
-#CONFIG_WPS_NFC=y
-
-# EAP-IKEv2
-#CONFIG_EAP_IKEV2=y
-
-# EAP-EKE
-#CONFIG_EAP_EKE=y
-
-# PKCS#12 (PFX) support (used to read private key and certificate file from
-# a file that usually has extension .p12 or .pfx)
-CONFIG_PKCS12=y
-
-# Smartcard support (i.e., private key on a smartcard), e.g., with openssl
-# engine.
-CONFIG_SMARTCARD=y
-
-# PC/SC interface for smartcards (USIM, GSM SIM)
-# Enable this if EAP-SIM or EAP-AKA is included
-#CONFIG_PCSC=y
-
-# Support HT overrides (disable HT/HT40, mask MCS rates, etc.)
-#CONFIG_HT_OVERRIDES=y
-
-# Support VHT overrides (disable VHT, mask MCS rates, etc.)
-#CONFIG_VHT_OVERRIDES=y
-
-# Development testing
-#CONFIG_EAPOL_TEST=y
-
-# Select control interface backend for external programs, e.g, wpa_cli:
-# unix = UNIX domain sockets (default for Linux/*BSD)
-# udp = UDP sockets using localhost (127.0.0.1)
-# named_pipe = Windows Named Pipe (default for Windows)
-# udp-remote = UDP sockets with remote access (only for tests systems/purpose)
-# y = use default (backwards compatibility)
-# If this option is commented out, control interface is not included in the
-# build.
-CONFIG_CTRL_IFACE=y
-
-# Include support for GNU Readline and History Libraries in wpa_cli.
-# When building a wpa_cli binary for distribution, please note that these
-# libraries are licensed under GPL and as such, BSD license may not apply for
-# the resulting binary.
-#CONFIG_READLINE=y
-
-# Include internal line edit mode in wpa_cli. This can be used as a replacement
-# for GNU Readline to provide limited command line editing and history support.
-#CONFIG_WPA_CLI_EDIT=y
-
-# Remove debugging code that is printing out debug message to stdout.
-# This can be used to reduce the size of the wpa_supplicant considerably
-# if debugging code is not needed. The size reduction can be around 35%
-# (e.g., 90 kB).
-#CONFIG_NO_STDOUT_DEBUG=y
-
-# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save
-# 35-50 kB in code size.
-#CONFIG_NO_WPA=y
-
-# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support
-# This option can be used to reduce code size by removing support for
-# converting ASCII passphrases into PSK. If this functionality is removed, the
-# PSK can only be configured as the 64-octet hexstring (e.g., from
-# wpa_passphrase). This saves about 0.5 kB in code size.
-#CONFIG_NO_WPA_PASSPHRASE=y
-
-# Disable scan result processing (ap_mode=1) to save code size by about 1 kB.
-# This can be used if ap_scan=1 mode is never enabled.
-#CONFIG_NO_SCAN_PROCESSING=y
-
-# Select configuration backend:
-# file = text file (e.g., wpa_supplicant.conf; note: the configuration file
-#	path is given on command line, not here; this option is just used to
-#	select the backend that allows configuration files to be used)
-# winreg = Windows registry (see win_example.reg for an example)
-CONFIG_BACKEND=file
-
-# Remove configuration write functionality (i.e., to allow the configuration
-# file to be updated based on runtime configuration changes). The runtime
-# configuration can still be changed, the changes are just not going to be
-# persistent over restarts. This option can be used to reduce code size by
-# about 3.5 kB.
-#CONFIG_NO_CONFIG_WRITE=y
-
-# Remove support for configuration blobs to reduce code size by about 1.5 kB.
-#CONFIG_NO_CONFIG_BLOBS=y
-
-# Select program entry point implementation:
-# main = UNIX/POSIX like main() function (default)
-# main_winsvc = Windows service (read parameters from registry)
-# main_none = Very basic example (development use only)
-#CONFIG_MAIN=main
-
-# Select wrapper for operatins system and C library specific functions
-# unix = UNIX/POSIX like systems (default)
-# win32 = Windows systems
-# none = Empty template
-#CONFIG_OS=unix
-
-# Select event loop implementation
-# eloop = select() loop (default)
-# eloop_win = Windows events and WaitForMultipleObject() loop
-#CONFIG_ELOOP=eloop
-
-# Should we use poll instead of select? Select is used by default.
-#CONFIG_ELOOP_POLL=y
-
-# Select layer 2 packet implementation
-# linux = Linux packet socket (default)
-# pcap = libpcap/libdnet/WinPcap
-# freebsd = FreeBSD libpcap
-# winpcap = WinPcap with receive thread
-# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y)
-# none = Empty template
-#CONFIG_L2_PACKET=linux
-
-# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
-CONFIG_PEERKEY=y
-
-# IEEE 802.11w (management frame protection), also known as PMF
-# Driver support is also needed for IEEE 802.11w.
-#CONFIG_IEEE80211W=y
-
-# Select TLS implementation
-# openssl = OpenSSL (default)
-# gnutls = GnuTLS
-# internal = Internal TLSv1 implementation (experimental)
-# none = Empty template
-#CONFIG_TLS=openssl
-
-# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1)
-# can be enabled to get a stronger construction of messages when block ciphers
-# are used. It should be noted that some existing TLS v1.0 -based
-# implementation may not be compatible with TLS v1.1 message (ClientHello is
-# sent prior to negotiating which version will be used)
-#CONFIG_TLSV11=y
-
-# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2)
-# can be enabled to enable use of stronger crypto algorithms. It should be
-# noted that some existing TLS v1.0 -based implementation may not be compatible
-# with TLS v1.2 message (ClientHello is sent prior to negotiating which version
-# will be used)
-#CONFIG_TLSV12=y
-
-# If CONFIG_TLS=internal is used, additional library and include paths are
-# needed for LibTomMath. Alternatively, an integrated, minimal version of
-# LibTomMath can be used. See beginning of libtommath.c for details on benefits
-# and drawbacks of this option.
-#CONFIG_INTERNAL_LIBTOMMATH=y
-#ifndef CONFIG_INTERNAL_LIBTOMMATH
-#LTM_PATH=/usr/src/libtommath-0.39
-#CFLAGS += -I$(LTM_PATH)
-#LIBS += -L$(LTM_PATH)
-#LIBS_p += -L$(LTM_PATH)
-#endif
-# At the cost of about 4 kB of additional binary size, the internal LibTomMath
-# can be configured to include faster routines for exptmod, sqr, and div to
-# speed up DH and RSA calculation considerably
-#CONFIG_INTERNAL_LIBTOMMATH_FAST=y
-
-# Include NDIS event processing through WMI into wpa_supplicant/wpasvc.
-# This is only for Windows builds and requires WMI-related header files and
-# WbemUuid.Lib from Platform SDK even when building with MinGW.
-#CONFIG_NDIS_EVENTS_INTEGRATED=y
-#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib"
-
-# Add support for old DBus control interface
-# (fi.epitest.hostap.WPASupplicant)
-#CONFIG_CTRL_IFACE_DBUS=y
-
-# Add support for new DBus control interface
-# (fi.w1.hostap.wpa_supplicant1)
-CONFIG_CTRL_IFACE_DBUS_NEW=y
-
-# Add introspection support for new DBus control interface
-#CONFIG_CTRL_IFACE_DBUS_INTRO=y
-
-# Add support for loading EAP methods dynamically as shared libraries.
-# When this option is enabled, each EAP method can be either included
-# statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn).
-# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to
-# be loaded in the beginning of the wpa_supplicant configuration file
-# (see load_dynamic_eap parameter in the example file) before being used in
-# the network blocks.
-#
-# Note that some shared parts of EAP methods are included in the main program
-# and in order to be able to use dynamic EAP methods using these parts, the
-# main program must have been build with the EAP method enabled (=y or =dyn).
-# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries
-# unless at least one of them was included in the main build to force inclusion
-# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included
-# in the main build to be able to load these methods dynamically.
-#
-# Please also note that using dynamic libraries will increase the total binary
-# size. Thus, it may not be the best option for targets that have limited
-# amount of memory/flash.
-#CONFIG_DYNAMIC_EAP_METHODS=y
-
-# IEEE Std 802.11r-2008 (Fast BSS Transition)
-#CONFIG_IEEE80211R=y
-
-# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
-#CONFIG_DEBUG_FILE=y
-
-# Send debug messages to syslog instead of stdout
-#CONFIG_DEBUG_SYSLOG=y
-# Set syslog facility for debug messages
-#CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
-
-# Add support for sending all debug messages (regardless of debug verbosity)
-# to the Linux kernel tracing facility. This helps debug the entire stack by
-# making it easy to record everything happening from the driver up into the
-# same file, e.g., using trace-cmd.
-#CONFIG_DEBUG_LINUX_TRACING=y
-
-# Enable privilege separation (see README 'Privilege separation' for details)
-#CONFIG_PRIVSEP=y
-
-# Enable mitigation against certain attacks against TKIP by delaying Michael
-# MIC error reports by a random amount of time between 0 and 60 seconds
-#CONFIG_DELAYED_MIC_ERROR_REPORT=y
-
-# Enable tracing code for developer debugging
-# This tracks use of memory allocations and other registrations and reports
-# incorrect use with a backtrace of call (or allocation) location.
-#CONFIG_WPA_TRACE=y
-# For BSD, uncomment these.
-#LIBS += -lexecinfo
-#LIBS_p += -lexecinfo
-#LIBS_c += -lexecinfo
-
-# Use libbfd to get more details for developer debugging
-# This enables use of libbfd to get more detailed symbols for the backtraces
-# generated by CONFIG_WPA_TRACE=y.
-#CONFIG_WPA_TRACE_BFD=y
-# For BSD, uncomment these.
-#LIBS += -lbfd -liberty -lz
-#LIBS_p += -lbfd -liberty -lz
-#LIBS_c += -lbfd -liberty -lz
-
-CONFIG_TLS = gnutls
-CONFIG_CTRL_IFACE_DBUS=y
-CONFIG_CTRL_IFACE_DBUS_NEW=y
-
-# wpa_supplicant depends on strong random number generation being available
-# from the operating system. os_get_random() function is used to fetch random
-# data when needed, e.g., for key generation. On Linux and BSD systems, this
-# works by reading /dev/urandom. It should be noted that the OS entropy pool
-# needs to be properly initialized before wpa_supplicant is started. This is
-# important especially on embedded devices that do not have a hardware random
-# number generator and may by default start up with minimal entropy available
-# for random number generation.
-#
-# As a safety net, wpa_supplicant is by default trying to internally collect
-# additional entropy for generating random data to mix in with the data fetched
-# from the OS. This by itself is not considered to be very strong, but it may
-# help in cases where the system pool is not initialized properly. However, it
-# is very strongly recommended that the system pool is initialized with enough
-# entropy either by using hardware assisted random number generator or by
-# storing state over device reboots.
-#
-# wpa_supplicant can be configured to maintain its own entropy store over
-# restarts to enhance random number generation. This is not perfect, but it is
-# much more secure than using the same sequence of random numbers after every
-# reboot. This can be enabled with -e<entropy file> command line option. The
-# specified file needs to be readable and writable by wpa_supplicant.
-#
-# If the os_get_random() is known to provide strong random data (e.g., on
-# Linux/BSD, the board in question is known to have reliable source of random
-# data from /dev/urandom), the internal wpa_supplicant random pool can be
-# disabled. This will save some in binary size and CPU use. However, this
-# should only be considered for builds that are known to be used on devices
-# that meet the requirements described above.
-#CONFIG_NO_RANDOM_POOL=y
-
-# IEEE 802.11n (High Throughput) support (mainly for AP mode)
-#CONFIG_IEEE80211N=y
-
-# IEEE 802.11ac (Very High Throughput) support (mainly for AP mode)
-# (depends on CONFIG_IEEE80211N)
-#CONFIG_IEEE80211AC=y
-
-# Wireless Network Management (IEEE Std 802.11v-2011)
-# Note: This is experimental and not complete implementation.
-#CONFIG_WNM=y
-
-# Interworking (IEEE 802.11u)
-# This can be used to enable functionality to improve interworking with
-# external networks (GAS/ANQP to learn more about the networks and network
-# selection based on available credentials).
-#CONFIG_INTERWORKING=y
-
-# Hotspot 2.0
-#CONFIG_HS20=y
-
-# Disable roaming in wpa_supplicant
-#CONFIG_NO_ROAMING=y
-
-# AP mode operations with wpa_supplicant
-# This can be used for controlling AP mode operations with wpa_supplicant. It
-# should be noted that this is mainly aimed at simple cases like
-# WPA2-Personal while more complex configurations like WPA2-Enterprise with an
-# external RADIUS server can be supported with hostapd.
-CONFIG_AP=y
-
-CONFIG_BGSCAN_SIMPLE=y
-
-# P2P (Wi-Fi Direct)
-# This can be used to enable P2P support in wpa_supplicant. See README-P2P for
-# more information on P2P operations.
-#CONFIG_P2P=y
-
-# Enable TDLS support
-#CONFIG_TDLS=y
-
-# Wi-Fi Direct
-# This can be used to enable Wi-Fi Direct extensions for P2P using an external
-# program to control the additional information exchanges in the messages.
-#CONFIG_WIFI_DISPLAY=y
-
-# Autoscan
-# This can be used to enable automatic scan support in wpa_supplicant.
-# See wpa_supplicant.conf for more information on autoscan usage.
-#
-# Enabling directly a module will enable autoscan support.
-# For exponential module:
-CONFIG_AUTOSCAN_EXPONENTIAL=y
-# For periodic module:
-#CONFIG_AUTOSCAN_PERIODIC=y
-
-# Password (and passphrase, etc.) backend for external storage
-# These optional mechanisms can be used to add support for storing passwords
-# and other secrets in external (to wpa_supplicant) location. This allows, for
-# example, operating system specific key storage to be used
-#
-# External password backend for testing purposes (developer use)
-#CONFIG_EXT_PASSWORD_TEST=y
diff --git a/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch b/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
deleted file mode 100644
index 7276848..0000000
--- a/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From cf4cab804c7afd5c45505528a8d16e46163243a2 Mon Sep 17 00:00:00 2001
-From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
-Date: Fri, 14 Jul 2017 15:15:35 +0200
-Subject: [PATCH 1/8] hostapd: Avoid key reinstallation in FT handshake
-
-Do not reinstall TK to the driver during Reassociation Response frame
-processing if the first attempt of setting the TK succeeded. This avoids
-issues related to clearing the TX/RX PN that could result in reusing
-same PN values for transmitted frames (e.g., due to CCM nonce reuse and
-also hitting replay protection on the receiver) and accepting replayed
-frames on RX side.
-
-This issue was introduced by the commit
-0e84c25434e6a1f283c7b4e62e483729085b78d2 ('FT: Fix PTK configuration in
-authenticator') which allowed wpa_ft_install_ptk() to be called multiple
-times with the same PTK. While the second configuration attempt is
-needed with some drivers, it must be done only if the first attempt
-failed.
-
-Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
----
- src/ap/ieee802_11.c  | 16 +++++++++++++---
- src/ap/wpa_auth.c    | 11 +++++++++++
- src/ap/wpa_auth.h    |  3 ++-
- src/ap/wpa_auth_ft.c | 10 ++++++++++
- src/ap/wpa_auth_i.h  |  1 +
- 5 files changed, 37 insertions(+), 4 deletions(-)
-
-diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
-index 4e04169..333035f 100644
---- a/src/ap/ieee802_11.c
-+++ b/src/ap/ieee802_11.c
-@@ -1841,6 +1841,7 @@ static int add_associated_sta(struct hostapd_data *hapd,
- {
- 	struct ieee80211_ht_capabilities ht_cap;
- 	struct ieee80211_vht_capabilities vht_cap;
-+	int set = 1;
- 
- 	/*
- 	 * Remove the STA entry to ensure the STA PS state gets cleared and
-@@ -1848,9 +1849,18 @@ static int add_associated_sta(struct hostapd_data *hapd,
- 	 * FT-over-the-DS, where a station re-associates back to the same AP but
- 	 * skips the authentication flow, or if working with a driver that
- 	 * does not support full AP client state.
-+	 *
-+	 * Skip this if the STA has already completed FT reassociation and the
-+	 * TK has been configured since the TX/RX PN must not be reset to 0 for
-+	 * the same key.
- 	 */
--	if (!sta->added_unassoc)
-+	if (!sta->added_unassoc &&
-+	    (!(sta->flags & WLAN_STA_AUTHORIZED) ||
-+	     !wpa_auth_sta_ft_tk_already_set(sta->wpa_sm))) {
- 		hostapd_drv_sta_remove(hapd, sta->addr);
-+		wpa_auth_sm_event(sta->wpa_sm, WPA_DRV_STA_REMOVED);
-+		set = 0;
-+	}
- 
- #ifdef CONFIG_IEEE80211N
- 	if (sta->flags & WLAN_STA_HT)
-@@ -1873,11 +1883,11 @@ static int add_associated_sta(struct hostapd_data *hapd,
- 			    sta->flags & WLAN_STA_VHT ? &vht_cap : NULL,
- 			    sta->flags | WLAN_STA_ASSOC, sta->qosinfo,
- 			    sta->vht_opmode, sta->p2p_ie ? 1 : 0,
--			    sta->added_unassoc)) {
-+			    set)) {
- 		hostapd_logger(hapd, sta->addr,
- 			       HOSTAPD_MODULE_IEEE80211, HOSTAPD_LEVEL_NOTICE,
- 			       "Could not %s STA to kernel driver",
--			       sta->added_unassoc ? "set" : "add");
-+			       set ? "set" : "add");
- 
- 		if (sta->added_unassoc) {
- 			hostapd_drv_sta_remove(hapd, sta->addr);
-diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c
-index 3587086..707971d 100644
---- a/src/ap/wpa_auth.c
-+++ b/src/ap/wpa_auth.c
-@@ -1745,6 +1745,9 @@ int wpa_auth_sm_event(struct wpa_state_machine *sm, enum wpa_event event)
- #else /* CONFIG_IEEE80211R */
- 		break;
- #endif /* CONFIG_IEEE80211R */
-+	case WPA_DRV_STA_REMOVED:
-+		sm->tk_already_set = FALSE;
-+		return 0;
- 	}
- 
- #ifdef CONFIG_IEEE80211R
-@@ -3250,6 +3253,14 @@ int wpa_auth_sta_wpa_version(struct wpa_state_machine *sm)
- }
- 
- 
-+int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm)
-+{
-+	if (!sm || !wpa_key_mgmt_ft(sm->wpa_key_mgmt))
-+		return 0;
-+	return sm->tk_already_set;
-+}
-+
-+
- int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm,
- 			     struct rsn_pmksa_cache_entry *entry)
- {
-diff --git a/src/ap/wpa_auth.h b/src/ap/wpa_auth.h
-index 0de8d97..97461b0 100644
---- a/src/ap/wpa_auth.h
-+++ b/src/ap/wpa_auth.h
-@@ -267,7 +267,7 @@ void wpa_receive(struct wpa_authenticator *wpa_auth,
- 		 u8 *data, size_t data_len);
- enum wpa_event {
- 	WPA_AUTH, WPA_ASSOC, WPA_DISASSOC, WPA_DEAUTH, WPA_REAUTH,
--	WPA_REAUTH_EAPOL, WPA_ASSOC_FT
-+	WPA_REAUTH_EAPOL, WPA_ASSOC_FT, WPA_DRV_STA_REMOVED
- };
- void wpa_remove_ptk(struct wpa_state_machine *sm);
- int wpa_auth_sm_event(struct wpa_state_machine *sm, enum wpa_event event);
-@@ -280,6 +280,7 @@ int wpa_auth_pairwise_set(struct wpa_state_machine *sm);
- int wpa_auth_get_pairwise(struct wpa_state_machine *sm);
- int wpa_auth_sta_key_mgmt(struct wpa_state_machine *sm);
- int wpa_auth_sta_wpa_version(struct wpa_state_machine *sm);
-+int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm);
- int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm,
- 			     struct rsn_pmksa_cache_entry *entry);
- struct rsn_pmksa_cache_entry *
-diff --git a/src/ap/wpa_auth_ft.c b/src/ap/wpa_auth_ft.c
-index 42242a5..e63b99a 100644
---- a/src/ap/wpa_auth_ft.c
-+++ b/src/ap/wpa_auth_ft.c
-@@ -780,6 +780,14 @@ void wpa_ft_install_ptk(struct wpa_state_machine *sm)
- 		return;
- 	}
- 
-+	if (sm->tk_already_set) {
-+		/* Must avoid TK reconfiguration to prevent clearing of TX/RX
-+		 * PN in the driver */
-+		wpa_printf(MSG_DEBUG,
-+			   "FT: Do not re-install same PTK to the driver");
-+		return;
-+	}
-+
- 	/* FIX: add STA entry to kernel/driver here? The set_key will fail
- 	 * most likely without this.. At the moment, STA entry is added only
- 	 * after association has been completed. This function will be called
-@@ -792,6 +800,7 @@ void wpa_ft_install_ptk(struct wpa_state_machine *sm)
- 
- 	/* FIX: MLME-SetProtection.Request(TA, Tx_Rx) */
- 	sm->pairwise_set = TRUE;
-+	sm->tk_already_set = TRUE;
- }
- 
- 
-@@ -898,6 +907,7 @@ static int wpa_ft_process_auth_req(struct wpa_state_machine *sm,
- 
- 	sm->pairwise = pairwise;
- 	sm->PTK_valid = TRUE;
-+	sm->tk_already_set = FALSE;
- 	wpa_ft_install_ptk(sm);
- 
- 	buflen = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) +
-diff --git a/src/ap/wpa_auth_i.h b/src/ap/wpa_auth_i.h
-index 72b7eb3..7fd8f05 100644
---- a/src/ap/wpa_auth_i.h
-+++ b/src/ap/wpa_auth_i.h
-@@ -65,6 +65,7 @@ struct wpa_state_machine {
- 	struct wpa_ptk PTK;
- 	Boolean PTK_valid;
- 	Boolean pairwise_set;
-+	Boolean tk_already_set;
- 	int keycount;
- 	Boolean Pair;
- 	struct wpa_key_replay_counter {
--- 
-2.7.4
-
diff --git a/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch b/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch
deleted file mode 100644
index 1802d66..0000000
--- a/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-From 927f891007c402fefd1ff384645b3f07597c3ede Mon Sep 17 00:00:00 2001
-From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
-Date: Wed, 12 Jul 2017 16:03:24 +0200
-Subject: [PATCH 2/8] Prevent reinstallation of an already in-use group key
-
-Track the current GTK and IGTK that is in use and when receiving a
-(possibly retransmitted) Group Message 1 or WNM-Sleep Mode Response, do
-not install the given key if it is already in use. This prevents an
-attacker from trying to trick the client into resetting or lowering the
-sequence counter associated to the group key.
-
-Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
----
- src/common/wpa_common.h |  11 +++++
- src/rsn_supp/wpa.c      | 116 ++++++++++++++++++++++++++++++------------------
- src/rsn_supp/wpa_i.h    |   4 ++
- 3 files changed, 87 insertions(+), 44 deletions(-)
-
-diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h
-index af1d0f0..d200285 100644
---- a/src/common/wpa_common.h
-+++ b/src/common/wpa_common.h
-@@ -217,6 +217,17 @@ struct wpa_ptk {
- 	size_t tk_len;
- };
- 
-+struct wpa_gtk {
-+	u8 gtk[WPA_GTK_MAX_LEN];
-+	size_t gtk_len;
-+};
-+
-+#ifdef CONFIG_IEEE80211W
-+struct wpa_igtk {
-+	u8 igtk[WPA_IGTK_MAX_LEN];
-+	size_t igtk_len;
-+};
-+#endif /* CONFIG_IEEE80211W */
- 
- /* WPA IE version 1
-  * 00-50-f2:1 (OUI:OUI type)
-diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
-index 3c47879..95bd7be 100644
---- a/src/rsn_supp/wpa.c
-+++ b/src/rsn_supp/wpa.c
-@@ -714,6 +714,15 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm,
- 	const u8 *_gtk = gd->gtk;
- 	u8 gtk_buf[32];
- 
-+	/* Detect possible key reinstallation */
-+	if (sm->gtk.gtk_len == (size_t) gd->gtk_len &&
-+	    os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) {
-+		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
-+			"WPA: Not reinstalling already in-use GTK to the driver (keyidx=%d tx=%d len=%d)",
-+			gd->keyidx, gd->tx, gd->gtk_len);
-+		return 0;
-+	}
-+
- 	wpa_hexdump_key(MSG_DEBUG, "WPA: Group Key", gd->gtk, gd->gtk_len);
- 	wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
- 		"WPA: Installing GTK to the driver (keyidx=%d tx=%d len=%d)",
-@@ -748,6 +757,9 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm,
- 	}
- 	os_memset(gtk_buf, 0, sizeof(gtk_buf));
- 
-+	sm->gtk.gtk_len = gd->gtk_len;
-+	os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len);
-+
- 	return 0;
- }
- 
-@@ -854,6 +866,48 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm,
- }
- 
- 
-+#ifdef CONFIG_IEEE80211W
-+static int wpa_supplicant_install_igtk(struct wpa_sm *sm,
-+				       const struct wpa_igtk_kde *igtk)
-+{
-+	size_t len = wpa_cipher_key_len(sm->mgmt_group_cipher);
-+	u16 keyidx = WPA_GET_LE16(igtk->keyid);
-+
-+	/* Detect possible key reinstallation */
-+	if (sm->igtk.igtk_len == len &&
-+	    os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) {
-+		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
-+			"WPA: Not reinstalling already in-use IGTK to the driver (keyidx=%d)",
-+			keyidx);
-+		return  0;
-+	}
-+
-+	wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
-+		"WPA: IGTK keyid %d pn %02x%02x%02x%02x%02x%02x",
-+		keyidx, MAC2STR(igtk->pn));
-+	wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK", igtk->igtk, len);
-+	if (keyidx > 4095) {
-+		wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
-+			"WPA: Invalid IGTK KeyID %d", keyidx);
-+		return -1;
-+	}
-+	if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher),
-+			   broadcast_ether_addr,
-+			   keyidx, 0, igtk->pn, sizeof(igtk->pn),
-+			   igtk->igtk, len) < 0) {
-+		wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
-+			"WPA: Failed to configure IGTK to the driver");
-+		return -1;
-+	}
-+
-+	sm->igtk.igtk_len = len;
-+	os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len);
-+
-+	return 0;
-+}
-+#endif /* CONFIG_IEEE80211W */
-+
-+
- static int ieee80211w_set_keys(struct wpa_sm *sm,
- 			       struct wpa_eapol_ie_parse *ie)
- {
-@@ -864,30 +918,14 @@ static int ieee80211w_set_keys(struct wpa_sm *sm,
- 	if (ie->igtk) {
- 		size_t len;
- 		const struct wpa_igtk_kde *igtk;
--		u16 keyidx;
-+
- 		len = wpa_cipher_key_len(sm->mgmt_group_cipher);
- 		if (ie->igtk_len != WPA_IGTK_KDE_PREFIX_LEN + len)
- 			return -1;
-+
- 		igtk = (const struct wpa_igtk_kde *) ie->igtk;
--		keyidx = WPA_GET_LE16(igtk->keyid);
--		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, "WPA: IGTK keyid %d "
--			"pn %02x%02x%02x%02x%02x%02x",
--			keyidx, MAC2STR(igtk->pn));
--		wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK",
--				igtk->igtk, len);
--		if (keyidx > 4095) {
--			wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
--				"WPA: Invalid IGTK KeyID %d", keyidx);
--			return -1;
--		}
--		if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher),
--				   broadcast_ether_addr,
--				   keyidx, 0, igtk->pn, sizeof(igtk->pn),
--				   igtk->igtk, len) < 0) {
--			wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
--				"WPA: Failed to configure IGTK to the driver");
-+		if (wpa_supplicant_install_igtk(sm, igtk) < 0)
- 			return -1;
--		}
- 	}
- 
- 	return 0;
-@@ -2307,7 +2345,7 @@ void wpa_sm_deinit(struct wpa_sm *sm)
-  */
- void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid)
- {
--	int clear_ptk = 1;
-+	int clear_keys = 1;
- 
- 	if (sm == NULL)
- 		return;
-@@ -2333,11 +2371,11 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid)
- 		/* Prepare for the next transition */
- 		wpa_ft_prepare_auth_request(sm, NULL);
- 
--		clear_ptk = 0;
-+		clear_keys = 0;
- 	}
- #endif /* CONFIG_IEEE80211R */
- 
--	if (clear_ptk) {
-+	if (clear_keys) {
- 		/*
- 		 * IEEE 802.11, 8.4.10: Delete PTK SA on (re)association if
- 		 * this is not part of a Fast BSS Transition.
-@@ -2347,6 +2385,10 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid)
- 		os_memset(&sm->ptk, 0, sizeof(sm->ptk));
- 		sm->tptk_set = 0;
- 		os_memset(&sm->tptk, 0, sizeof(sm->tptk));
-+		os_memset(&sm->gtk, 0, sizeof(sm->gtk));
-+#ifdef CONFIG_IEEE80211W
-+		os_memset(&sm->igtk, 0, sizeof(sm->igtk));
-+#endif /* CONFIG_IEEE80211W */
- 	}
- 
- #ifdef CONFIG_TDLS
-@@ -2877,6 +2919,10 @@ void wpa_sm_drop_sa(struct wpa_sm *sm)
- 	os_memset(sm->pmk, 0, sizeof(sm->pmk));
- 	os_memset(&sm->ptk, 0, sizeof(sm->ptk));
- 	os_memset(&sm->tptk, 0, sizeof(sm->tptk));
-+	os_memset(&sm->gtk, 0, sizeof(sm->gtk));
-+#ifdef CONFIG_IEEE80211W
-+	os_memset(&sm->igtk, 0, sizeof(sm->igtk));
-+#endif /* CONFIG_IEEE80211W */
- #ifdef CONFIG_IEEE80211R
- 	os_memset(sm->xxkey, 0, sizeof(sm->xxkey));
- 	os_memset(sm->pmk_r0, 0, sizeof(sm->pmk_r0));
-@@ -2949,29 +2995,11 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf)
- 		os_memset(&gd, 0, sizeof(gd));
- #ifdef CONFIG_IEEE80211W
- 	} else if (subelem_id == WNM_SLEEP_SUBELEM_IGTK) {
--		struct wpa_igtk_kde igd;
--		u16 keyidx;
--
--		os_memset(&igd, 0, sizeof(igd));
--		keylen = wpa_cipher_key_len(sm->mgmt_group_cipher);
--		os_memcpy(igd.keyid, buf + 2, 2);
--		os_memcpy(igd.pn, buf + 4, 6);
--
--		keyidx = WPA_GET_LE16(igd.keyid);
--		os_memcpy(igd.igtk, buf + 10, keylen);
--
--		wpa_hexdump_key(MSG_DEBUG, "Install IGTK (WNM SLEEP)",
--				igd.igtk, keylen);
--		if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher),
--				   broadcast_ether_addr,
--				   keyidx, 0, igd.pn, sizeof(igd.pn),
--				   igd.igtk, keylen) < 0) {
--			wpa_printf(MSG_DEBUG, "Failed to install the IGTK in "
--				   "WNM mode");
--			os_memset(&igd, 0, sizeof(igd));
-+		const struct wpa_igtk_kde *igtk;
-+
-+		igtk = (const struct wpa_igtk_kde *) (buf + 2);
-+		if (wpa_supplicant_install_igtk(sm, igtk) < 0)
- 			return -1;
--		}
--		os_memset(&igd, 0, sizeof(igd));
- #endif /* CONFIG_IEEE80211W */
- 	} else {
- 		wpa_printf(MSG_DEBUG, "Unknown element id");
-diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h
-index f653ba6..afc9e37 100644
---- a/src/rsn_supp/wpa_i.h
-+++ b/src/rsn_supp/wpa_i.h
-@@ -31,6 +31,10 @@ struct wpa_sm {
- 	u8 rx_replay_counter[WPA_REPLAY_COUNTER_LEN];
- 	int rx_replay_counter_set;
- 	u8 request_counter[WPA_REPLAY_COUNTER_LEN];
-+	struct wpa_gtk gtk;
-+#ifdef CONFIG_IEEE80211W
-+	struct wpa_igtk igtk;
-+#endif /* CONFIG_IEEE80211W */
- 
- 	struct eapol_sm *eapol; /* EAPOL state machine from upper level code */
- 
--- 
-2.7.4
-
diff --git a/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch b/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch
deleted file mode 100644
index e2937b8..0000000
--- a/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From 8280294e74846ea342389a0cd17215050fa5afe8 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Sun, 1 Oct 2017 12:12:24 +0300
-Subject: [PATCH 3/8] Extend protection of GTK/IGTK reinstallation of WNM-Sleep
- Mode cases
-
-This extends the protection to track last configured GTK/IGTK value
-separately from EAPOL-Key frames and WNM-Sleep Mode frames to cover a
-corner case where these two different mechanisms may get used when the
-GTK/IGTK has changed and tracking a single value is not sufficient to
-detect a possible key reconfiguration.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- src/rsn_supp/wpa.c   | 53 +++++++++++++++++++++++++++++++++++++---------------
- src/rsn_supp/wpa_i.h |  2 ++
- 2 files changed, 40 insertions(+), 15 deletions(-)
-
-diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
-index 95bd7be..7a2c68d 100644
---- a/src/rsn_supp/wpa.c
-+++ b/src/rsn_supp/wpa.c
-@@ -709,14 +709,17 @@ struct wpa_gtk_data {
- 
- static int wpa_supplicant_install_gtk(struct wpa_sm *sm,
- 				      const struct wpa_gtk_data *gd,
--				      const u8 *key_rsc)
-+				      const u8 *key_rsc, int wnm_sleep)
- {
- 	const u8 *_gtk = gd->gtk;
- 	u8 gtk_buf[32];
- 
- 	/* Detect possible key reinstallation */
--	if (sm->gtk.gtk_len == (size_t) gd->gtk_len &&
--	    os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) {
-+	if ((sm->gtk.gtk_len == (size_t) gd->gtk_len &&
-+	     os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) ||
-+	    (sm->gtk_wnm_sleep.gtk_len == (size_t) gd->gtk_len &&
-+	     os_memcmp(sm->gtk_wnm_sleep.gtk, gd->gtk,
-+		       sm->gtk_wnm_sleep.gtk_len) == 0)) {
- 		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
- 			"WPA: Not reinstalling already in-use GTK to the driver (keyidx=%d tx=%d len=%d)",
- 			gd->keyidx, gd->tx, gd->gtk_len);
-@@ -757,8 +760,14 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm,
- 	}
- 	os_memset(gtk_buf, 0, sizeof(gtk_buf));
- 
--	sm->gtk.gtk_len = gd->gtk_len;
--	os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len);
-+	if (wnm_sleep) {
-+		sm->gtk_wnm_sleep.gtk_len = gd->gtk_len;
-+		os_memcpy(sm->gtk_wnm_sleep.gtk, gd->gtk,
-+			  sm->gtk_wnm_sleep.gtk_len);
-+	} else {
-+		sm->gtk.gtk_len = gd->gtk_len;
-+		os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len);
-+	}
- 
- 	return 0;
- }
-@@ -852,7 +861,7 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm,
- 	    (wpa_supplicant_check_group_cipher(sm, sm->group_cipher,
- 					       gtk_len, gtk_len,
- 					       &gd.key_rsc_len, &gd.alg) ||
--	     wpa_supplicant_install_gtk(sm, &gd, key_rsc))) {
-+	     wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0))) {
- 		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
- 			"RSN: Failed to install GTK");
- 		os_memset(&gd, 0, sizeof(gd));
-@@ -868,14 +877,18 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm,
- 
- #ifdef CONFIG_IEEE80211W
- static int wpa_supplicant_install_igtk(struct wpa_sm *sm,
--				       const struct wpa_igtk_kde *igtk)
-+				       const struct wpa_igtk_kde *igtk,
-+				       int wnm_sleep)
- {
- 	size_t len = wpa_cipher_key_len(sm->mgmt_group_cipher);
- 	u16 keyidx = WPA_GET_LE16(igtk->keyid);
- 
- 	/* Detect possible key reinstallation */
--	if (sm->igtk.igtk_len == len &&
--	    os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) {
-+	if ((sm->igtk.igtk_len == len &&
-+	     os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) ||
-+	    (sm->igtk_wnm_sleep.igtk_len == len &&
-+	     os_memcmp(sm->igtk_wnm_sleep.igtk, igtk->igtk,
-+		       sm->igtk_wnm_sleep.igtk_len) == 0)) {
- 		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
- 			"WPA: Not reinstalling already in-use IGTK to the driver (keyidx=%d)",
- 			keyidx);
-@@ -900,8 +913,14 @@ static int wpa_supplicant_install_igtk(struct wpa_sm *sm,
- 		return -1;
- 	}
- 
--	sm->igtk.igtk_len = len;
--	os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len);
-+	if (wnm_sleep) {
-+		sm->igtk_wnm_sleep.igtk_len = len;
-+		os_memcpy(sm->igtk_wnm_sleep.igtk, igtk->igtk,
-+			  sm->igtk_wnm_sleep.igtk_len);
-+	} else {
-+		sm->igtk.igtk_len = len;
-+		os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len);
-+	}
- 
- 	return 0;
- }
-@@ -924,7 +943,7 @@ static int ieee80211w_set_keys(struct wpa_sm *sm,
- 			return -1;
- 
- 		igtk = (const struct wpa_igtk_kde *) ie->igtk;
--		if (wpa_supplicant_install_igtk(sm, igtk) < 0)
-+		if (wpa_supplicant_install_igtk(sm, igtk, 0) < 0)
- 			return -1;
- 	}
- 
-@@ -1574,7 +1593,7 @@ static void wpa_supplicant_process_1_of_2(struct wpa_sm *sm,
- 	if (wpa_supplicant_rsc_relaxation(sm, key->key_rsc))
- 		key_rsc = null_rsc;
- 
--	if (wpa_supplicant_install_gtk(sm, &gd, key_rsc) ||
-+	if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0) ||
- 	    wpa_supplicant_send_2_of_2(sm, key, ver, key_info) < 0)
- 		goto failed;
- 	os_memset(&gd, 0, sizeof(gd));
-@@ -2386,8 +2405,10 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid)
- 		sm->tptk_set = 0;
- 		os_memset(&sm->tptk, 0, sizeof(sm->tptk));
- 		os_memset(&sm->gtk, 0, sizeof(sm->gtk));
-+		os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep));
- #ifdef CONFIG_IEEE80211W
- 		os_memset(&sm->igtk, 0, sizeof(sm->igtk));
-+		os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep));
- #endif /* CONFIG_IEEE80211W */
- 	}
- 
-@@ -2920,8 +2941,10 @@ void wpa_sm_drop_sa(struct wpa_sm *sm)
- 	os_memset(&sm->ptk, 0, sizeof(sm->ptk));
- 	os_memset(&sm->tptk, 0, sizeof(sm->tptk));
- 	os_memset(&sm->gtk, 0, sizeof(sm->gtk));
-+	os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep));
- #ifdef CONFIG_IEEE80211W
- 	os_memset(&sm->igtk, 0, sizeof(sm->igtk));
-+	os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep));
- #endif /* CONFIG_IEEE80211W */
- #ifdef CONFIG_IEEE80211R
- 	os_memset(sm->xxkey, 0, sizeof(sm->xxkey));
-@@ -2986,7 +3009,7 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf)
- 
- 		wpa_hexdump_key(MSG_DEBUG, "Install GTK (WNM SLEEP)",
- 				gd.gtk, gd.gtk_len);
--		if (wpa_supplicant_install_gtk(sm, &gd, key_rsc)) {
-+		if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 1)) {
- 			os_memset(&gd, 0, sizeof(gd));
- 			wpa_printf(MSG_DEBUG, "Failed to install the GTK in "
- 				   "WNM mode");
-@@ -2998,7 +3021,7 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf)
- 		const struct wpa_igtk_kde *igtk;
- 
- 		igtk = (const struct wpa_igtk_kde *) (buf + 2);
--		if (wpa_supplicant_install_igtk(sm, igtk) < 0)
-+		if (wpa_supplicant_install_igtk(sm, igtk, 1) < 0)
- 			return -1;
- #endif /* CONFIG_IEEE80211W */
- 	} else {
-diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h
-index afc9e37..9a54631 100644
---- a/src/rsn_supp/wpa_i.h
-+++ b/src/rsn_supp/wpa_i.h
-@@ -32,8 +32,10 @@ struct wpa_sm {
- 	int rx_replay_counter_set;
- 	u8 request_counter[WPA_REPLAY_COUNTER_LEN];
- 	struct wpa_gtk gtk;
-+	struct wpa_gtk gtk_wnm_sleep;
- #ifdef CONFIG_IEEE80211W
- 	struct wpa_igtk igtk;
-+	struct wpa_igtk igtk_wnm_sleep;
- #endif /* CONFIG_IEEE80211W */
- 
- 	struct eapol_sm *eapol; /* EAPOL state machine from upper level code */
--- 
-2.7.4
-
diff --git a/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch b/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch
deleted file mode 100644
index 22ee217..0000000
--- a/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 8f82bc94e8697a9d47fa8774dfdaaede1084912c Mon Sep 17 00:00:00 2001
-From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
-Date: Fri, 29 Sep 2017 04:22:51 +0200
-Subject: [PATCH 4/8] Prevent installation of an all-zero TK
-
-Properly track whether a PTK has already been installed to the driver
-and the TK part cleared from memory. This prevents an attacker from
-trying to trick the client into installing an all-zero TK.
-
-This fixes the earlier fix in commit
-ad00d64e7d8827b3cebd665a0ceb08adabf15e1e ('Fix TK configuration to the
-driver in EAPOL-Key 3/4 retry case') which did not take into account
-possibility of an extra message 1/4 showing up between retries of
-message 3/4.
-
-Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
----
- src/common/wpa_common.h | 1 +
- src/rsn_supp/wpa.c      | 5 ++---
- src/rsn_supp/wpa_i.h    | 1 -
- 3 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h
-index d200285..1021ccb 100644
---- a/src/common/wpa_common.h
-+++ b/src/common/wpa_common.h
-@@ -215,6 +215,7 @@ struct wpa_ptk {
- 	size_t kck_len;
- 	size_t kek_len;
- 	size_t tk_len;
-+	int installed; /* 1 if key has already been installed to driver */
- };
- 
- struct wpa_gtk {
-diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
-index 7a2c68d..0550a41 100644
---- a/src/rsn_supp/wpa.c
-+++ b/src/rsn_supp/wpa.c
-@@ -510,7 +510,6 @@ static void wpa_supplicant_process_1_of_4(struct wpa_sm *sm,
- 		os_memset(buf, 0, sizeof(buf));
- 	}
- 	sm->tptk_set = 1;
--	sm->tk_to_set = 1;
- 
- 	kde = sm->assoc_wpa_ie;
- 	kde_len = sm->assoc_wpa_ie_len;
-@@ -615,7 +614,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm,
- 	enum wpa_alg alg;
- 	const u8 *key_rsc;
- 
--	if (!sm->tk_to_set) {
-+	if (sm->ptk.installed) {
- 		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
- 			"WPA: Do not re-install same PTK to the driver");
- 		return 0;
-@@ -659,7 +658,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm,
- 
- 	/* TK is not needed anymore in supplicant */
- 	os_memset(sm->ptk.tk, 0, WPA_TK_MAX_LEN);
--	sm->tk_to_set = 0;
-+	sm->ptk.installed = 1;
- 
- 	if (sm->wpa_ptk_rekey) {
- 		eloop_cancel_timeout(wpa_sm_rekey_ptk, sm, NULL);
-diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h
-index 9a54631..41f371f 100644
---- a/src/rsn_supp/wpa_i.h
-+++ b/src/rsn_supp/wpa_i.h
-@@ -24,7 +24,6 @@ struct wpa_sm {
- 	struct wpa_ptk ptk, tptk;
- 	int ptk_set, tptk_set;
- 	unsigned int msg_3_of_4_ok:1;
--	unsigned int tk_to_set:1;
- 	u8 snonce[WPA_NONCE_LEN];
- 	u8 anonce[WPA_NONCE_LEN]; /* ANonce from the last 1/4 msg */
- 	int renew_snonce;
--- 
-2.7.4
-
diff --git a/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch b/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch
deleted file mode 100644
index c19c4c7..0000000
--- a/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 12fac09b437a1dc8a0f253e265934a8aaf4d2f8b Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Sun, 1 Oct 2017 12:32:57 +0300
-Subject: [PATCH 5/8] Fix PTK rekeying to generate a new ANonce
-
-The Authenticator state machine path for PTK rekeying ended up bypassing
-the AUTHENTICATION2 state where a new ANonce is generated when going
-directly to the PTKSTART state since there is no need to try to
-determine the PMK again in such a case. This is far from ideal since the
-new PTK would depend on a new nonce only from the supplicant.
-
-Fix this by generating a new ANonce when moving to the PTKSTART state
-for the purpose of starting new 4-way handshake to rekey PTK.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- src/ap/wpa_auth.c | 24 +++++++++++++++++++++---
- 1 file changed, 21 insertions(+), 3 deletions(-)
-
-diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c
-index 707971d..bf10cc1 100644
---- a/src/ap/wpa_auth.c
-+++ b/src/ap/wpa_auth.c
-@@ -1901,6 +1901,21 @@ SM_STATE(WPA_PTK, AUTHENTICATION2)
- }
- 
- 
-+static int wpa_auth_sm_ptk_update(struct wpa_state_machine *sm)
-+{
-+	if (random_get_bytes(sm->ANonce, WPA_NONCE_LEN)) {
-+		wpa_printf(MSG_ERROR,
-+			   "WPA: Failed to get random data for ANonce");
-+		sm->Disconnect = TRUE;
-+		return -1;
-+	}
-+	wpa_hexdump(MSG_DEBUG, "WPA: Assign new ANonce", sm->ANonce,
-+		    WPA_NONCE_LEN);
-+	sm->TimeoutCtr = 0;
-+	return 0;
-+}
-+
-+
- SM_STATE(WPA_PTK, INITPMK)
- {
- 	u8 msk[2 * PMK_LEN];
-@@ -2458,9 +2473,12 @@ SM_STEP(WPA_PTK)
- 		SM_ENTER(WPA_PTK, AUTHENTICATION);
- 	else if (sm->ReAuthenticationRequest)
- 		SM_ENTER(WPA_PTK, AUTHENTICATION2);
--	else if (sm->PTKRequest)
--		SM_ENTER(WPA_PTK, PTKSTART);
--	else switch (sm->wpa_ptk_state) {
-+	else if (sm->PTKRequest) {
-+		if (wpa_auth_sm_ptk_update(sm) < 0)
-+			SM_ENTER(WPA_PTK, DISCONNECTED);
-+		else
-+			SM_ENTER(WPA_PTK, PTKSTART);
-+	} else switch (sm->wpa_ptk_state) {
- 	case WPA_PTK_INITIALIZE:
- 		break;
- 	case WPA_PTK_DISCONNECT:
--- 
-2.7.4
-
diff --git a/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch b/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch
deleted file mode 100644
index e1bd5a5..0000000
--- a/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 6c4bed4f47d1960ec04981a9d50e5076aea5223d Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Fri, 22 Sep 2017 11:03:15 +0300
-Subject: [PATCH 6/8] TDLS: Reject TPK-TK reconfiguration
-
-Do not try to reconfigure the same TPK-TK to the driver after it has
-been successfully configured. This is an explicit check to avoid issues
-related to resetting the TX/RX packet number. There was already a check
-for this for TPK M2 (retries of that message are ignored completely), so
-that behavior does not get modified.
-
-For TPK M3, the TPK-TK could have been reconfigured, but that was
-followed by immediate teardown of the link due to an issue in updating
-the STA entry. Furthermore, for TDLS with any real security (i.e.,
-ignoring open/WEP), the TPK message exchange is protected on the AP path
-and simple replay attacks are not feasible.
-
-As an additional corner case, make sure the local nonce gets updated if
-the peer uses a very unlikely "random nonce" of all zeros.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- src/rsn_supp/tdls.c | 38 ++++++++++++++++++++++++++++++++++++--
- 1 file changed, 36 insertions(+), 2 deletions(-)
-
-diff --git a/src/rsn_supp/tdls.c b/src/rsn_supp/tdls.c
-index e424168..9eb9738 100644
---- a/src/rsn_supp/tdls.c
-+++ b/src/rsn_supp/tdls.c
-@@ -112,6 +112,7 @@ struct wpa_tdls_peer {
- 		u8 tk[16]; /* TPK-TK; assuming only CCMP will be used */
- 	} tpk;
- 	int tpk_set;
-+	int tk_set; /* TPK-TK configured to the driver */
- 	int tpk_success;
- 	int tpk_in_progress;
- 
-@@ -192,6 +193,20 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer)
- 	u8 rsc[6];
- 	enum wpa_alg alg;
- 
-+	if (peer->tk_set) {
-+		/*
-+		 * This same TPK-TK has already been configured to the driver
-+		 * and this new configuration attempt (likely due to an
-+		 * unexpected retransmitted frame) would result in clearing
-+		 * the TX/RX sequence number which can break security, so must
-+		 * not allow that to happen.
-+		 */
-+		wpa_printf(MSG_INFO, "TDLS: TPK-TK for the peer " MACSTR
-+			   " has already been configured to the driver - do not reconfigure",
-+			   MAC2STR(peer->addr));
-+		return -1;
-+	}
-+
- 	os_memset(rsc, 0, 6);
- 
- 	switch (peer->cipher) {
-@@ -209,12 +224,15 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer)
- 		return -1;
- 	}
- 
-+	wpa_printf(MSG_DEBUG, "TDLS: Configure pairwise key for peer " MACSTR,
-+		   MAC2STR(peer->addr));
- 	if (wpa_sm_set_key(sm, alg, peer->addr, -1, 1,
- 			   rsc, sizeof(rsc), peer->tpk.tk, key_len) < 0) {
- 		wpa_printf(MSG_WARNING, "TDLS: Failed to set TPK to the "
- 			   "driver");
- 		return -1;
- 	}
-+	peer->tk_set = 1;
- 	return 0;
- }
- 
-@@ -696,7 +714,7 @@ static void wpa_tdls_peer_clear(struct wpa_sm *sm, struct wpa_tdls_peer *peer)
- 	peer->cipher = 0;
- 	peer->qos_info = 0;
- 	peer->wmm_capable = 0;
--	peer->tpk_set = peer->tpk_success = 0;
-+	peer->tk_set = peer->tpk_set = peer->tpk_success = 0;
- 	peer->chan_switch_enabled = 0;
- 	os_memset(&peer->tpk, 0, sizeof(peer->tpk));
- 	os_memset(peer->inonce, 0, WPA_NONCE_LEN);
-@@ -1159,6 +1177,7 @@ skip_rsnie:
- 		wpa_tdls_peer_free(sm, peer);
- 		return -1;
- 	}
-+	peer->tk_set = 0; /* A new nonce results in a new TK */
- 	wpa_hexdump(MSG_DEBUG, "TDLS: Initiator Nonce for TPK handshake",
- 		    peer->inonce, WPA_NONCE_LEN);
- 	os_memcpy(ftie->Snonce, peer->inonce, WPA_NONCE_LEN);
-@@ -1751,6 +1770,19 @@ static int wpa_tdls_addset_peer(struct wpa_sm *sm, struct wpa_tdls_peer *peer,
- }
- 
- 
-+static int tdls_nonce_set(const u8 *nonce)
-+{
-+	int i;
-+
-+	for (i = 0; i < WPA_NONCE_LEN; i++) {
-+		if (nonce[i])
-+			return 1;
-+	}
-+
-+	return 0;
-+}
-+
-+
- static int wpa_tdls_process_tpk_m1(struct wpa_sm *sm, const u8 *src_addr,
- 				   const u8 *buf, size_t len)
- {
-@@ -2004,7 +2036,8 @@ skip_rsn:
- 	peer->rsnie_i_len = kde.rsn_ie_len;
- 	peer->cipher = cipher;
- 
--	if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0) {
-+	if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0 ||
-+	    !tdls_nonce_set(peer->inonce)) {
- 		/*
- 		 * There is no point in updating the RNonce for every obtained
- 		 * TPK M1 frame (e.g., retransmission due to timeout) with the
-@@ -2020,6 +2053,7 @@ skip_rsn:
- 				"TDLS: Failed to get random data for responder nonce");
- 			goto error;
- 		}
-+		peer->tk_set = 0; /* A new nonce results in a new TK */
- 	}
- 
- #if 0
--- 
-2.7.4
-
diff --git a/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch b/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch
deleted file mode 100644
index 85ea1d6..0000000
--- a/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 53c5eb58e95004f86e65ee9fbfccbc291b139057 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Fri, 22 Sep 2017 11:25:02 +0300
-Subject: [PATCH 7/8] WNM: Ignore WNM-Sleep Mode Response without pending
- request
-
-Commit 03ed0a52393710be6bdae657d1b36efa146520e5 ('WNM: Ignore WNM-Sleep
-Mode Response if WNM-Sleep Mode has not been used') started ignoring the
-response when no WNM-Sleep Mode Request had been used during the
-association. This can be made tighter by clearing the used flag when
-successfully processing a response. This adds an additional layer of
-protection against unexpected retransmissions of the response frame.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- wpa_supplicant/wnm_sta.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c
-index 1b3409c..67a07ff 100644
---- a/wpa_supplicant/wnm_sta.c
-+++ b/wpa_supplicant/wnm_sta.c
-@@ -260,7 +260,7 @@ static void ieee802_11_rx_wnmsleep_resp(struct wpa_supplicant *wpa_s,
- 
- 	if (!wpa_s->wnmsleep_used) {
- 		wpa_printf(MSG_DEBUG,
--			   "WNM: Ignore WNM-Sleep Mode Response frame since WNM-Sleep Mode has not been used in this association");
-+			   "WNM: Ignore WNM-Sleep Mode Response frame since WNM-Sleep Mode operation has not been requested");
- 		return;
- 	}
- 
-@@ -299,6 +299,8 @@ static void ieee802_11_rx_wnmsleep_resp(struct wpa_supplicant *wpa_s,
- 		return;
- 	}
- 
-+	wpa_s->wnmsleep_used = 0;
-+
- 	if (wnmsleep_ie->status == WNM_STATUS_SLEEP_ACCEPT ||
- 	    wnmsleep_ie->status == WNM_STATUS_SLEEP_EXIT_ACCEPT_GTK_UPDATE) {
- 		wpa_printf(MSG_DEBUG, "Successfully recv WNM-Sleep Response "
--- 
-2.7.4
-
diff --git a/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch b/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch
deleted file mode 100644
index b9678f6..0000000
--- a/recipes-connectivity/wpa-supplicant/wpa-supplicant/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From b372ab0b7daea719749194dc554b26e6367603f2 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Fri, 22 Sep 2017 12:06:37 +0300
-Subject: [PATCH 8/8] FT: Do not allow multiple Reassociation Response frames
-
-The driver is expected to not report a second association event without
-the station having explicitly request a new association. As such, this
-case should not be reachable. However, since reconfiguring the same
-pairwise or group keys to the driver could result in nonce reuse issues,
-be extra careful here and do an additional state check to avoid this
-even if the local driver ends up somehow accepting an unexpected
-Reassociation Response frame.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- src/rsn_supp/wpa.c    | 3 +++
- src/rsn_supp/wpa_ft.c | 8 ++++++++
- src/rsn_supp/wpa_i.h  | 1 +
- 3 files changed, 12 insertions(+)
-
-diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
-index 0550a41..2a53c6f 100644
---- a/src/rsn_supp/wpa.c
-+++ b/src/rsn_supp/wpa.c
-@@ -2440,6 +2440,9 @@ void wpa_sm_notify_disassoc(struct wpa_sm *sm)
- #ifdef CONFIG_TDLS
- 	wpa_tdls_disassoc(sm);
- #endif /* CONFIG_TDLS */
-+#ifdef CONFIG_IEEE80211R
-+	sm->ft_reassoc_completed = 0;
-+#endif /* CONFIG_IEEE80211R */
- 
- 	/* Keys are not needed in the WPA state machine anymore */
- 	wpa_sm_drop_sa(sm);
-diff --git a/src/rsn_supp/wpa_ft.c b/src/rsn_supp/wpa_ft.c
-index 205793e..d45bb45 100644
---- a/src/rsn_supp/wpa_ft.c
-+++ b/src/rsn_supp/wpa_ft.c
-@@ -153,6 +153,7 @@ static u8 * wpa_ft_gen_req_ies(struct wpa_sm *sm, size_t *len,
- 	u16 capab;
- 
- 	sm->ft_completed = 0;
-+	sm->ft_reassoc_completed = 0;
- 
- 	buf_len = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) +
- 		2 + sm->r0kh_id_len + ric_ies_len + 100;
-@@ -681,6 +682,11 @@ int wpa_ft_validate_reassoc_resp(struct wpa_sm *sm, const u8 *ies,
- 		return -1;
- 	}
- 
-+	if (sm->ft_reassoc_completed) {
-+		wpa_printf(MSG_DEBUG, "FT: Reassociation has already been completed for this FT protocol instance - ignore unexpected retransmission");
-+		return 0;
-+	}
-+
- 	if (wpa_ft_parse_ies(ies, ies_len, &parse) < 0) {
- 		wpa_printf(MSG_DEBUG, "FT: Failed to parse IEs");
- 		return -1;
-@@ -781,6 +787,8 @@ int wpa_ft_validate_reassoc_resp(struct wpa_sm *sm, const u8 *ies,
- 		return -1;
- 	}
- 
-+	sm->ft_reassoc_completed = 1;
-+
- 	if (wpa_ft_process_gtk_subelem(sm, parse.gtk, parse.gtk_len) < 0)
- 		return -1;
- 
-diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h
-index 41f371f..56f88dc 100644
---- a/src/rsn_supp/wpa_i.h
-+++ b/src/rsn_supp/wpa_i.h
-@@ -128,6 +128,7 @@ struct wpa_sm {
- 	size_t r0kh_id_len;
- 	u8 r1kh_id[FT_R1KH_ID_LEN];
- 	int ft_completed;
-+	int ft_reassoc_completed;
- 	int over_the_ds_in_progress;
- 	u8 target_ap[ETH_ALEN]; /* over-the-DS target AP */
- 	int set_ptk_after_assoc;
--- 
-2.7.4
-
diff --git a/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa-supplicant.sh b/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa-supplicant.sh
deleted file mode 100644
index 5c9e5d3..0000000
--- a/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa-supplicant.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-
-
-WPA_SUP_BIN="/usr/sbin/wpa_supplicant"
-WPA_SUP_PNAME="wpa_supplicant"
-WPA_SUP_PIDFILE="/var/run/wpa_supplicant.$IFACE.pid"
-WPA_SUP_OPTIONS="-B -P $WPA_SUP_PIDFILE -i $IFACE"
-
-VERBOSITY=0
-
-
-if [ -s "$IF_WPA_CONF" ]; then
-	WPA_SUP_CONF="-c $IF_WPA_CONF"
-else
-	exit 0
-fi
-
-if [ ! -x "$WPA_SUP_BIN" ]; then
-	
-	if [ "$VERBOSITY" = "1" ]; then
-		echo "$WPA_SUP_PNAME: binaries not executable or missing from $WPA_SUP_BIN"
-	fi
-	
-	exit 1
-fi
-
-if [ "$MODE" = "start" ] ; then
-	# driver type of interface, defaults to wext when undefined
-	if [ -s "/etc/wpa_supplicant/driver.$IFACE" ]; then
-		IF_WPA_DRIVER=$(cat "/etc/wpa_supplicant/driver.$IFACE")
-	elif [ -z "$IF_WPA_DRIVER" ]; then
-		
-		if [ "$VERBOSITY" = "1" ]; then
-			echo "$WPA_SUP_PNAME: wpa-driver not provided, using \"wext\""
-		fi
-		
-		IF_WPA_DRIVER="wext"
-	fi
-	
-	# if we have passed the criteria, start wpa_supplicant
-	if [ -n "$WPA_SUP_CONF" ]; then
-		
-		if [ "$VERBOSITY" = "1" ]; then
-			echo "$WPA_SUP_PNAME: $WPA_SUP_BIN $WPA_SUP_OPTIONS $WPA_SUP_CONF -D $IF_WPA_DRIVER"
-		fi
-		
-		start-stop-daemon --start --quiet \
-			--name $WPA_SUP_PNAME --startas $WPA_SUP_BIN --pidfile $WPA_SUP_PIDFILE \
-			--  $WPA_SUP_OPTIONS $WPA_SUP_CONF -D $IF_WPA_DRIVER
-	fi
-
-	# if the interface socket exists, then wpa_supplicant was invoked successfully
-	if [ -S "$WPA_COMMON_CTRL_IFACE/$IFACE" ]; then
-	
-		if [ "$VERBOSITY" = "1" ]; then
-			echo "$WPA_SUP_PNAME: ctrl_interface socket located at $WPA_COMMON_CTRL_IFACE/$IFACE"
-		fi
-
-		exit 0
-		
-	fi
-	
-elif [ "$MODE" = "stop" ]; then
-
-	if [ -f "$WPA_SUP_PIDFILE" ]; then
-		
-		if [ "$VERBOSITY" = "1" ]; then
-			echo "$WPA_SUP_PNAME: terminating $WPA_SUP_PNAME daemon"
-		fi
-		
-		start-stop-daemon --stop --quiet \
-			--name $WPA_SUP_PNAME --pidfile	$WPA_SUP_PIDFILE
-			
-		if [ -S "$WPA_COMMON_CTRL_IFACE/$IFACE" ]; then
-			rm -f $WPA_COMMON_CTRL_IFACE/$IFACE
-		fi
-			
-		if [ -f "$WPA_SUP_PIDFILE" ]; then
-			rm -f $WPA_SUP_PIDFILE
-		fi
-	fi
-
-fi
-
-exit 0
diff --git a/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf b/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf
deleted file mode 100644
index 68258f5..0000000
--- a/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf
+++ /dev/null
@@ -1,690 +0,0 @@
-##### Example wpa_supplicant configuration file ###############################
-#
-# This file describes configuration file format and lists all available option.
-# Please also take a look at simpler configuration examples in 'examples'
-# subdirectory.
-#
-# Empty lines and lines starting with # are ignored
-
-# NOTE! This file may contain password information and should probably be made
-# readable only by root user on multiuser systems.
-
-# Note: All file paths in this configuration file should use full (absolute,
-# not relative to working directory) path in order to allow working directory
-# to be changed. This can happen if wpa_supplicant is run in the background.
-
-# Whether to allow wpa_supplicant to update (overwrite) configuration
-#
-# This option can be used to allow wpa_supplicant to overwrite configuration
-# file whenever configuration is changed (e.g., new network block is added with
-# wpa_cli or wpa_gui, or a password is changed). This is required for
-# wpa_cli/wpa_gui to be able to store the configuration changes permanently.
-# Please note that overwriting configuration file will remove the comments from
-# it.
-#update_config=1
-
-# global configuration (shared by all network blocks)
-#
-# Parameters for the control interface. If this is specified, wpa_supplicant
-# will open a control interface that is available for external programs to
-# manage wpa_supplicant. The meaning of this string depends on which control
-# interface mechanism is used. For all cases, the existence of this parameter
-# in configuration is used to determine whether the control interface is
-# enabled.
-#
-# For UNIX domain sockets (default on Linux and BSD): This is a directory that
-# will be created for UNIX domain sockets for listening to requests from
-# external programs (CLI/GUI, etc.) for status information and configuration.
-# The socket file will be named based on the interface name, so multiple
-# wpa_supplicant processes can be run at the same time if more than one
-# interface is used.
-# /var/run/wpa_supplicant is the recommended directory for sockets and by
-# default, wpa_cli will use it when trying to connect with wpa_supplicant.
-#
-# Access control for the control interface can be configured by setting the
-# directory to allow only members of a group to use sockets. This way, it is
-# possible to run wpa_supplicant as root (since it needs to change network
-# configuration and open raw sockets) and still allow GUI/CLI components to be
-# run as non-root users. However, since the control interface can be used to
-# change the network configuration, this access needs to be protected in many
-# cases. By default, wpa_supplicant is configured to use gid 0 (root). If you
-# want to allow non-root users to use the control interface, add a new group
-# and change this value to match with that group. Add users that should have
-# control interface access to this group. If this variable is commented out or
-# not included in the configuration file, group will not be changed from the
-# value it got by default when the directory or socket was created.
-#
-# When configuring both the directory and group, use following format:
-# DIR=/var/run/wpa_supplicant GROUP=wheel
-# DIR=/var/run/wpa_supplicant GROUP=0
-# (group can be either group name or gid)
-#
-# For UDP connections (default on Windows): The value will be ignored. This
-# variable is just used to select that the control interface is to be created.
-# The value can be set to, e.g., udp (ctrl_interface=udp)
-#
-# For Windows Named Pipe: This value can be used to set the security descriptor
-# for controlling access to the control interface. Security descriptor can be
-# set using Security Descriptor String Format (see http://msdn.microsoft.com/
-# library/default.asp?url=/library/en-us/secauthz/security/
-# security_descriptor_string_format.asp). The descriptor string needs to be
-# prefixed with SDDL=. For example, ctrl_interface=SDDL=D: would set an empty
-# DACL (which will reject all connections). See README-Windows.txt for more
-# information about SDDL string format.
-#
-ctrl_interface=/var/run/wpa_supplicant
-
-# IEEE 802.1X/EAPOL version
-# wpa_supplicant is implemented based on IEEE Std 802.1X-2004 which defines
-# EAPOL version 2. However, there are many APs that do not handle the new
-# version number correctly (they seem to drop the frames completely). In order
-# to make wpa_supplicant interoperate with these APs, the version number is set
-# to 1 by default. This configuration value can be used to set it to the new
-# version (2).
-eapol_version=1
-
-# AP scanning/selection
-# By default, wpa_supplicant requests driver to perform AP scanning and then
-# uses the scan results to select a suitable AP. Another alternative is to
-# allow the driver to take care of AP scanning and selection and use
-# wpa_supplicant just to process EAPOL frames based on IEEE 802.11 association
-# information from the driver.
-# 1: wpa_supplicant initiates scanning and AP selection
-# 0: driver takes care of scanning, AP selection, and IEEE 802.11 association
-#    parameters (e.g., WPA IE generation); this mode can also be used with
-#    non-WPA drivers when using IEEE 802.1X mode; do not try to associate with
-#    APs (i.e., external program needs to control association). This mode must
-#    also be used when using wired Ethernet drivers.
-# 2: like 0, but associate with APs using security policy and SSID (but not
-#    BSSID); this can be used, e.g., with ndiswrapper and NDIS drivers to
-#    enable operation with hidden SSIDs and optimized roaming; in this mode,
-#    the network blocks in the configuration file are tried one by one until
-#    the driver reports successful association; each network block should have
-#    explicit security policy (i.e., only one option in the lists) for
-#    key_mgmt, pairwise, group, proto variables
-ap_scan=1
-
-# EAP fast re-authentication
-# By default, fast re-authentication is enabled for all EAP methods that
-# support it. This variable can be used to disable fast re-authentication.
-# Normally, there is no need to disable this.
-fast_reauth=1
-
-# OpenSSL Engine support
-# These options can be used to load OpenSSL engines.
-# The two engines that are supported currently are shown below:
-# They are both from the opensc project (http://www.opensc.org/)
-# By default no engines are loaded.
-# make the opensc engine available
-#opensc_engine_path=/usr/lib/opensc/engine_opensc.so
-# make the pkcs11 engine available
-#pkcs11_engine_path=/usr/lib/opensc/engine_pkcs11.so
-# configure the path to the pkcs11 module required by the pkcs11 engine
-#pkcs11_module_path=/usr/lib/pkcs11/opensc-pkcs11.so
-
-# Dynamic EAP methods
-# If EAP methods were built dynamically as shared object files, they need to be
-# loaded here before being used in the network blocks. By default, EAP methods
-# are included statically in the build, so these lines are not needed
-#load_dynamic_eap=/usr/lib/wpa_supplicant/eap_tls.so
-#load_dynamic_eap=/usr/lib/wpa_supplicant/eap_md5.so
-
-# Driver interface parameters
-# This field can be used to configure arbitrary driver interace parameters. The
-# format is specific to the selected driver interface. This field is not used
-# in most cases.
-#driver_param="field=value"
-
-# Maximum lifetime for PMKSA in seconds; default 43200
-#dot11RSNAConfigPMKLifetime=43200
-# Threshold for reauthentication (percentage of PMK lifetime); default 70
-#dot11RSNAConfigPMKReauthThreshold=70
-# Timeout for security association negotiation in seconds; default 60
-#dot11RSNAConfigSATimeout=60
-
-# network block
-#
-# Each network (usually AP's sharing the same SSID) is configured as a separate
-# block in this configuration file. The network blocks are in preference order
-# (the first match is used).
-#
-# network block fields:
-#
-# disabled:
-#	0 = this network can be used (default)
-#	1 = this network block is disabled (can be enabled through ctrl_iface,
-#	    e.g., with wpa_cli or wpa_gui)
-#
-# id_str: Network identifier string for external scripts. This value is passed
-#	to external action script through wpa_cli as WPA_ID_STR environment
-#	variable to make it easier to do network specific configuration.
-#
-# ssid: SSID (mandatory); either as an ASCII string with double quotation or
-#	as hex string; network name
-#
-# scan_ssid:
-#	0 = do not scan this SSID with specific Probe Request frames (default)
-#	1 = scan with SSID-specific Probe Request frames (this can be used to
-#	    find APs that do not accept broadcast SSID or use multiple SSIDs;
-#	    this will add latency to scanning, so enable this only when needed)
-#
-# bssid: BSSID (optional); if set, this network block is used only when
-#	associating with the AP using the configured BSSID
-#
-# priority: priority group (integer)
-# By default, all networks will get same priority group (0). If some of the
-# networks are more desirable, this field can be used to change the order in
-# which wpa_supplicant goes through the networks when selecting a BSS. The
-# priority groups will be iterated in decreasing priority (i.e., the larger the
-# priority value, the sooner the network is matched against the scan results).
-# Within each priority group, networks will be selected based on security
-# policy, signal strength, etc.
-# Please note that AP scanning with scan_ssid=1 and ap_scan=2 mode are not
-# using this priority to select the order for scanning. Instead, they try the
-# networks in the order that used in the configuration file.
-#
-# mode: IEEE 802.11 operation mode
-# 0 = infrastructure (Managed) mode, i.e., associate with an AP (default)
-# 1 = IBSS (ad-hoc, peer-to-peer)
-# Note: IBSS can only be used with key_mgmt NONE (plaintext and static WEP)
-# and key_mgmt=WPA-NONE (fixed group key TKIP/CCMP). In addition, ap_scan has
-# to be set to 2 for IBSS. WPA-None requires following network block options:
-# proto=WPA, key_mgmt=WPA-NONE, pairwise=NONE, group=TKIP (or CCMP, but not
-# both), and psk must also be set.
-#
-# proto: list of accepted protocols
-# WPA = WPA/IEEE 802.11i/D3.0
-# RSN = WPA2/IEEE 802.11i (also WPA2 can be used as an alias for RSN)
-# If not set, this defaults to: WPA RSN
-#
-# key_mgmt: list of accepted authenticated key management protocols
-# WPA-PSK = WPA pre-shared key (this requires 'psk' field)
-# WPA-EAP = WPA using EAP authentication (this can use an external
-#	program, e.g., Xsupplicant, for IEEE 802.1X EAP Authentication
-# IEEE8021X = IEEE 802.1X using EAP authentication and (optionally) dynamically
-#	generated WEP keys
-# NONE = WPA is not used; plaintext or static WEP could be used
-# If not set, this defaults to: WPA-PSK WPA-EAP
-#
-# auth_alg: list of allowed IEEE 802.11 authentication algorithms
-# OPEN = Open System authentication (required for WPA/WPA2)
-# SHARED = Shared Key authentication (requires static WEP keys)
-# LEAP = LEAP/Network EAP (only used with LEAP)
-# If not set, automatic selection is used (Open System with LEAP enabled if
-# LEAP is allowed as one of the EAP methods).
-#
-# pairwise: list of accepted pairwise (unicast) ciphers for WPA
-# CCMP = AES in Counter mode with CBC-MAC [RFC 3610, IEEE 802.11i/D7.0]
-# TKIP = Temporal Key Integrity Protocol [IEEE 802.11i/D7.0]
-# NONE = Use only Group Keys (deprecated, should not be included if APs support
-#	pairwise keys)
-# If not set, this defaults to: CCMP TKIP
-#
-# group: list of accepted group (broadcast/multicast) ciphers for WPA
-# CCMP = AES in Counter mode with CBC-MAC [RFC 3610, IEEE 802.11i/D7.0]
-# TKIP = Temporal Key Integrity Protocol [IEEE 802.11i/D7.0]
-# WEP104 = WEP (Wired Equivalent Privacy) with 104-bit key
-# WEP40 = WEP (Wired Equivalent Privacy) with 40-bit key [IEEE 802.11]
-# If not set, this defaults to: CCMP TKIP WEP104 WEP40
-#
-# psk: WPA preshared key; 256-bit pre-shared key
-# The key used in WPA-PSK mode can be entered either as 64 hex-digits, i.e.,
-# 32 bytes or as an ASCII passphrase (in which case, the real PSK will be
-# generated using the passphrase and SSID). ASCII passphrase must be between
-# 8 and 63 characters (inclusive).
-# This field is not needed, if WPA-EAP is used.
-# Note: Separate tool, wpa_passphrase, can be used to generate 256-bit keys
-# from ASCII passphrase. This process uses lot of CPU and wpa_supplicant
-# startup and reconfiguration time can be optimized by generating the PSK only
-# only when the passphrase or SSID has actually changed.
-#
-# eapol_flags: IEEE 802.1X/EAPOL options (bit field)
-# Dynamic WEP key required for non-WPA mode
-# bit0 (1): require dynamically generated unicast WEP key
-# bit1 (2): require dynamically generated broadcast WEP key
-# 	(3 = require both keys; default)
-# Note: When using wired authentication, eapol_flags must be set to 0 for the
-# authentication to be completed successfully.
-#
-# proactive_key_caching:
-# Enable/disable opportunistic PMKSA caching for WPA2.
-# 0 = disabled (default)
-# 1 = enabled
-#
-# wep_key0..3: Static WEP key (ASCII in double quotation, e.g. "abcde" or
-# hex without quotation, e.g., 0102030405)
-# wep_tx_keyidx: Default WEP key index (TX) (0..3)
-#
-# peerkey: Whether PeerKey negotiation for direct links (IEEE 802.11e DLS) is
-# allowed. This is only used with RSN/WPA2.
-# 0 = disabled (default)
-# 1 = enabled
-#peerkey=1
-#
-# Following fields are only used with internal EAP implementation.
-# eap: space-separated list of accepted EAP methods
-#	MD5 = EAP-MD5 (unsecure and does not generate keying material ->
-#			cannot be used with WPA; to be used as a Phase 2 method
-#			with EAP-PEAP or EAP-TTLS)
-#       MSCHAPV2 = EAP-MSCHAPv2 (cannot be used separately with WPA; to be used
-#		as a Phase 2 method with EAP-PEAP or EAP-TTLS)
-#       OTP = EAP-OTP (cannot be used separately with WPA; to be used
-#		as a Phase 2 method with EAP-PEAP or EAP-TTLS)
-#       GTC = EAP-GTC (cannot be used separately with WPA; to be used
-#		as a Phase 2 method with EAP-PEAP or EAP-TTLS)
-#	TLS = EAP-TLS (client and server certificate)
-#	PEAP = EAP-PEAP (with tunnelled EAP authentication)
-#	TTLS = EAP-TTLS (with tunnelled EAP or PAP/CHAP/MSCHAP/MSCHAPV2
-#			 authentication)
-#	If not set, all compiled in methods are allowed.
-#
-# identity: Identity string for EAP
-# anonymous_identity: Anonymous identity string for EAP (to be used as the
-#	unencrypted identity with EAP types that support different tunnelled
-#	identity, e.g., EAP-TTLS)
-# password: Password string for EAP
-# ca_cert: File path to CA certificate file (PEM/DER). This file can have one
-#	or more trusted CA certificates. If ca_cert and ca_path are not
-#	included, server certificate will not be verified. This is insecure and
-#	a trusted CA certificate should always be configured when using
-#	EAP-TLS/TTLS/PEAP. Full path should be used since working directory may
-#	change when wpa_supplicant is run in the background.
-#	On Windows, trusted CA certificates can be loaded from the system
-#	certificate store by setting this to cert_store://<name>, e.g.,
-#	ca_cert="cert_store://CA" or ca_cert="cert_store://ROOT".
-#	Note that when running wpa_supplicant as an application, the user
-#	certificate store (My user account) is used, whereas computer store
-#	(Computer account) is used when running wpasvc as a service.
-# ca_path: Directory path for CA certificate files (PEM). This path may
-#	contain multiple CA certificates in OpenSSL format. Common use for this
-#	is to point to system trusted CA list which is often installed into
-#	directory like /etc/ssl/certs. If configured, these certificates are
-#	added to the list of trusted CAs. ca_cert may also be included in that
-#	case, but it is not required.
-# client_cert: File path to client certificate file (PEM/DER)
-#	Full path should be used since working directory may change when
-#	wpa_supplicant is run in the background.
-#	Alternatively, a named configuration blob can be used by setting this
-#	to blob://<blob name>.
-# private_key: File path to client private key file (PEM/DER/PFX)
-#	When PKCS#12/PFX file (.p12/.pfx) is used, client_cert should be
-#	commented out. Both the private key and certificate will be read from
-#	the PKCS#12 file in this case. Full path should be used since working
-#	directory may change when wpa_supplicant is run in the background.
-#	Windows certificate store can be used by leaving client_cert out and
-#	configuring private_key in one of the following formats:
-#	cert://substring_to_match
-#	hash://certificate_thumbprint_in_hex
-#	for example: private_key="hash://63093aa9c47f56ae88334c7b65a4"
-#	Note that when running wpa_supplicant as an application, the user
-#	certificate store (My user account) is used, whereas computer store
-#	(Computer account) is used when running wpasvc as a service.
-#	Alternatively, a named configuration blob can be used by setting this
-#	to blob://<blob name>.
-# private_key_passwd: Password for private key file (if left out, this will be
-#	asked through control interface)
-# dh_file: File path to DH/DSA parameters file (in PEM format)
-#	This is an optional configuration file for setting parameters for an
-#	ephemeral DH key exchange. In most cases, the default RSA
-#	authentication does not use this configuration. However, it is possible
-#	setup RSA to use ephemeral DH key exchange. In addition, ciphers with
-#	DSA keys always use ephemeral DH keys. This can be used to achieve
-#	forward secrecy. If the file is in DSA parameters format, it will be
-#	automatically converted into DH params.
-# subject_match: Substring to be matched against the subject of the
-#	authentication server certificate. If this string is set, the server
-#	sertificate is only accepted if it contains this string in the subject.
-#	The subject string is in following format:
-#	/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com
-# altsubject_match: Semicolon separated string of entries to be matched against
-#	the alternative subject name of the authentication server certificate.
-#	If this string is set, the server sertificate is only accepted if it
-#	contains one of the entries in an alternative subject name extension.
-#	altSubjectName string is in following format: TYPE:VALUE
-#	Example: EMAIL:server@example.com
-#	Example: DNS:server.example.com;DNS:server2.example.com
-#	Following types are supported: EMAIL, DNS, URI
-# phase1: Phase1 (outer authentication, i.e., TLS tunnel) parameters
-#	(string with field-value pairs, e.g., "peapver=0" or
-#	"peapver=1 peaplabel=1")
-#	'peapver' can be used to force which PEAP version (0 or 1) is used.
-#	'peaplabel=1' can be used to force new label, "client PEAP encryption",
-#	to be used during key derivation when PEAPv1 or newer. Most existing
-#	PEAPv1 implementation seem to be using the old label, "client EAP
-#	encryption", and wpa_supplicant is now using that as the default value.
-#	Some servers, e.g., Radiator, may require peaplabel=1 configuration to
-#	interoperate with PEAPv1; see eap_testing.txt for more details.
-#	'peap_outer_success=0' can be used to terminate PEAP authentication on
-#	tunneled EAP-Success. This is required with some RADIUS servers that
-#	implement draft-josefsson-pppext-eap-tls-eap-05.txt (e.g.,
-#	Lucent NavisRadius v4.4.0 with PEAP in "IETF Draft 5" mode)
-#	include_tls_length=1 can be used to force wpa_supplicant to include
-#	TLS Message Length field in all TLS messages even if they are not
-#	fragmented.
-#	sim_min_num_chal=3 can be used to configure EAP-SIM to require three
-#	challenges (by default, it accepts 2 or 3)
-# phase2: Phase2 (inner authentication with TLS tunnel) parameters
-#	(string with field-value pairs, e.g., "auth=MSCHAPV2" for EAP-PEAP or
-#	"autheap=MSCHAPV2 autheap=MD5" for EAP-TTLS)
-# Following certificate/private key fields are used in inner Phase2
-# authentication when using EAP-TTLS or EAP-PEAP.
-# ca_cert2: File path to CA certificate file. This file can have one or more
-#	trusted CA certificates. If ca_cert2 and ca_path2 are not included,
-#	server certificate will not be verified. This is insecure and a trusted
-#	CA certificate should always be configured.
-# ca_path2: Directory path for CA certificate files (PEM)
-# client_cert2: File path to client certificate file
-# private_key2: File path to client private key file
-# private_key2_passwd: Password for private key file
-# dh_file2: File path to DH/DSA parameters file (in PEM format)
-# subject_match2: Substring to be matched against the subject of the
-#	authentication server certificate.
-# altsubject_match2: Substring to be matched against the alternative subject
-#	name of the authentication server certificate.
-#
-# fragment_size: Maximum EAP fragment size in bytes (default 1398).
-#	This value limits the fragment size for EAP methods that support
-#	fragmentation (e.g., EAP-TLS and EAP-PEAP). This value should be set
-#	small enough to make the EAP messages fit in MTU of the network
-#	interface used for EAPOL. The default value is suitable for most
-#	cases.
-#
-# EAP-PSK variables:
-# eappsk: 16-byte (128-bit, 32 hex digits) pre-shared key in hex format
-# nai: user NAI
-#
-# EAP-PAX variables:
-# eappsk: 16-byte (128-bit, 32 hex digits) pre-shared key in hex format
-#
-# EAP-SAKE variables:
-# eappsk: 32-byte (256-bit, 64 hex digits) pre-shared key in hex format
-#	(this is concatenation of Root-Secret-A and Root-Secret-B)
-# nai: user NAI (PEERID)
-#
-# EAP-GPSK variables:
-# eappsk: Pre-shared key in hex format (at least 128 bits, i.e., 32 hex digits)
-# nai: user NAI (ID_Client)
-#
-# EAP-FAST variables:
-# pac_file: File path for the PAC entries. wpa_supplicant will need to be able
-#	to create this file and write updates to it when PAC is being
-#	provisioned or refreshed. Full path to the file should be used since
-#	working directory may change when wpa_supplicant is run in the
-#	background. Alternatively, a named configuration blob can be used by
-#	setting this to blob://<blob name>
-# phase1: fast_provisioning=1 option enables in-line provisioning of EAP-FAST
-#	credentials (PAC)
-#
-# wpa_supplicant supports number of "EAP workarounds" to work around
-# interoperability issues with incorrectly behaving authentication servers.
-# These are enabled by default because some of the issues are present in large
-# number of authentication servers. Strict EAP conformance mode can be
-# configured by disabling workarounds with eap_workaround=0.
-
-# Example blocks:
-
-# Simple case: WPA-PSK, PSK as an ASCII passphrase, allow all valid ciphers
-network={
-	ssid="simple"
-	psk="very secret passphrase"
-	priority=5
-}
-
-# Same as previous, but request SSID-specific scanning (for APs that reject
-# broadcast SSID)
-network={
-	ssid="second ssid"
-	scan_ssid=1
-	psk="very secret passphrase"
-	priority=2
-}
-
-# Only WPA-PSK is used. Any valid cipher combination is accepted.
-network={
-	ssid="example"
-	proto=WPA
-	key_mgmt=WPA-PSK
-	pairwise=CCMP TKIP
-	group=CCMP TKIP WEP104 WEP40
-	psk=06b4be19da289f475aa46a33cb793029d4ab3db7a23ee92382eb0106c72ac7bb
-	priority=2
-}
-
-# Only WPA-EAP is used. Both CCMP and TKIP is accepted. An AP that used WEP104
-# or WEP40 as the group cipher will not be accepted.
-network={
-	ssid="example"
-	proto=RSN
-	key_mgmt=WPA-EAP
-	pairwise=CCMP TKIP
-	group=CCMP TKIP
-	eap=TLS
-	identity="user@example.com"
-	ca_cert="/etc/cert/ca.pem"
-	client_cert="/etc/cert/user.pem"
-	private_key="/etc/cert/user.prv"
-	private_key_passwd="password"
-	priority=1
-}
-
-# EAP-PEAP/MSCHAPv2 configuration for RADIUS servers that use the new peaplabel
-# (e.g., Radiator)
-network={
-	ssid="example"
-	key_mgmt=WPA-EAP
-	eap=PEAP
-	identity="user@example.com"
-	password="foobar"
-	ca_cert="/etc/cert/ca.pem"
-	phase1="peaplabel=1"
-	phase2="auth=MSCHAPV2"
-	priority=10
-}
-
-# EAP-TTLS/EAP-MD5-Challenge configuration with anonymous identity for the
-# unencrypted use. Real identity is sent only within an encrypted TLS tunnel.
-network={
-	ssid="example"
-	key_mgmt=WPA-EAP
-	eap=TTLS
-	identity="user@example.com"
-	anonymous_identity="anonymous@example.com"
-	password="foobar"
-	ca_cert="/etc/cert/ca.pem"
-	priority=2
-}
-
-# EAP-TTLS/MSCHAPv2 configuration with anonymous identity for the unencrypted
-# use. Real identity is sent only within an encrypted TLS tunnel.
-network={
-	ssid="example"
-	key_mgmt=WPA-EAP
-	eap=TTLS
-	identity="user@example.com"
-	anonymous_identity="anonymous@example.com"
-	password="foobar"
-	ca_cert="/etc/cert/ca.pem"
-	phase2="auth=MSCHAPV2"
-}
-
-# WPA-EAP, EAP-TTLS with different CA certificate used for outer and inner
-# authentication.
-network={
-	ssid="example"
-	key_mgmt=WPA-EAP
-	eap=TTLS
-	# Phase1 / outer authentication
-	anonymous_identity="anonymous@example.com"
-	ca_cert="/etc/cert/ca.pem"
-	# Phase 2 / inner authentication
-	phase2="autheap=TLS"
-	ca_cert2="/etc/cert/ca2.pem"
-	client_cert2="/etc/cer/user.pem"
-	private_key2="/etc/cer/user.prv"
-	private_key2_passwd="password"
-	priority=2
-}
-
-# Both WPA-PSK and WPA-EAP is accepted. Only CCMP is accepted as pairwise and
-# group cipher.
-network={
-	ssid="example"
-	bssid=00:11:22:33:44:55
-	proto=WPA RSN
-	key_mgmt=WPA-PSK WPA-EAP
-	pairwise=CCMP
-	group=CCMP
-	psk=06b4be19da289f475aa46a33cb793029d4ab3db7a23ee92382eb0106c72ac7bb
-}
-
-# Special characters in SSID, so use hex string. Default to WPA-PSK, WPA-EAP
-# and all valid ciphers.
-network={
-	ssid=00010203
-	psk=000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f
-}
-
-
-# IEEE 802.1X/EAPOL with dynamically generated WEP keys (i.e., no WPA) using
-# EAP-TLS for authentication and key generation; require both unicast and
-# broadcast WEP keys.
-network={
-	ssid="1x-test"
-	key_mgmt=IEEE8021X
-	eap=TLS
-	identity="user@example.com"
-	ca_cert="/etc/cert/ca.pem"
-	client_cert="/etc/cert/user.pem"
-	private_key="/etc/cert/user.prv"
-	private_key_passwd="password"
-	eapol_flags=3
-}
-
-
-# LEAP with dynamic WEP keys
-network={
-	ssid="leap-example"
-	key_mgmt=IEEE8021X
-	eap=LEAP
-	identity="user"
-	password="foobar"
-}
-
-# Plaintext connection (no WPA, no IEEE 802.1X)
-network={
-	ssid="plaintext-test"
-	key_mgmt=NONE
-}
-
-
-# Shared WEP key connection (no WPA, no IEEE 802.1X)
-network={
-	ssid="static-wep-test"
-	key_mgmt=NONE
-	wep_key0="abcde"
-	wep_key1=0102030405
-	wep_key2="1234567890123"
-	wep_tx_keyidx=0
-	priority=5
-}
-
-
-# Shared WEP key connection (no WPA, no IEEE 802.1X) using Shared Key
-# IEEE 802.11 authentication
-network={
-	ssid="static-wep-test2"
-	key_mgmt=NONE
-	wep_key0="abcde"
-	wep_key1=0102030405
-	wep_key2="1234567890123"
-	wep_tx_keyidx=0
-	priority=5
-	auth_alg=SHARED
-}
-
-
-# IBSS/ad-hoc network with WPA-None/TKIP.
-network={
-	ssid="test adhoc"
-	mode=1
-	proto=WPA
-	key_mgmt=WPA-NONE
-	pairwise=NONE
-	group=TKIP
-	psk="secret passphrase"
-}
-
-
-# Catch all example that allows more or less all configuration modes
-network={
-	ssid="example"
-	scan_ssid=1
-	key_mgmt=WPA-EAP WPA-PSK IEEE8021X NONE
-	pairwise=CCMP TKIP
-	group=CCMP TKIP WEP104 WEP40
-	psk="very secret passphrase"
-	eap=TTLS PEAP TLS
-	identity="user@example.com"
-	password="foobar"
-	ca_cert="/etc/cert/ca.pem"
-	client_cert="/etc/cert/user.pem"
-	private_key="/etc/cert/user.prv"
-	private_key_passwd="password"
-	phase1="peaplabel=0"
-}
-
-# Example of EAP-TLS with smartcard (openssl engine)
-network={
-	ssid="example"
-	key_mgmt=WPA-EAP
-	eap=TLS
-	proto=RSN
-	pairwise=CCMP TKIP
-	group=CCMP TKIP
-	identity="user@example.com"
-	ca_cert="/etc/cert/ca.pem"
-	client_cert="/etc/cert/user.pem"
-
-	engine=1
-
-	# The engine configured here must be available. Look at
-	# OpenSSL engine support in the global section.
-	# The key available through the engine must be the private key
-	# matching the client certificate configured above.
-
-	# use the opensc engine
-	#engine_id="opensc"
-	#key_id="45"
-
-	# use the pkcs11 engine
-	engine_id="pkcs11"
-	key_id="id_45"
-
-	# Optional PIN configuration; this can be left out and PIN will be
-	# asked through the control interface
-	pin="1234"
-}
-
-# Example configuration showing how to use an inlined blob as a CA certificate
-# data instead of using external file
-network={
-	ssid="example"
-	key_mgmt=WPA-EAP
-	eap=TTLS
-	identity="user@example.com"
-	anonymous_identity="anonymous@example.com"
-	password="foobar"
-	ca_cert="blob://exampleblob"
-	priority=20
-}
-
-blob-base64-exampleblob={
-SGVsbG8gV29ybGQhCg==
-}
-
-
-# Wildcard match for SSID (plaintext APs only). This example select any
-# open AP regardless of its SSID.
-network={
-	key_mgmt=NONE
-}
diff --git a/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf-sane b/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf-sane
deleted file mode 100644
index c91ffe0..0000000
--- a/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf-sane
+++ /dev/null
@@ -1,7 +0,0 @@
-ctrl_interface=/var/run/wpa_supplicant
-ctrl_interface_group=0
-update_config=1
-
-network={
-        key_mgmt=NONE
-}
diff --git a/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.6.bb b/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.6.bb
deleted file mode 100644
index afd0654..0000000
--- a/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.6.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require wpa-supplicant.inc
-
diff --git a/recipes-core/annex-client/annex-client-from-src.bb b/recipes-core/annex-client/annex-client-from-src.bb
deleted file mode 100644
index 3534f23..0000000
--- a/recipes-core/annex-client/annex-client-from-src.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "Provides the Multi-Tech MDM client"
-SECTION = "remote-management"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-PROVIDES = "annex-client-from-src"
-DEPENDS = "jsoncpp curl protobuf cyrus-sasl protobuf-native annex-proto mts-io"
-
-# IMPORTANT: if you change PR, you'll also want to change the url in annex-client.bb
-PR = "r1"
-SRCREV = "b954c83e155f95ecd68c14a890f9455331e19878"
-
-SRC_URI = "git://git@${MTS_INTERNAL_GIT}/multitech/annex-client.git;protocol=ssh;branch=master"
-
-S = "${WORKDIR}/git"
-
-do_compile() {
-    echo "directory: `pwd`"
-    mkdir -p annex_pb
-    cp ${STAGING_DIR_NATIVE}/annex.proto annex_pb/
-    make all CFLAGS+="-DMLINUX_BUILD"
-}
-
-# IMPORTANT NOTE:
-# this recipe is only used for the annex-client Jenkin's job to build IPK.
-# annex-client.bb is used to install the binary in an image
-do_install() {
-    oe_runmake install DESTDIR=${D} SUBDIRS="src"
-}
diff --git a/recipes-core/annex-client/annex-client.bb b/recipes-core/annex-client/annex-client.bb
deleted file mode 100644
index 83dd602..0000000
--- a/recipes-core/annex-client/annex-client.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-DESCRIPTION = "Provides the Multi-Tech MDM client"
-SECTION = "remote-management"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-PROVIDES = "annex-client"
-
-# NOTE: annex-client binary is built with Jenkin's job using annex-client-from-src.bb
-# To update this, manually copy ipk from Jenkin's job to .net/downloads/
-PR = "r3"
-ANNEX_PR = "r1"
-SRC_URI = "http://multitech.net/downloads/annex-client-from-src_1.0-${ANNEX_PR}.0_${TUNE_PKGARCH}.ipk \
-          file://annex-client.init \
-          file://monitor-annexcd \
-          file://call_home \
-          file://call_home.init \
-          file://config.json.sample \
-          file://push_api_mdm_connected \
-          file://push_api_mdm_status \
-"
-
-SRC_URI[md5sum] = "e180f4e569fbba2f5b9d524b5a9e944e"
-SRC_URI[sha256sum] = "1e93c65005c630cf211615dc143eb64f177591efcdbed6952142c7bac0e95988"
-
-#inherit update-rc.d
-#
-#INITSCRIPT_NAME = "annex-client"
-#INITSCRIPT_PARAMS = "defaults 95 1"
-S = "${WORKDIR}"
-
-DHQ_DIR="/opt/devicehq"
-
-do_install() {
-    install -d ${D}${sbindir}
-    install -m 755 sbin/annexcd ${D}${sbindir}
-
-    install -d ${D}/etc/ssl/certs
-    install -m 644 etc/ssl/certs/rootCA.pem ${D}/etc/ssl/certs
-
-    install -d ${D}${base_sbindir}
-    install -m 755 ${WORKDIR}/monitor-annexcd ${D}${base_sbindir}
-    install -m 755 ${WORKDIR}/call_home ${D}${base_sbindir}
-    install -m 755 ${WORKDIR}/push_api_mdm_connected ${D}${base_sbindir}
-    install -m 755 ${WORKDIR}/push_api_mdm_status ${D}${base_sbindir}
-
-    install -d ${D}${sysconfdir}/init.d
-    install -m 755 ${WORKDIR}/annex-client.init ${D}${sysconfdir}/init.d/annex-client
-    install -m 755 ${WORKDIR}/call_home.init ${D}${sysconfdir}/init.d/call_home
-
-    install -d ${D}${DHQ_DIR}
-    install -m 644 ${WORKDIR}/config.json.sample ${D}${DHQ_DIR}
-}
-
-FILES_${PN} += "${DHQ_DIR}"
diff --git a/recipes-core/annex-client/annex-client/annex-client.init b/recipes-core/annex-client/annex-client/annex-client.init
deleted file mode 100644
index 4a5dc4b..0000000
--- a/recipes-core/annex-client/annex-client/annex-client.init
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-MONITOR="/sbin/monitor-annexcd"
-CLIENT="annexcd"
-
-start() {
-    if [[ $(pidof -x $MONITOR) ]]; then
-        echo "RM client is already running"
-    else
-        echo "Starting RM client"
-        $MONITOR &
-    fi
-}
-
-stop() {
-    MONITOR_PID=$(pidof -x $MONITOR)
-    CLIENT_PID=$(pidof $CLIENT)
-    if [[ $MONITOR_PID ]]; then
-        echo "Stopping RM client"
-        kill $MONITOR_PID $CLIENT_PID
-    else
-        echo "RM client is not running"
-    fi
-}
-
-case "$1" in
-    start)
-        start
-        ;;
-    stop)
-        stop
-        ;;
-    restart)
-        stop
-        start
-        ;;
-    *)
-        echo "Usage: /etc/init.d/annex-client {start|stop|restart}" >&2
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/recipes-core/annex-client/annex-client/call_home b/recipes-core/annex-client/annex-client/call_home
deleted file mode 100755
index 64887ec..0000000
--- a/recipes-core/annex-client/annex-client/call_home
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/bin/bash
-#Attempt to gain a WAN connection for MDM Registration to query for this device's MDM account ID
-#PREREQ: Firewall allows outgoing DHCP requests and MDM Client connection
-
-CONFIG_FILE="/var/config/devicehq/config.json"
-STATUS_FILE="/var/config/devicehq/status.json"
-
-if [ ! -f $CONFIG_FILE ]; then
-    logger -t callhome "Config file missing!"
-    logger -t callhome "Do: mkdir /var/config/devicehq"
-    logger -t callhome "Then: cp /opt/devicehq/config.json.sample /var/config/devicehq/config.json"
-    exit 1
-fi
-
-JSON=$(cat $CONFIG_FILE)
-ENABLED=$( echo $JSON | jsparser -p /enabled )
-KEY=$( echo $JSON | jsparser -p /accountKey )
-MDM_URL=$( echo $JSON | jsparser -p /deviceHqUrl )
-
-if [ "$ENABLED" != "true" ]; then
-    logger -t callhome "Not calling home because DeviceHQ is disabled in /var/config/devicehq/config..json."
-    exit 1
-fi
-
-UUID=$(mts-io-sysfs show uuid)
-DEVID=$(mts-io-sysfs show device-id)
-
-
-MDM_REG_URL="$MDM_URL/api/v1/register-device"
-TMPFILE="/var/run/callhome"
-DONE=false
-FORCE=false
-WAN_AVAILABLE=true
-MAX_ATTEMPTS=0 #Infinite
-INTERVAL_SECONDS=30
-
-#Gather options from command line
-# Reset in case getopts has been used previously in the shell.
-OPTIND=1
-
-function show_help() {
-  echo "Usage: $0 -k <ACCOUNT KEY> -a <MAX ATTEMPTS> -i <INTERVAL SECONDS>"
-}
-
-while getopts "h?k:a:i:d:u:m:f" opt; do
-    case "$opt" in
-    h|\?)
-        show_help
-        exit 0
-        ;;
-    k)  KEY=$OPTARG
-        ;;
-    a)  MAX_ATTEMPTS=$OPTARG
-        ;;
-    a)  INTERVAL_SECONDS=$OPTARG
-        ;;
-    f)  FORCE=true
-        ;;
-    d)  DEVID=$OPTARG
-        ;;
-    u)  UUID=$OPTARG
-        ;;
-    m)  MDM_URL=$OPTARG
-        ;;
-    esac
-done
-
-shift $((OPTIND-1))
-
-[ "$1" = "--" ] && shift
-
-if [ "$FORCE" == "true" ]; then
-  DONE=false
-fi
-
-
-function checkCallHomeNeeded() {
-  if [ "$FORCE" != "true" ]; then
-    JSON=$(cat $CONFIG_FILE)
-    KEY=$( echo $JSON | jsparser -p /accountKey )
-
-    LAST_CONNECTED="unknown"
-    STATUS=""
-    if [ -f $STATUS_FILE ]; then
-      JSON=$(cat $STATUS_FILE)
-      LAST_CONNECTED=$( echo $JSON | jsparser -p /lastConnected )
-      STATUS=$( echo $JSON | jsparser -p /status )
-    fi
-
-    if [ "$KEY" != "" ] && [ $LAST_CONNECTED != "unknown" ] && [ $STATUS == "idle" ]; then
-      echo "Found that Call-Home Not Needed"
-      exit 0
-    fi
-  fi
-}
-
-function saveConfigs() {
-  logger -t callhome "Saving accountKey"
-
-  sed -i "s/\"accountKey\"\s*:\s*\".*\"/\"accountKey\": \"$KEY\"/" $CONFIG_FILE
-
-  if [ $? != 0 ]; then
-    logger -t callhome "Failed to add account key [$KEY] to $CONFIG_FILE"
-  fi
-}
-
-function checkForCheckIn() {
-
-  i=0
-  while [  $i -lt 10 ]; do
-    if [ -f $STATUS_FILE ]; then
-      JSON=$(cat $STATUS_FILE)
-      LAST_CONNECTED=$( echo $JSON | jsparser -p /lastConnected )
-      STATUS=$( echo $JSON | jsparser -p /status )
-      if [ "$LAST_CONNECTED" == "unknown" ] || [ $STATUS != "idle" ]; then
-        logger -t callhome "MDM client has not checked-in yet"
-      else
-        logger -t callhome "SUCCESS! MDM Client has checked-in."
-        DONE=true
-        return
-      fi
-    else
-      logger -t callhome "MDM client has not checked-in yet"
-    fi
-
-    let i=i+1
-    logger -t callhome "Sleeping for 30 seconds."
-    sleep 30
-  done
-
-}
-
-function attemptMdmRegistration() {
-
-  logger -t callhome "Attempting to register with MDM"
-  CODE=$( curl -m 20 -ks -o $TMPFILE -w "%{http_code}" -X POST -H "Content-Type: application/json" \
-            -d '{ "device_id" : "'$DEVID'", "uuid" : "'$UUID'"  }' \
-            $MDM_REG_URL )
-
-  if [ $? == 0 ]; then
-    if [ "$CODE" == "200" ]; then
-      logger -t callhome "Registered with MDM.  Checking for Account Key"
-
-      #Request returned 200
-      KEY=$( cat $TMPFILE | jsparser -p /account_key )
-      if [ $? == 0 ]; then
-        if [ "$KEY" != "" ]; then
-          logger -t callhome "Received Account Key! [$KEY]"
-          saveConfigs
-          /etc/init.d/annex-client start
-          checkForCheckIn
-        else
-          logger -t callhome "Account Key not returned.  This device may not be registered with a user account"
-        fi
-      else
-        RESULT=$(cat $TMPFILE)
-        logger -t callhome "Error: Unexpected MDM Registration Server response: $RESULT"
-      fi
-    else
-      RESULT=$(cat $TMPFILE)
-      logger -t callhome "Error: MDM Registration Failed with Device ID [$DEVID] and UUID [$UUID]"
-      logger -t callhome "Error: MDM Registration Server Response Header Code: $CODE"
-      logger -t callhome "Error: MDM Registration Server Response Body Content: $RESULT"
-    fi
-  else
-    logger -t callhome "Warning: Could not connect to MDM server: $MDM_REG_URL"
-  fi
-}
-
-logger -t callhome "Setting Up Call-Home "
-COUNT=0
-
-while [ $DONE == false ]; do
-  logger -t callhome "Attempts: $COUNT"
-
-  checkCallHomeNeeded
-
-  attemptMdmRegistration
-
-  COUNT=$(($COUNT+1))
-  if [ $MAX_ATTEMPTS != 0 ] && [ $COUNT -gt $MAX_ATTEMPTS ]; then
-    DONE=true
-    logger -t callhome "Reached Maximum Attempts [$MAX_ATTEMPTS]"
-  fi
-
-  if [ $DONE == false ]; then
-    logger -t callhome "Sleeping for $INTERVAL_SECONDS seconds before next attempt"
-    sleep $INTERVAL_SECONDS
-  fi
-
-done
-
diff --git a/recipes-core/annex-client/annex-client/call_home.init b/recipes-core/annex-client/annex-client/call_home.init
deleted file mode 100755
index b874565..0000000
--- a/recipes-core/annex-client/annex-client/call_home.init
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-CALLHOME="/sbin/call_home"
-
-start() {
-    if [[ $(pidof $CALLHOME) ]]; then
-        echo "Call-Home Service is already running"
-    else
-        echo "Starting Call-Home Service"
-        $CALLHOME &
-    fi
-}
-
-stop() {
-    CALLHOME_PID=$(pidof -x $CALLHOME)
-    if [[ $CALLHOME_PID ]]; then
-        echo "Stopping Call-Home Service"
-        kill $CALLHOME_PID
-    else
-        echo "Call-Home Service is not running"
-    fi
-}
-
-case "$1" in
-    start)
-        start
-        ;;
-    stop)
-        stop
-        ;;
-    restart)
-        stop
-        start
-        ;;
-    *)
-        echo "Usage: /etc/init.d/call_home {start|stop|restart}" >&2
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/recipes-core/annex-client/annex-client/config.json.sample b/recipes-core/annex-client/annex-client/config.json.sample
deleted file mode 100644
index 5e83c64..0000000
--- a/recipes-core/annex-client/annex-client/config.json.sample
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "enabled": true,
-  "accountKey": "",
-  "deviceHqUrl": "https://www.devicehq.com",
-  "deviceServerUrl": "ds.devicehq.com",
-  "checkInIntervalMins": 720,
-  "gpsDataIntervalMins": 720,
-  "allowFirmwareUpgrade": true,
-  "allowConfigUpgrade": false
-}
diff --git a/recipes-core/annex-client/annex-client/monitor-annexcd b/recipes-core/annex-client/annex-client/monitor-annexcd
deleted file mode 100755
index 21d5a6b..0000000
--- a/recipes-core/annex-client/annex-client/monitor-annexcd
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-CONFIG_FILE="/var/config/devicehq/config.json"
-
-if [ ! -f $CONFIG_FILE ]; then
-    logger -t monitor-annexcd "Config file missing!"
-    logger -t monitor-annexcd "Do: mkdir /var/config/devicehq"
-    logger -t monitor-annexcd "Then: cp /opt/devicehq/config.json.sample /var/config/devicehq/config.json"
-    logger -t monitor-annexcd "Exiting..."
-    exit 1
-fi
-
-DEVICE_ID=$(mts-io-sysfs show device-id)
-PRODUCT_ID=$(mts-io-sysfs show product-id)
-
-get_args() {
-    JSON=$(cat $CONFIG_FILE)
-
-    ENABLED=$(       echo $JSON | jsparser -p enabled )
-    KEY=$(           echo $JSON | jsparser -p accountKey )
-    SERVER=$(        echo $JSON | jsparser -p deviceServerUrl )
-    PORT=5798
-    QUERY_INT=$(     echo $JSON | jsparser -p checkInIntervalMins )
-    GPS_INT=$(       echo $JSON | jsparser -p gpsDataIntervalMins )
-    FW_UPGRADE=$(    echo $JSON | jsparser -p allowFirmwareUpgrade )
-    CONFIG_UPGRADE=$(echo $JSON | jsparser -p allowConfigUpgrade )
-}
-
-
-get_args
-
-if [ "$KEY" == "" ]; then
-    logger -t monitor-annexcd "Account key missing in $CONFIG_FILE"
-    logger -t monitor-annexcd "Exiting..."
-    exit 1
-fi
-
-MIN_TO_MS=60000
-
-if [[ $ENABLED == "true" ]]; then
-    ANNEXCD="annexcd --account-key $KEY --host $SERVER --port $PORT --product-id $PRODUCT_ID --device-id $DEVICE_ID --rpd-interval $(( $QUERY_INT * $MIN_TO_MS )) --gps-interval $(( $GPS_INT * $MIN_TO_MS )) --net-interval $(( $QUERY_INT * $MIN_TO_MS )) --cell-interval $(( $QUERY_INT * $MIN_TO_MS )) --active-apps-interval $(( $QUERY_INT * $MIN_TO_MS )) --lora-interval $(( $QUERY_INT * $MIN_TO_MS )) --when-ppp-up on --firmware-upgrade $FW_UPGRADE --config-upgrade $CONFIG_UPGRADE --ssl-method ssl --ssl-ca-certificate /etc/ssl/certs/rootCA.pem --ssl-ca-strict --log-upto 7"
-    until $ANNEXCD; do
-        echo "annexcd exited with status $? - restarting..." >&2
-        sleep 1
-    done
-fi
diff --git a/recipes-core/annex-client/annex-client/push_api_mdm_connected b/recipes-core/annex-client/annex-client/push_api_mdm_connected
deleted file mode 100755
index ec8a23d..0000000
--- a/recipes-core/annex-client/annex-client/push_api_mdm_connected
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-# This script pushes the current time to the API's remote management
-# to track last connected time
-
-STATUS_FILE="/var/config/devicehq/status.json"
-DHQ_DIR="/var/config/devicehq"
-
-LAST_CONNECTED=$(date +%m/%d/%Y/%H:%M:%S)
-INTERVAL=""
-
-# Reset in case getopts has been used previously in the shell.
-OPTIND=1
-
-function show_help() {
-  echo "Usage: $0 -t <TIME OF CONNECTION> -i <INTERVAL SECONDS>"
-}
-
-while getopts "h?t:i:" opt; do
-    case "$opt" in
-    h|\?)
-        show_help
-        exit 0
-        ;;
-    t)  LAST_CONNECTED=$OPTARG
-        ;;
-    i)  INTERVAL=$OPTARG
-        ;;
-    esac
-done
-
-shift $((OPTIND-1))
-[ "$1" = "--" ] && shift
-
-if [ ! -f $STATUS_FILE ]; then
-    mkdir -p $DHQ_DIR
-    echo "{
-  \"status\": \"unknown\",
-  \"lastConnected\": \"unknown\",
-  \"intervalSeconds\": \"10\"
-}" > $STATUS_FILE
-fi
-
-
-sed -i "s~\"lastConnected\"\s*:\s*\".*\"~\"lastConnected\": \"$LAST_CONNECTED\"~" $STATUS_FILE
-
-if [ $? != 0 ]; then
-  logger -t push_api_mdm_connected "Failed to save lastConnected [$LAST_CONNECTED] to $STATUS_FILE"
-fi
-
-
-if [ "$INTERVAL" != "" ]; then
-  sed -i "s/\"intervalSeconds\"\s*:\s*\".*\"/\"intervalSeconds\": \"$INTERVAL\"/" $STATUS_FILE
-
-  if [ $? != 0 ]; then
-    logger -t push_api_mdm_connected "Failed to save intervalSeconds [$INTERVAL] to $STATUS_FILE"
-  fi
-fi
-
-
diff --git a/recipes-core/annex-client/annex-client/push_api_mdm_status b/recipes-core/annex-client/annex-client/push_api_mdm_status
deleted file mode 100755
index cf91eda..0000000
--- a/recipes-core/annex-client/annex-client/push_api_mdm_status
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-# This script pushes the current time to the API's remote management
-# to track last connected time
-
-STATUS_FILE="/var/config/devicehq/status.json"
-DHQ_DIR="/var/config/devicehq"
-
-STATUS="$1"
-
-if [ "$STATUS" == "" ]; then
-  STATUS="HEARTBEAT: $(date)"
-fi
-
-if [ ! -f $STATUS_FILE ]; then
-    mkdir -p $DHQ_DIR
-    echo "{
-  \"status\": \"unknown\",
-  \"lastConnected\": \"unknown\",
-  \"intervalSeconds\": \"10\"
-}" > $STATUS_FILE
-fi
-
-sed -i "s~\"status\"\s*:\s*\".*\"~\"status\": \"$STATUS\"~" $STATUS_FILE
-
-if [ $? != 0 ]; then
-  logger -t push_api_mdm_status "Failed to save status [$STATUS] to $STATUS_FILE"
-fi
-
-
-
diff --git a/recipes-core/annex-proto/annex-proto.bb b/recipes-core/annex-proto/annex-proto.bb
deleted file mode 100644
index cbb6fb2..0000000
--- a/recipes-core/annex-proto/annex-proto.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Provides the Multi-Tech MDM client protobuffer definitions"
-SECTION = "remote-management"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-PR = "r20"
-PROVIDES = "annex_proto"
-DEPENDS = "protobuf"
-SRCREV = "7ad3f17a59d3fe564da099518310d61ad1304913"
-
-SRC_URI = "git://git@${MTS_INTERNAL_GIT}/annex/proto.git;protocol=ssh;branch=master \
-"
-S = "${WORKDIR}/git"
-
-# don't use cli here
-do_compile() {
-    echo "directory: `pwd`"
-}
-
-do_install() {
-    install annex.proto ${STAGING_DIR_NATIVE}
-}
-
-
-
diff --git a/recipes-core/base-files/base-files/mlinux/issue b/recipes-core/base-files/base-files/mlinux/issue
deleted file mode 100644
index 9de31d4..0000000
--- a/recipes-core/base-files/base-files/mlinux/issue
+++ /dev/null
@@ -1,7 +0,0 @@
-            _     _                  
-  _ __ ___ | |   (_)_ __  _   ___  __
- | '_ ` _ \\| |   | | '_ \\| | | \\ \\/ /
- | | | | | | |___| | | | | |_| |>  < 
- |_| |_| |_|_____|_|_| |_|\\__,_/_/\\_\\
-                                     
-MultiTech Systems mLinux GNU/Linux
diff --git a/recipes-core/base-files/base-files/mlinux/issue.net b/recipes-core/base-files/base-files/mlinux/issue.net
deleted file mode 100644
index efd075c..0000000
--- a/recipes-core/base-files/base-files/mlinux/issue.net
+++ /dev/null
@@ -1,7 +0,0 @@
-            _     _                  
-  _ __ ___ | |   (_)_ __  _   ___  __
- | '_ ` _ \| |   | | '_ \| | | \ \/ /
- | | | | | | |___| | | | | |_| |>  < 
- |_| |_| |_|_____|_|_| |_|\__,_/_/\_\
-                                     
-Multi-Tech Systems mLinux GNU/Linux
diff --git a/recipes-core/base-files/base-files_3.0.14.bbappend b/recipes-core/base-files/base-files_3.0.14.bbappend
deleted file mode 100644
index d7431ad..0000000
--- a/recipes-core/base-files/base-files_3.0.14.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PR = "m1"
-
-do_install_append() {
-   if [ -d ${D}/media ] ; then
-     rmdir ${D}/media  # So the next line does not nest the media link inside of media
-   fi
-   ln -snf /run/media ${D}/media
-}
diff --git a/recipes-core/base-files/base-files/mlinux/fstab b/recipes-core/base-files/fstab-at91/fstab
index 8922faf..8922faf 100644
--- a/recipes-core/base-files/base-files/mlinux/fstab
+++ b/recipes-core/base-files/fstab-at91/fstab
diff --git a/recipes-core/base-files/fstab-at91_1.0.bb b/recipes-core/base-files/fstab-at91_1.0.bb
new file mode 100644
index 0000000..cd2102a
--- /dev/null
+++ b/recipes-core/base-files/fstab-at91_1.0.bb
@@ -0,0 +1,17 @@
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+inherit allarch
+PR = "r1"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+PROVIDES = "fstab"
+DEPENDS = "base-files"
+RDEPENDS_${PN} = "base-files"
+
+SRC_URI = "file://fstab"
+
+FILES_${PN} = "${sysconfdir}/fstab"
+
+do_install() {
+	install -d ${D}${sysconfdir}
+	install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}
+}
diff --git a/recipes-core/busybox/busybox_%.bbappend b/recipes-core/busybox/busybox_%.bbappend
deleted file mode 100644
index 6ead22b..0000000
--- a/recipes-core/busybox/busybox_%.bbappend
+++ /dev/null
@@ -1,53 +0,0 @@
-PR .= ".mlinux4"
-PACKAGES =+ "busybox-ifplugd"
-FILESEXTRAPATHS_prepend := ":${THISDIR}/files:"
-RDEPENDS_${PN} += "bash"
-
-SRC_URI += "file://udhcpd.conf.example \
-            file://ifplugd.action \
-            file://ifplugd.default \
-            file://ifplugd.init \
-            file://eth0.conf \
-            file://eth1.conf.example \
-            file://ifplugd.patch \
-"
-
-do_install_append () {
-	install -m 644 ${WORKDIR}/udhcpd.conf.example ${D}${sysconfdir}/udhcpd.conf.example
-	install -m 600 ${WORKDIR}/udhcpd.conf.example ${D}${sysconfdir}/udhcpd.conf
-        install -d -m 755 ${D}${sysconfdir}/init.d
-        install -d -m 755 ${D}${sysconfdir}/ifplugd
-        install -d -m 755 ${D}${sysconfdir}/default
-        install -m 755 ${WORKDIR}/ifplugd.init ${D}${sysconfdir}/init.d/ifplugd
-        install -m 755 ${WORKDIR}/ifplugd.default ${D}${sysconfdir}/default/ifplugd
-        install -m 755 ${WORKDIR}/ifplugd.action ${D}${sysconfdir}/ifplugd
-        install -m 755 ${WORKDIR}/eth0.conf ${D}${sysconfdir}/ifplugd
-        install -m 644 ${WORKDIR}/eth1.conf.example ${D}${sysconfdir}/ifplugd
-}
-
-RDEPENDS_${PN}-ifplugd += "bash"
-# PACKAGES =+ "${PN}-ifplugd"
-inherit update-rc.d
-INITSCRIPT_PACKAGES += "${PN}-ifplugd"
-INITSCRIPT_NAME_${PN}-ifplugd = "ifplugd"
-INITSCRIPT_PARAMS_${PN}-ifplugd = "defaults 3"
-
-FILES_${PN}-ifplugd = "${sysconfdir}/ifplugd/eth0.conf \
-               ${sysconfdir}/ifplugd/eth1.conf.example \
-               ${sysconfdir}/ifplugd/ifplugd.action \
-               ${sysconfdir}/default/ifplugd \
-               ${sysconfdir}/init.d/ifplugd \
-               "
-
-FILES_${PN}-udhcpc =+ "${sysconfidir}/udhcpd.conf \
-                       ${sysconfidir}/udhcpd.conf.example \
-                      "
-
-
-CONFFILES_${PN}-ifplugd = "${sysconfdir}/ifplugd/eth0.conf \
-               ${sysconfdir}/ifplugd/ifplugd.action \
-               ${sysconfdir}/default/ifplugd \
-               ${sysconfidir}/udhcpd.conf \
-               "
-
-CONFFILES_${PN}-udhcpc =+ "${sysconfidir}/udhcpd.conf"
diff --git a/recipes-core/busybox/files/defconfig b/recipes-core/busybox/files/defconfig
deleted file mode 100644
index a24c108..0000000
--- a/recipes-core/busybox/files/defconfig
+++ /dev/null
@@ -1,1020 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Busybox version: 1.20.2
-# Mon Aug 20 17:01:45 2012
-#
-CONFIG_HAVE_DOT_CONFIG=y
-
-#
-# Busybox Settings
-#
-
-#
-# General Configuration
-#
-# CONFIG_DESKTOP is not set
-# CONFIG_EXTRA_COMPAT is not set
-# CONFIG_INCLUDE_SUSv2 is not set
-# CONFIG_USE_PORTABLE_CODE is not set
-CONFIG_PLATFORM_LINUX=y
-CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-CONFIG_SHOW_USAGE=y
-CONFIG_FEATURE_VERBOSE_USAGE=y
-CONFIG_FEATURE_COMPRESS_USAGE=y
-# CONFIG_FEATURE_INSTALLER is not set
-# CONFIG_INSTALL_NO_USR is not set
-# CONFIG_LOCALE_SUPPORT is not set
-# CONFIG_UNICODE_SUPPORT is not set
-# CONFIG_UNICODE_USING_LOCALE is not set
-# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
-CONFIG_SUBST_WCHAR=0
-CONFIG_LAST_SUPPORTED_WCHAR=0
-# CONFIG_UNICODE_COMBINING_WCHARS is not set
-# CONFIG_UNICODE_WIDE_WCHARS is not set
-# CONFIG_UNICODE_BIDI_SUPPORT is not set
-# CONFIG_UNICODE_NEUTRAL_TABLE is not set
-# CONFIG_UNICODE_PRESERVE_BROKEN is not set
-CONFIG_LONG_OPTS=y
-CONFIG_FEATURE_DEVPTS=y
-# CONFIG_FEATURE_CLEAN_UP is not set
-CONFIG_FEATURE_UTMP=y
-# CONFIG_FEATURE_WTMP is not set
-CONFIG_FEATURE_PIDFILE=y
-CONFIG_FEATURE_SUID=y
-CONFIG_FEATURE_SUID_CONFIG=y
-CONFIG_FEATURE_SUID_CONFIG_QUIET=y
-# CONFIG_SELINUX is not set
-# CONFIG_FEATURE_PREFER_APPLETS is not set
-CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
-CONFIG_FEATURE_SYSLOG=y
-CONFIG_FEATURE_HAVE_RPC=y
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-# CONFIG_PIE is not set
-# CONFIG_NOMMU is not set
-# CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_INDIVIDUAL is not set
-# CONFIG_FEATURE_SHARED_BUSYBOX is not set
-CONFIG_LFS=y
-# CONFIG_CROSS_COMPILER_PREFIX is not set
-CONFIG_SYSROOT=""
-# CONFIG_EXTRA_CFLAGS is not set
-CONFIG_EXTRA_LDFLAGS=""
-CONFIG_EXTRA_LDLIBS=""
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_DEBUG_PESSIMIZE is not set
-# CONFIG_WERROR is not set
-CONFIG_NO_DEBUG_LIB=y
-# CONFIG_DMALLOC is not set
-# CONFIG_EFENCE is not set
-
-#
-# Installation Options ("make install" behavior)
-#
-CONFIG_INSTALL_APPLET_SYMLINKS=y
-# CONFIG_INSTALL_APPLET_HARDLINKS is not set
-# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
-# CONFIG_INSTALL_APPLET_DONT is not set
-# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
-# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
-# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
-CONFIG_PREFIX="./_install"
-
-#
-# Busybox Library Tuning
-#
-CONFIG_FEATURE_SYSTEMD=y
-CONFIG_FEATURE_RTMINMAX=y
-CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SMALL=1
-CONFIG_FEATURE_FAST_TOP=y
-# CONFIG_FEATURE_ETC_NETWORKS is not set
-CONFIG_FEATURE_USE_TERMIOS=y
-CONFIG_FEATURE_EDITING=y
-CONFIG_FEATURE_EDITING_MAX_LEN=1024
-# CONFIG_FEATURE_EDITING_VI is not set
-CONFIG_FEATURE_EDITING_HISTORY=64
-CONFIG_FEATURE_EDITING_SAVEHISTORY=y
-# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set
-# CONFIG_FEATURE_REVERSE_SEARCH is not set
-CONFIG_FEATURE_TAB_COMPLETION=y
-CONFIG_FEATURE_USERNAME_COMPLETION=y
-CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
-# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
-CONFIG_FEATURE_NON_POSIX_CP=y
-CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
-CONFIG_FEATURE_COPYBUF_KB=4
-CONFIG_FEATURE_SKIP_ROOTFS=y
-CONFIG_MONOTONIC_SYSCALL=y
-CONFIG_IOCTL_HEX2STR_ERROR=y
-CONFIG_FEATURE_HWIB=y
-
-#
-# Applets
-#
-
-#
-# Archival Utilities
-#
-CONFIG_FEATURE_SEAMLESS_XZ=y
-CONFIG_FEATURE_SEAMLESS_LZMA=y
-CONFIG_FEATURE_SEAMLESS_BZ2=y
-CONFIG_FEATURE_SEAMLESS_GZ=y
-CONFIG_FEATURE_SEAMLESS_Z=y
-CONFIG_AR=y
-# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
-CONFIG_FEATURE_AR_CREATE=y
-CONFIG_BUNZIP2=y
-CONFIG_BZIP2=y
-CONFIG_CPIO=y
-# CONFIG_FEATURE_CPIO_O is not set
-# CONFIG_FEATURE_CPIO_P is not set
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-CONFIG_GUNZIP=y
-CONFIG_GZIP=y
-CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
-CONFIG_GZIP_FAST=0
-CONFIG_LZOP=y
-# CONFIG_LZOP_COMPR_HIGH is not set
-# CONFIG_RPM2CPIO is not set
-# CONFIG_RPM is not set
-CONFIG_TAR=y
-CONFIG_FEATURE_TAR_CREATE=y
-CONFIG_FEATURE_TAR_AUTODETECT=y
-CONFIG_FEATURE_TAR_FROM=y
-CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
-# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
-CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-CONFIG_FEATURE_TAR_LONG_OPTIONS=y
-CONFIG_FEATURE_TAR_TO_COMMAND=y
-CONFIG_FEATURE_TAR_UNAME_GNAME=y
-CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
-# CONFIG_FEATURE_TAR_SELINUX is not set
-# CONFIG_UNCOMPRESS is not set
-# CONFIG_UNLZMA is not set
-# CONFIG_FEATURE_LZMA_FAST is not set
-# CONFIG_LZMA is not set
-CONFIG_UNXZ=y
-CONFIG_XZ=y
-CONFIG_UNZIP=y
-
-#
-# Coreutils
-#
-CONFIG_BASENAME=y
-CONFIG_CAT=y
-CONFIG_DATE=y
-CONFIG_FEATURE_DATE_ISOFMT=y
-# CONFIG_FEATURE_DATE_NANO is not set
-CONFIG_FEATURE_DATE_COMPAT=y
-# CONFIG_HOSTID is not set
-CONFIG_ID=y
-CONFIG_GROUPS=y
-CONFIG_TEST=y
-CONFIG_FEATURE_TEST_64=y
-CONFIG_TOUCH=y
-CONFIG_FEATURE_TOUCH_SUSV3=y
-CONFIG_TR=y
-CONFIG_FEATURE_TR_CLASSES=y
-# CONFIG_FEATURE_TR_EQUIV is not set
-CONFIG_BASE64=y
-CONFIG_WHO=y
-CONFIG_USERS=y
-# CONFIG_CAL is not set
-# CONFIG_CATV is not set
-CONFIG_CHGRP=y
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
-CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
-CONFIG_CHROOT=y
-# CONFIG_CKSUM is not set
-# CONFIG_COMM is not set
-CONFIG_CP=y
-CONFIG_FEATURE_CP_LONG_OPTIONS=y
-CONFIG_CUT=y
-CONFIG_DD=y
-CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
-CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
-# CONFIG_FEATURE_DD_IBS_OBS is not set
-CONFIG_DF=y
-CONFIG_FEATURE_DF_FANCY=y
-CONFIG_DIRNAME=y
-# CONFIG_DOS2UNIX is not set
-# CONFIG_UNIX2DOS is not set
-CONFIG_DU=y
-CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
-CONFIG_ECHO=y
-CONFIG_FEATURE_FANCY_ECHO=y
-CONFIG_ENV=y
-CONFIG_FEATURE_ENV_LONG_OPTIONS=y
-# CONFIG_EXPAND is not set
-# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
-CONFIG_EXPR=y
-CONFIG_EXPR_MATH_SUPPORT_64=y
-CONFIG_FALSE=y
-# CONFIG_FOLD is not set
-CONFIG_FSYNC=y
-CONFIG_HEAD=y
-CONFIG_FEATURE_FANCY_HEAD=y
-# CONFIG_INSTALL is not set
-# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
-CONFIG_LN=y
-CONFIG_LOGNAME=y
-CONFIG_LS=y
-CONFIG_FEATURE_LS_FILETYPES=y
-CONFIG_FEATURE_LS_FOLLOWLINKS=y
-CONFIG_FEATURE_LS_RECURSIVE=y
-CONFIG_FEATURE_LS_SORTFILES=y
-CONFIG_FEATURE_LS_TIMESTAMPS=y
-CONFIG_FEATURE_LS_USERNAME=y
-CONFIG_FEATURE_LS_COLOR=y
-# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
-CONFIG_MD5SUM=y
-CONFIG_MKDIR=y
-CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
-CONFIG_MKFIFO=y
-CONFIG_MKNOD=y
-CONFIG_MV=y
-CONFIG_FEATURE_MV_LONG_OPTIONS=y
-CONFIG_NICE=y
-CONFIG_NOHUP=y
-CONFIG_OD=y
-# CONFIG_PRINTENV is not set
-CONFIG_PRINTF=y
-CONFIG_PWD=y
-CONFIG_READLINK=y
-CONFIG_FEATURE_READLINK_FOLLOW=y
-CONFIG_REALPATH=y
-CONFIG_RM=y
-CONFIG_RMDIR=y
-CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y
-CONFIG_SEQ=y
-# CONFIG_SHA1SUM is not set
-CONFIG_SHA256SUM=y
-CONFIG_SHA512SUM=y
-CONFIG_SLEEP=y
-CONFIG_FEATURE_FANCY_SLEEP=y
-CONFIG_FEATURE_FLOAT_SLEEP=y
-CONFIG_SORT=y
-CONFIG_FEATURE_SORT_BIG=y
-# CONFIG_SPLIT is not set
-# CONFIG_FEATURE_SPLIT_FANCY is not set
-CONFIG_STAT=y
-CONFIG_FEATURE_STAT_FORMAT=y
-CONFIG_STTY=y
-# CONFIG_SUM is not set
-CONFIG_SYNC=y
-# CONFIG_TAC is not set
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-CONFIG_TEE=y
-CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
-CONFIG_TRUE=y
-CONFIG_TTY=y
-CONFIG_UNAME=y
-# CONFIG_UNEXPAND is not set
-# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
-CONFIG_UNIQ=y
-CONFIG_USLEEP=y
-# CONFIG_UUDECODE is not set
-# CONFIG_UUENCODE is not set
-CONFIG_WC=y
-# CONFIG_FEATURE_WC_LARGE is not set
-CONFIG_WHOAMI=y
-CONFIG_YES=y
-
-#
-# Common options for cp and mv
-#
-# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
-
-#
-# Common options for ls, more and telnet
-#
-CONFIG_FEATURE_AUTOWIDTH=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
-#
-# Common options for md5sum, sha1sum, sha256sum, sha512sum
-#
-CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
-
-#
-# Console Utilities
-#
-CONFIG_CHVT=y
-# CONFIG_FGCONSOLE is not set
-CONFIG_CLEAR=y
-CONFIG_DEALLOCVT=y
-CONFIG_DUMPKMAP=y
-# CONFIG_KBD_MODE is not set
-CONFIG_LOADFONT=y
-CONFIG_LOADKMAP=y
-CONFIG_OPENVT=y
-CONFIG_RESET=y
-# CONFIG_RESIZE is not set
-# CONFIG_FEATURE_RESIZE_PRINT is not set
-CONFIG_SETCONSOLE=y
-# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
-# CONFIG_SETFONT is not set
-# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
-CONFIG_DEFAULT_SETFONT_DIR=""
-# CONFIG_SETKEYCODES is not set
-# CONFIG_SETLOGCONS is not set
-# CONFIG_SHOWKEY is not set
-
-#
-# Common options for loadfont and setfont
-#
-# CONFIG_FEATURE_LOADFONT_PSF2 is not set
-# CONFIG_FEATURE_LOADFONT_RAW is not set
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-# CONFIG_PIPE_PROGRESS is not set
-CONFIG_RUN_PARTS=y
-CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
-CONFIG_FEATURE_RUN_PARTS_FANCY=y
-CONFIG_START_STOP_DAEMON=y
-CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
-CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
-CONFIG_WHICH=y
-
-#
-# Editors
-#
-CONFIG_PATCH=y
-CONFIG_VI=y
-CONFIG_FEATURE_VI_MAX_LEN=1024
-CONFIG_FEATURE_VI_8BIT=y
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-CONFIG_FEATURE_VI_REGEX_SEARCH=y
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-CONFIG_FEATURE_VI_DOT_CMD=y
-# CONFIG_FEATURE_VI_READONLY is not set
-CONFIG_FEATURE_VI_SETOPTS=y
-CONFIG_FEATURE_VI_SET=y
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_ASK_TERMINAL=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-CONFIG_AWK=y
-CONFIG_FEATURE_AWK_LIBM=y
-CONFIG_CMP=y
-CONFIG_DIFF=y
-CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
-CONFIG_FEATURE_DIFF_DIR=y
-# CONFIG_ED is not set
-CONFIG_SED=y
-CONFIG_FEATURE_ALLOW_EXEC=y
-
-#
-# Finding Utilities
-#
-CONFIG_FIND=y
-CONFIG_FEATURE_FIND_PRINT0=y
-CONFIG_FEATURE_FIND_MTIME=y
-CONFIG_FEATURE_FIND_MMIN=y
-CONFIG_FEATURE_FIND_PERM=y
-CONFIG_FEATURE_FIND_TYPE=y
-CONFIG_FEATURE_FIND_XDEV=y
-CONFIG_FEATURE_FIND_MAXDEPTH=y
-CONFIG_FEATURE_FIND_NEWER=y
-CONFIG_FEATURE_FIND_INUM=y
-CONFIG_FEATURE_FIND_EXEC=y
-CONFIG_FEATURE_FIND_USER=y
-CONFIG_FEATURE_FIND_GROUP=y
-CONFIG_FEATURE_FIND_NOT=y
-CONFIG_FEATURE_FIND_DEPTH=y
-CONFIG_FEATURE_FIND_PAREN=y
-CONFIG_FEATURE_FIND_SIZE=y
-CONFIG_FEATURE_FIND_PRUNE=y
-CONFIG_FEATURE_FIND_DELETE=y
-CONFIG_FEATURE_FIND_PATH=y
-CONFIG_FEATURE_FIND_REGEX=y
-# CONFIG_FEATURE_FIND_CONTEXT is not set
-CONFIG_FEATURE_FIND_LINKS=y
-CONFIG_GREP=y
-CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-CONFIG_FEATURE_GREP_FGREP_ALIAS=y
-CONFIG_FEATURE_GREP_CONTEXT=y
-CONFIG_XARGS=y
-# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
-CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
-CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
-CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
-
-#
-# Init Utilities
-#
-# CONFIG_BOOTCHARTD is not set
-# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
-# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
-CONFIG_HALT=y
-# CONFIG_FEATURE_CALL_TELINIT is not set
-CONFIG_TELINIT_PATH=""
-# CONFIG_INIT is not set
-# CONFIG_FEATURE_USE_INITTAB is not set
-# CONFIG_FEATURE_KILL_REMOVED is not set
-CONFIG_FEATURE_KILL_DELAY=0
-# CONFIG_FEATURE_INIT_SCTTY is not set
-# CONFIG_FEATURE_INIT_SYSLOG is not set
-# CONFIG_FEATURE_EXTRA_QUIET is not set
-# CONFIG_FEATURE_INIT_COREDUMPS is not set
-# CONFIG_FEATURE_INITRD is not set
-CONFIG_INIT_TERMINAL_TYPE=""
-# CONFIG_MESG is not set
-# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
-
-#
-# Login/Password Management Utilities
-#
-# CONFIG_ADD_SHELL is not set
-# CONFIG_REMOVE_SHELL is not set
-# CONFIG_FEATURE_SHADOWPASSWDS is not set
-# CONFIG_USE_BB_PWD_GRP is not set
-# CONFIG_USE_BB_SHADOW is not set
-CONFIG_USE_BB_CRYPT=y
-# CONFIG_USE_BB_CRYPT_SHA is not set
-# CONFIG_ADDUSER is not set
-# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
-# CONFIG_FEATURE_CHECK_NAMES is not set
-CONFIG_FIRST_SYSTEM_ID=100
-CONFIG_LAST_SYSTEM_ID=999
-# CONFIG_ADDGROUP is not set
-# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
-# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
-# CONFIG_DELUSER is not set
-# CONFIG_DELGROUP is not set
-# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
-# CONFIG_GETTY is not set
-# CONFIG_LOGIN is not set
-# CONFIG_LOGIN_SESSION_AS_CHILD is not set
-# CONFIG_PAM is not set
-# CONFIG_LOGIN_SCRIPTS is not set
-# CONFIG_FEATURE_NOLOGIN is not set
-# CONFIG_FEATURE_SECURETTY is not set
-# CONFIG_PASSWD is not set
-# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
-# CONFIG_CRYPTPW is not set
-# CONFIG_CHPASSWD is not set
-CONFIG_FEATURE_DEFAULT_PASSWD_ALGO=""
-# CONFIG_SU is not set
-# CONFIG_FEATURE_SU_SYSLOG is not set
-# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
-# CONFIG_SULOGIN is not set
-# CONFIG_VLOCK is not set
-
-#
-# Linux Ext2 FS Progs
-#
-CONFIG_CHATTR=y
-CONFIG_FSCK=y
-# CONFIG_LSATTR is not set
-# CONFIG_TUNE2FS is not set
-
-#
-# Linux Module Utilities
-#
-# CONFIG_MODINFO is not set
-# CONFIG_MODPROBE_SMALL is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
-CONFIG_INSMOD=y
-CONFIG_RMMOD=y
-CONFIG_LSMOD=y
-# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
-CONFIG_MODPROBE=y
-# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
-CONFIG_DEPMOD=y
-
-#
-# Options common to multiple modutils
-#
-# CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-CONFIG_FEATURE_MODUTILS_ALIAS=y
-CONFIG_FEATURE_MODUTILS_SYMBOLS=y
-CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
-CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
-
-#
-# Linux System Utilities
-#
-# CONFIG_BLOCKDEV is not set
-# CONFIG_MDEV is not set
-# CONFIG_FEATURE_MDEV_CONF is not set
-# CONFIG_FEATURE_MDEV_RENAME is not set
-# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
-# CONFIG_FEATURE_MDEV_EXEC is not set
-# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
-# CONFIG_REV is not set
-# CONFIG_ACPID is not set
-# CONFIG_FEATURE_ACPID_COMPAT is not set
-# CONFIG_BLKID is not set
-# CONFIG_FEATURE_BLKID_TYPE is not set
-CONFIG_DMESG=y
-CONFIG_FEATURE_DMESG_PRETTY=y
-CONFIG_FBSET=y
-CONFIG_FEATURE_FBSET_FANCY=y
-CONFIG_FEATURE_FBSET_READMODE=y
-# CONFIG_FDFLUSH is not set
-# CONFIG_FDFORMAT is not set
-CONFIG_FDISK=y
-# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
-CONFIG_FEATURE_FDISK_WRITABLE=y
-# CONFIG_FEATURE_AIX_LABEL is not set
-# CONFIG_FEATURE_SGI_LABEL is not set
-# CONFIG_FEATURE_SUN_LABEL is not set
-# CONFIG_FEATURE_OSF_LABEL is not set
-# CONFIG_FEATURE_GPT_LABEL is not set
-# CONFIG_FEATURE_FDISK_ADVANCED is not set
-# CONFIG_FINDFS is not set
-CONFIG_FLOCK=y
-# CONFIG_FREERAMDISK is not set
-CONFIG_FSCK_MINIX=y
-# CONFIG_MKFS_EXT2 is not set
-CONFIG_MKFS_MINIX=y
-CONFIG_FEATURE_MINIX2=y
-# CONFIG_MKFS_REISER is not set
-# CONFIG_MKFS_VFAT is not set
-CONFIG_GETOPT=y
-CONFIG_FEATURE_GETOPT_LONG=y
-CONFIG_HEXDUMP=y
-# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
-# CONFIG_HD is not set
-CONFIG_HWCLOCK=y
-CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
-CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
-CONFIG_IPCRM=y
-CONFIG_IPCS=y
-CONFIG_LOSETUP=y
-# CONFIG_LSPCI is not set
-# CONFIG_LSUSB is not set
-CONFIG_MKSWAP=y
-# CONFIG_FEATURE_MKSWAP_UUID is not set
-CONFIG_MORE=y
-CONFIG_MOUNT=y
-# CONFIG_FEATURE_MOUNT_FAKE is not set
-# CONFIG_FEATURE_MOUNT_VERBOSE is not set
-# CONFIG_FEATURE_MOUNT_HELPERS is not set
-# CONFIG_FEATURE_MOUNT_LABEL is not set
-CONFIG_FEATURE_MOUNT_NFS=y
-# CONFIG_FEATURE_MOUNT_CIFS is not set
-CONFIG_FEATURE_MOUNT_FLAGS=y
-CONFIG_FEATURE_MOUNT_FSTAB=y
-CONFIG_PIVOT_ROOT=y
-CONFIG_RDATE=y
-# CONFIG_RDEV is not set
-# CONFIG_READPROFILE is not set
-# CONFIG_RTCWAKE is not set
-# CONFIG_SCRIPT is not set
-# CONFIG_SCRIPTREPLAY is not set
-# CONFIG_SETARCH is not set
-CONFIG_SWAPONOFF=y
-CONFIG_FEATURE_SWAPON_PRI=y
-CONFIG_SWITCH_ROOT=y
-CONFIG_UMOUNT=y
-CONFIG_FEATURE_UMOUNT_ALL=y
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-# CONFIG_VOLUMEID is not set
-# CONFIG_FEATURE_VOLUMEID_EXT is not set
-# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
-# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
-# CONFIG_FEATURE_VOLUMEID_FAT is not set
-# CONFIG_FEATURE_VOLUMEID_HFS is not set
-# CONFIG_FEATURE_VOLUMEID_JFS is not set
-# CONFIG_FEATURE_VOLUMEID_XFS is not set
-# CONFIG_FEATURE_VOLUMEID_NTFS is not set
-# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
-# CONFIG_FEATURE_VOLUMEID_UDF is not set
-# CONFIG_FEATURE_VOLUMEID_LUKS is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
-# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
-# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
-# CONFIG_FEATURE_VOLUMEID_SYSV is not set
-# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
-
-#
-# Miscellaneous Utilities
-#
-# CONFIG_CONSPY is not set
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_MAXLINES=9999999
-CONFIG_FEATURE_LESS_BRACKETS=y
-CONFIG_FEATURE_LESS_FLAGS=y
-# CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
-# CONFIG_FEATURE_LESS_WINCH is not set
-# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
-# CONFIG_FEATURE_LESS_DASHCMD is not set
-# CONFIG_FEATURE_LESS_LINENUMS is not set
-# CONFIG_NANDWRITE is not set
-# CONFIG_NANDDUMP is not set
-# CONFIG_SETSERIAL is not set
-# CONFIG_UBIATTACH is not set
-# CONFIG_UBIDETACH is not set
-# CONFIG_UBIMKVOL is not set
-# CONFIG_UBIRMVOL is not set
-# CONFIG_UBIRSVOL is not set
-# CONFIG_UBIUPDATEVOL is not set
-# CONFIG_ADJTIMEX is not set
-# CONFIG_BBCONFIG is not set
-# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
-# CONFIG_BEEP is not set
-CONFIG_FEATURE_BEEP_FREQ=0
-CONFIG_FEATURE_BEEP_LENGTH_MS=0
-# CONFIG_CHAT is not set
-# CONFIG_FEATURE_CHAT_NOFAIL is not set
-# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
-# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
-# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
-# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
-# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
-# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
-# CONFIG_CHRT is not set
-# CONFIG_CROND is not set
-# CONFIG_FEATURE_CROND_D is not set
-# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
-CONFIG_FEATURE_CROND_DIR=""
-# CONFIG_CRONTAB is not set
-CONFIG_DC=y
-# CONFIG_FEATURE_DC_LIBM is not set
-# CONFIG_DEVFSD is not set
-# CONFIG_DEVFSD_MODLOAD is not set
-# CONFIG_DEVFSD_FG_NP is not set
-# CONFIG_DEVFSD_VERBOSE is not set
-# CONFIG_FEATURE_DEVFS is not set
-# CONFIG_DEVMEM is not set
-# CONFIG_EJECT is not set
-# CONFIG_FEATURE_EJECT_SCSI is not set
-# CONFIG_FBSPLASH is not set
-# CONFIG_FLASHCP is not set
-# CONFIG_FLASH_LOCK is not set
-# CONFIG_FLASH_UNLOCK is not set
-# CONFIG_FLASH_ERASEALL is not set
-# CONFIG_IONICE is not set
-# CONFIG_INOTIFYD is not set
-# CONFIG_LAST is not set
-# CONFIG_FEATURE_LAST_SMALL is not set
-# CONFIG_FEATURE_LAST_FANCY is not set
-# CONFIG_HDPARM is not set
-# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
-# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
-# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
-# CONFIG_MAKEDEVS is not set
-# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
-# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
-# CONFIG_MAN is not set
-CONFIG_MICROCOM=y
-# CONFIG_MOUNTPOINT is not set
-# CONFIG_MT is not set
-# CONFIG_RAIDAUTORUN is not set
-# CONFIG_READAHEAD is not set
-CONFIG_RFKILL=y
-# CONFIG_RUNLEVEL is not set
-# CONFIG_RX is not set
-# CONFIG_SETSID is not set
-CONFIG_STRINGS=y
-# CONFIG_TASKSET is not set
-# CONFIG_FEATURE_TASKSET_FANCY is not set
-CONFIG_TIME=y
-# CONFIG_TIMEOUT is not set
-# CONFIG_TTYSIZE is not set
-# CONFIG_VOLNAME is not set
-# CONFIG_WALL is not set
-# CONFIG_WATCHDOG is not set
-
-#
-# Networking Utilities
-#
-# CONFIG_NAMEIF is not set
-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
-# CONFIG_NBDCLIENT is not set
-CONFIG_NC=y
-CONFIG_NC_SERVER=y
-CONFIG_NC_EXTRA=y
-# CONFIG_NC_110_COMPAT is not set
-CONFIG_PING=y
-CONFIG_PING6=y
-CONFIG_FEATURE_FANCY_PING=y
-# CONFIG_WHOIS is not set
-CONFIG_FEATURE_IPV6=y
-# CONFIG_FEATURE_UNIX_LOCAL is not set
-CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
-# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
-# CONFIG_ARP is not set
-# CONFIG_ARPING is not set
-# CONFIG_BRCTL is not set
-# CONFIG_FEATURE_BRCTL_FANCY is not set
-# CONFIG_FEATURE_BRCTL_SHOW is not set
-# CONFIG_DNSD is not set
-# CONFIG_ETHER_WAKE is not set
-# CONFIG_FAKEIDENTD is not set
-# CONFIG_FTPD is not set
-# CONFIG_FEATURE_FTP_WRITE is not set
-# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
-# CONFIG_FTPGET is not set
-# CONFIG_FTPPUT is not set
-# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
-CONFIG_HOSTNAME=y
-# CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_RANGES is not set
-# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
-# CONFIG_FEATURE_HTTPD_SETUID is not set
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_CGI is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
-# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
-# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
-# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
-# CONFIG_FEATURE_HTTPD_PROXY is not set
-# CONFIG_FEATURE_HTTPD_GZIP is not set
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
-# CONFIG_FEATURE_IFCONFIG_SLIP is not set
-# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
-CONFIG_FEATURE_IFCONFIG_HW=y
-# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
-# CONFIG_IFENSLAVE is not set
-CONFIG_IFPLUGD=y
-CONFIG_IFUPDOWN=y
-CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
-# CONFIG_FEATURE_IFUPDOWN_IP is not set
-# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
-CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN=y
-CONFIG_FEATURE_IFUPDOWN_IPV4=y
-CONFIG_FEATURE_IFUPDOWN_IPV6=y
-CONFIG_FEATURE_IFUPDOWN_MAPPING=y
-# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
-# CONFIG_INETD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
-# CONFIG_FEATURE_INETD_RPC is not set
-CONFIG_IP=y
-CONFIG_FEATURE_IP_ADDRESS=y
-CONFIG_FEATURE_IP_LINK=y
-CONFIG_FEATURE_IP_ROUTE=y
-CONFIG_FEATURE_IP_TUNNEL=y
-# CONFIG_FEATURE_IP_RULE is not set
-# CONFIG_FEATURE_IP_SHORT_FORMS is not set
-# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
-# CONFIG_IPADDR is not set
-# CONFIG_IPLINK is not set
-# CONFIG_IPROUTE is not set
-# CONFIG_IPTUNNEL is not set
-# CONFIG_IPRULE is not set
-# CONFIG_IPCALC is not set
-# CONFIG_FEATURE_IPCALC_FANCY is not set
-# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-CONFIG_NETSTAT=y
-CONFIG_FEATURE_NETSTAT_WIDE=y
-CONFIG_FEATURE_NETSTAT_PRG=y
-CONFIG_NSLOOKUP=y
-# CONFIG_NTPD is not set
-# CONFIG_FEATURE_NTPD_SERVER is not set
-# CONFIG_PSCAN is not set
-CONFIG_ROUTE=y
-# CONFIG_SLATTACH is not set
-# CONFIG_TCPSVD is not set
-CONFIG_TELNET=y
-# CONFIG_FEATURE_TELNET_TTYPE is not set
-CONFIG_FEATURE_TELNET_AUTOLOGIN=y
-# CONFIG_TELNETD is not set
-# CONFIG_FEATURE_TELNETD_STANDALONE is not set
-# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
-CONFIG_TFTP=y
-# CONFIG_TFTPD is not set
-
-#
-# Common options for tftp/tftpd
-#
-CONFIG_FEATURE_TFTP_GET=y
-CONFIG_FEATURE_TFTP_PUT=y
-CONFIG_FEATURE_TFTP_BLOCKSIZE=y
-CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
-# CONFIG_TFTP_DEBUG is not set
-CONFIG_TRACEROUTE=y
-CONFIG_TRACEROUTE6=y
-CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
-CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y
-CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
-CONFIG_TUNCTL=y
-CONFIG_FEATURE_TUNCTL_UG=y
-# CONFIG_UDHCPC6 is not set
-CONFIG_UDHCPD=y
-# CONFIG_DHCPRELAY is not set
-CONFIG_DUMPLEASES=y
-# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
-# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
-CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
-CONFIG_UDHCPC=y
-CONFIG_FEATURE_UDHCPC_ARPING=y
-# CONFIG_FEATURE_UDHCP_PORT is not set
-CONFIG_UDHCP_DEBUG=0
-# CONFIG_FEATURE_UDHCP_RFC3397 is not set
-# CONFIG_FEATURE_UDHCP_8021Q is not set
-CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
-CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
-CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
-# CONFIG_UDPSVD is not set
-# CONFIG_VCONFIG is not set
-CONFIG_WGET=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
-CONFIG_FEATURE_WGET_LONG_OPTIONS=y
-CONFIG_FEATURE_WGET_TIMEOUT=y
-# CONFIG_ZCIP is not set
-
-#
-# Print Utilities
-#
-# CONFIG_LPD is not set
-# CONFIG_LPR is not set
-# CONFIG_LPQ is not set
-
-#
-# Mail Utilities
-#
-# CONFIG_MAKEMIME is not set
-CONFIG_FEATURE_MIME_CHARSET=""
-# CONFIG_POPMAILDIR is not set
-# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
-# CONFIG_REFORMIME is not set
-# CONFIG_FEATURE_REFORMIME_COMPAT is not set
-# CONFIG_SENDMAIL is not set
-
-#
-# Process Utilities
-#
-# CONFIG_IOSTAT is not set
-# CONFIG_LSOF is not set
-# CONFIG_MPSTAT is not set
-# CONFIG_NMETER is not set
-# CONFIG_PMAP is not set
-# CONFIG_POWERTOP is not set
-# CONFIG_PSTREE is not set
-# CONFIG_PWDX is not set
-# CONFIG_SMEMCAP is not set
-CONFIG_UPTIME=y
-# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
-CONFIG_FREE=y
-CONFIG_FUSER=y
-CONFIG_KILL=y
-CONFIG_KILLALL=y
-# CONFIG_KILLALL5 is not set
-# CONFIG_PGREP is not set
-CONFIG_PIDOF=y
-CONFIG_FEATURE_PIDOF_SINGLE=y
-CONFIG_FEATURE_PIDOF_OMIT=y
-# CONFIG_PKILL is not set
-CONFIG_PS=y
-CONFIG_FEATURE_PS_WIDE=y
-CONFIG_FEATURE_PS_LONG=y
-# CONFIG_FEATURE_PS_TIME is not set
-CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
-# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
-CONFIG_RENICE=y
-CONFIG_BB_SYSCTL=y
-CONFIG_TOP=y
-CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
-CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
-# CONFIG_FEATURE_TOP_SMP_CPU is not set
-# CONFIG_FEATURE_TOP_DECIMALS is not set
-# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
-# CONFIG_FEATURE_TOPMEM is not set
-# CONFIG_FEATURE_SHOW_THREADS is not set
-CONFIG_WATCH=y
-
-#
-# Runit Utilities
-#
-# CONFIG_RUNSV is not set
-# CONFIG_RUNSVDIR is not set
-# CONFIG_FEATURE_RUNSVDIR_LOG is not set
-# CONFIG_SV is not set
-CONFIG_SV_DEFAULT_SERVICE_DIR=""
-# CONFIG_SVLOGD is not set
-# CONFIG_CHPST is not set
-# CONFIG_SETUIDGID is not set
-# CONFIG_ENVUIDGID is not set
-# CONFIG_ENVDIR is not set
-# CONFIG_SOFTLIMIT is not set
-# CONFIG_CHCON is not set
-# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
-# CONFIG_GETENFORCE is not set
-# CONFIG_GETSEBOOL is not set
-# CONFIG_LOAD_POLICY is not set
-# CONFIG_MATCHPATHCON is not set
-# CONFIG_RESTORECON is not set
-# CONFIG_RUNCON is not set
-# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
-# CONFIG_SELINUXENABLED is not set
-# CONFIG_SETENFORCE is not set
-# CONFIG_SETFILES is not set
-# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
-# CONFIG_SETSEBOOL is not set
-# CONFIG_SESTATUS is not set
-
-#
-# Shells
-#
-CONFIG_ASH=y
-CONFIG_ASH_BASH_COMPAT=y
-# CONFIG_ASH_IDLE_TIMEOUT is not set
-CONFIG_ASH_JOB_CONTROL=y
-CONFIG_ASH_ALIAS=y
-CONFIG_ASH_GETOPTS=y
-CONFIG_ASH_BUILTIN_ECHO=y
-CONFIG_ASH_BUILTIN_PRINTF=y
-CONFIG_ASH_BUILTIN_TEST=y
-# CONFIG_ASH_CMDCMD is not set
-# CONFIG_ASH_MAIL is not set
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-# CONFIG_ASH_RANDOM_SUPPORT is not set
-CONFIG_ASH_EXPAND_PRMT=y
-# CONFIG_CTTYHACK is not set
-# CONFIG_HUSH is not set
-# CONFIG_HUSH_BASH_COMPAT is not set
-# CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_HELP is not set
-# CONFIG_HUSH_INTERACTIVE is not set
-# CONFIG_HUSH_SAVEHISTORY is not set
-# CONFIG_HUSH_JOB is not set
-# CONFIG_HUSH_TICK is not set
-# CONFIG_HUSH_IF is not set
-# CONFIG_HUSH_LOOPS is not set
-# CONFIG_HUSH_CASE is not set
-# CONFIG_HUSH_FUNCTIONS is not set
-# CONFIG_HUSH_LOCAL is not set
-# CONFIG_HUSH_RANDOM_SUPPORT is not set
-# CONFIG_HUSH_EXPORT_N is not set
-# CONFIG_HUSH_MODE_X is not set
-# CONFIG_MSH is not set
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-# CONFIG_FEATURE_BASH_IS_ASH is not set
-# CONFIG_FEATURE_BASH_IS_HUSH is not set
-CONFIG_FEATURE_BASH_IS_NONE=y
-CONFIG_SH_MATH_SUPPORT=y
-CONFIG_SH_MATH_SUPPORT_64=y
-CONFIG_FEATURE_SH_EXTRA_QUIET=y
-# CONFIG_FEATURE_SH_STANDALONE is not set
-# CONFIG_FEATURE_SH_NOFORK is not set
-CONFIG_FEATURE_SH_HISTFILESIZE=y
-
-#
-# System Logging Utilities
-#
-CONFIG_SYSLOGD=y
-CONFIG_FEATURE_ROTATE_LOGFILE=y
-CONFIG_FEATURE_REMOTE_LOG=y
-CONFIG_FEATURE_SYSLOGD_DUP=y
-CONFIG_FEATURE_SYSLOGD_CFG=y
-CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
-CONFIG_FEATURE_IPC_SYSLOG=y
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=64
-CONFIG_LOGREAD=y
-CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
-CONFIG_KLOGD=y
-CONFIG_FEATURE_KLOGD_KLOGCTL=y
-CONFIG_LOGGER=y
diff --git a/recipes-core/busybox/files/eth0.conf b/recipes-core/busybox/files/eth0.conf
deleted file mode 100755
index 4ccb2bc..0000000
--- a/recipes-core/busybox/files/eth0.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-INTERFACE="eth0"
-# An arbitrary script may be specified:
-ARGS="-fI -i ${INTERFACE} -u 0 -d 10 -r /etc/ifplugd/ifplugd.action"
diff --git a/recipes-core/busybox/files/eth1.conf.example b/recipes-core/busybox/files/eth1.conf.example
deleted file mode 100755
index eb2337f..0000000
--- a/recipes-core/busybox/files/eth1.conf.example
+++ /dev/null
@@ -1,2 +0,0 @@
-INTERFACE="eth1"
-ARGS="-fI -i ${INTERFACE} -u 0 -d 10 -r /etc/ifplugd/ifplugd.action"
diff --git a/recipes-core/busybox/files/ifplugd.action b/recipes-core/busybox/files/ifplugd.action
deleted file mode 100755
index e7184c7..0000000
--- a/recipes-core/busybox/files/ifplugd.action
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# $Id: ifplugd.action 99 2004-02-08 20:17:59Z lennart $
-
-# This file is part of ifplugd.
-#
-# ifplugd 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 2 of the License, or (at your
-# option) any later version.
-#
-# ifplugd 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 ifplugd; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-set -e
-
-if [ -z "$1" ] || [ -z "$2" ] ; then
-        echo "Wrong arguments" > /dev/stderr
-        exit 1
-fi
-
-[ "$2" = "up" ] && exec /sbin/ifup $1
-[ "$2" = "down" ] && exec /sbin/ifdown $1
-
-exit 0
diff --git a/recipes-core/busybox/files/ifplugd.default b/recipes-core/busybox/files/ifplugd.default
deleted file mode 100644
index a19632e..0000000
--- a/recipes-core/busybox/files/ifplugd.default
+++ /dev/null
@@ -1,3 +0,0 @@
-ENABLED="yes"
-#PIDFILE="/run/ifplugd.${INTERFACE}.pid"
-
diff --git a/recipes-core/busybox/files/ifplugd.init b/recipes-core/busybox/files/ifplugd.init
deleted file mode 100755
index 418b088..0000000
--- a/recipes-core/busybox/files/ifplugd.init
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/bash
-#
-# ifplugd  init.d script
-[[ -x /usr/sbin/ifplugd ]] || exit 0
-[[ -r /etc/default/ifplugd ]] && . /etc/default/ifplugd
-
-
-#Functions to do individual actions
-startdaemon(){
-    # Start the application
-    echo -n "Starting ifplugd: "
-    CONFS=($(find -L /etc/ifplugd -name '*.conf'))
-    ((i=0))
-    logger -p daemon.info "Found ${#CONFS[@]} Configurations"
-    while ((i < ${#CONFS[@]})) ; do
-        unset ARGS INTERFACE
-        . ${CONFS[$i]}
-	logger -p daemon.info "Starting Interface ${INTERFACE}"
-        ((i++))
-        /usr/sbin/start-stop-daemon -Svp /run/ifplugd.${INTERFACE}.pid -a /usr/sbin/ifplugd -- ${ARGS}
-    done
-    if ((${#CONFS[@]} == 0)) ; then
-        /usr/sbin/start-stop-daemon -n ifplugd -Sv -x /usr/sbin/ifplugd -- ${ARGS}
-    fi
-    echo "done"
-}
-stopdaemon(){
-    echo -n "Stopping ifplugd: "
-    PIDS=($(find /run -xdev -name 'ifplugd.*.pid'))
-    ((i=0))
-    while ((i < ${#PIDS[@]})) ; do
-        PF=${PIDS[$i]}
-        [[ $PF =~ /ifplugd\.([^.]*)\.pid ]]
-        IF=${BASH_REMATCH[1]}
-        logger -p user.info "Shutting down interface $IF"
-        /usr/sbin/start-stop-daemon -n ifplugd -Kqp $PF
-        ((i++))
-    done
-    echo "done"
-}
-
-case "$1" in
-  start)
-        [[ ${ENABLED} == "yes" ]] || exit 0
-	startdaemon
-	;;
-  stop)
-  	stopdaemon
-	;;
-  restart|force-reload)
-	stopdaemon
-	sleep 2
-	startdaemon
-	;;
-  *)
-	echo "Usage: /etc/init.d/ifplugd { start | stop | restart | force-reload }" >&2
-	exit 1
-	;;
-esac
-
-exit 0
-
diff --git a/recipes-core/busybox/files/ifplugd.patch b/recipes-core/busybox/files/ifplugd.patch
deleted file mode 100644
index 839a8a2..0000000
--- a/recipes-core/busybox/files/ifplugd.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# This patch is found here:
-# http://lists.busybox.net/pipermail/busybox/2018-March/086328.html
-# Basically ifplugd will not stay up if the driver is loading.
-# This is particularly apparent with gadget.
-diff -arNu a/networking/ifplugd.c b/networking/ifplugd.c
---- a/networking/ifplugd.c	2019-05-28 18:11:43.836982315 -0500
-+++ b/networking/ifplugd.c	2019-05-28 18:13:13.088979672 -0500
-@@ -358,8 +358,10 @@
- 		ifrequest.ifr_flags |= IFF_UP;
- 		/* Let user know we mess up with interface */
- 		bb_error_msg("upping interface");
--		if (network_ioctl(SIOCSIFFLAGS, &ifrequest, "setting interface flags") < 0)
-+		if (network_ioctl(SIOCSIFFLAGS, &ifrequest, "setting interface flags") < 0) {
-+                    if (errno != ENODEV && errno != EADDRNOTAVAIL)
- 			xfunc_die();
-+                }
- 	}
- 
- #if 0 /* why do we mess with IP addr? It's not our business */
diff --git a/recipes-core/busybox/files/syslog-startup.conf b/recipes-core/busybox/files/syslog-startup.conf
deleted file mode 100644
index f4fb90b..0000000
--- a/recipes-core/busybox/files/syslog-startup.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# This configuration file is used by the busybox syslog init script,
-# /etc/init.d/syslog[.busybox] to set syslog configuration at start time.
-
-DESTINATION=file		# log destinations (buffer file remote)
-LOGFILE=/var/log/messages	# where to log (file)
-REMOTE=loghost:514		# where to log (syslog remote)
-REDUCE=no			# reduce-size logging
-DROPDUPLICATES=no		# whether to drop duplicate log entries
-ROTATESIZE=512			# rotate log if grown beyond X [kByte]
-ROTATEGENS=4			# keep X generations of rotated logs
-BUFFERSIZE=64			# size of circular buffer [kByte]
-FOREGROUND=no			# run in foreground (don't use!)
-#LOGLEVEL=5			# local log level (between 1 and 8)
diff --git a/recipes-core/busybox/files/udhcpd.conf.example b/recipes-core/busybox/files/udhcpd.conf.example
deleted file mode 100644
index f72d672..0000000
--- a/recipes-core/busybox/files/udhcpd.conf.example
+++ /dev/null
@@ -1,6 +0,0 @@
-start			192.168.2.100
-end				192.168.2.254
-interface		eth0
-option subnet	255.255.255.0
-option router	192.168.2.1
-option dns		8.8.8.8			# google's DNS server
diff --git a/recipes-core/busybox/ifplugd-disable_1.0.bb b/recipes-core/busybox/ifplugd-disable_1.0.bb
deleted file mode 100644
index 3037e23..0000000
--- a/recipes-core/busybox/ifplugd-disable_1.0.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-DESCRIPTION = "Turn off ifplugd"
-LICENSE = "GPLv2"
-PACKAGE_ARCH = "all"
-
-RDEPENDS_ifplugd-disable = "busybox-ifplugd"
-ALLOW_EMPTY_ifplugd-disable = "1"
-
-PR = "r2"
-
-
-# Mount root rw  to disable/enable ifplugd.
-# Mount root ro when we are done.
-# This makes the Yocto Police happy.
-pkg_prerm_${PN}() {
-ro=0
-if [ -z "$D" ] ; then
-    if egrep -q '[[:space:]]/[[:space:]].*[[:space:]]ro,' /proc/mounts ; then
-        ro=1
-	mount -o remount,rw /
-    fi
-fi
-sed -i 's/^ENABLED="no"/ENABLED="yes"/i' $D${sysconfdir}/default/ifplugd
-if [ $ro -eq 1 ] ; then
-    mount -o remount,ro /
-fi
-}
-
-pkg_postinst_${PN}() {
-ro=0
-if [ -z "$D" ] ; then
-    if egrep -q '[[:space:]]/[[:space:]].*[[:space:]]ro,' /proc/mounts ; then
-        ro=1
-	mount -o remount,rw /
-    fi
-fi
-sed -i 's/^ENABLED="yes"/ENABLED="no"/i' $D${sysconfdir}/default/ifplugd
-if [ -f $D/var/config/default/ifplugd ]; then
-    sed -i 's/^ENABLED="yes"/ENABLED="no"/i' $D/var/config/default/ifplugd
-else
-    cp $D${sysconfdir}/default/ifplugd $D/var/config/default/ifplugd
-fi
-if [ $ro -eq 1 ] ; then
-    mount -o remount,ro /
-fi
-}
diff --git a/recipes-core/eglibc/eglibc/cvs-gethostbyname4-memory-leak.patch b/recipes-core/eglibc/eglibc/cvs-gethostbyname4-memory-leak.patch
deleted file mode 100644
index cd4e388..0000000
--- a/recipes-core/eglibc/eglibc/cvs-gethostbyname4-memory-leak.patch
+++ /dev/null
@@ -1,576 +0,0 @@
-diff -Naur '--exclude=.git' '--exclude=*.pyc' '--exclude=*.py' '--exclude=*.*~' libc.orig/include/arpa/nameser_compat.h libc/include/arpa/nameser_compat.h

---- libc.orig/include/arpa/nameser_compat.h	2008-05-12 11:38:35.000000000 -0400

-+++ libc/include/arpa/nameser_compat.h	2017-04-06 16:34:20.413823000 -0400

-@@ -1,8 +1,8 @@

- #ifndef _ARPA_NAMESER_COMPAT_

- #include <resolv/arpa/nameser_compat.h>

- 

--/* Picksome unused number to represent lookups of IPv4 and IPv6 (i.e.,

--   T_A and T_AAAA).  */

--#define T_UNSPEC 62321

-+/* The number is outside the 16-bit RR type range and is used

-+   internally by the implementation.  */

-+#define T_QUERY_A_AND_AAAA 439963904

- 

- #endif

-diff -Naur '--exclude=.git' '--exclude=*.pyc' '--exclude=*.py' '--exclude=*.*~' libc.orig/include/resolv.h libc/include/resolv.h

---- libc.orig/include/resolv.h	2013-09-05 18:41:05.000000000 -0400

-+++ libc/include/resolv.h	2017-04-06 16:33:09.853700600 -0400

-@@ -48,11 +48,11 @@

- libc_hidden_proto (__res_state)

- 

- int __libc_res_nquery (res_state, const char *, int, int, u_char *, int,

--		       u_char **, u_char **, int *, int *);

-+		       u_char **, u_char **, int *, int *, int *);

- int __libc_res_nsearch (res_state, const char *, int, int, u_char *, int,

--			u_char **, u_char **, int *, int *);

-+			u_char **, u_char **, int *, int *, int *);

- int __libc_res_nsend (res_state, const u_char *, int, const u_char *, int,

--		      u_char *, int, u_char **, u_char **, int *, int *)

-+		      u_char *, int, u_char **, u_char **, int *, int *, int *)

-   attribute_hidden;

- 

- libresolv_hidden_proto (_sethtent)

-diff -Naur '--exclude=.git' '--exclude=*.pyc' '--exclude=*.py' '--exclude=*.*~' libc.orig/resolv/gethnamaddr.c libc/resolv/gethnamaddr.c

---- libc.orig/resolv/gethnamaddr.c	2013-06-15 13:37:04.000000000 -0400

-+++ libc/resolv/gethnamaddr.c	2017-04-06 16:13:44.727609300 -0400

-@@ -621,7 +621,7 @@

- 	buf.buf = origbuf = (querybuf *) alloca (1024);

- 

- 	if ((n = __libc_res_nsearch(&_res, name, C_IN, type, buf.buf->buf, 1024,

--				    &buf.ptr, NULL, NULL, NULL)) < 0) {

-+				    &buf.ptr, NULL, NULL, NULL, NULL)) < 0) {

- 		if (buf.buf != origbuf)

- 			free (buf.buf);

- 		Dprintf("res_nsearch failed (%d)\n", n);

-@@ -716,12 +716,12 @@

- 	buf.buf = orig_buf = (querybuf *) alloca (1024);

- 

- 	n = __libc_res_nquery(&_res, qbuf, C_IN, T_PTR, buf.buf->buf, 1024,

--			      &buf.ptr, NULL, NULL, NULL);

-+			      &buf.ptr, NULL, NULL, NULL, NULL);

- 	if (n < 0 && af == AF_INET6 && (_res.options & RES_NOIP6DOTINT) == 0) {

- 		strcpy(qp, "ip6.int");

- 		n = __libc_res_nquery(&_res, qbuf, C_IN, T_PTR, buf.buf->buf,

- 				      buf.buf != orig_buf ? MAXPACKET : 1024,

--				      &buf.ptr, NULL, NULL, NULL);

-+				      &buf.ptr, NULL, NULL, NULL, NULL);

- 	}

- 	if (n < 0) {

- 		if (buf.buf != orig_buf)

-diff -Naur '--exclude=.git' '--exclude=*.pyc' '--exclude=*.py' '--exclude=*.*~' libc.orig/resolv/nss_dns/dns-canon.c libc/resolv/nss_dns/dns-canon.c

---- libc.orig/resolv/nss_dns/dns-canon.c	2014-01-03 12:51:28.000000000 -0500

-+++ libc/resolv/nss_dns/dns-canon.c	2017-04-06 16:11:49.654787500 -0400

-@@ -62,7 +62,7 @@

-     {

-       int r = __libc_res_nquery (&_res, name, ns_c_in, qtypes[i],

- 				 buf, sizeof (buf), &ansp.ptr, NULL, NULL,

--				 NULL);

-+				 NULL, NULL);

-       if (r > 0)

- 	{

- 	  /* We need to decode the response.  Just one question record.

-diff -Naur '--exclude=.git' '--exclude=*.pyc' '--exclude=*.py' '--exclude=*.*~' libc.orig/resolv/nss_dns/dns-host.c libc/resolv/nss_dns/dns-host.c

---- libc.orig/resolv/nss_dns/dns-host.c	2017-04-06 14:03:55.000000000 -0400

-+++ libc/resolv/nss_dns/dns-host.c	2017-04-06 16:12:50.319551700 -0400

-@@ -190,7 +190,7 @@

-   host_buffer.buf = orig_host_buffer = (querybuf *) alloca (1024);

- 

-   n = __libc_res_nsearch (&_res, name, C_IN, type, host_buffer.buf->buf,

--			  1024, &host_buffer.ptr, NULL, NULL, NULL);

-+			  1024, &host_buffer.ptr, NULL, NULL, NULL, NULL);

-   if (n < 0)

-     {

-       switch (errno)

-@@ -225,7 +225,7 @@

- 	n = __libc_res_nsearch (&_res, name, C_IN, T_A, host_buffer.buf->buf,

- 				host_buffer.buf != orig_host_buffer

- 				? MAXPACKET : 1024, &host_buffer.ptr,

--				NULL, NULL, NULL);

-+				NULL, NULL, NULL, NULL);

- 

-       if (n < 0)

- 	{

-@@ -308,12 +308,13 @@

-   u_char *ans2p = NULL;

-   int nans2p = 0;

-   int resplen2 = 0;

-+  int ans2p_malloced = 0;

- 

-   int olderr = errno;

-   enum nss_status status;

--  int n = __libc_res_nsearch (&_res, name, C_IN, T_UNSPEC,

-+  int n = __libc_res_nsearch (&_res, name, C_IN, T_QUERY_A_AND_AAAA,

- 			      host_buffer.buf->buf, 2048, &host_buffer.ptr,

--			      &ans2p, &nans2p, &resplen2);

-+			      &ans2p, &nans2p, &resplen2, &ans2p_malloced);

-   if (n < 0)

-     {

-       switch (errno)

-@@ -352,6 +353,10 @@

- 			  resplen2, name, pat, buffer, buflen,

- 			  errnop, herrnop, ttlp);

- 

-+  /* Check whether ans2p was separately allocated.  */

-+  if (ans2p_malloced)

-+    free (ans2p);

-+

-   if (host_buffer.buf != orig_host_buffer)

-     free (host_buffer.buf);

- 

-@@ -460,7 +465,7 @@

- 	  strcpy (qp, "].ip6.arpa");

- 	  n = __libc_res_nquery (&_res, qbuf, C_IN, T_PTR,

- 				 host_buffer.buf->buf, 1024, &host_buffer.ptr,

--				 NULL, NULL, NULL);

-+				 NULL, NULL, NULL, NULL);

- 	  if (n >= 0)

- 	    goto got_it_already;

- 	}

-@@ -481,14 +486,14 @@

-     }

- 

-   n = __libc_res_nquery (&_res, qbuf, C_IN, T_PTR, host_buffer.buf->buf,

--			 1024, &host_buffer.ptr, NULL, NULL, NULL);

-+			 1024, &host_buffer.ptr, NULL, NULL, NULL, NULL);

-   if (n < 0 && af == AF_INET6 && (_res.options & RES_NOIP6DOTINT) == 0)

-     {

-       strcpy (qp, "ip6.int");

-       n = __libc_res_nquery (&_res, qbuf, C_IN, T_PTR, host_buffer.buf->buf,

- 			     host_buffer.buf != orig_host_buffer

- 			     ? MAXPACKET : 1024, &host_buffer.ptr,

--			     NULL, NULL, NULL);

-+			     NULL, NULL, NULL, NULL);

-     }

-   if (n < 0)

-     {

-@@ -613,7 +618,8 @@

-   int have_to_map = 0;

-   uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct host_data);

-   buffer += pad;

--  if (__builtin_expect (buflen < sizeof (struct host_data) + pad, 0))

-+  buflen = buflen > pad ? buflen - pad : 0;

-+  if (__glibc_unlikely (buflen < sizeof (struct host_data)))

-     {

-       /* The buffer is too small.  */

-     too_small:

-

-diff -Naur '--exclude=.git' '--exclude=*.pyc' '--exclude=*.py' '--exclude=*.*~' libc.orig/resolv/nss_dns/dns-network.c libc/resolv/nss_dns/dns-network.c

---- libc.orig/resolv/nss_dns/dns-network.c	2014-01-03 12:51:28.000000000 -0500

-+++ libc/resolv/nss_dns/dns-network.c	2017-04-06 16:13:18.561373600 -0400

-@@ -118,18 +118,15 @@

-   } net_buffer;

-   querybuf *orig_net_buffer;

-   int anslen;

--  char *qbuf;

-   enum nss_status status;

- 

-   if (__res_maybe_init (&_res, 0) == -1)

-     return NSS_STATUS_UNAVAIL;

- 

--  qbuf = strdupa (name);

--

-   net_buffer.buf = orig_net_buffer = (querybuf *) alloca (1024);

- 

--  anslen = __libc_res_nsearch (&_res, qbuf, C_IN, T_PTR, net_buffer.buf->buf,

--			       1024, &net_buffer.ptr, NULL, NULL, NULL);

-+  anslen = __libc_res_nsearch (&_res, name, C_IN, T_PTR, net_buffer.buf->buf,

-+			       1024, &net_buffer.ptr, NULL, NULL, NULL, NULL);

-   if (anslen < 0)

-     {

-       /* Nothing found.  */

-@@ -205,7 +202,7 @@

-   net_buffer.buf = orig_net_buffer = (querybuf *) alloca (1024);

- 

-   anslen = __libc_res_nquery (&_res, qbuf, C_IN, T_PTR, net_buffer.buf->buf,

--			      1024, &net_buffer.ptr, NULL, NULL, NULL);

-+			      1024, &net_buffer.ptr, NULL, NULL, NULL, NULL);

-   if (anslen < 0)

-     {

-       /* Nothing found.  */

-@@ -398,8 +395,8 @@

- 

- 	case BYNAME:

- 	  {

--	    char **ap = result->n_aliases++;

--	    while (*ap != NULL)

-+	    char **ap;

-+	    for (ap = result->n_aliases; *ap != NULL; ++ap)

- 	      {

- 		/* Check each alias name for being of the forms:

- 		   4.3.2.1.in-addr.arpa		= net 1.2.3.4

-diff -Naur '--exclude=.git' '--exclude=*.pyc' '--exclude=*.py' '--exclude=*.*~' libc.orig/resolv/res_mkquery.c libc/resolv/res_mkquery.c

---- libc.orig/resolv/res_mkquery.c	2013-09-05 18:41:05.000000000 -0400

-+++ libc/resolv/res_mkquery.c	2017-04-06 16:13:56.412597600 -0400

-@@ -110,6 +110,10 @@

- 	int n;

- 	u_char *dnptrs[20], **dpp, **lastdnptr;

- 

-+	if (class < 0 || class > 65535

-+	    || type < 0 || type > 65535)

-+	  return -1;

-+

- #ifdef DEBUG

- 	if (statp->options & RES_DEBUG)

- 		printf(";; res_nmkquery(%s, %s, %s, %s)\n",

-diff -Naur '--exclude=.git' '--exclude=*.pyc' '--exclude=*.py' '--exclude=*.*~' libc.orig/resolv/res_query.c libc/resolv/res_query.c

---- libc.orig/resolv/res_query.c	2017-04-06 14:03:55.000000000 -0400

-+++ libc/resolv/res_query.c	2017-04-06 16:15:04.137842200 -0400

-@@ -98,7 +98,7 @@

- __libc_res_nquerydomain(res_state statp, const char *name, const char *domain,

- 			int class, int type, u_char *answer, int anslen,

- 			u_char **answerp, u_char **answerp2, int *nanswerp2,

--			int *resplen2);

-+			int *resplen2, int *answerp2_malloced);

- 

- /*

-  * Formulate a normal query, send, and await answer.

-@@ -119,14 +119,15 @@

- 		  u_char **answerp,	/* if buffer needs to be enlarged */

- 		  u_char **answerp2,

- 		  int *nanswerp2,

--		  int *resplen2)

-+		  int *resplen2,

-+		  int *answerp2_malloced)

- {

- 	HEADER *hp = (HEADER *) answer;

- 	HEADER *hp2;

- 	int n, use_malloc = 0;

- 	u_int oflags = statp->_flags;

- 

--	size_t bufsize = (type == T_UNSPEC ? 2 : 1) * QUERYSIZE;

-+	size_t bufsize = (type == T_QUERY_A_AND_AAAA ? 2 : 1) * QUERYSIZE;

- 	u_char *buf = alloca (bufsize);

- 	u_char *query1 = buf;

- 	int nquery1 = -1;

-@@ -141,7 +142,7 @@

- 		printf(";; res_query(%s, %d, %d)\n", name, class, type);

- #endif

- 

--	if (type == T_UNSPEC)

-+	if (type == T_QUERY_A_AND_AAAA)

- 	  {

- 	    n = res_nmkquery(statp, QUERY, name, class, T_A, NULL, 0, NULL,

- 			     query1, bufsize);

-@@ -194,7 +195,7 @@

- 	if (__builtin_expect (n <= 0, 0) && !use_malloc) {

- 		/* Retry just in case res_nmkquery failed because of too

- 		   short buffer.  Shouldn't happen.  */

--		bufsize = (type == T_UNSPEC ? 2 : 1) * MAXPACKET;

-+		bufsize = (type == T_QUERY_A_AND_AAAA ? 2 : 1) * MAXPACKET;

- 		buf = malloc (bufsize);

- 		if (buf != NULL) {

- 			query1 = buf;

-@@ -224,7 +225,8 @@

- 	}

- 	assert (answerp == NULL || (void *) *answerp == (void *) answer);

- 	n = __libc_res_nsend(statp, query1, nquery1, query2, nquery2, answer,

--			     anslen, answerp, answerp2, nanswerp2, resplen2);

-+			     anslen, answerp, answerp2, nanswerp2, resplen2,

-+			     answerp2_malloced);

- 	if (use_malloc)

- 		free (buf);

- 	if (n < 0) {

-@@ -316,7 +318,7 @@

- 	   int anslen)		/* size of answer buffer */

- {

- 	return __libc_res_nquery(statp, name, class, type, answer, anslen,

--				 NULL, NULL, NULL, NULL);

-+				 NULL, NULL, NULL, NULL, NULL);

- }

- libresolv_hidden_def (res_nquery)

- 

-@@ -335,7 +337,8 @@

- 		   u_char **answerp,

- 		   u_char **answerp2,

- 		   int *nanswerp2,

--		   int *resplen2)

-+		   int *resplen2,

-+		   int *answerp2_malloced)

- {

- 	const char *cp, * const *domain;

- 	HEADER *hp = (HEADER *) answer;

-@@ -360,7 +363,7 @@

- 	if (!dots && (cp = res_hostalias(statp, name, tmp, sizeof tmp))!= NULL)

- 		return (__libc_res_nquery(statp, cp, class, type, answer,

- 					  anslen, answerp, answerp2,

--					  nanswerp2, resplen2));

-+					  nanswerp2, resplen2, answerp2_malloced));

- 

- #ifdef DEBUG

- 	if (statp->options & RES_DEBUG)

-@@ -377,8 +380,9 @@

- 	if (dots >= statp->ndots || trailing_dot) {

- 		ret = __libc_res_nquerydomain(statp, name, NULL, class, type,

- 					      answer, anslen, answerp,

--					      answerp2, nanswerp2, resplen2);

--		if (ret > 0 || trailing_dot)

-+					      answerp2, nanswerp2, resplen2,

-+					      answerp2_malloced);

-+		if (ret > 0 || (ret == 0 && *resplen2 > 0) || trailing_dot)

- 			return (ret);

- 		saved_herrno = h_errno;

- 		tried_as_is++;

-@@ -386,12 +390,12 @@

- 			answer = *answerp;

- 			anslen = MAXPACKET;

- 		}

--		if (answerp2

--		    && (*answerp2 < answer || *answerp2 >= answer + anslen))

-+		if (answerp2 && *answerp2_malloced)

- 		  {

- 		    free (*answerp2);

- 		    *answerp2 = NULL;

- 		    *nanswerp2 = 0;

-+		    *answerp2_malloced = 0;

- 		  }

- 	}

- 

-@@ -418,21 +422,20 @@

- 						      class, type,

- 						      answer, anslen, answerp,

- 						      answerp2, nanswerp2,

--						      resplen2);

--			if (ret > 0)

-+						      resplen2, answerp2_malloced);

-+			if ((ret > 0) || (ret == 0 && *resplen2 > 0))

- 				return (ret);

- 

- 			if (answerp && *answerp != answer) {

- 				answer = *answerp;

- 				anslen = MAXPACKET;

- 			}

--			if (answerp2

--			    && (*answerp2 < answer

--				|| *answerp2 >= answer + anslen))

-+			if (answerp2 && *answerp2_malloced)

- 			  {

- 			    free (*answerp2);

- 			    *answerp2 = NULL;

- 			    *nanswerp2 = 0;

-+			    *answerp2_malloced = 0;

- 			  }

- 

- 			/*

-@@ -488,8 +491,9 @@

- 	    && !(tried_as_is || root_on_list)) {

- 		ret = __libc_res_nquerydomain(statp, name, NULL, class, type,

- 					      answer, anslen, answerp,

--					      answerp2, nanswerp2, resplen2);

--		if (ret > 0)

-+					      answerp2, nanswerp2, resplen2,

-+					      answerp2_malloced);

-+		if ((ret > 0) || (ret == 0 && *resplen2 > 0))

- 			return (ret);

- 	}

- 

-@@ -500,11 +504,12 @@

- 	 * else send back meaningless H_ERRNO, that being the one from

- 	 * the last DNSRCH we did.

- 	 */

--	if (answerp2 && (*answerp2 < answer || *answerp2 >= answer + anslen))

-+	if (answerp2 && *answerp2_malloced)

- 	  {

- 	    free (*answerp2);

- 	    *answerp2 = NULL;

- 	    *nanswerp2 = 0;

-+	    *answerp2_malloced = 0;

- 	  }

- 	if (saved_herrno != -1)

- 		RES_SET_H_ERRNO(statp, saved_herrno);

-@@ -524,7 +529,7 @@

- 	    int anslen)		/* size of answer */

- {

- 	return __libc_res_nsearch(statp, name, class, type, answer,

--				  anslen, NULL, NULL, NULL, NULL);

-+				  anslen, NULL, NULL, NULL, NULL, NULL);

- }

- libresolv_hidden_def (res_nsearch)

- 

-@@ -542,7 +547,8 @@

- 			u_char **answerp,

- 			u_char **answerp2,

- 			int *nanswerp2,

--			int *resplen2)

-+			int *resplen2,

-+			int *answerp2_malloced)

- {

- 	char nbuf[MAXDNAME];

- 	const char *longname = nbuf;

-@@ -584,7 +590,7 @@

- 	}

- 	return (__libc_res_nquery(statp, longname, class, type, answer,

- 				  anslen, answerp, answerp2, nanswerp2,

--				  resplen2));

-+				  resplen2, answerp2_malloced));

- }

- 

- int

-@@ -596,7 +602,8 @@

- 	    int anslen)		/* size of answer */

- {

- 	return __libc_res_nquerydomain(statp, name, domain, class, type,

--				       answer, anslen, NULL, NULL, NULL, NULL);

-+				       answer, anslen, NULL, NULL, NULL, NULL,

-+				       NULL);

- }

- libresolv_hidden_def (res_nquerydomain)

- 

-diff -Naur libc.orig/resolv/res_send.c libc/resolv/res_send.c

---- libc.orig/resolv/res_send.c	2017-04-21 17:26:25.089490339 -0500

-+++ libc/resolv/res_send.c	2017-04-21 17:30:47.397482573 -0500

-@@ -120,13 +120,13 @@

- #define MAXPACKET       65536

- #endif

- 

--

-+#ifdef SOCK_NONBLOCK

- #ifndef __ASSUME_SOCK_CLOEXEC

- static int __have_o_nonblock;

- #else

- # define __have_o_nonblock 0

- #endif

--

-+#endif

- 

- /* From ev_streams.c.  */

- 

-@@ -203,12 +203,12 @@

- static int		send_vc(res_state, const u_char *, int,

- 				const u_char *, int,

- 				u_char **, int *, int *, int, u_char **,

--				u_char **, int *, int *);

-+				u_char **, int *, int *, int *);

- static int		send_dg(res_state, const u_char *, int,

- 				const u_char *, int,

- 				u_char **, int *, int *, int,

- 				int *, int *, u_char **,

--				u_char **, int *, int *);

-+				u_char **, int *, int *, int *);

- #ifdef DEBUG

- static void		Aerror(const res_state, FILE *, const char *, int,

- 			       const struct sockaddr *);

-@@ -360,7 +360,7 @@

- __libc_res_nsend(res_state statp, const u_char *buf, int buflen,

- 		 const u_char *buf2, int buflen2,

- 		 u_char *ans, int anssiz, u_char **ansp, u_char **ansp2,

--		 int *nansp2, int *resplen2)

-+		 int *nansp2, int *resplen2, int *ansp2_malloced)

- {

-   int gotsomewhere, terrno, try, v_circuit, resplen, ns, n;

- 

-@@ -565,7 +565,8 @@

- 			try = statp->retry;

- 			n = send_vc(statp, buf, buflen, buf2, buflen2,

- 				    &ans, &anssiz, &terrno,

--				    ns, ansp, ansp2, nansp2, resplen2);

-+				    ns, ansp, ansp2, nansp2, resplen2,

-+				    ansp2_malloced);

- 			if (n < 0)

- 				return (-1);

- 			if (n == 0 && (buf2 == NULL || *resplen2 == 0))

-@@ -575,7 +576,7 @@

- 			n = send_dg(statp, buf, buflen, buf2, buflen2,

- 				    &ans, &anssiz, &terrno,

- 				    ns, &v_circuit, &gotsomewhere, ansp,

--				    ansp2, nansp2, resplen2);

-+				    ansp2, nansp2, resplen2, ansp2_malloced);

- 			if (n < 0)

- 				return (-1);

- 			if (n == 0 && (buf2 == NULL || *resplen2 == 0))

-@@ -665,7 +666,7 @@

- 	  const u_char *buf, int buflen, u_char *ans, int anssiz)

- {

-   return __libc_res_nsend(statp, buf, buflen, NULL, 0, ans, anssiz,

--			  NULL, NULL, NULL, NULL);

-+			  NULL, NULL, NULL, NULL, NULL);

- }

- libresolv_hidden_def (res_nsend)

- 

-@@ -747,7 +748,7 @@

- 	const u_char *buf, int buflen, const u_char *buf2, int buflen2,

- 	u_char **ansp, int *anssizp,

- 	int *terrno, int ns, u_char **anscp, u_char **ansp2, int *anssizp2,

--	int *resplen2)

-+	int *resplen2, int *ansp2_malloced)

- {

- 	const HEADER *hp = (HEADER *) buf;

- 	const HEADER *hp2 = (HEADER *) buf2;

-@@ -896,6 +897,8 @@

- 			}

- 			*thisanssizp = MAXPACKET;

- 			*thisansp = newp;

-+			if (thisansp == ansp2)

-+			  *ansp2_malloced = 1;

- 			anhp = (HEADER *) newp;

- 			/* A uint16_t can't be larger than MAXPACKET

- 			   thus it's safe to allocate MAXPACKET but

-@@ -993,6 +996,7 @@

- 

- 		/* only try IPv6 if IPv6 NS and if not failed before */

- 		if (nsap->sa_family == AF_INET6 && !statp->ipv6_unavail) {

-+#ifdef SOCK_NONBLOCK

- 			if (__builtin_expect (__have_o_nonblock >= 0, 1)) {

- 				EXT(statp).nssocks[ns] =

- 				  socket(PF_INET6, SOCK_DGRAM|SOCK_NONBLOCK,

-@@ -1005,12 +1009,14 @@

- #endif

- 			}

- 			if (__builtin_expect (__have_o_nonblock < 0, 0))

-+#endif

- 				EXT(statp).nssocks[ns] =

- 				  socket(PF_INET6, SOCK_DGRAM, 0);

- 			if (EXT(statp).nssocks[ns] < 0)

- 			    statp->ipv6_unavail = errno == EAFNOSUPPORT;

- 			slen = sizeof (struct sockaddr_in6);

- 		} else if (nsap->sa_family == AF_INET) {

-+#ifdef SOCK_NONBLOCK

- 			if (__builtin_expect (__have_o_nonblock >= 0, 1)) {

- 				EXT(statp).nssocks[ns]

- 				  = socket(PF_INET, SOCK_DGRAM|SOCK_NONBLOCK,

-@@ -1023,6 +1029,7 @@

- #endif

- 			}

- 			if (__builtin_expect (__have_o_nonblock < 0, 0))

-+#endif

- 				EXT(statp).nssocks[ns]

- 				  = socket(PF_INET, SOCK_DGRAM, 0);

- 			slen = sizeof (struct sockaddr_in);

-@@ -1049,7 +1056,11 @@

- 			__res_iclose(statp, false);

- 			return (0);

- 		}

-+#ifdef SOCK_NONBLOCK

- 		if (__builtin_expect (__have_o_nonblock < 0, 0)) {

-+#else

-+                {

-+#endif

- 			/* Make socket non-blocking.  */

- 			int fl = __fcntl (EXT(statp).nssocks[ns], F_GETFL);

- 			if  (fl != -1)

-@@ -1128,7 +1139,7 @@

- 	const u_char *buf, int buflen, const u_char *buf2, int buflen2,

- 	u_char **ansp, int *anssizp,

- 	int *terrno, int ns, int *v_circuit, int *gotsomewhere, u_char **anscp,

--	u_char **ansp2, int *anssizp2, int *resplen2)

-+	u_char **ansp2, int *anssizp2, int *resplen2, int *ansp2_malloced)

- {

- 	const HEADER *hp = (HEADER *) buf;

- 	const HEADER *hp2 = (HEADER *) buf2;

-@@ -1359,6 +1370,8 @@

- 			if (newp != NULL) {

- 				*thisanssizp = MAXPACKET;

- 				*thisansp = newp;

-+				if (thisansp == ansp2)

-+				  *ansp2_malloced = 1;

- 			}

- 		}

- 		/* We could end up with truncation if anscp was NULL

-@@ -1542,6 +1555,7 @@

- 					retval = reopen (statp, terrno, ns);

- 					if (retval <= 0)

- 						return retval;

-+					pfd[0].fd = EXT(statp).nssocks[ns];

- 				}

- 			}

- 			goto wait;

diff --git a/recipes-core/eglibc/eglibc_%.bbappend.obsolete b/recipes-core/eglibc/eglibc_%.bbappend.obsolete
deleted file mode 100644
index 68af86e..0000000
--- a/recipes-core/eglibc/eglibc_%.bbappend.obsolete
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}"
-SRC_URI += "file://cvs-gethostbyname4-memory-leak.patch"
-PR = "r2"
diff --git a/recipes-core/file-magic-db-images/file-magic-db-images_0.1.bb b/recipes-core/file-magic-db-images/file-magic-db-images_0.1.bb
deleted file mode 100644
index 43d3052..0000000
--- a/recipes-core/file-magic-db-images/file-magic-db-images_0.1.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Stripped MIME detection database for file(1) with definition of images"
-HOMEPAGE = "http://www.darwinsys.com/file/"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03188"
-DEPENDS = "file-native"
-FILES_${PN} = "${datadir}/misc/magic-images.mgc"
-
-PV = "0.1"
-PR = "r5"
-
-SRC_URI = "file://COPYING \
-           file://Magdir/images \
-           file://Magdir/jpeg \
-           file://Magdir/msdos \
-           file://Magdir/sgml"
-
-S = "${WORKDIR}"
-
-do_compile() {
-  ${STAGING_BINDIR_NATIVE}/file-native/file -v
-  ${STAGING_BINDIR_NATIVE}/file-native/file -C -m ${S}/Magdir
-}
-
-do_install() {
-  install -d ${D}/${datadir}/misc/
-  install -m 0644 ${WORKDIR}/Magdir.mgc ${D}/${datadir}/misc/magic-images.mgc
-}
diff --git a/recipes-core/file-magic-db-images/files/COPYING b/recipes-core/file-magic-db-images/files/COPYING
deleted file mode 100644
index 68148e2..0000000
--- a/recipes-core/file-magic-db-images/files/COPYING
+++ /dev/null
@@ -1,29 +0,0 @@
-$File: LEGAL.NOTICE,v 1.15 2006/05/03 18:48:33 christos Exp $
-Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995.
-Software written by Ian F. Darwin and others;
-maintained 1994- Christos Zoulas.
-
-This software is not subject to any export provision of the United States
-Department of Commerce, and may be exported to any country or planet.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice immediately at the beginning of the file, without modification,
-   this list of conditions, and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
- 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
diff --git a/recipes-core/file-magic-db-images/files/Magdir/images b/recipes-core/file-magic-db-images/files/Magdir/images
deleted file mode 100644
index 493027f..0000000
--- a/recipes-core/file-magic-db-images/files/Magdir/images
+++ /dev/null
@@ -1,78 +0,0 @@
-# PNG [Portable Network Graphics, or "PNG's Not GIF"] images
-# (Greg Roelofs, newt@uchicago.edu)
-# (Albert Cahalan, acahalan@cs.uml.edu)
-#
-# 137 P N G \r \n ^Z \n [4-byte length] H E A D [HEAD data] [HEAD crc] ...
-#
-0	string		\x89PNG\x0d\x0a\x1a\x0a		PNG image data
-!:mime	image/png
->16	belong		x		\b, %d x
->20	belong		x		%d,
->24	byte		x		%d-bit
->25	byte		0		grayscale,
->25	byte		2		\b/color RGB,
->25	byte		3		colormap,
->25	byte		4		gray+alpha,
->25	byte		6		\b/color RGBA,
-#>26	byte		0		deflate/32K,
->28	byte		0		non-interlaced
->28	byte		1		interlaced
-
-# GIF
-0	string		GIF8		GIF image data
-!:mime	image/gif
-!:apple	8BIMGIFf
->4	string		7a		\b, version 8%s,
->4	string		9a		\b, version 8%s,
->6	leshort		>0		%d x
->8	leshort		>0		%d
-#>10	byte		&0x80		color mapped,
-#>10	byte&0x07	=0x00		2 colors
-#>10	byte&0x07	=0x01		4 colors
-#>10	byte&0x07	=0x02		8 colors
-#>10	byte&0x07	=0x03		16 colors
-#>10	byte&0x07	=0x04		32 colors
-#>10	byte&0x07	=0x05		64 colors
-#>10	byte&0x07	=0x06		128 colors
-#>10	byte&0x07	=0x07		256 colors
-
-# PC bitmaps (OS/2, Windows BMP files)  (Greg Roelofs, newt@uchicago.edu)
-# http://en.wikipedia.org/wiki/BMP_file_format#DIB_header_.\
-# 28bitmap_information_header.29
-0	string		BM
->14	leshort		12		PC bitmap, OS/2 1.x format
-!:mime	image/x-ms-bmp
->>18	leshort		x		\b, %d x
->>20	leshort		x		%d
->14	leshort		64		PC bitmap, OS/2 2.x format
-!:mime	image/x-ms-bmp
->>18	leshort		x		\b, %d x
->>20	leshort		x		%d
->14	leshort		40		PC bitmap, Windows 3.x format
-!:mime	image/x-ms-bmp
->>18	lelong		x		\b, %d x
->>22	lelong		x		%d x
->>28	leshort		x		%d
->14	leshort		124		PC bitmap, Windows 98/2000 and newer format
-!:mime	image/x-ms-bmp
->>18	lelong		x		\b, %d x
->>22	lelong		x		%d x
->>28	leshort		x		%d
->14	leshort		108		PC bitmap, Windows 95/NT4 and newer format
-!:mime	image/x-ms-bmp
->>18	lelong		x		\b, %d x
->>22	lelong		x		%d x
->>28	leshort		x		%d
->14	leshort		128		PC bitmap, Windows NT/2000 format
-!:mime	image/x-ms-bmp
->>18	lelong		x		\b, %d x
->>22	lelong		x		%d x
->>28	leshort		x		%d
-# Too simple - MPi
-#0	string		IC		PC icon data
-#0	string		PI		PC pointer image data
-#0	string		CI		PC color icon data
-#0	string		CP		PC color pointer image data
-# Conflicts with other entries [BABYL]
-#0	string		BA		PC bitmap array data
-
diff --git a/recipes-core/file-magic-db-images/files/Magdir/jpeg b/recipes-core/file-magic-db-images/files/Magdir/jpeg
deleted file mode 100644
index e6a4ffa..0000000
--- a/recipes-core/file-magic-db-images/files/Magdir/jpeg
+++ /dev/null
@@ -1,119 +0,0 @@
-
-#------------------------------------------------------------------------------
-# $File: jpeg,v 1.28 2015/04/09 20:01:40 christos Exp $
-# JPEG images
-# SunOS 5.5.1 had
-#
-#	0	string		\377\330\377\340	JPEG file
-#	0	string		\377\330\377\356	JPG file
-#
-# both of which turn into "JPEG image data" here.
-#
-0	beshort		0xffd8		JPEG image data
-!:mime	image/jpeg
-!:apple	8BIMJPEG
-!:strength *3
-!:ext jpeg/jpg/jpe/jfif
->6	string		JFIF		\b, JFIF standard
-# The following added by Erik Rossen <rossen@freesurf.ch> 1999-09-06
-# in a vain attempt to add image size reporting for JFIF.  Note that these
-# tests are not fool-proof since some perfectly valid JPEGs are currently
-# impossible to specify in magic(4) format.
-# First, a little JFIF version info:
->>11	byte		x		\b %d.
->>12	byte		x		\b%02d
-# Next, the resolution or aspect ratio of the image:
->>13	byte		0		\b, aspect ratio
->>13	byte		1		\b, resolution (DPI)
->>13	byte		2		\b, resolution (DPCM)
->>14	beshort		x		\b, density %dx
->>16	beshort		x		\b%d
->>4	beshort		x		\b, segment length %d
-# Next, show thumbnail info, if it exists:
->>18	byte		!0		\b, thumbnail %dx
->>>19	byte		x		\b%d
->6	string		Exif		\b, Exif standard: [
->>12	indirect/r	x
->>12	string		x		\b]
-
-# Jump to the first segment
->(4.S+4)	use		jpeg_segment
-
-# This uses recursion...
-0		name		jpeg_segment
->0	beshort		0xFFFE
-# Recursion handled by FFE0
-#>>(2.S+2)	use			jpeg_segment
->>2	pstring/HJ	x		\b, comment: "%s"
-
->0	beshort		0xFFC0
->>(2.S+2)	use			jpeg_segment
->>4	byte		x		\b, baseline, precision %d
->>7	beshort		x		\b, %dx
->>5	beshort		x		\b%d
->>9	byte		x		\b, frames %d
-
->0	beshort		0xFFC1		
->>(2.S+2)	use			jpeg_segment
->>4	byte		x		\b, extended sequential, precision %d
->>7	beshort		x		\b, %dx
->>5	beshort		x		\b%d
->>9	byte		x		\b, frames %d
-
->0	beshort		0xFFC2		
->>(2.S+2)	use			jpeg_segment
->>4	byte		x		\b, progressive, precision %d
->>7	beshort		x		\b, %dx
->>5	beshort		x		\b%d
->>9	byte		x		\b, frames %d
-
-# Define Huffman Tables
->0	beshort		0xFFC4
->>(2.S+2)	use			jpeg_segment
-
->0	beshort		0xFFE1		
-# Recursion handled by FFE0
-#>>(2.S+2)	use			jpeg_segment
->>4	string		Exif		\b, Exif Standard: [
->>>10	indirect/r	x		
->>>10	string		x		\b]
-
-# Application specific markers
->0	beshort&0xFFE0	=0xFFE0
->>(2.S+2)	use			jpeg_segment
-
-# DB: Define Quantization tables
-# DD: Define Restart interval [XXX: wrong here, it is 4 bytes]
-# D8: Start of image
-# D9: End of image
-# Dn: Restart
->0	beshort&0xFFD0	=0xFFD0
->>0	beshort&0xFFE0	!0xFFE0
->>>(2.S+2)	use			jpeg_segment
-
-#>0	beshort		x		unknown 0x%x
-#>>(2.S+2)	use			jpeg_segment
-
-# HSI is Handmade Software's proprietary JPEG encoding scheme
-0	string		hsi1		JPEG image data, HSI proprietary
-
-# From: David Santinoli <david@santinoli.com>
-0	string		\x00\x00\x00\x0C\x6A\x50\x20\x20\x0D\x0A\x87\x0A	JPEG 2000
-# From: Johan van der Knijff <johan.vanderknijff@kb.nl>
-# Added sub-entries for JP2, JPX, JPM and MJ2 formats; added mimetypes
-# https://github.com/bitsgalore/jp2kMagic
-#
-# Now read value of 'Brand' field, which yields a few possibilities:
->20	string		\x6a\x70\x32\x20	Part 1 (JP2)
-!:mime	image/jp2
->20	string		\x6a\x70\x78\x20	Part 2 (JPX)
-!:mime	image/jpx
->20	string		\x6a\x70\x6d\x20	Part 6 (JPM)
-!:mime	image/jpm
->20	string		\x6d\x6a\x70\x32	Part 3 (MJ2)
-!:mime	video/mj2
-
-# Type: JPEG 2000 codesream
-# From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
-0	belong		0xff4fff51						JPEG 2000 codestream
-45	beshort		0xff52
diff --git a/recipes-core/file-magic-db-images/files/Magdir/msdos b/recipes-core/file-magic-db-images/files/Magdir/msdos
deleted file mode 100644
index 7b1330e..0000000
--- a/recipes-core/file-magic-db-images/files/Magdir/msdos
+++ /dev/null
@@ -1,29 +0,0 @@
-
-#------------------------------------------------------------------------------
-# $File: msdos,v 1.105 2016/03/03 18:58:14 christos Exp $
-# msdos:  file(1) magic for MS-DOS files
-#
-
-# Windows icons
-# Update: Joerg Jenderek
-# URL: https://en.wikipedia.org/wiki/CUR_(file_format)
-# Note: similiar to Windows CURsor. container for BMP (only DIB part) or PNG
-0   belong  0x00000100
->9  byte    0
->>0 byte    x           
->>0 use     cur-ico-dir
->9  ubyte   0xff
->>0 byte    x           
->>0 use     cur-ico-dir
-#	displays number of icons and information for icon or cursor
-0	name		cur-ico-dir
-# skip some Lotus 1-2-3 worksheets, CYCLE.PIC and keep Windows cursors with
-# 1st data offset = dir header size + n * dir entry size = 6 + n * 10h = ?6h
->18		ulelong		&0x00000006	
-# skip remaining worksheets, because valid only for DIB image (40) or PNG image (\x89PNG)
->>(18.l)	ulelong		x		MS Windows
->>>0		ubelong		0x00000100	icon resource
-#!:mime		image/vnd.microsoft.icon
-!:mime		image/x-icon
-!:ext		ico
-
diff --git a/recipes-core/file-magic-db-images/files/Magdir/sgml b/recipes-core/file-magic-db-images/files/Magdir/sgml
deleted file mode 100644
index 79abe8c..0000000
--- a/recipes-core/file-magic-db-images/files/Magdir/sgml
+++ /dev/null
@@ -1,8 +0,0 @@
-#------------------------------------------------------------------------------ # $File: sgml,v 1.32 2015/07/11 15:08:53 christos Exp $
-# Type:	SVG Vectorial Graphics
-# From:	Noel Torres <tecnico@ejerciciosresueltos.com>
-0	string		\<?xml\ version="
->15	string		>\0
->>19	search/4096	\<svg			SVG Scalable Vector Graphics image
-!:mime	image/svg+xml
-
diff --git a/recipes-core/images/core-image-rorootfs-overlay-initramfs.bb b/recipes-core/images/core-image-rorootfs-overlay-initramfs.bb
new file mode 100644
index 0000000..47946c5
--- /dev/null
+++ b/recipes-core/images/core-image-rorootfs-overlay-initramfs.bb
@@ -0,0 +1,23 @@
+# Simple initramfs image. Mostly used for live images.
+# Derived from https://github.com/cmhe/meta-readonly-rootfs-overlay
+DESCRIPTION = "Small image capable of booting a device. The kernel includes \
+the Minimal RAM-based Initial Root Filesystem (initramfs), mounts the root fs \
+read only and uses a file system overlay for written data."
+
+PACKAGE_INSTALL = "initramfs-readonly-rootfs-overlay ${VIRTUAL-RUNTIME_base-utils} udev base-passwd gptfdisk ${ROOTFS_BOOTSTRAP_INSTALL}"
+
+# Do not pollute the initrd image with rootfs features
+IMAGE_FEATURES = ""
+
+export IMAGE_BASENAME = "${PN}"
+IMAGE_LINGUAS = ""
+
+LICENSE = "MIT"
+
+IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
+inherit core-image
+
+IMAGE_ROOTFS_SIZE = "8192"
+IMAGE_ROOTFS_EXTRA_SPACE = "0"
+
+BAD_RECOMMENDATIONS += "busybox-syslog"
diff --git a/recipes-core/images/mlinux-base-image.bb b/recipes-core/images/mlinux-base-image.bb
index bd8dce7..e06e754 100644
--- a/recipes-core/images/mlinux-base-image.bb
+++ b/recipes-core/images/mlinux-base-image.bb
@@ -9,11 +9,12 @@ FILESYSTEM_FEATURES = "dosfstools \
 				 lsof \
                  "
 
-NETWORKING_FEATURES += "bridge-utils \
+NETWORKING_FEATURES_append = " \
+                       bridge-utils \
                        inetutils-ftp \
                        openssl \
                        rsync \
-                       iperf \
+                       iperf3 \
                        lldpd \
 					   mii-diag \
 					   tcpdump \
@@ -26,9 +27,8 @@ NETWORKING_FEATURES += "bridge-utils \
 WIFI_FEATURES = " \
                 libnl \
                 wpa-supplicant \
-                wireless-tools \
                 iw \
-                hostap-daemon hostap-utils \
+                hostapd \
                 "
 
 BLUETOOTH_FEATURES = "bluez5"
@@ -48,9 +48,9 @@ TIME_FEATURES = "tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-a
 # radio-cmd: supports cellular radio activation and other configuration commands
 # radio-query: queries cellular radio for common info (IMEI, RSSI, etc)
 # jsparser: command line tool to parse JSON files
-MULTITECH_FEATURES += " \
-                     u-boot-linux-utils \
-                     mlinux-scripts \
+MULTITECH_FEATURES_append = " \
+					 u-boot-linux-utils \
+					 mlinux-scripts \
 					 reset-handler \
 					 radio-cmd radio-query \
 					 jsparser \
@@ -58,12 +58,15 @@ MULTITECH_FEATURES += " \
 
 MISC_FEATURES = "minicom lrzsz nano"
 
+DEBUG_FEATURES = ""
+
 # Extra stuff to install
-IMAGE_INSTALL += " \
+IMAGE_INSTALL_append = " \
                 kernel-modules \
 		${WIFI_FEATURES} \
 		${BLUETOOTH_FEATURES} \
 		${FILESYSTEM_FEATURES} \
                 ${TIME_FEATURES} \
                 ${MISC_FEATURES} \
+                ${DEBUG_FEATURES} \
                 "
diff --git a/recipes-core/images/mlinux-factory-image.bb b/recipes-core/images/mlinux-factory-image.bb
index a20e64b..4afabff 100644
--- a/recipes-core/images/mlinux-factory-image.bb
+++ b/recipes-core/images/mlinux-factory-image.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "mLinux factory image"
 
 # For now we don't put this in MTR or AEP
 # Password restrictions library from Redhat
-IMAGE_INSTALL += "libpwquality"
+IMAGE_INSTALL_append = " libpwquality"
 
 LIGHTTPD = "lighttpd \
             lighttpd-module-cgi lighttpd-module-indexfile \
@@ -16,41 +16,39 @@ LIGHTTPD = "lighttpd \
             "
 
 # Lighttpd web server
-IMAGE_INSTALL += "${LIGHTTPD}"
+IMAGE_INSTALL_append = " ${LIGHTTPD}"
 
-IMAGE_INSTALL += "sqlite3"
+IMAGE_INSTALL_append = " sqlite3"
 
-IMAGE_INSTALL += "autossh"
+IMAGE_INSTALL_append= " autossh"
 
 # Monit system/process monitor
-IMAGE_INSTALL += "monit"
+IMAGE_INSTALL_append = " monit"
 
 # LoRa support (MTAC-LORA accessory card)
-IMAGE_INSTALL += "lora-gateway-utils lora-network-server lora-query lora-packet-forwarder-usb lora-gateway-geolocation-utils lora-packet-forwarder-geolocation mtac-xdot-util"
+IMAGE_INSTALL_append = " lora-gateway-utils lora-query lora-network-server lora-packet-forwarder-usb"
+IMAGE_INSTALL_mtcdt_append = " lora-gateway-geolocation-utils lora-packet-forwarder-geolocation"
+IMAGE_INSTALL_mtbsp-at91_append = " mtac-xdot-util"
 
 # MQTT server
-#IMAGE_INSTALL += "mosquitto"
-IMAGE_INSTALL += "mosquitto mosquitto-clients"
+IMAGE_INSTALL_append = " mosquitto mosquitto-clients"
 
 
 # Perl support
-IMAGE_INSTALL += "perl"
-IMAGE_INSTALL += "perl-module-io perl-module-fcntl"
+IMAGE_INSTALL_append = " perl"
+IMAGE_INSTALL_append = " perl-module-io perl-module-fcntl"
 # not in meta-oe or oe-core...
-#IMAGE_INSTALL += "libdevice-serialport-perl"
-#IMAGE_INSTALL += "libexpect-perl"
+#IMAGE_INSTALL_append = " libdevice-serialport-perl"
+#IMAGE_INSTALL_append = " libexpect-perl"
 
 # Python support
-IMAGE_INSTALL += "python"
+IMAGE_INSTALL_append = " python"
 # Python modules
-IMAGE_INSTALL += "python-async \
-python-argparse \
+IMAGE_INSTALL_append = " python-argparse \
 python-compression \
 python-dateutil \
 python-html \
-python-importlib \
 python-psutil \
-python-pycurl \
 python-pyopenssl \
 python-pyserial \
 python-pyudev \
@@ -64,34 +62,34 @@ python-xml \
 "
 
 # Ruby support
-IMAGE_INSTALL += "ruby"
+IMAGE_INSTALL_append = " ruby"
 
-IMAGE_INSTALL += "ruby-sqlite3"
-IMAGE_INSTALL += "ruby-serialport"
+IMAGE_INSTALL_append = " ruby-sqlite3"
+IMAGE_INSTALL_append = " ruby-serialport"
 
 # OpenJDK Java runtime
-# IMAGE_INSTALL += "openjdk-8"
+# IMAGE_INSTALL_append = " openjdk-8"
 # OpenJDK with JamVM VM (Multi-Tech default)
-# IMAGE_INSTALL += "jamvm"
+# IMAGE_INSTALL_append = " jamvm"
 # OpenJDK with CACAO VM (run with 'java -cacao')
-# IMAGE_INSTALL += "openjdk-7-vm-cacao"
+# IMAGE_INSTALL_append = " openjdk-7-vm-cacao"
 # OpenJDK Zero VM (run with 'java -zero')
-# IMAGE_INSTALL += "openjdk-7-vm-zero"
+# IMAGE_INSTALL_append = " openjdk-7-vm-zero"
 
 # PHP support
-IMAGE_INSTALL += "php php-cli php-fpm"
+IMAGE_INSTALL_append = " php php-cli php-fpm"
 
 # Node.js support
-IMAGE_INSTALL += "nodejs nodejs-npm"
+IMAGE_INSTALL_append = " nodejs nodejs-npm"
 
 # Multi-Tech SMS Utility (see http://git.multitech.net)
-IMAGE_INSTALL += "sms-utils"
+IMAGE_INSTALL_append = " sms-utils"
 # Multi-Tech GPS Utility
-IMAGE_INSTALL += "venus-gps"
-IMAGE_INSTALL += "pps-tools"
-IMAGE_INSTALL += "dnsmasq bluez5-pand bluez5-rfcomm"
+IMAGE_INSTALL_append = " venus-gps"
+IMAGE_INSTALL_append = " pps-tools"
+IMAGE_INSTALL_append = " dnsmasq bluez5-pand bluez5-rfcomm"
 
 # When ntp is to use the GPS, gps-utils is required
-IMAGE_INSTALL += "gpsd libgps24 libgps ntp ntp-utils gpspipe gps-utils"
+IMAGE_INSTALL_append = " gpsd libgps ntp ntp-utils gpspipe gps-utils"
 
-IMAGE_INSTALL += "lxfp uvccapture"
+IMAGE_INSTALL_append = " lxfp uvccapture"
diff --git a/recipes-core/images/mlinux-minimal-image.bb b/recipes-core/images/mlinux-minimal-image.bb
index 0e1d4a3..41829ec 100644
--- a/recipes-core/images/mlinux-minimal-image.bb
+++ b/recipes-core/images/mlinux-minimal-image.bb
@@ -5,24 +5,28 @@ inherit core-image
 inherit mlinux-image
 
 IMAGE_LINGUAS = ""
-IMAGE_FEATURES += "ssh-server-openssh package-management"
+IMAGE_FEATURES_append = " ssh-server-openssh package-management"
 
-CORE_FEATURES = "packagegroup-core-boot packagegroup-distro-base \
+# Don't wipe out CORE_FEATURES from minimal image
+CORE_FEATURES_append = " \
+                 packagegroup-core-boot packagegroup-distro-base \
                  packagegroup-base-ext2 \
                  packagegroup-base-usbhost packagegroup-base-usbgadget \
                  udev-extraconf usb-gadget-mode \
                  sysfsutils module-init-tools \
-                 bash procps mtd-utils mtd-utils-jffs2 \
+                 bash procps \ 
                  openssh-sftp-server \
                  util-linux-mount util-linux-umount \
                  start-stop-daemon \
-		 sudo \
+		         sudo \
                  ${CORE_IMAGE_EXTRA_INSTALL} \
                  mlinux-feed-configs \
-		 useradd \
-                 get-eeprom-device-config \
+		         useradd \
+                 mts-io-sysfs \
                  "
 
+CORE_FEATURES_append_mtbsp-at91 = " mtd-utils mtd-utils-jffs2 fstab-at91"
+
 NETWORKING_FEATURES = "ppp curl iproute2 \
                        iptables iputils \
                        "
@@ -44,10 +48,12 @@ MULTITECH_FEATURES = "kernel-module-mts-io \
 			config \
 			mts-id-eeprom \
 			set-rs485 \
-			radio-reset"
-
+			radio-reset \
+            upgrade-reboot"
 
-MULTITECH_MTAC = "kernel-module-mtac \
+MULTITECH_MTAC = ""
+MULTITECH_MTAC_append_mtcdt = " \
+		        kernel-module-mtac \
 			kernel-module-mtac-eth \
 			kernel-module-mtac-gpiob \
 			kernel-module-mtac-lora \
@@ -55,7 +61,11 @@ MULTITECH_MTAC = "kernel-module-mtac \
 			kernel-module-mtac-pulse \
 			kernel-module-mtac-xdot"
 
-UPGRADE_FEATURES = "upgrade-reboot mtd-utils-static"
+MULTITECH_BB = ""
+
+# BSP SPECIFIC UPGRADE FEATURES
+UPGRADE_FEATURES = ""
+UPGRADE_FEATURES_mtbsp-at91 = "mtd-utils-static"
 
 CONSOLE = "sysvinit-inittab-start"
 
@@ -64,6 +74,7 @@ IMAGE_INSTALL = "${CORE_FEATURES} \
                  ${UPGRADE_FEATURES} \
                  ${MULTITECH_FEATURES} \
                  ${MULTITECH_MTAC} \
-		 ${CONSOLE} \
+                 ${MULTITECH_BB} \
+                 ${CONSOLE} \
                  "
 
diff --git a/recipes-core/images/mlinux-mono-image.bb b/recipes-core/images/mlinux-mono-image.bb
index f15d7d2..d066ae9 100644
--- a/recipes-core/images/mlinux-mono-image.bb
+++ b/recipes-core/images/mlinux-mono-image.bb
@@ -1,3 +1,3 @@
 require mlinux-base-image.bb
 
-IMAGE_INSTALL += "mono mono-helloworld"
+IMAGE_INSTALL_append = " mono mono-helloworld"
diff --git a/recipes-core/images/mlinux-mtcap-debug-image.bb b/recipes-core/images/mlinux-mtcap-debug-image.bb
index 48009ae..13a3518 100644
--- a/recipes-core/images/mlinux-mtcap-debug-image.bb
+++ b/recipes-core/images/mlinux-mtcap-debug-image.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "mLinux Conduit Access Point debug image"
 require mlinux-mtcap-image.bb
 
 # Extra stuff to install
-IMAGE_INSTALL += "lora-network-server-mtcap \
+IMAGE_INSTALL_append = " lora-network-server-mtcap \
                   lora-gateway-utils \
                   lora-query \
                   mosquitto mosquitto-clients \
diff --git a/recipes-core/images/mlinux-mtcap-image.bb b/recipes-core/images/mlinux-mtcap-image.bb
index ec161bd..1c0c94f 100644
--- a/recipes-core/images/mlinux-mtcap-image.bb
+++ b/recipes-core/images/mlinux-mtcap-image.bb
@@ -5,18 +5,19 @@ require mtcap-modules.inc
 
 # For now we don't put this in MTR or AEP
 # Password restrictions library from Redhat
-IMAGE_INSTALL += "libpwquality"
+IMAGE_INSTALL_append = " libpwquality"
 
 FILESYSTEM_FEATURES = "dosfstools \
                        cifs-utils \
                        lsof \
                        "
 
-NETWORKING_FEATURES += "bridge-utils \
+NETWORKING_FEATURES_append = " \
+                       bridge-utils \
                        inetutils-ftp \
                        openssl \
                        rsync \
-                       iperf \
+                       iperf3 \
                        mii-diag \
                        tcpdump \
                        netcat \
@@ -25,9 +26,6 @@ NETWORKING_FEATURES += "bridge-utils \
                        busybox-ifplugd \
                        "
 
-# No accessory cards for MTAC
-MULTITECH_MTAC = ""
-
 TIME_FEATURES = "tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic \
                  tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \
                  tzdata-misc \
@@ -37,13 +35,12 @@ TIME_FEATURES = "tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-a
 
 WIFI_FEATURES = "libnl \
                 wpa-supplicant \
-                wireless-tools \
                 iw \
-                hostap-daemon hostap-utils \
+                hostapd \
                 wilc1000 \
                 "
 
-MULTITECH_FEATURES += " \
+MULTITECH_FEATURES_append = " \
                  u-boot-linux-utils \
                  mlinux-scripts \
                  reset-handler \
@@ -54,7 +51,8 @@ MULTITECH_FEATURES += " \
                  annex-client \
                  "
 
-IMAGE_INSTALL += "lora-gateway-utils \
+IMAGE_INSTALL_append = " \
+                  lora-gateway-utils \
                   lora-query \
                   lora-packet-forwarder \
                   lora-network-server \
@@ -68,11 +66,11 @@ MISC_FEATURES = "minicom lrzsz nano lxfp"
 #   Someday add wifi features
 #               ${WIFI_FEATURES}
 #
-IMAGE_INSTALL += " \
+IMAGE_INSTALL_append = " \
                 ${FILESYSTEM_FEATURES} \
                 ${TIME_FEATURES} \
                 ${MISC_FEATURES} \
                 "
 
 # Multi-Tech SMS Utility (see http://git.multitech.net)
-IMAGE_INSTALL += "sms-utils"
+IMAGE_INSTALL_append = " sms-utils"
diff --git a/recipes-core/images/mlinux-mtr-image.bb b/recipes-core/images/mlinux-mtr-image.bb
index bf56719..5a557ab 100644
--- a/recipes-core/images/mlinux-mtr-image.bb
+++ b/recipes-core/images/mlinux-mtr-image.bb
@@ -3,18 +3,17 @@ DESCRIPTION = "mLinux base mtr image"
 LICENSE = "MIT"
 
 require mlinux-minimal-image.bb
-MULTITECH_MTAC = ""
 
 FILESYSTEM_FEATURES = "dosfstools \
                  cifs-utils \
 				 lsof \
                  "
 
-NETWORKING_FEATURES += "bridge-utils \
+NETWORKING_FEATURES_append = " bridge-utils \
                        inetutils-ftp \
                        openssl \
                        rsync \
-                       iperf \
+                       iperf3 \
 					   mii-diag \
 					   tcpdump \
 					   netcat \
@@ -26,9 +25,8 @@ NETWORKING_FEATURES += "bridge-utils \
 WIFI_FEATURES = " \
                 libnl \
                 wpa-supplicant \
-                wireless-tools \
                 iw \
-                hostap-daemon hostap-utils \
+                hostapd \
                 "
 
 BLUETOOTH_FEATURES = "bluez5"
@@ -48,7 +46,7 @@ TIME_FEATURES = "tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-a
 # radio-cmd: supports cellular radio activation and other configuration commands
 # radio-query: queries cellular radio for common info (IMEI, RSSI, etc)
 # jsparser: command line tool to parse JSON files
-MULTITECH_FEATURES += " \
+MULTITECH_FEATURES_append = " \
                      u-boot-linux-utils \
                      mlinux-scripts \
 					 reset-handler \
@@ -59,7 +57,7 @@ MULTITECH_FEATURES += " \
 MISC_FEATURES = "minicom lrzsz nano"
 
 # Extra stuff to install
-IMAGE_INSTALL += " \
+IMAGE_INSTALL_append = " \
 				${WIFI_FEATURES} \
 				${BLUETOOTH_FEATURES} \
 				${FILESYSTEM_FEATURES} \
diff --git a/recipes-core/images/mlinux-mtrv1-image.bb b/recipes-core/images/mlinux-mtrv1-image.bb
index cb19add..ff9af34 100644
--- a/recipes-core/images/mlinux-mtrv1-image.bb
+++ b/recipes-core/images/mlinux-mtrv1-image.bb
@@ -3,19 +3,16 @@ DESCRIPTION = "mLinux base mtr image"
 LICENSE = "MIT"
 
 require mlinux-minimal-image.bb
-MULTITECH_MTAC = ""
 
 FILESYSTEM_FEATURES = "dosfstools \
                  cifs-utils \
 				 lsof \
                  "
 
-NETWORKING_FEATURES += "bridge-utils \
-                       dnsmasq \
+NETWORKING_FEATURES_append = " bridge-utils \
                        inetutils-ftp \
                        openssl \
                        rsync \
-                       iperf \
                        iperf3 \
 					   mii-diag \
 					   tcpdump \
@@ -28,9 +25,8 @@ NETWORKING_FEATURES += "bridge-utils \
 WIFI_FEATURES = " \
                 libnl \
                 wpa-supplicant \
-                wireless-tools \
                 iw \
-                hostap-daemon hostap-utils \
+                hostapd \
                 "
 
 BLUETOOTH_FEATURES = "bluez5 bluez5-pand"
@@ -50,7 +46,7 @@ TIME_FEATURES = "tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-a
 # radio-cmd: supports cellular radio activation and other configuration commands
 # radio-query: queries cellular radio for common info (IMEI, RSSI, etc)
 # jsparser: command line tool to parse JSON files
-MULTITECH_FEATURES += " \
+MULTITECH_FEATURES_append = " \
                      u-boot-linux-utils \
                      mlinux-scripts \
 					 reset-handler \
@@ -61,10 +57,10 @@ MULTITECH_FEATURES += " \
 MISC_FEATURES = "minicom lrzsz nano pps-tools"
 
 # Extra stuff to install
-IMAGE_INSTALL += "gpsd libgps libgps24 ntp ntp-utils gpspipe gps-utils"
-IMAGE_INSTALL += "lxfp"
+IMAGE_INSTALL_append = " kernel-module-rs9113 rs9113-util rs9113-autostart"
+IMAGE_INSTALL_append = " gpsd libgps libgps24 ntp ntp-utils gpspipe gps-utils"
 
-IMAGE_INSTALL += " \
+IMAGE_INSTALL_append = " \
 				${WIFI_FEATURES} \
 				${BLUETOOTH_FEATURES} \
 				${FILESYSTEM_FEATURES} \
diff --git a/recipes-core/images/mlinux-rs9113-base-image.bb b/recipes-core/images/mlinux-rs9113-base-image.bb
index ef565b6..ed2fc83 100644
--- a/recipes-core/images/mlinux-rs9113-base-image.bb
+++ b/recipes-core/images/mlinux-rs9113-base-image.bb
@@ -2,4 +2,4 @@ require mlinux-base-image.bb
 DESCRIPTION = "mLinux base image with rs9113 drivers"
 
 # Extra stuff to install
-IMAGE_INSTALL += "kernel-module-rs9113 rs9113-autostart rs9113-util"
+IMAGE_INSTALL_append = " kernel-module-rs9113 rs9113-autostart rs9113-util"
diff --git a/recipes-core/images/mlinux-rs9113-factory-image.bb b/recipes-core/images/mlinux-rs9113-factory-image.bb
index 55a2316..40a4610 100644
--- a/recipes-core/images/mlinux-rs9113-factory-image.bb
+++ b/recipes-core/images/mlinux-rs9113-factory-image.bb
@@ -2,4 +2,4 @@ require mlinux-factory-image.bb
 DESCRIPTION = "mLinux factory image with rs9113 drivers"
 
 # Extra stuff to install
-IMAGE_INSTALL += "dnsmasq bluez5-noinst-tools python-dbus kernel-module-rs9113 rs9113-autostart rs9113-util rs9113-misc rs9113-utils-extra"
+IMAGE_INSTALL_append = " dnsmasq bluez5-noinst-tools python-dbus kernel-module-rs9113 rs9113-autostart rs9113-util rs9113-misc rs9113-utils-extra"
diff --git a/recipes-core/images/mlinux-sdk.bb b/recipes-core/images/mlinux-sdk.bb
index 0f956bc..abdadbf 100644
--- a/recipes-core/images/mlinux-sdk.bb
+++ b/recipes-core/images/mlinux-sdk.bb
@@ -2,4 +2,4 @@
 require mlinux-factory-image.bb
 DESCRIPTION = "mLinux SDK"
 
-IMAGE_INSTALL += "boost i2c-tools"
+IMAGE_INSTALL_append = " boost i2c-tools"
diff --git a/recipes-core/images/mtcap-modules.inc b/recipes-core/images/mtcap-modules.inc
index 8cdfea4..ed3ca51 100644
--- a/recipes-core/images/mtcap-modules.inc
+++ b/recipes-core/images/mtcap-modules.inc
@@ -5,7 +5,7 @@
 # modules that are dependency's
 # of other modules.
 
-IMAGE_INSTALL += " \
+IMAGE_INSTALL_append = " \
     kernel-module-8021q \
     kernel-module-af-alg \
     kernel-module-algif-hash \
diff --git a/recipes-core/init-ifupdown/files/bonding.post-down b/recipes-core/init-ifupdown/files/bonding.post-down
deleted file mode 100644
index 13ed4fd..0000000
--- a/recipes-core/init-ifupdown/files/bonding.post-down
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-
-[ "$IF_VERBOSITY" = 1 ] && set -x
-
-sysfs()
-{
-	# Called with :
-	# $1 = value to write. Won't write if $1 is empty.
-	# $2 = basename of the file in bonding/ to write to.
-	if [ "$1" ] ; then
-		echo "$1" > "/sys/class/net/$IFACE/master/bonding/$2"
-		return $?
-	fi
-	return 0
-}
-
-sysfs_remove_all()
-{
-	# Called with:
-	# $1 = target filename
-	read values < "/sys/class/net/$IFACE/bonding/$1"
-	for value in $values ; do
-		echo "-$value" > "/sys/class/net/$IFACE/bonding/$1"
-	done
-}
-
-BOND_PARAMS="/sys/class/net/$IFACE/bonding"
-IFSTATE=/var/run/ifstate
-
-# free $IFACE if it is currently enslaved to a bonding device.
-if [ -f "/sys/class/net/$IFACE/master/bonding/slaves" ] ; then
-	echo "-$IFACE" > "/sys/class/net/$IFACE/master/bonding/slaves"
-
-	# The first slave in bond-primary found in current slaves becomes the primary.
-	# If no slave in bond-primary is found, then primary does not change and might be undefined if just removed.
-	for slave in $IF_BOND_PRIMARY ; do
-		if grep -sq "\\<$slave\\>" "/sys/class/net/$IFACE/master/bonding/slaves" ; then
-			sysfs "$slave" primary
-			break
-		fi
-	done
-fi
-
-# If $IFACE is not a master, exit.
-[ ! -f "$BOND_PARAMS/slaves" ] && exit
-
-# Unset multivalue sysfs entries, so that re-enabling the interface later won't cause error.
-
-sysfs_remove_all arp_ip_target
-
-# Remove any slaves of $IFACE.
-
-[ "$IF_VERBOSITY" = 1 ] && v=-v
-read slaves < "$BOND_PARAMS/slaves"
-for slave in $slaves ; do
-	# If $slave is currently up in $IFSTATE, then bring it down, to keep $IFSTATE consistent.
-	# This is supposed to have the side effect of freeing the interface.
-	grep -q "^$slave=" $IFSTATE && ifdown $v $slave
-
-	# Anyway, ensure $slave is free.
-	if [ -f "/sys/class/net/$slave/master/bonding/slaves" ] ; then
-		echo "-$slave" > "$BOND_PARAMS/slaves" 2> /dev/null
-	fi
-done
-
-# make sure that the link is set to down
-ip link set dev $IFACE down
diff --git a/recipes-core/init-ifupdown/files/bonding.pre-up b/recipes-core/init-ifupdown/files/bonding.pre-up
deleted file mode 100644
index 39011b6..0000000
--- a/recipes-core/init-ifupdown/files/bonding.pre-up
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/bin/sh
-
-[ "$IF_VERBOSITY" = 1 ] && set -x
-
-IFSTATE=/var/run/ifstate
-
-add_master()
-{
-	# Return if $BOND_MASTER is already a bonding interface.
-	[ -f "/sys/class/net/$BOND_MASTER/bonding/slaves" ] && return
-
-	# If the bonding module is not yet loaded, load it.
-	if [ ! -r /sys/class/net/bonding_masters ]; then
-		modprobe -q bonding
-	fi
-
-	# Create the master interface.
-	if ! grep -sq "\\<$BOND_MASTER\\>" /sys/class/net/bonding_masters; then
-		echo "+$BOND_MASTER" > /sys/class/net/bonding_masters
-	fi
-}
-
-sysfs()
-{
-	# Called with :
-	# $1 = value to write. Won't write if $1 is empty.
-	# $2 = basename of the file in bonding/ to write to.
-	if [ "$1" ] ; then
-		echo "$1" > "/sys/class/net/$BOND_MASTER/bonding/$2"
-		return $?
-	fi
-	return 0
-}
-
-sysfs_add()
-{
-	# Called with :
-	# $1 = values to write.
-	# $2 = target filename.
-	for value in $1; do
-		# Do not add $1 to $2 if already present.
-		if ! grep -sq "\\<$value\\>" /sys/class/net/$BOND_MASTER/bonding/$2
-		then
-		    sysfs "+$value" "$2"
-		fi 
-	done
-}
-
-ifup_once()
-{
-	local v=
-	[ "$IF_VERBOSITY" = 1 ] && v=-v
-	if [ "$1" != "$IFACE" ] && ! grep -q "^$1=" $IFSTATE && ifup -n "$1" >/dev/null 2>&1; then
-		ifup $v $1
-	fi
-}
-
-enslave_slaves()
-{
-	case "$BOND_SLAVES" in
-		none)
-			BOND_SLAVES=""
-			;;
-		all)
-			BOND_SLAVES=`sed -ne 's/ *\(eth[^:]*\):.*/\1/p' /proc/net/dev`
-			AUTOIF="yes"
-			;;
-	esac
-
-	for slave in $BOND_SLAVES ; do
-		if ( [ "$AUTOIF" ] && grep -q "^$slave=" $IFSTATE ) ; then
-			echo "Not enslaving interface $slave since it is already configured"
-		else
-			# Ensure $slave is down.
-			ip link set "$slave" down 2>/dev/null
-			if ! sysfs_add "$slave" slaves 2>/dev/null ; then
-				echo "Failed to enslave $slave to $BOND_MASTER. Is $BOND_MASTER ready and a bonding interface ?" >&2
-			else
-				# Bring up slave if it is defined in interfaces 
-				# This is usefull to bring up slaves that need extra setup.
-				ifup_once $slave
-			fi
-		fi
-	done
-}
-
-setup_master()
-{
-	sysfs "$IF_BOND_MODE" mode
-	sysfs "$IF_BOND_MIIMON" miimon
-	sysfs "$IF_BOND_USE_CARRIER" use_carrier
-	sysfs "$IF_BOND_UPDELAY" updelay
-	sysfs "$IF_BOND_DOWNDELAY" downdelay
-	sysfs "$IF_BOND_ARP_INTERVAL" arp_interval
-	sysfs "$IF_BOND_ARP_VALIDATE" arp_validate
-	sysfs "$IF_BOND_FAIL_OVER_MAC" fail_over_mac
-	sysfs "$IF_BOND_XMIT_HASH_POLICY" xmit_hash_policy
-	sysfs "$IF_BOND_LACP_RATE" lacp_rate
-	sysfs_add "$IF_BOND_ARP_IP_TARGET" arp_ip_target
-}
-
-setup_slaves()
-{
-	# The first slave in bond-primary found in current slaves becomes the primary.
-	# If no slave in bond-primary is found, then primary does not change.
-	for slave in $IF_BOND_PRIMARY ; do
-		if grep -sq "\\<$slave\\>" "/sys/class/net/$BOND_MASTER/bonding/slaves" ; then
-			sysfs "$slave" primary
-			break
-		fi
-	done
-
-	if [ "$IF_BOND_ACTIVE_SLAVE" ] ; then
-		# Need to force interface up before. Bonding will refuse to activate a down interface.
-		ip link set "$IF_BOND_ACTIVE_SLAVE" up
-		sysfs "$IF_BOND_ACTIVE_SLAVE" active_slave
-	fi
-}
-
-# Are there anything to do ?
-
-# Option slaves deprecated, replaced by bond-slaves, but still supported for backward compatibility.
-IF_BOND_SLAVES=${IF_BOND_SLAVES:-$IF_SLAVES}
-
-if [ "$IF_BOND_MASTER" ] ; then
-	BOND_MASTER="$IF_BOND_MASTER"
-	BOND_SLAVES="$IFACE"
-	if ! [ -e /sys/class/net/$IFACE/master ]; then
-		ifup_once $BOND_MASTER
-	fi
-else
-	if [ "$IF_BOND_SLAVES$IF_BOND_MODE" ]; then
-		BOND_MASTER="$IFACE"
-		BOND_SLAVES="$IF_BOND_SLAVES"
-	fi
-fi
-
-# Exit if nothing to do...
-[ -z "$BOND_MASTER$BOND_SLAVES" ] && exit
-
-add_master
-setup_master
-enslave_slaves
-setup_slaves
diff --git a/recipes-core/init-ifupdown/files/bonding.up b/recipes-core/init-ifupdown/files/bonding.up
deleted file mode 100644
index f10152c..0000000
--- a/recipes-core/init-ifupdown/files/bonding.up
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-[ "$IF_VERBOSITY" = 1 ] && set -x
-
-sysfs()
-{
-	# Called with :
-	# $1 = value to write. Won't write if $1 is empty.
-	# $2 = basename of the file in bonding/ to write to.
-	if [ "$1" ] ; then
-		echo "$1" > "/sys/class/net/$IFACE/master/bonding/$2"
-		return $?
-	fi
-	return 0
-}
-
-# If the stanza bond-give-a-chance is set for a slave interface,
-# then force $IFACE to be the primary for some time, then restore primary to it previous value.
-
-# This stanza is designed to workaround a bug in wpa_supplicant, when used with bonding :
-
-# wpa_supplicant expect wifi authentication packets on the bond interface, but also send wifi authentication packets on the bond interface.
-# If the active interface is not the wifi interface at the time wpa_supplicant try to authenticate, the wifi AP won't receive anything, causing the authentication to fail.
-
-# In order for the wifi authentication to succeed, one need to give a chance to the wifi interface to send authentication packets.
-# "bond-give-a-chance 10" will set the wifi interface as the primary interface for 10 seconds, then restore the previous primary interface.
-# This is supposed to be enought to give a chance to wifi to authenticate properly.
-
-if [ "$IF_BOND_GIVE_A_CHANCE" ] ; then
-	read primary < "/sys/class/net/$IFACE/master/bonding/primary"
-	# Set the temporary primary.
-	sysfs "$IFACE" primary
-
-	# Wait for the link to be setup, but not longer that $IF_BOND_GIVE_A_CHANGE seconds.
-	while [ "$IF_BOND_GIVE_A_CHANCE" -gt 0 ] ; do
-		if ip link show $IFACE | grep -sq 'state UP'; then
-			break
-		fi
-		sleep 1
-		IF_BOND_GIVE_A_CHANCE=`expr $IF_BOND_GIVE_A_CHANCE - 1`
-	done
-		
-	# Restore the previous primary.
-	sysfs "$primary" primary
-fi
diff --git a/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
deleted file mode 100644
index 9d000d6..0000000
--- a/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-PR = "r8"
-
-SRC_URI += "file://bonding.pre-up \
-           file://bonding.up \
-           file://bonding.post-down"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-do_install_append () {
-	install -m 0755 ${WORKDIR}/bonding.pre-up ${D}${sysconfdir}/network/if-pre-up.d/bonding
-	install -m 0755 ${WORKDIR}/bonding.up ${D}${sysconfdir}/network/if-up.d/bonding
-	install -m 0755 ${WORKDIR}/bonding.post-down ${D}${sysconfdir}/network/if-post-down.d/bonding
-}
diff --git a/recipes-core/initscripts/initscripts-1.0/umountfs b/recipes-core/initscripts/initscripts-1.0/umountfs
deleted file mode 100644
index 9c36bd3..0000000
--- a/recipes-core/initscripts/initscripts-1.0/umountfs
+++ /dev/null
@@ -1,346 +0,0 @@
-#!/bin/bash
-### BEGIN INIT INFO
-# Provides:          umountfs
-# Required-Start:
-# Required-Stop:     
-# Default-Start:
-# Default-Stop:      0 6
-# Short-Description: Turn off swap and unmount all local file systems.
-# Description:
-### END INIT INFO
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-upgrade_fname="/var/volatile/do_flash_upgrade"
-
-umount_all() {
-  echo "Deactivating swap..."
-  swapoff -a
-
-  # We leave /proc mounted.
-  echo "Unmounting local filesystems..."
-  grep -q /mnt/ram /proc/mounts && mount -o remount,ro /mnt/ram
-  umount -f -a -r > /dev/null 2>&1
-
-  mount -o remount,ro /
-}
-
-blink_leds() {
-  led_dir=/sys/class/leds
-  # blink all programmable LEDs except status
-  leds=$(ls $led_dir/ | grep -v status)
-  nleds=$(echo "$leds" | wc -w)
-
-  # turn LEDs off
-  for led in $leds; do
-      echo "timer" > $led_dir/$led/trigger
-      echo 0  > $led_dir/$led/delay_off
-  done
-
-  int=200
-  total=$(( int * (nleds+1) ))
-  on=$(( total - int ))
-  off=$(( total - on ))
-
-  # make a pattern
-  for led in $leds; do
-      echo "$on"  > $led_dir/$led/delay_on
-      echo "$off"  > $led_dir/$led/delay_off
-      on=$(( on - int ))
-      off=$(( total - on ))
-  done
-}
-
-err_leds() {
-  led_dir=/sys/class/leds
-  # blink all programmable LEDs except status
-  leds=$(ls $led_dir/ | grep -v status)
-  nleds=$(echo "$leds" | wc -w)
-
-  # turn LEDs off
-  for led in $leds; do
-      echo "timer" > $led_dir/$led/trigger
-      echo 0  > $led_dir/$led/delay_off
-  done
-
-  int=200
-  total=$(( int * (nleds+1) ))
-  on=$(( total - int ))
-  off=$(( total - on ))
-
-  # make a pattern
-  for led in $leds; do
-      echo "$on"  > $led_dir/$led/delay_on
-      echo "$off"  > $led_dir/$led/delay_off
-  done
-  sleep 5
-}
-
-
-
-flash_upgrade() {
-  if [ $# -ne 1 ]; then
-    echo "need to specify flash-root"
-    return
-  fi
-  # flash_root must be a mountpoint that is not the rootfs and be mounted rw
-  # External mount may be on symlink.
-  local flash_root=$(readlink -f ${1})
-
-  local flash_dir=${flash_root}/flash-upgrade
-  local upgrade_file=${flash_dir}/upgrade.bin
-  local kernel_solo_file=${flash_dir}/uImage.bin
-  local rootfs_solo_file=${flash_dir}/rootfs.jffs2
-  local uboot_solo_file=${flash_dir}/u-boot.bin
-
-  local reboot_cmd=/usr/sbin/upgrade-reboot
-  local nandwrite_cmd=/usr/bin/nandwrite.static
-  local mode=
-  local bootstrap_mtd=
-  local config_mtd=
-  local oem_mtd=
-  local rootfs_mtd=
-  local kernel_mtd=
-  local uboot_mtd=
-  local bootstrap_file=bstrap.bin
-  local config_file=config.jffs2
-  local oem_file=oem.jffs2
-  local rootfs_file=rootfs.jffs2
-  local kernel_file=uImage.bin
-  local uboot_file=uboot.bin
-  local install_file=install.sh
-
-  if [ ! -d "${flash_dir}" ]; then
-    echo "${flash_dir} not present, skipping"
-    return
-  fi
-
-  if ! mountpoint -q "${flash_root}"; then
-    echo "${flash_root} is not a mountpoint"
-    return
-  fi
-
-  mode=$(grep "${flash_root}" /proc/mounts | cut -d ' ' -f 4 | cut -d ',' -f 1)
-  if [ "${mode}" != "rw" ]; then
-    echo "${flash_root} is not mounted rw"
-    return
-  fi
-
-  if [ ! -x "${reboot_cmd}" ]; then
-    echo "${reboot_cmd} is not installed"
-    return
-  fi
-
-  if [ ! -x "${nandwrite_cmd}" ]; then
-    echo "${nandwrite_cmd} is not installed"
-    return
-  fi
-
-  bootstrap_mtd="/dev/$(cat /proc/mtd | grep '\"at91bootstrap\"' | cut -d : -f 1)"
-  if [ ! -c "${bootstrap_mtd}" ]; then
-    echo "No valid MTD partition is labeled at91bootstrap"
-    return
-  fi
-
-  config_mtd="/dev/$(cat /proc/mtd | grep '\"Config\"' | cut -d : -f 1)"
-  if [ ! -c "${config_mtd}" ]; then
-    echo "No valid MTD partition is labeled Config"
-    return
-  fi
-
-  oem_mtd="/dev/$(cat /proc/mtd | grep '\"OEM Config\"' | cut -d : -f 1)"
-  if [ ! -c "${oem_mtd}" ]; then
-    echo "No valid MTD partition is labeled OEM Config"
-    return
-  fi
-
-  kernel_mtd="/dev/$(cat /proc/mtd | grep '\"uImage\"' | cut -d : -f 1)"
-  if [ ! -c "${kernel_mtd}" ]; then
-    echo "No valid MTD partition is labeled uImage"
-    return
-  fi
-
-  uboot_mtd="/dev/$(cat /proc/mtd | grep '\"u-Boot\"' | cut -d : -f 1)"
-  if [ ! -c "${uboot_mtd}" ]; then
-    echo "No valid MTD partition is labeled u-Boot"
-    return
-  fi
-
-  rootfs_mtd="/dev/$(cat /proc/mtd | grep '\"Rootfs\"' | cut -d : -f 1)"
-  if [ ! -c "${rootfs_mtd}" ]; then
-    echo "No valid MTD partition is labeled Rootfs"
-    return
-  fi
-
-  cd /var/volatile
-
-  # rootfs should always be flashed last, so always keep it last here
-  local files=(${bootstrap_file} ${uboot_file} ${config_file} ${oem_file} ${kernel_file} ${rootfs_file} ${install_file})
-  local devs=(${bootstrap_mtd} ${uboot_mtd} ${config_mtd} ${oem_mtd} ${kernel_mtd} ${rootfs_mtd})
-
-  if [ -f "${upgrade_file}" ]; then
-    echo "Found ${upgrade_file}"
-    # make sure firmware is for this device
-    shopt -s nocasematch
-    local hw_version=$(cat /sys/devices/platform/mts-io/hw-version)
-    local firmware_model=$(tar -xO -f ${upgrade_file} model)
-    # Do case insensity character match.
-    shopt -s nocasematch
-    if [[ ! "${hw_version}" =~ ^(${firmware_model})- ]]; then
-      echo "Wrong firmware for this hardware"
-      echo "hw version: ${hw_version}"
-      echo "firmware model: ${firmware_model}"
-      return
-    fi
-    shopt -u nocasematch
-
-    echo "Checking MD5s"
-    ((upgrade_script=0))
-    # check md5sum
-    for (( i = 0; i < ${#files[@]}; i++ )); do
-      local file=${files[i]}
-      if tar -t -f ${upgrade_file} | grep -F -q "${file}"; then
-        if ! tar -x -f ${upgrade_file} ${file}.md5; then
-          echo "MD5 not found for ${file}"
-          return
-        fi
-        if ! tar -xO -f ${upgrade_file} ${file} | md5sum -c ${file}.md5; then
-          echo "MD5 check failed for ${file}"
-          return
-        fi
-        if [[ ${file} == ${install_file} ]] ; then
-          ((upgrade_script=1))
-        fi
-      fi
-    done
-  fi
-
-  echo ""
-  if [ -f "${upgrade_file}" ]; then
-    echo "Starting flash upgrade from ${upgrade_file}..."
-  elif [ -f "${kernel_solo_file}" ] || [ -f "${rootfs_solo_file}" ] || [ -f "${uboot_solo_file}" ] ; then
-    echo "Starting flash upgrade from ${flash_dir}..."
-  else
-    return
-  fi
-
-  blink_leds
-  
-  if [[ ${flash_root} == /var/volatile ]] ; then
-    oldIFS="${IFS}"                                                                                                             
-    IFS=$'\n' rmlist=($(find ${flash_root} -xdev -maxdepth 1 -print | egrep -v "^${flash_root}$|^${flash_dir}$|^${flash_dir}/"))
-    IFS="${oldIFS}"                                            
-    ((i=0))                        
-    while((i < ${#rmlist[@]})) ; do
-        rm -rf "${rmlist[$i]}"
-        ((i++))
-    done      
-  fi
-
-  if ! cp ${reboot_cmd} ${flash_dir}/upgrade-reboot ; then
-     echo "Aborting upgrade.  Failed \"cp ${reboot_cmd} ${flash_dir}/upgrade-reboot\""
-     err_leds
-     return 1
-  fi
-  if ! cp ${nandwrite_cmd} ${flash_dir}/nandwrite.static ; then
-     echo "Aborting upgrade.  Failed \"cp ${nandwrite_cmd} ${flash_dir}/nandwrite.static\""
-     err_leds
-     return 1
-  fi
-
-  # Run the upgrade script, if it exists, before we change
-  # flash-root to read-only
-  if ((upgrade_script == 1)) ; then
-      if (cd ${flash_dir};tar -xf ${upgrade_file}) ; then
-          exec ${flash_dir}/${install_file} ${flash_root}
-      else
-	  echo "Extraction of ${upgrade_file} failed"
-	  echo "Upgrade aborted"
-	  umount_all
-      fi
-  fi
-  sync
-  sleep 2
-  mount -o remount,ro ${flash_root}
-
-  # flash_root is not going to be umounted
-  sed -i -e "\\|${flash_root}| d" /etc/mtab
-
-  umount_all
-
-  if [ -f "${upgrade_file}" ]; then
-    for (( i = 0; i < ${#files[@]}; i++ )); do
-      local file=${files[i]}
-      local dev=${devs[i]}
-      if tar -t -f ${upgrade_file} | grep -F -q "${file}"; then
-        if [ "${file}" == "${bootstrap_file}" ] || [ "${file}" == "${uboot_file}" ]; then
-          local file_size=$(tar -xO -f ${upgrade_file} ${file} | wc -c)
-          if dd if=${dev} bs=${file_size} count=1 | md5sum -c ${file}.md5; then
-            echo "Found ${file} in upgrade but it is the same as current. Continuing..."
-            continue
-          fi
-        fi
-        echo "Flashing ${dev} with ${file}..."
-
-        flash_erase -j ${dev} 0 0
-        tar -xO -f ${upgrade_file} ${file} | ${flash_dir}/nandwrite.static -p ${dev}
-      fi
-    done
-  else
-    if [ -f ${uboot_solo_file} ]; then
-      echo "Flashing ${uboot_mtd} (u-boot) with ${uboot_solo_file}..."
-
-      flash_erase ${uboot_mtd} 0 0
-      ${flash_dir}/nandwrite.static -p ${uboot_mtd} ${uboot_solo_file}
-    else
-      echo "u-boot file ${uboot_solo_file} not found"
-    fi
-
-    if [ -f ${kernel_solo_file} ]; then
-      echo "Flashing ${kernel_mtd} (uImage) with ${kernel_solo_file}..."
-
-      flash_erase ${kernel_mtd} 0 0
-      ${flash_dir}/nandwrite.static -p ${kernel_mtd} ${kernel_solo_file}
-    else
-      echo "uImage file ${kernel_solo_file} not found"
-    fi
-
-    if [ -f ${rootfs_solo_file} ]; then
-      echo "Flashing ${rootfs_mtd} (rootfs) with ${rootfs_solo_file}..."
-
-      flash_erase -j ${rootfs_mtd} 0 0
-      ${flash_dir}/nandwrite.static -p ${rootfs_mtd} ${rootfs_solo_file}
-    else
-      echo "rootfs file ${rootfs_solo_file} not found"
-    fi
-  fi
-
-  echo "Rebooting..."
-
-  ${flash_dir}/upgrade-reboot
-
-  # Should not get here normally
-  echo "upgrade-reboot failed"
-  exit 1
-}
-
-# do flash on reboot if do_flash_upgrade exists
-# and is owned by root
-if [[ -f ${upgrade_fname} ]] ; then
-    owner=$(stat -c%u "${upgrade_fname}")
-    if ((${#owner} > 0)) && ((owner == 0)) ; then
-      flash_upgrade /var/volatile
-      flash_upgrade /media/card
-      # Look for upgrade on external media besides
-      # SD card.
-      cd /run/media
-      # See if there is a USB driver
-      last=$(dirname $(ls -d */flash-upgrade))
-      if ((${#last} > 0)) ; then
-        flash_upgrade "/run/media/${last}"
-      fi
-    fi
-fi
-
-umount_all
-
-: exit 0
diff --git a/recipes-core/initscripts/initscripts_1.0.bbappend b/recipes-core/initscripts/initscripts_1.0.bbappend
deleted file mode 100644
index af7b258..0000000
--- a/recipes-core/initscripts/initscripts_1.0.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
-
-# flash on reboot/umountfs needs regular umount (not busybox)
-RDEPENDS_${PN} += "util-linux-umount util-linux-mount bash"
-
-PR .= ".43"
diff --git a/recipes-core/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch b/recipes-core/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch
deleted file mode 100644
index b88440d..0000000
--- a/recipes-core/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 340f911f9e3f4ff6b01682c5341c959060782af2 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 2 Apr 2015 19:18:45 -0700
-Subject: [PATCH] usb.h: Include sys/types.h
-
-We need the definitions for things like u_intX_t
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libusb/usb.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libusb/usb.h b/libusb/usb.h
-index 84e730f..caffae2 100644
---- a/libusb/usb.h
-+++ b/libusb/usb.h
-@@ -31,6 +31,8 @@
- 
- #include <dirent.h>
- 
-+#include <sys/types.h>
-+
- /*
-  * USB spec information
-  *
--- 
-2.1.4
-
diff --git a/recipes-core/libusb/libusb1/no-dll.patch b/recipes-core/libusb/libusb1/no-dll.patch
deleted file mode 100644
index 6e6bb83..0000000
--- a/recipes-core/libusb/libusb1/no-dll.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-As all invokes all-recursive which uses sub-makes to invoke all-am, the
-resulting makefile wants to build libusb-1.0.la twice. In non-parallel builds
-the second attempt is skipped as the target already exists, but in highly
-parallel builds it's likely that two makes will be building libusb-1.0.la at the
-same time.
-
-Solve this by removing the explicit all target, which as libusb-1.0.dll isn't
-built under Linux is redundant anyway.
-
-Upstream-Status: Pending
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-diff --git a/libusb/Makefile.am b/libusb/Makefile.am
-index 0cab0a0..c880213 100644
---- a/libusb/Makefile.am
-+++ b/libusb/Makefile.am
-@@ -1,2 +0,0 @@
--all: libusb-1.0.la libusb-1.0.dll
--
diff --git a/recipes-core/libusb/libusb1_1.0.21.bb b/recipes-core/libusb/libusb1_1.0.21.bb
deleted file mode 100644
index 1fefd14..0000000
--- a/recipes-core/libusb/libusb1_1.0.21.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-SUMMARY = "Userspace library to access USB (version 1.0)"
-HOMEPAGE = "http://libusb.sf.net"
-BUGTRACKER = "http://www.libusb.org/report"
-SECTION = "libs"
-
-LICENSE = "LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
-
-BBCLASSEXTEND = "native nativesdk"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \
-           file://no-dll.patch \
-          "
-
-SRC_URI[md5sum] = "1da9ea3c27b3858fa85c5f4466003e44"
-SRC_URI[sha256sum] = "7dce9cce9a81194b7065ee912bcd55eeffebab694ea403ffb91b67db66b1824b"
-
-S = "${WORKDIR}/libusb-${PV}"
-
-inherit autotools pkgconfig
-
-# Don't configure udev by default since it will cause a circular
-# dependecy with udev package, which depends on libusb
-EXTRA_OECONF = "--libdir=${base_libdir} --disable-udev"
-
-do_install_append() {
-	install -d ${D}${libdir}
-	if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
-		mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
-	fi
-}
-
-FILES_${PN} += "${base_libdir}/*.so.*"
-
-FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la"
diff --git a/recipes-core/lighttpd/files/0001-lighttpd-pcre-use-pkg-config.patch b/recipes-core/lighttpd/files/0001-lighttpd-pcre-use-pkg-config.patch
deleted file mode 100644
index 48be920..0000000
--- a/recipes-core/lighttpd/files/0001-lighttpd-pcre-use-pkg-config.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 22afc5d9aaa215c3c87ba21c77d47da44ab3b113 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Fri, 26 Aug 2016 18:20:32 +0300
-Subject: [PATCH] Use pkg-config for pcre dependency instead of -config script.
-
-RP 2014/5/22
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- configure.ac | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5383cec..c29a902 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -651,10 +651,18 @@ AC_ARG_WITH([pcre],
- )
- AC_MSG_RESULT([$WITH_PCRE])
-
--if test "$WITH_PCRE" != no; then
--  if test "$WITH_PCRE" != yes; then
--    PCRE_LIB="-L$WITH_PCRE/lib -lpcre"
--    CPPFLAGS="$CPPFLAGS -I$WITH_PCRE/include"
-+if test "$WITH_PCRE" != "no"; then
-+  PKG_CHECK_MODULES(PCREPKG, [libpcre], [
-+				PCRE_LIB=${PCREPKG_LIBS}
-+				CPPFLAGS="$CPPFLAGS ${PCREPKG_CFLAGS}"
-+  ], [
-+				AC_MSG_ERROR([pcre pkgconfig not found, install the pcre-devel package or build with --without-pcre])
-+  ])
-+
-+  if test x"$PCRE_LIB" != x; then
-+    AC_DEFINE([HAVE_LIBPCRE], [1], [libpcre])
-+    AC_DEFINE([HAVE_PCRE_H], [1], [pcre.h])
-+    AC_SUBST(PCRE_LIB)
-   else
-     AC_PATH_PROG([PCRECONFIG], [pcre-config])
-     if test -n "$PCRECONFIG"; then
---
-2.15.0
diff --git a/recipes-core/lighttpd/files/0002_extended_tls_conf.patch b/recipes-core/lighttpd/files/0002_extended_tls_conf.patch
deleted file mode 100644
index 1a216dd..0000000
--- a/recipes-core/lighttpd/files/0002_extended_tls_conf.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff --git a/src/base.h b/src/base.h
-index 134fc41..f2d849e 100644
---- a/src/base.h
-+++ b/src/base.h
-@@ -289,6 +289,9 @@ typedef struct {
- 	unsigned short ssl_empty_fragments; /* whether to not set SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS */
- 	unsigned short ssl_use_sslv2;
- 	unsigned short ssl_use_sslv3;
-+	unsigned short ssl_use_tlsv1;
-+	unsigned short ssl_use_tlsv1_1;
-+	unsigned short ssl_use_tlsv1_2;
- 	unsigned short ssl_verifyclient;
- 	unsigned short ssl_verifyclient_enforce;
- 	unsigned short ssl_verifyclient_depth;
-diff --git a/src/configfile.c b/src/configfile.c
-index bba6925..bbedd77 100644
---- a/src/configfile.c
-+++ b/src/configfile.c
-@@ -146,6 +146,10 @@ static int config_insert(server *srv) {
- 		{ "server.max-request-field-size",     NULL, T_CONFIG_INT,     T_CONFIG_SCOPE_SERVER     }, /* 78 */
- 		{ "ssl.read-ahead",                    NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 79 */
- 
-+		{ "ssl.use-tlsv1",                     NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER     }, /* 80 */
-+		{ "ssl.use-tlsv1_1",                   NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER     }, /* 81 */
-+		{ "ssl.use-tlsv1_2",                   NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER     }, /* 82 */
-+
- 		{ NULL,                                NULL, T_CONFIG_UNSET,   T_CONFIG_SCOPE_UNSET      }
- 	};
- 
-@@ -226,6 +230,9 @@ static int config_insert(server *srv) {
- 		s->ssl_empty_fragments = 0;
- 		s->ssl_use_sslv2 = 0;
- 		s->ssl_use_sslv3 = 0;
-+		s->ssl_use_tlsv1 = 0;
-+		s->ssl_use_tlsv1_1 = 0;
-+		s->ssl_use_tlsv1_2 = 1;
- 		s->use_ipv6      = (i == 0) ? 0 : srv->config_storage[0]->use_ipv6;
- 		s->set_v6only    = (i == 0) ? 1 : srv->config_storage[0]->set_v6only;
- 		s->defer_accept  = (i == 0) ? 0 : srv->config_storage[0]->defer_accept;
-@@ -318,6 +325,9 @@ static int config_insert(server *srv) {
- 		cv[76].destination = &(s->stream_request_body);
- 		cv[77].destination = &(s->stream_response_body);
- 		cv[79].destination = &(s->ssl_read_ahead);
-+		cv[80].destination = &(s->ssl_use_tlsv1);
-+		cv[81].destination = &(s->ssl_use_tlsv1_1);
-+		cv[82].destination = &(s->ssl_use_tlsv1_2);
- 
- 		srv->config_storage[i] = s;
- 
-@@ -536,6 +546,9 @@ int config_setup_connection(server *srv, connection *con) {
- 	PATCH(ssl_empty_fragments);
- 	PATCH(ssl_use_sslv2);
- 	PATCH(ssl_use_sslv3);
-+	PATCH(ssl_use_tlsv1);
-+	PATCH(ssl_use_tlsv1_1);
-+	PATCH(ssl_use_tlsv1_2);
- 	PATCH(etag_use_inode);
- 	PATCH(etag_use_mtime);
- 	PATCH(etag_use_size);
-@@ -615,6 +628,12 @@ int config_patch_connection(server *srv, connection *con) {
- 				PATCH(ssl_use_sslv2);
- 			} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.use-sslv3"))) {
- 				PATCH(ssl_use_sslv3);
-+			} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.use-tlsv1"))) {
-+				PATCH(ssl_use_tlsv1);
-+			} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.use-tlsv1_1"))) {
-+				PATCH(ssl_use_tlsv1_1);
-+			} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.use-tlsv1_2"))) {
-+				PATCH(ssl_use_tlsv1_2);
- 			} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.cipher-list"))) {
- 				PATCH(ssl_cipher_list);
- 			} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.engine"))) {
-diff --git a/src/network.c b/src/network.c
-index 4295fe9..a3f9ec3 100644
---- a/src/network.c
-+++ b/src/network.c
-@@ -859,6 +859,33 @@ int network_init(server *srv) {
- 			}
- 		}
- 
-+		if (!s->ssl_use_tlsv1) {
-+			/* disable TLSv1 */
-+			if (!(SSL_OP_NO_TLSv1 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_TLSv1))) {
-+				log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:",
-+						ERR_error_string(ERR_get_error(), NULL));
-+				return -1;
-+			}
-+		}
-+
-+		if (!s->ssl_use_tlsv1_1) {
-+			/* disable TLSv1.1 */
-+			if (!(SSL_OP_NO_TLSv1_1 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_TLSv1_1))) {
-+				log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:",
-+						ERR_error_string(ERR_get_error(), NULL));
-+				return -1;
-+			}
-+		}
-+
-+		if (!s->ssl_use_tlsv1_2) {
-+			/* disable TLSv1.2 */
-+			if (!(SSL_OP_NO_TLSv1_2 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_TLSv1_2))) {
-+				log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:",
-+						ERR_error_string(ERR_get_error(), NULL));
-+				return -1;
-+			}
-+		}
-+
- 		if (!buffer_string_is_empty(s->ssl_cipher_list)) {
- 			/* Disable support for low encryption ciphers */
- 			if (SSL_CTX_set_cipher_list(s->ssl_ctx, s->ssl_cipher_list->ptr) != 1) {
diff --git a/recipes-core/lighttpd/files/0004_fastcgi_env_with_unixsocket.patch b/recipes-core/lighttpd/files/0004_fastcgi_env_with_unixsocket.patch
deleted file mode 100644
index c265066..0000000
--- a/recipes-core/lighttpd/files/0004_fastcgi_env_with_unixsocket.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From bdfb7f9c6ab29d2de3576f8bd845fa871bb44ead Mon Sep 17 00:00:00 2001
-From: Serhii Voloshynov <serhii.voloshynov@globallogic.com>
-Date: Tue, 6 Nov 2018 13:50:04 +0200
-Subject: [PATCH] patch
-
----
- src/http-header-glue.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/src/http-header-glue.c b/src/http-header-glue.c
-index 1916ca6..d4f42ad 100644
---- a/src/http-header-glue.c
-+++ b/src/http-header-glue.c
-@@ -1457,6 +1457,8 @@ int http_cgi_headers (server *srv, connection *con, http_cgi_opts *opts, http_cg
-         rc |= cb(vdata, CONST_STR_LEN("HTTPS"), CONST_STR_LEN("on"));
-     }
- 
-+    if (srv_sock->addr.plain.sa_family != AF_UNIX) {
-+
-     addr = &srv_sock->addr;
-     li_utostrn(buf, sizeof(buf), sock_addr_get_port(addr));
-     rc |= cb(vdata, CONST_STR_LEN("SERVER_PORT"), buf, strlen(buf));
-@@ -1482,6 +1484,7 @@ int http_cgi_headers (server *srv, connection *con, http_cgi_opts *opts, http_cg
-     }
-     force_assert(s);
-     rc |= cb(vdata, CONST_STR_LEN("SERVER_ADDR"), s, strlen(s));
-+    }
- 
-     if (!buffer_string_is_empty(con->server_name)) {
-         size_t len = buffer_string_length(con->server_name);
-@@ -1497,15 +1500,23 @@ int http_cgi_headers (server *srv, connection *con, http_cgi_opts *opts, http_cg
-         rc |= cb(vdata, CONST_STR_LEN("SERVER_NAME"),
-                         con->server_name->ptr, len);
-     } else {
-+      if (srv_sock->addr.plain.sa_family != AF_UNIX) {
-         /* set to be same as SERVER_ADDR (above) */
-         rc |= cb(vdata, CONST_STR_LEN("SERVER_NAME"), s, strlen(s));
-     }
-+      }
-+      if (srv_sock->addr.plain.sa_family == AF_UNIX) {
-+	  rc |= cb(vdata, CONST_STR_LEN("SERVER_IPC"), CONST_STR_LEN("yes"));
-+      }
-+
-+    if (srv_sock->addr.plain.sa_family != AF_UNIX) {
- 
-     rc |= cb(vdata, CONST_STR_LEN("REMOTE_ADDR"),
-                     CONST_BUF_LEN(con->dst_addr_buf));
- 
-     li_utostrn(buf, sizeof(buf), sock_addr_get_port(&con->dst_addr));
-     rc |= cb(vdata, CONST_STR_LEN("REMOTE_PORT"), buf, strlen(buf));
-+    }
- 
-     for (n = 0; n < con->request.headers->used; n++) {
-         data_string *ds = (data_string *)con->request.headers->data[n];
--- 
-2.7.4
-
diff --git a/recipes-core/lighttpd/files/lighttpd.conf b/recipes-core/lighttpd/files/lighttpd.conf
deleted file mode 100644
index a3e02da..0000000
--- a/recipes-core/lighttpd/files/lighttpd.conf
+++ /dev/null
@@ -1,209 +0,0 @@
-# lighttpd configuration file for the rcell 
-# include config file (/var/run/config/lighttpd_port.conf) generated at start up
-#
-# $Id: lighttpd.conf,v 1.7 2004/11/03 22:26:05 weigon Exp $
-
-#IMPORT PORT SETTINGS
-include "/var/run/config/lighttpd_port.conf"
-
-## local access from startup scripts and apps
-$SERVER["socket"] == "/var/run/api/http.sock" { }
-
-## modules
-server.modules              = (
-                                "mod_rewrite",
-                                "mod_redirect",
-                                "mod_proxy",
-                                "mod_alias",
-                                "mod_access",
-                                "mod_fastcgi",
-                                "mod_accesslog",
-                                "mod_openssl",
-                                "mod_setenv")
-
-
-## static document-root
-server.document-root        = "/var/www/"
-setenv.add-response-header = ( "Access-Control-Allow-Origin" => "*",
-  "Content-Security-Policy" => "default-src 'self'; script-src 'unsafe-inline' 'unsafe-eval' 'self'; style-src 'unsafe-inline' https://fonts.googleapis.com 'self'; font-src https://fonts.gstatic.com 'self'; connect-src 'self'; img-src 'self' data:",
-  "X-Frame-Options" =>"SAMEORIGIN",
-  "X-XSS-Protection" => "1; mode=block",
-  "X-Content-Type-Options" => "nosniff",
-  "Referrer-Policy" => "strict-origin-when-cross-origin",
-  "Feature-Policy" => "accelerometer 'none'; camera 'none'; geolocation 'none'; gyroscope 'none'; payment 'none'; usb 'none'",
-  "Strict-Transport-Security" => "max-age=31536000",
-  "Cache-Control" => "no-cache"
-)
-server.socket-perms = "0760"
-
-## where to send error-messages to
-#server.errorlog             = "/var/log/lighttpd.error.log"
-server.errorlog-use-syslog = "enable"
-
-# disable stat cache
-server.stat-cache-engine = "disable"
-
-## where to send access log
-#accesslog.filename         = "/var/log/lighttpd.access.log"
-accesslog.use-syslog = "enable"
-
-## enable debugging
-#debug.log-request-header     = "enable"
-#debug.log-response-header    = "enable"
-#debug.log-request-handling   = "enable"
-#debug.log-file-not-found     = "enable"
-#debug.log-condition-handling = "enable"
-
-## where to upload files
-server.upload-dirs = ( "/var/volatile/tmp" )
-
-# files to check for if .../ is requested
-index-file.names            = ( "index.php", "index.html",
-                                "index.htm", "default.htm" )
-
-# mimetype mapping
-mimetype.assign             = (
-  ".pdf"          =>      "application/pdf",
-  ".sig"          =>      "application/pgp-signature",
-  ".spl"          =>      "application/futuresplash",
-  ".class"        =>      "application/octet-stream",
-  ".ps"           =>      "application/postscript",
-  ".torrent"      =>      "application/x-bittorrent",
-  ".dvi"          =>      "application/x-dvi",
-  ".pac"          =>      "application/x-ns-proxy-autoconfig",
-  ".swf"          =>      "application/x-shockwave-flash",
-  ".tar.gz"       =>      "application/x-tgz",
-  ".tgz"          =>      "application/x-tgz",
-  ".tar"          =>      "application/x-tar",
-  ".xhtml"        =>      "application/xhtml+xml",
-  ".xht"          =>      "application/xhtml+xml",
-  ".zip"          =>      "application/zip",
-  ".mp3"          =>      "audio/mpeg",
-  ".m3u"          =>      "audio/x-mpegurl",
-  ".wma"          =>      "audio/x-ms-wma",
-  ".wax"          =>      "audio/x-ms-wax",
-  ".ogg"          =>      "application/ogg",
-  ".wav"          =>      "audio/x-wav",
-  ".gif"          =>      "image/gif",
-  ".jpg"          =>      "image/jpeg",
-  ".jpeg"         =>      "image/jpeg",
-  ".png"          =>      "image/png",
-  ".svg"          =>      "image/svg+xml",
-  ".ico"          =>      "image/x-icon",
-  ".xbm"          =>      "image/x-xbitmap",
-  ".xpm"          =>      "image/x-xpixmap",
-  ".xwd"          =>      "image/x-xwindowdump",
-  ".css"          =>      "text/css",
-  ".html"         =>      "text/html",
-  ".htm"          =>      "text/html",
-  ".asc"          =>      "text/plain",
-  ".c"            =>      "text/plain",
-  ".cpp"          =>      "text/plain",
-  ".log"          =>      "text/plain",
-  ".conf"         =>      "text/plain",
-  ".text"         =>      "text/plain",
-  ".txt"          =>      "text/plain",
-  ".dtd"          =>      "text/xml",
-  ".xml"          =>      "text/xml",
-  ".mpeg"         =>      "video/mpeg",
-  ".mpg"          =>      "video/mpeg",
-  ".mov"          =>      "video/quicktime",
-  ".qt"           =>      "video/quicktime",
-  ".avi"          =>      "video/x-msvideo",
-  ".asf"          =>      "video/x-ms-asf",
-  ".asx"          =>      "video/x-ms-asf",
-  ".wmv"          =>      "video/x-ms-wmv",
-  ".bz2"          =>      "application/x-bzip",
-  ".tbz"          =>      "application/x-bzip-compressed-tar",
-  ".tar.bz2"      =>      "application/x-bzip-compressed-tar",
-  ".mib"          =>      "application/text",
-  ".js"           =>      "application/javascript"
- )
-
-## deny access the file-extensions
-url.access-deny             = ( "~", ".inc" )
-
-# send a different Server: header
-server.tag = ""
-
-#server.error-handler-404   = "/index.html"
-
-#Range request are requests of one or more sub-ranges of a file. 
-#Range requests are very helpful for resuming interrupted downloads and fetching small portions of huge files.
-#Note: Adobe Acrobat Reader can crash when it tries to open a PDF file if range requests are enabled.
-$HTTP["url"] =~ "\.pdf$" {
-  server.range-requests = "disable"
-}
-
-##
-# which extensions should not be handle via static-file transfer
-#
-# .php, .pl, .fcgi are most often handled by mod_fastcgi or mod_cgi
-static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
-
-## to help the rc.scripts
-server.pid-file             = "/var/run/lighttpd.pid"
-
-# Restrict server process to non priveleged user
-server.username = "www"
-server.groupname = "www"
-
-# server limit POST size in kilobytes (60MB for firmware update)
-server.max-request-size  = 113246
-
-# server limits
-server.max-keep-alive-requests 	= 16
-server.max-keep-alive-idle 	= 15
-server.max-read-idle 		= 60
-server.max-write-idle 		= 360
-
-##
-## Format: <errorfile-prefix><status-code>.html
-## -> ..../status-404.html for 'File not found'
-server.errorfile-prefix    = "/var/www/errors/status-"
-
-## virtual directory listings
-#dir-listing.activate       = "enable"
-
-#IMPORTED CONFIGS WILL HANDLE SETTING HTTP/HTTPS
-
-#### fastcgi module
-fastcgi.server = ( "/" =>
-	( "authorizer" =>
-		(
-		"mode"   	=> "authorizer",
-		"check-local" 	=> "disable",
-		"socket"	=> "/var/run/api/rcell_api.sock",
-		"docroot"	=> "/var/www"
-		 )
-	)
-)
-
-
-$HTTP["url"] =~ "/static/js" {
-    setenv.add-response-header  = ( "Content-Encoding" => "gzip")
-    mimetype.assign = ("" => "text/javascript" )
-  } else $HTTP["url"] =~ "/help/template/scripts" {
-    setenv.add-response-header  = ( "Content-Encoding" => "gzip")
-    mimetype.assign = ("" => "text/javascript" )
-  } else $HTTP["url"] =~ "/help/whxdata/" {
-    setenv.add-response-header  = ( "Content-Encoding" => "gzip")
-    mimetype.assign = ("" => "text/javascript" )
-  } else $HTTP["url"] =~ "/help/template/Azure_Blue_MTS_1/layout.css" {
-    setenv.add-response-header  = ( "Content-Encoding" => "gzip")
-    mimetype.assign = ("" => "text/css" )
-  } else $HTTP["url"] =~ "^/api" {
-	fastcgi.server =  ( "/api" => 
-		( "api" => 
-			( 
-			"mode"		=> "responder",
-			"check-local"	=> "disable",
-			"socket"	=> "/var/run/api/rcell_api.sock"
-			)
-		)
-	)
-}
-
-#INCLUDE DIPSERVICE SETTINGS
-include "/var/run/config/lighttpd_dipservice.conf"
-include "/var/run/config/lighttpd_custom_images.conf"
diff --git a/recipes-core/lighttpd/files/lighttpd.init b/recipes-core/lighttpd/files/lighttpd.init
deleted file mode 100644
index 39860d3..0000000
--- a/recipes-core/lighttpd/files/lighttpd.init
+++ /dev/null
@@ -1,310 +0,0 @@
-#!/bin/sh
-
-enable -f libjsonget.so jsonget
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/lighttpd
-NAME=lighttpd
-ANGEL=/sbin/lighttpd-angel
-DESC="Lighttpd Web Server"
-# Web UI
-OPTS="-D -f /etc/lighttpd.conf"
-# Node-RED stub
-OPTS_NRS="-f /etc/lighttpd_nrs.conf"
-
-CAPA_NODE_RED=$(jsonget "$(< /var/run/config/device_info.json)" /capabilities/nodeRed)
-
-CONF_DIR=/var/config
-RUN_CONF_DIR=/var/run/config
-
-true2enable() {
-  if [[ "$1" == "true" ]]; then
-    echo "enable"
-  else
-    echo "disable"
-  fi
-}
-
-#Generates additional lighttpd configuration files
-#1) Enables HTTPS
-#2) Allows port configurations for HTTP and HTTPS
-#3) Enables dipservice
-#4) Allows port configurations for dipservice
-generate_config() {
-  FILE="$RUN_CONF_DIR/lighttpd_port.conf"
-  FILE_DIP="$RUN_CONF_DIR/lighttpd_dipservice.conf"
-
-  #Pull Webserver Ports
-  RMA=$(jsonget "$(< "/var/config/db.json")" /remoteAccess)
-  HTTP_ENABLED=$(jsonget "$RMA" /http/enabled)
-  HTTP_PORT=$(jsonget "$RMA" /http/port)
-  HTTPS_REDIRECT=$(jsonget "$RMA" /http/redirectToHttps)
-  HTTPS_ENABLED=$(jsonget "$RMA" /https/enabled)
-  HTTPS_PORT=$(jsonget "$RMA" /https/port)
-
-  # Advanced secure protocol settings
-  ADVANCED_SEC_VALID="false"
-  ADVANCED_SEC=$(jsonget "$(< "/var/config/db.json")" /secureProtocols/2)
-
-  if [[ "0" == "$?" ]]; then
-    ADVANCED_SEC_NAME=$(jsonget "$ADVANCED_SEC" /name)
-    if [[ "$ADVANCED_SEC_NAME" == "lighttpd" ]]; then
-      ADVANCED_SEC_VALID="true"
-      HTTPS_SSL3=$(true2enable "false") # $(true2enable $(jsonget "$ADVANCED_SEC" /protocol/ssl3))
-      HTTPS_TLS1=$(true2enable "false") # $(true2enable $(jsonget "$ADVANCED_SEC" /protocol/tls1))
-      HTTPS_TLS1_1=$(true2enable $(jsonget "$ADVANCED_SEC" /protocol/tls1_1))
-      HTTPS_TLS1_2=$(true2enable $(jsonget "$ADVANCED_SEC" /protocol/tls1_2))
-      HTTPS_CIPHER=$(jsonget "$ADVANCED_SEC" /cipherSuite)
-      if [[ -z $HTTPS_CIPHER && -f /etc/ssl/allowed_ciphersuites ]]; then
-        HTTPS_CIPHER=$( cat /etc/ssl/allowed_ciphersuites | tr "\n" ":" )
-      fi
-      CLIENT_VERIFY=$(jsonget "$ADVANCED_SEC" /client/verify )
-    fi
-  fi
-
-  if [[ "$ADVANCED_SEC_VALID" != "true" ]]; then
-    echo "API init. Using default SSL security settings"
-    # In case of invalid Advanced Security section - start with default parameters
-    HTTPS_SSL3=$(true2enable "false")
-    HTTPS_TLS1=$(true2enable "false")
-    HTTPS_TLS1_1=$(true2enable "false")
-    HTTPS_TLS1_2=$(true2enable "true")
-    HTTPS_CIPHER=""
-    CLIENT_VERIFY="false"
-  fi
-
-  #("Protocol" => "-ALL, TLSv1.2")
-  HTTPS_SSL_CONF='("Protocol" => "-ALL'
-
-  if [[ "$HTTPS_TLS1" == "enable" ]]; then
-    HTTPS_SSL_CONF+=', TLSv1'
-  fi
-  if [[ "$HTTPS_TLS1_1" == "enable" ]]; then
-    HTTPS_SSL_CONF+=', TLSv1.1'
-  fi
-  if [[ "$HTTPS_TLS1_2" == "enable" ]]; then
-    HTTPS_SSL_CONF+=', TLSv1.2'
-  fi
-  HTTPS_SSL_CONF+='")'
-
-  #Generate Lighttpd dipservice config
-  DIP=$(jsonget "$(< "$CONF_DIR/db.json")" /customDiagnostic || echo '{ "enabled": false, "port":8080 }')
-  DIP_ENABLED=$(jsonget "$DIP" /enabled)
-  DIP_PORT=$(jsonget "$DIP" /port)
-
-  echo "Generating $FILE_DIP"
-  > "$FILE_DIP"
-
-  #Generate Lighttpd Port Config
-  echo "Generating $FILE"
-  > "$FILE"
-
-  if [[ "$DIP_ENABLED" == "true" ]]; then
-    cat >> $FILE_DIP <<END
-\$SERVER["socket"] == "0.0.0.0:$DIP_PORT" {
-  fastcgi.server = (
-    "/" => (
-      (
-        "host" => "127.0.0.1",
-        "port" => 9009,
-        "check-local" => "disable",
-        "bin-path" => "/sbin/dipservice -d /var/config/dipdata",
-        "max-procs" => 1,
-        "docroot" => "/var/config/dipdata"
-      )
-    )
-  )
-}
-END
-  fi
-
-  cat >> $FILE <<END
-#AUTO-GENERATED LIGHTTPD HTTP/HTTPS CONFIGURATIONS
-#DO NOT CHANGE THIS FILE -> CHANGE $0
-END
-
-#Explicitly set the default listening port to HTTP port.
-cat >> $FILE <<END
-
-# listen to ipv4
-server.bind = "0.0.0.0"
-server.port = "$HTTP_PORT"
-END
-
-  if [ "$HTTPS_ENABLED" = "true" ]; then
-    # Enable HTTPS for ipv4/ipv6
-    # See (https://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config#Recommended-IPv6-setup)
-
-    HTTPS_SSL_ENGINE_CONFIG="ssl.engine = \"enable\"
-    ssl.use-sslv3 = \"$HTTPS_SSL3\"
-    ssl.openssl.ssl-conf-cmd = $HTTPS_SSL_CONF
-    ssl.pemfile = \"$CONF_DIR/server.pem\""
-
-    if [ "$CLIENT_VERIFY" = "true" ]; then
-      HTTPS_SSL_ENGINE_CONFIG+="ssl.ca-file = \"/etc/ssl/certs/ca-certificates.crt\"
-    ssl.verifyclient.activate = \"enable\"
-    ssl.verifyclient.enforce = \"enable\""
-    fi
-
-    if [ -n "$HTTPS_CIPHER" ]; then
-      HTTPS_SSL_ENGINE_CONFIG+="
-    ssl.cipher-list = \"$HTTPS_CIPHER\""
-    fi
-
-    cat >> $FILE <<END
-
-# ipv4 socket
-\$SERVER["socket"] == "0.0.0.0:$HTTPS_PORT" {
-  $HTTPS_SSL_ENGINE_CONFIG
-}
-
-# ipv6 socket
-\$SERVER["socket"] == "[::]:$HTTPS_PORT" {
-  $HTTPS_SSL_ENGINE_CONFIG
-}
-
-END
-
-  fi
-
-
-  # Ensure that loopback can always access port 80
-  if [ "$HTTP_PORT" != 80 ]; then
-    echo "\$SERVER[\"socket\"] == \"127.0.0.1:80\" { }" >> $FILE
-  fi
-
-  # Enable redirect from HTTP to HTTPS if enabled
-  if [ "$HTTPS_REDIRECT" == "true" ]; then
-    HTTPS_REDIRECT_CONFIG="\$SERVER[\"socket\"] == \":$HTTP_PORT\" {
-      \$HTTP[\"host\"] =~ \"^([^:^/]*)(:\d*)?(.*)\" {
-        url.redirect = ( \"^/(.*)\" => \"https://%1:$HTTPS_PORT/\$1\" )
-      }
-    } else "
-  fi
-
-  HTTPX_REWRITE_URL='url.rewrite-once = ( "^/(?!static|api|tmp|help)(.+)/?$" => "/index.html" )'
-
-  #BREAKDOWN
-  # LINE 1: CHECK: REMOTE IP IS NOT 127.0.0.1 (LOOPBACK)
-  # LINE 2: CHECK: DEST PORT IS THE HTTP PORT LIGHTTPD IS LISTENING ON
-  # LINE 3: CHECK: HOST ADDRESS (ex: 192.168.2.1:81/whatever) MATCHES THE REGEX [DOMAIN][PORT (optional)][URI]
-  #   THE REGEX FROM LINE 3 CAN BE ACCESSED IN LINE 4 WITH '%#' (ex: %1 == DOMAIN, %2 == PORT, %3 == URI)
-  # LINE 4: FUNCTION: REGEX THE URI ([MATCH ALL]) AND BUILD THE REDIRECT URL
-  #   THE REGEX FROM LINE 4 CAN BE ACCESSED IN THE REDIRECT CONSTRUCTION WITH '$#' (ex: $1 == THE ENTIRE URI)
-
-  cat >> $FILE <<END
-\$HTTP["remoteip"] != "127.0.0.1" {
-  $HTTPS_REDIRECT_CONFIG \$HTTP["host"] =~ "^([^:^/]*)(:\d*)?(.*)" {
-    \$SERVER["socket"] == "[::]:$HTTPS_PORT" {
-      $HTTPX_REWRITE_URL
-    }
-    \$SERVER["socket"] == ":$HTTPS_PORT" {
-      $HTTPX_REWRITE_URL
-    }
-    \$SERVER["socket"] == ":$HTTP_PORT" {
-      $HTTPX_REWRITE_URL
-    }
-  }
-}
-END
-}
-
-populate_www_images() {
-  local CONFIGIMAGES="/var/config/images"
-  local OEMIMAGES="/var/oem/images"
-  local WWWIMAGES="/var/volatile/www/images"
-  local WWWIMAGES_RO="/var/www/images_ro"
-
-  # Populate images only once per boot
-  if [ ! -d $WWWIMAGES ]; then
-
-    # Copy from oem partition to config partition
-    if [ ! -d $CONFIGIMAGES ]; then
-      if [ -d $OEMIMAGES ]; then
-        echo "Copying oem images"
-        mkdir -p $CONFIGIMAGES
-        cp -rf $OEMIMAGES/* $CONFIGIMAGES
-      fi
-    fi
-
-    # Copy from root partition to RAM
-    mkdir -p $WWWIMAGES
-    cp -rf $WWWIMAGES_RO/* $WWWIMAGES
-
-    # Overwrite with /var/config/images
-    if [ -d $CONFIGIMAGES ]; then
-      cp -rf $CONFIGIMAGES/* $WWWIMAGES
-    fi
-  fi
-}
-
-wait_ready() {
-  # wait api
-  local retry=0
-  local MAX=30
-  sleep 1
-  while [ $retry -lt $MAX ]; do
-    if [ "200" == "$(curl -s --unix-socket /var/run/api/http.sock -I -o /dev/null -w "%{http_code}" http://localhost/api/system)" ]; then
-      return
-    fi
-    retry=$(( $retry + 1 ))
-    echo "Waiting for API ($retry/$MAX)..."
-    sleep 1
-  done
-  echo "Failed waiting API!"
-}
-
-start() {
-  mkdir -p /var/volatile/www/tmp
-  lighttpd_custom_images_setup  # detect mime types for UI Customization images and generate Lighttpd config fragment
-
-  generate_config
-
-  start-stop-daemon --start --background --exec $ANGEL -- $DAEMON $OPTS
-
-  if [ "$CAPA_NODE_RED" = "true" ]; then
-    start-stop-daemon --start -x "$DAEMON" -p /var/run/lighttpd_nrs.pid -- $OPTS_NRS
-  fi
-
-  wait_ready
-}
-
-stop() {
-  start-stop-daemon --stop --exec $ANGEL
-
-  if [ "$CAPA_NODE_RED" = "true" ]; then
-    start-stop-daemon --stop -x "$DAEMON" -p /var/run/lighttpd_nrs.pid
-    rm -f /var/run/lighttpd_nrs.pid
-  fi
-
-  rm -f /var/run/config/lighttpd_*
-}
-
-populate_www_images
-
-case "$1" in
-  start)
-	echo -n "Starting $DESC: "
-	start
-	echo "$NAME."
-	;;
-  stop)
-	echo -n "Stopping $DESC: "
-	stop
-	echo "$NAME."
-	;;
-  restart|force-reload)
-	echo -n "Restarting $DESC: "
-	stop
-	sleep 1
-	start
-	echo "$NAME."
-	;;
-  *)
-    N=/etc/init.d/$NAME
-    echo "Usage: $N {start|stop|restart|force-reload}" >&2
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/recipes-core/lighttpd/files/lighttpd_custom_images_setup b/recipes-core/lighttpd/files/lighttpd_custom_images_setup
deleted file mode 100644
index ecd5f46..0000000
--- a/recipes-core/lighttpd/files/lighttpd_custom_images_setup
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-# Detects mime types for UI Customization images and generates according Lighttpd config fragment
-
-CONFIG_PATH="/var/run/config/lighttpd_custom_images.conf"
-IMAGE_PATH="/var/www/static/images/"
-MAGIC_DB_PATH="/usr/share/misc/magic-images.mgc"
-shopt -s nullglob
-
-echoerr() {
-  echo "$@" 1>&2
-}
-
-generate_mime_assign() {
-  local IMAGE="$1"
-  local OUTPUT=$(file -ib "$IMAGE" --magic-file "$MAGIC_DB_PATH")
-  local CONTENT_TYPE
-
-  if [ "$?" -ne "0" ] || [[ "$OUTPUT" == "" ]] || [[ "$OUTPUT" == *"cannot open"* ]]; then
-    echoerr "Failed to run file(1): ${?}; ${OUTPUT}"
-    return 1
-  fi
-
-  CONTENT_TYPE="$OUTPUT"
-  cat <<END
-\$HTTP["url"] =~ "/static/images/$IMAGE" {
-    mimetype.assign = ("" => "$CONTENT_TYPE")
-  }
-END
-}
-
-process_files() {
-  local INDENT="  "
-  local ELSE_STRING=""
-  local FRAGMENT
-
-  for IMAGE in custom_*; do
-    INDENT="  "
-
-    FRAGMENT=$(generate_mime_assign $IMAGE)
-    if [ "$?" -eq "0" ]; then
-      echo "${INDENT}${ELSE_STRING}${FRAGMENT}" >> "$CONFIG_PATH"
-      ELSE_STRING="else "
-    fi
-  done
-}
-
-echo "Generating $CONFIG_PATH"
-
-# truncate and write head
-cat > "$CONFIG_PATH" <<END
-\$HTTP["url"] =~ "/static/images/custom_" {
-END
-
-cd "$IMAGE_PATH" && process_files
-
-# write tail (closing brace)
-echo "}" >> "$CONFIG_PATH"
diff --git a/recipes-core/lighttpd/files/lighttpd_nrs.conf b/recipes-core/lighttpd/files/lighttpd_nrs.conf
deleted file mode 100644
index 8c23747..0000000
--- a/recipes-core/lighttpd/files/lighttpd_nrs.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-server.modules                 = ( "mod_expire" )
-server.bind                    = "127.0.0.1"
-server.port                    = 1882
-server.document-root           = "/var/www/node-red/node-red-stub"
-server.max-keep-alive-requests = 0
-expire.url                     = ( "/" => "access 0 days" )
-server.errorlog-use-syslog     = "enable"
-server.upload-dirs             = ( "/var/volatile/tmp" )
-index-file.names               = ( "index.html" )
-server.pid-file                = "/var/run/lighttpd_nrs.pid"
-server.errorfile-prefix        = "/var/www/node-red/node-red-errors/status-"
-mimetype.assign                = (
-  ".pdf"          =>      "application/pdf",
-  ".sig"          =>      "application/pgp-signature",
-  ".spl"          =>      "application/futuresplash",
-  ".class"        =>      "application/octet-stream",
-  ".ps"           =>      "application/postscript",
-  ".torrent"      =>      "application/x-bittorrent",
-  ".dvi"          =>      "application/x-dvi",
-  ".gz"           =>      "application/x-gzip",
-  ".pac"          =>      "application/x-ns-proxy-autoconfig",
-  ".swf"          =>      "application/x-shockwave-flash",
-  ".tar.gz"       =>      "application/x-tgz",
-  ".tgz"          =>      "application/x-tgz",
-  ".tar"          =>      "application/x-tar",
-  ".xhtml"        =>      "application/xhtml+xml",
-  ".xht"          =>      "application/xhtml+xml",
-  ".zip"          =>      "application/zip",
-  ".mp3"          =>      "audio/mpeg",
-  ".m3u"          =>      "audio/x-mpegurl",
-  ".wma"          =>      "audio/x-ms-wma",
-  ".wax"          =>      "audio/x-ms-wax",
-  ".ogg"          =>      "application/ogg",
-  ".wav"          =>      "audio/x-wav",
-  ".gif"          =>      "image/gif",
-  ".jpg"          =>      "image/jpeg",
-  ".jpeg"         =>      "image/jpeg",
-  ".png"          =>      "image/png",
-  ".xbm"          =>      "image/x-xbitmap",
-  ".xpm"          =>      "image/x-xpixmap",
-  ".xwd"          =>      "image/x-xwindowdump",
-  ".css"          =>      "text/css",
-  ".html"         =>      "text/html",
-  ".htm"          =>      "text/html",
-  ".js"           =>      "text/javascript",
-  ".asc"          =>      "text/plain",
-  ".c"            =>      "text/plain",
-  ".cpp"          =>      "text/plain",
-  ".log"          =>      "text/plain",
-  ".conf"         =>      "text/plain",
-  ".text"         =>      "text/plain",
-  ".txt"          =>      "text/plain",
-  ".dtd"          =>      "text/xml",
-  ".xml"          =>      "text/xml",
-  ".mpeg"         =>      "video/mpeg",
-  ".mpg"          =>      "video/mpeg",
-  ".mov"          =>      "video/quicktime",
-  ".qt"           =>      "video/quicktime",
-  ".avi"          =>      "video/x-msvideo",
-  ".asf"          =>      "video/x-ms-asf",
-  ".asx"          =>      "video/x-ms-asf",
-  ".wmv"          =>      "video/x-ms-wmv",
-  ".bz2"          =>      "application/x-bzip",
-  ".tbz"          =>      "application/x-bzip-compressed-tar",
-  ".tar.bz2"      =>      "application/x-bzip-compressed-tar"
-)
diff --git a/recipes-core/lighttpd/lighttpd_1.4.48.bb b/recipes-core/lighttpd/lighttpd_1.4.48.bb
deleted file mode 100644
index 0b9897a..0000000
--- a/recipes-core/lighttpd/lighttpd_1.4.48.bb
+++ /dev/null
@@ -1,100 +0,0 @@
-SUMMARY = "Lightweight high-performance web server"
-HOMEPAGE = "http://www.lighttpd.net/"
-BUGTRACKER = "http://redmine.lighttpd.net/projects/lighttpd/issues"
-
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579"
-
-PR .= ".mts21"
-
-SECTION = "net"
-DEPENDS = "zlib libpcre openssl"
-RDEPENDS_${PN} += " \
-               lighttpd-module-access \
-               lighttpd-module-accesslog \
-               lighttpd-module-fastcgi \
-               lighttpd-module-rewrite \
-               lighttpd-module-redirect \
-               lighttpd-module-alias \
-               lighttpd-module-setenv \
-               lighttpd-module-expire \
-               lighttpd-module-openssl \
-"
-RDEPENDS_${PN} += " openssl"
-# for lighttpd_custom_images_setup script
-RDEPENDS_${PN} += "bash file file-magic-db-images"
-
-
-SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.gz \
-        file://lighttpd.conf \
-        file://lighttpd_nrs.conf \
-        file://lighttpd.init \
-        file://lighttpd_custom_images_setup \
-        file://0001-lighttpd-pcre-use-pkg-config.patch;apply=true \
-        file://0004_fastcgi_env_with_unixsocket.patch;apply=true \
-"
-
-
-SRC_URI[md5sum] = "fe9ea4dccacd9738be03245c364bc055"
-SRC_URI[sha256sum] = "fc36f82877284eb506356aa80f483f133a9e17ec7cb79acd7e5b7733768538ef"
-
-EXTRA_OECONF = " \
-             --without-bzip2 \
-             --without-ldap \
-             --without-lua \
-             --without-memcached \
-             --with-pcre \
-             --without-webdav-props \
-             --without-webdav-locks \
-             --with-openssl \
-             --with-openssl-libs=${STAGING_LIBDIR} \
-             --with-zlib \
-             --disable-static \
-"
-
-inherit useradd autotools pkgconfig update-rc.d gettext systemd
-
-INITSCRIPT_NAME = "lighttpd"
-INITSCRIPT_PARAMS = "defaults 60 40"
-
-USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN} = "--system --gid 667 www"
-USERADD_PARAM_${PN} = "--system --gid 667 --uid 667 --groups 667 --no-create-home --home-dir /var/www --shell /bin/false --no-user-group www"
-
-do_install_append() {
-    install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav
-    install -d 0644 ${D}${sysconfdir}/ssl
-    install -m 0755 --group www -d ${D}${localstatedir}/www
-    install -m 0755 ${WORKDIR}/lighttpd.init ${D}${sysconfdir}/init.d/lighttpd
-    install -m 0644 --group www ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
-    install -m 0644 --group www ${WORKDIR}/lighttpd_nrs.conf ${D}${sysconfdir}
-
-    #For FHS compliance, create symbolic links to /var/log and /var/tmp for logs and temporary data
-    ln -sf ${localstatedir}/log ${D}/www/logs
-    ln -sf ${localstatedir}/tmp ${D}/www/var
-    ln -snf ../volatile/www/tmp ${D}${localstatedir}/www/tmp
-
-    install -d ${D}/${base_sbindir}
-    install -m 755 ${WORKDIR}/lighttpd_custom_images_setup ${D}/${base_sbindir}/lighttpd_custom_images_setup
-}
-
-do_install_append_mtr() {
-    sed -i 's/^server.max-request-size.*/server.max-request-size  = 60000/g' ${D}${sysconfdir}/lighttpd.conf
-}
-
-do_install_append_mtrv1() {
-    sed -i 's/^server.max-request-size.*/server.max-request-size  = 60000/g' ${D}${sysconfdir}/lighttpd.conf
-}
-
-FILES_${PN} += "${sysconfdir} /www"
-
-CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf \
-                   ${sysconfdir}/lighttpd_nrs.conf \
-                  "
-
-PACKAGES_DYNAMIC += "^lighttpd-module-.*"
-
-python populate_packages_prepend () {
-    lighttpd_libdir = d.expand('${libdir}')
-    do_split_packages(d, lighttpd_libdir, '^mod_(.*)\.so$', 'lighttpd-module-%s', 'Lighttpd module for %s', extra_depends='')
-}
diff --git a/recipes-core/mlinux-scripts/mlinux-scripts-1.2/mlinux-cell-radio-ready b/recipes-core/mlinux-scripts/mlinux-scripts-1.2/mlinux-cell-radio-ready
deleted file mode 100644
index 42c5cdc..0000000
--- a/recipes-core/mlinux-scripts/mlinux-scripts-1.2/mlinux-cell-radio-ready
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-# The timeout can be set in the environment or the
-# first parameter.
-
-COUNTER=0
-
-if [ $# -gt 1 ]; then
-    echo "usage: $0 [timeout]"
-    exit 1
-fi
-
-[ $# -eq 1 ] && TIMEOUT=$1
-
-# Set the default TIMEOUT
-: ${TIMEOUT:=60}
-
-# Wait for the radio to be ready before continuing
-while [ $COUNTER -lt $TIMEOUT ]; do
-  TYPE=$(radio-query --type)
-  MODEL=$(radio-query --model)
-  if [ $? == 0 ]; then
-    echo "Cellular radio is ready."
-    exit 0
-  fi
-  let COUNTER=COUNTER+1
-
-  echo "Waiting for radio to come up in order to identify type ..."
-
-  sleep 1
-done
-
-echo "Cellular radio is not ready."
-exit 1
diff --git a/recipes-core/mlinux-scripts/mlinux-scripts-1.2/mlinux-cell-router b/recipes-core/mlinux-scripts/mlinux-scripts-1.2/mlinux-cell-router
deleted file mode 100755
index 1607c32..0000000
--- a/recipes-core/mlinux-scripts/mlinux-scripts-1.2/mlinux-cell-router
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (C) 2014 Multi-Tech Systems
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-set -e
-
-do_start() {
-	lan_interfaces=$(echo "$lan" | sed "s/,/ /g")
-
-	echo "Configuring firewall rules..."
-	# Flush all the tables first
-	iptables -t filter -F
-	iptables -t nat -F
-	iptables -t mangle -F
-
-	# Drop all incoming packets by default
-	iptables -t filter -P INPUT DROP
-	# Accept all on local loopback
-	iptables -t filter -A INPUT -i lo -j ACCEPT
-	# Allow packets in for existing socket connections
-	iptables -t filter -A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT
-
-	# Accept all from LAN interfaces
-	for i in $lan_interfaces; do
-		iptables -t filter -A INPUT -i $i -j ACCEPT
-
-		# Accept ssh from the LAN (Wired)
-		#iptables -t filter -A INPUT -i $i -p tcp --dport 22 -j ACCEPT
-		# Accept http from the LAN (Wired)
-		#iptables -t filter -A INPUT -i $i -p tcp --dport 80 -j ACCEPT
-		# Accept tftp from the LAN (Wired)
-		#iptables -t filter -A INPUT -i $i -p udp --dport 69 -j ACCEPT
-	done
-
-	# Accept ssh from the WAN (Wireless)
-	#iptables -t filter -A INPUT -i $wan -p tcp --dport 22 -j ACCEPT
-	# Accept http from the WAN (Wireless)
-	#iptables -t filter -A INPUT -i $wan -p tcp --dport 80 -j ACCEPT
-
-	# Allow packet fowarding from LAN interfaces to WAN (cell router)
-	iptables -t filter -P FORWARD DROP
-	iptables -t filter -A FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT
-	for i in $lan_interfaces; do
-		iptables -t filter -A FORWARD -i $i -o $wan -j ACCEPT
-	done
-
-	# Allow all output packets
-	iptables -t filter -P OUTPUT ACCEPT
-
-	# enable NAT for cell router
-	iptables -t nat -A POSTROUTING -o $wan -j MASQUERADE
-
-	echo "Enabling packet forwarding..."
-	# turn on packet forwarding last
-	echo 1 > /proc/sys/net/ipv4/ip_forward
-	echo "Done"
-}
-
-do_stop() {
-	echo "Clearing firewall rules..."
-	# clear all tables
-	iptables -t filter -F
-	iptables -t nat -F
-	iptables -t mangle -F
-	# reset policies to ACCEPT
-	iptables -t filter -P INPUT ACCEPT
-	iptables -t filter -P OUTPUT ACCEPT
-	iptables -t filter -P FORWARD ACCEPT
-
-	# turn off packet forwarding
-	echo "Disabling packet forwarding..."
-	echo 0 > /proc/sys/net/ipv4/ip_forward
-	echo "Done"
-}
-
-usage() {
-	echo "Usage: $(basename $0) start|stop [options]"
-	echo "  options:"
-	echo "    -l <lan-interfaces> LAN interfaces to allow, comma-separated (defaults to \"eth0\")"
-	echo "    -w <wan-interface>  WAN interface to route out (defaults to \"ppp0\")"
-	exit 1
-}
-
-# main
-if [[ $# < 1 ]]; then
-	usage
-fi
-
-cmd=$1
-shift
-
-while getopts "l:w:h" opt; do
-	case "$opt" in
-		l)
-			l=$OPTARG
-			;;
-		w)
-			w=$OPTARG
-			;;
-		h)
-			usage
-			;;
-		*)
-			usage
-			;;
-	esac
-done
-
-# default lan to eth0 if not specified
-lan=${l-eth0}
-# default wan to ppp0 if not specified
-wan=${w-ppp0}
-
-case $cmd in
-	start)
-		echo "LAN: $lan"
-		echo "WAN: $wan"
-		do_start
-		;;
-	stop)
-		do_stop
-		;;
-	*)
-		usage
-		;;
-esac
-
-exit 0
-
diff --git a/recipes-core/mlinux-scripts/mlinux-scripts-1.2/mlinux-dhcpd b/recipes-core/mlinux-scripts/mlinux-scripts-1.2/mlinux-dhcpd
deleted file mode 100755
index 976b138..0000000
--- a/recipes-core/mlinux-scripts/mlinux-scripts-1.2/mlinux-dhcpd
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2014 Multi-Tech Systems
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-do_start() {
-	echo "starting dhcp daemon"
-	udhcpd -S /etc/udhcpd.conf
-}
-
-do_stop() {
-	echo "stopping dhcp daemon"
-	killall udhcpd
-}
-
-usage() {
-	echo "Usage: $(basename $0) start|stop|restart"
-	exit 1
-}
-
-# main
-if [[ $# != 1 ]]; then
-	usage
-fi
-
-case $1 in
-	start)
-		if [[ ! -f "/etc/udhcpd.conf" ]]
-		then
-			echo "/etc/udhcpd.conf does not exist"
-			exit 1
-		fi
-		do_start
-		;;
-	stop)
-		do_stop
-		;;
-	restart)
-		do_stop
-		sleep 1
-		do_start
-		;;
-	*)
-		usage
-		;;
-esac
-
-exit 0
diff --git a/recipes-core/mlinux-scripts/mlinux-scripts-1.2/mlinux-set-apn b/recipes-core/mlinux-scripts/mlinux-scripts-1.2/mlinux-set-apn
deleted file mode 100755
index ebe8096..0000000
--- a/recipes-core/mlinux-scripts/mlinux-scripts-1.2/mlinux-set-apn
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2014,2017,2019 Multi-Tech Systems
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-noapn_modems=(lvw2 lsp3 cdma)
-
-# Comment out AT+CGDCONT= statement
-remove_apn_sedcmd="s/^(OK[[:space:]]+'|#MT[[:space:]]+)(AT\+CGDCONT=[0-9]+[^\']*)'*/#comment by mlinux-set-apn \2/"
-
-
-
-function usage {
-	echo "Usage: $(basename $0) [--] APN"
-        echo "Or  $(basename $0)  -c to clear the APN line"
-        echo "-- is requied if the APN begins with -"
-	exit 1
-}
-
-
-((clear=0))
-if (($# < 1)); then
-  usage
-fi
-if [[ $1 == "--" ]] ; then
-  apn=$2
-elif [[ $1 == "-c" ]] ; then
-  clear=1
-elif [[ $1 =~ ^- ]] ; then
-  usage
-else
-  apn=$1
-fi
-
-
-set_apn_sedcmd="s/^(#comment by mlinux-set-apn )*(OK[[:space:]]+'|#MT[[:space:]]+)*AT\+CGDCONT=([0-9]+),\"([^\"]*)\",\"[^\"]*\".*/#MT AT\+CGDCONT=\3,\"\4\",\"${apn}\"/"
-
-
-
-getmodem()
-{
-    radioproduct=$(/usr/sbin/mts-io-sysfs show product-id) # LNA3?
-    if (($? != 0)) ; then
-        echo "Radio is not ready or not found and cannot determine the type"
-        exit 1
-    fi
-    if [[ $radioproduct =~ [^-]*-([^-]*)- ]] ; then
-        echo "${BASH_REMATCH[1]}"
-    fi
-}
-function findItem
-{
-    local s check="$1"
-    shift
-    for s ; do [[ "$s" == "$check" ]] && return 0; done
-    return 1
-}
-
-
-cd /var/config/ppp/peers
-if ((clear != 1)) ; then
-    for f in $noapn ; do
-        echo "Not allowed to set APN for $f"
-    done
-    
-    for f in *_chat *_chat_non_vz ; do
-        if [[ -L $f ]] ; then
-            continue
-        fi
-        [[ $f =~ ([^_]*) ]]
-        m=${BASH_REMATCH[1]}
-        if findItem "$m" "${noapn_modems[@]}" ; then
-            continue
-        fi
-        
-        if sed -r -i "${set_apn_sedcmd}" ${f}; then
-            echo "Set APN to \"${apn}\" in ${f}"
-            if ! grep -q /usr/libexec/ppp/chat_wrapper ${m} ; then
-                sed -i "s?connect '/usr/sbin/chat?connect '/usr/libexec/ppp/chat_wrapper /usr/sbin/chat?" ${m}
-            fi
-        else
-            echo "Failed to set APN in $f_chat"
-        fi
-    done
-else
-    for f in *_chat *_chat_non_vz ; do
-        if sed -i -r "${remove_apn_sedcmd}" $f ; then
-            echo "Commented out APN in $f"
-        else
-            if [[ $f =~ ([^_]*) ]] ; then
-                m=${BASH_REMATCH[1]}
-                if ! findItem "$m" "${noapn_modems[@]}" ; then
-                    echo "Failed to remove APN setting in $f"
-                fi
-            fi
-        fi
-    done
-fi
-
-exit 0
diff --git a/recipes-core/mlinux-scripts/mlinux-scripts-1.2/mlinux-switch-apn b/recipes-core/mlinux-scripts/mlinux-scripts-1.2/mlinux-switch-apn
deleted file mode 100755
index be056eb..0000000
--- a/recipes-core/mlinux-scripts/mlinux-scripts-1.2/mlinux-switch-apn
+++ /dev/null
@@ -1,161 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2014, 2017, 2019 Multi-Tech Systems
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-MTMODEMS=(LNA3 L4N1)
-MODEMS=(LE910-NA1 LE910C4-NF)
-
-function getactivefirmware
-{
-    /usr/bin/radio-query ${RADIOOPTION} --active-firmware
-#   FW=$(/usr/bin/radio-cmd ${RADIOOPTION} 'AT#FWSWITCH?' 2>/dev/null)
-#   if (($? != 0)) ; then
-#       >&2 echo "FW Query failed"
-#       return 1
-#   fi
-#   [[ $FW =~ \#FWSWITCH:[[:space:]]*([^,]*) ]]
-#   echo "${BASH_REMATCH[1]}"
-}
-
-# See if string is in array of strings
-# parm 1 String
-# parm 2 Arrays of strings
-function findItem {
-    local s check="$1"
-    shift
-    for s ; do 
-        [[ "$s" == "$check" ]] && return 0;
-    done
-    return 1
-}
-
-function usage {
-    >&2 echo "$(basename $0) [firmware image SKU]"
-    >&2 echo "The firmware image SKU is optional."
-    >&2 echo "If not specified, the image SKU will be determined"
-    >&2 echo "from the SIM, and automatically switched with the"
-    >&2 echo "APN.  Current valid SKU's are 0, 1 and 2"
-    exit 1
-}
-
-function setchat {
-    m=$1
-    m=${m,,}
-    fw=$2
-    silent=$3
-    case $fw in
-        0)
-            ending="non_vz"
-            ;;
-        1)
-            ending="vz"
-            ;;
-        2)
-            # Currently L4N1 only
-            ending="non_vz"
-            ;;
-        *)
-            >&2 echo 'Invalid firmware number $fw'
-            usage
-            exit 1
-            ;;
-    esac
-    source="/etc/ppp/peers/${m}_chat_${ending}"
-    target="/etc/ppp/peers/${m}_chat"
-    canon_src=$(readlink -f "${source}")
-    canon_target=$(readlink -f "${target}")
-    if [[ ${canon_src} != ${canon_target} ]] ; then
-        if ((silent == 0)) ; then
-            echo "Setting chat script to ${source}"
-        fi
-        ln -sf "${source}" "${target}"
-    fi
-}
-
-function not_ready {
-	>&2 echo "Radio is not ready"
-	>&2 echo "Try executing mlinux-switch-apn once the radio is ready"
-	exit 1
-}
-
-productid=$(/usr/sbin/mts-io-sysfs show product-id)
-if [[ $productid =~ [^-]*-([^-]*)- ]] ; then
-    mymtmodem="${BASH_REMATCH[1],,}"
-else
-    >&2 echo "Cannot find the modem in the $productid string"
-    exit 1
-fi
-
-if ! findItem "${mymtmodem^^}" "${MTMODEMS[@]}"  ; then
-  echo "Firmware switch is not supported on ${mymtmodem}."
-  usage
-  exit 1
-fi
-
-if (($# > 0)) ; then
-    fw="$1"
-    if [[ $fw =~ ^[0-9]+$ ]] ; then
-	echo fw is $fw
-        if ((fw < 0)) || ((fw > 2)) ; then
-            usage
-        fi
-    else
-        >&2 echo "Invalid firmware SKU value"
-        usage
-    fi
-    echo "Switching chat script to firmware SKU $fw"
-    setchat $mymtmodem $fw 0
-    exit $?
-else
-    if ! /usr/sbin/mlinux-cell-radio-ready ; then
-        >&2 echo Radio is not ready
-        >&2 echo Try again later
-        exit 1
-    fi
-    MODEL=$(radio-query ${RADIOOPTION} --model 2>&1)
-    result=$?
-    if [[ $MODEL =~ [Ee][Rr][Rr][Oo][Rr] ]] ; then
-        RADIOOPTION="${RADIOOPTION2}"
-        MODEL=$(radio-query ${RADIOOPTION} --model 2>&1)
-        result=$?
-    fi
-    if ((result != 0)) ; then
-        >&2echo "No radio on this device."
-        usage
-        exit 1
-    fi
-    if ! findItem $MODEL "${MODEMS[@]}" ; then
-        >&2 echo "Firmware switch is supported only on ${MODEMS[@]} and this modem is $MODEL"
-        usage
-    fi
-    
-    if  fwreply=$(/usr/sbin/mlinux-switch-cell-fw -1); then
-        if [[ $fwreply =~ Cellular[[:space:]]+radio[[:space:]]+firmware[[:space:]]+has[[:space:]]+(already[[:space:]]+)*been[[:space:]]+switched[[:space:]]+to[[:space:]]+([^[:space:]]*)[[:space:]]+image\. ]] ; then
-          fw=${BASH_REMATCH[2]}
-          setchat "${mymtmodem}" $fw 0
-        else
-	  fw=$(getactivefirmware)
-          if (($? == 0)) ; then
-              setchat "${mymtmodem}" $fw 0
-          fi
-      fi
-    fi
-fi
\ No newline at end of file
diff --git a/recipes-core/mlinux-scripts/mlinux-scripts-1.2/mlinux-switch-cell-fw b/recipes-core/mlinux-scripts/mlinux-scripts-1.2/mlinux-switch-cell-fw
deleted file mode 100755
index 4065ccb..0000000
--- a/recipes-core/mlinux-scripts/mlinux-scripts-1.2/mlinux-switch-cell-fw
+++ /dev/null
@@ -1,211 +0,0 @@
-#!/bin/bash
-# This script assumes Verizon SIMS ICCID start with 89148 and is firmware 1.
-# This script assumes T-Mobile SIMS start with 8901260 and is firmware 2.
-
-fwsw_modems=(LE910-NA1 LE910C4-NF)
-mt_modems=(lna3 l4n1)
-readme=/etc/ppp/peers/README.fwswitch
-function setactivefirmware
-{
-    radio-cmd ${RADIOOPTION} --set-active-firmware $1
-#   RESULT=$(radio-cmd ${RADIOOPTION} 'AT#FWSWITCH='$1',1' 2>&1)
-#   if (($? != 0)) ; then
-#       >&2 echo "FW Set failed"
-#       return 1
-#   fi
-#   if [[ $RESULT =~ [Ee][Rr][Rr][Oo][Rr] ]] ; then
-#       >&2 echo "FW Set failed"
-#       return 1
-#   fi
-}
-
-function getactivefirmware
-{
-    /usr/bin/radio-query ${RADIOOPTION} --active-firmware
-#   FW=$(/usr/bin/radio-cmd ${RADIOOPTION} 'AT#FWSWITCH?' 2>/dev/null)
-#   if (($? != 0)) ; then
-#       >&2 echo "FW Query failed"
-#       return 1
-#   fi
-#   [[ $FW =~ \#FWSWITCH:[[:space:]]*([^,]*) ]]
-#   echo "${BASH_REMATCH[1]}"
-}
-
-# See if string is in array of strings
-# parm 1 String
-# parm 2 Arrays of strings
-function findItem {
-    local s check="$1"
-    shift
-    for s ; do 
-        [[ "$s" == "$check" ]] && return 0;
-    done
-    return 1
-}
-
-
-function usage {
->&2 echo "
-Usage: $0 <image_id> [timeout]
-    image_id <0|1|2|-1>  : for dual FW image SKU-s, the id of the image to switch to
-                       -1 is based on SIM
-    timeout            : wait time for radio to come up if set (default : 15 sec)
-    
-"
-    exit 1
-}
-
-if [ $# -gt 2 ] ; then
-    usage
-fi
-
-#
-# Check if the radio present
-#
-MODEL=$(radio-query ${RADIOOPTION} --model 2>&1)
-result=$?
-if [[ $MCONTEXT =~ [Ee][Rr][Rr][Oo][Rr] ]] ; then
-    RADIOOPTION="${RADIOOPTION2}"
-    MODEL=$(radio-query ${RADIOOPTION} --model 2>&1)
-    result=$?
-fi
-
-if ((result != 0)) ; then
-  [ "$VERBOSE" ] && >&2 echo "Assume no radio on this device."
-  exit 0
-fi
-
-#
-# Load args (don't wait for the radio by default)
-#
-FWIMAGE=$1
-if ((FWIMAGE < -2)) || ((FWIMAGE > 2)) ; then
-    usage
-fi
-if ! >&2 /usr/sbin/mlinux-cell-radio-ready ; then
-    [ "$VERBOSE" ] && >&2 echo Radio is not ready
-    [ "$VERBOSE" ] && >&2 echo Try again later
-    exit 1
-fi
-if ((FWIMAGE == -1)) ; then
-    iccid=$(radio-query ${RADIOOPTION} --iccid)
-    if (($? == 0)); then
-        if ((${#iccid} == 0)) ; then
-            [ "$VERBOSE" ] && >&2 echo "No carrier.  Maybe no SIM?"
-            [ "$VERBOSE" ] && >&2 echo "ERROR: Cannot decide on firmware"
-            exit 1
-        fi
-        if [[ $iccid =~ ^89148.* ]] ; then
-            # Verizon
-            logger -s -t mlinux-sw-firmware -p daemon.info "Assuming $iccid is a Verizon SIM ICCID using Firmware 1"
-            ((FWIMAGE=1))
-        elif [[ $iccid =~ ^8901260.* ]] ; then
-            # T-Mobile
-            logger -s -t mlinux-sw-firmware -p daemon.info "Assuming $iccid is a T-Mobile SIM ICCID using Firmware 2"
-            ((FWMAGE=2))
-            if [[ $MODEL == LE910-NA1 ]] ; then  # Assume LNA3 has no firmware image 2
-                ((FWIMAGE=0))
-            fi
-        else
-            # Everybody else
-            logger -s -t mlinux-sw-firmware -p daemon.info "Assuming $iccid is a possibly AT&T SIM using Firmware 0"
-            ((FWIMAGE=0))
-        fi
-    else
-       >&2 echo "Cannot get ICCID from SIM"
-       >&2 echo "Try again later"
-       exit 1
-    fi
-fi
-    
-
-TIMEOUT=${2:-15}
-if [ "$VERBOSE" != "yes" ]; then
-  VERBOSE=""
-fi
-
-[ "$VERBOSE" ] && >&2 echo -n "Switching the radio firmware image: "
-
-#
-# Applicable for LTE910-NA1 and LE910C4-NF with dual FW images only
-#
-if ! findItem "$MODEL" "${fwsw_modems[@]}" ; then
-    echo "Firmware switch is not supported on ${MODEL}."
-    exit 1
-fi
-
-#
-# Check if firmware switch is required
-#
-FWACTIVE=$(getactivefirmware)
-if [ $? -ne 0 ] || [ "$FWACTIVE" == "" ]; then
-    [ "$VERBOSE" ] && >&2 echo "The $MODEL radio does not support firmware switching."
-    exit 0
-fi
-
-if (( FWACTIVE == FWIMAGE )); then
-    echo "Cellular radio firmware has already been switched to $FWIMAGE image."
-    exit 0
-fi
-
-# Disable the LNA3 chat script in case of failure.
-for f in $mt_modems ; do
-    linkf=/etc/ppp/peers/${f}_chat
-    if ! [[ -L ${linkf} ]] || [[ $(basename $(readlink -f ${linkf})) != ${readme} ]] ; then
-        ln -sf "${readme}" "${linkf}"
-        echo "Chat script is now disabled."
-    fi
-done
-
-#
-# Switch the firmware
-#
-RESULT=$(setactivefirmware "$FWIMAGE")
-if [ $? -ne 0 ]; then
-  [ "$VERBOSE" ] && >&2 echo "$RESULT"
-  exit 1
-fi
-
-
-#
-# Exit if no TIMEOUT set
-#
-# This is somewhat dangerous in that we assume the radio
-# will switch.
-if ((TIMEOUT == 0)) ; then
-   if ((FWIMAGE == 0)) ; then
-     [ "$VERBOSE" ] && >&2 echo "Use mlinux-switch-apn to switch the APN when the radio is ready, before dialing"
-     exit 0
-   fi
-fi
-# 
-#
-# Wait for the radio to be ready before continuing
-#
-COUNTER=0
-
-[ "$VERBOSE" ] && echo -n "Wait..."
-
-#
-# Give it some time
-#
-sleep 5
-
-while [ $COUNTER -lt $TIMEOUT ]; do
-  MODEL=$(radio-query ${RADIOOPTION} --model)
-  if [ $? -eq 0 ]; then
-    echo "Cellular radio firmware has been switched to $FWIMAGE image."
-    exit 0
-  fi
-
-  let COUNTER=COUNTER+1
-
-  [ "$VERBOSE" ] && echo -n "."
-
-  sleep 1
-done
-
->&2 echo "Cellular radio is not ready."
->&2 echo "When it becomes ready, invoke /usr/sbin/mlinux-switch-apn"
->&2 echo "to set the APN"
-exit 1
diff --git a/recipes-core/mlinux-scripts/mlinux-scripts-1.2/mlinux-wifi-ap b/recipes-core/mlinux-scripts/mlinux-scripts-1.2/mlinux-wifi-ap
deleted file mode 100755
index ddbec95..0000000
--- a/recipes-core/mlinux-scripts/mlinux-scripts-1.2/mlinux-wifi-ap
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2014 Multi-Tech Systems
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-dhcpd_file=/etc/udhcpd.conf
-hostapd_file=/etc/hostapd.conf
-interface=wlan0
-bridge_mode=0
-
-do_start() {
-	if [ "$bridge_mode" = 1 ]; then
-		interface=$b
-		if ! grep -E -q "^bridge=$interface\s*$" $hostapd_file; then
-			echo "Enabling bridge=br0 in $hostapd_file"
-			sed -r -i "s/^#?bridge=.*$/bridge=$interface/" $hostapd_file 
-		fi
-	else
-		if grep -E -q "^bridge=.*$" $hostapd_file; then
-			echo "Disabling bridge in $hostapd_file"
-			sed -r -i "s/^bridge=/#bridge=/" $hostapd_file 
-		fi
-	fi
-
-	echo "Starting hostap daemon"
-	/etc/init.d/hostapd start
-
-	if [ "$bridge_mode" != 1 ]; then
-		echo "Setting IP address to $ip"
-		ifconfig $interface $ip
-		# strip off end of IP address to get subnet
-		# assumes subnet of /24
-		subnet=${ip%.*}
-		# escape periods for regex
-		subnet_regex=${subnet//./\\.}
-		ip_regex=${ip//./\\.}
-		# set default address range for dhcpd
-		addr_start=100
-		addr_end=254
-		if ! grep -E -q "^start\s+$subnet_regex\." $dhcpd_file; then
-			echo "Changing dhcpd start to $subnet.$addr_start"
-			sed -r -i "s/^start\s+.*$/start $subnet.$addr_start/" $dhcpd_file 
-		fi
-		if ! grep -E -q "^end\s+$subnet_regex\." $dhcpd_file; then
-			echo "Changing dhcpd end to $subnet.$addr_end"
-			sed -r -i "s/^end\s+.*$/end $subnet.$addr_end/" $dhcpd_file 
-		fi
-		# update dhcpd addresses if needed
-		if ! grep -E -q "^option\s+router\s+$ip_regex" $dhcpd_file; then
-			echo "Changing dhcpd router to $ip"
-			sed -r -i "s/^option\s+router\s+.*$/option router $ip/" $dhcpd_file 
-		fi
-	else
-		# unset ip address for bridge mode
-		ifconfig wlan0 0.0.0.0
-	fi
-
-	if ! grep -E -q "^interface\s+$interface" $dhcpd_file; then
-		echo "Changing dhcpd interface to $interface"
-		sed -r -i "s/^interface\s+.*$/interface $interface/" $dhcpd_file 
-	fi
-	mlinux-dhcpd start
-}
-
-do_stop() {
-	echo "Stopping hostap daemon"
-	/etc/init.d/hostapd stop
-	mlinux-dhcpd stop
-}
-
-usage() {
-	echo "Usage: $(basename $0) start|stop|restart [options]"
-	echo "  options:"
-	echo "    -a <address>    Sets AP IP address (defaults to 192.168.3.1)"
-	echo "    -b <interface>  Add AP to specified bridge interface (conflicts with -a)"
-	exit 1
-}
-
-# main
-if [[ $# < 1 ]]; then
-	usage
-fi
-
-cmd=$1
-shift
-
-while getopts "a:b:h" opt; do
-	case "$opt" in
-		a)
-			a=$OPTARG
-			;;
-		b)
-			b=$OPTARG
-			bridge_mode=1
-			;;
-		h)
-			usage
-			;;
-		*)
-			usage
-			;;
-	esac
-done
-
-# can't specify both address and bridge mode
-if [ -n "$a" ] && [ -n "$b" ]; then
-	usage
-fi
-
-if [ -n "$a" ]; then
-	ret=1
-	if [[ $a =~ ^([0-9]{1,3}\.){3,3}[0-9]{1,3}$ ]]
-	then
-		OIFS=$IFS
-		IFS='.'
-		ip=($a)
-		IFS=$OFIS
-		[[ ${ip[0]} -le 255 && ${ip[1]} -le 255 && ${ip[2]} -le 255 && ${ip[3]} -le 255 ]]
-		ret=$?
-	fi
-	if [[ ret -ne 0 ]]
-	then
-		echo "invalid IP address"
-		exit 1
-	fi
-	ip=$a
-else
-	ip="192.168.3.1"
-fi
-
-case $cmd in
-	start)
-		do_start
-		;;
-	stop)
-		do_stop
-		;;
-	restart)
-		do_stop
-		sleep 1
-		do_start
-		;;
-	*)
-		usage
-		;;
-esac
-
-exit 0
diff --git a/recipes-core/mlinux-scripts/mlinux-scripts.inc b/recipes-core/mlinux-scripts/mlinux-scripts.inc
deleted file mode 100644
index 4e098aa..0000000
--- a/recipes-core/mlinux-scripts/mlinux-scripts.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-HOMEPAGE = "www.multitech.net"
-PRIORITY = "optional"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-RDEPENDS_${PN} += "bash"
-
-SRC_URI = "file://mlinux-wifi-ap \
-	file://mlinux-dhcpd \
-	file://mlinux-set-apn \
-	file://mlinux-switch-apn \
-	file://mlinux-switch-cell-fw \
-	file://mlinux-cell-router \
-	file://mlinux-cell-radio-ready \
-	file://mlinux-firmware-upgrade \
-"
-
-
-do_install() {
-	install -d ${D}${sbindir} ${D}${sbindir}
-	install -m 755 ${WORKDIR}/mlinux-wifi-ap ${D}${sbindir}
-	install -m 755 ${WORKDIR}/mlinux-dhcpd ${D}${sbindir}
-	install -m 755 ${WORKDIR}/mlinux-set-apn ${D}${sbindir}
-	install -m 755 ${WORKDIR}/mlinux-switch-apn ${D}${sbindir}
-	install -m 755 ${WORKDIR}/mlinux-switch-cell-fw ${D}${sbindir}
-	install -m 755 ${WORKDIR}/mlinux-cell-router ${D}${sbindir}
-	install -m 755 ${WORKDIR}/mlinux-cell-radio-ready ${D}${sbindir}
-	install -m 755 ${WORKDIR}/mlinux-firmware-upgrade ${D}${sbindir}
-}
diff --git a/recipes-core/mlinux-scripts/mlinux-scripts-1.2/mlinux-firmware-upgrade b/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade
index a377309..a377309 100755
--- a/recipes-core/mlinux-scripts/mlinux-scripts-1.2/mlinux-firmware-upgrade
+++ b/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade
diff --git a/recipes-core/mlinux-scripts/mlinux-scripts_%.bbappend b/recipes-core/mlinux-scripts/mlinux-scripts_%.bbappend
new file mode 100644
index 0000000..ecda287
--- /dev/null
+++ b/recipes-core/mlinux-scripts/mlinux-scripts_%.bbappend
@@ -0,0 +1,13 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PR .= ".mlinux0"
+
+SRC_URI += " \
+        file://mlinux-firmware-upgrade \
+"
+
+do_install_append() {
+        install -d ${D}${sbindir} ${D}${sbindir}
+        install -m 755 ${WORKDIR}/mlinux-firmware-upgrade ${D}${sbindir}
+}
+
diff --git a/recipes-core/mlinux-scripts/mlinux-scripts_1.2.bb b/recipes-core/mlinux-scripts/mlinux-scripts_1.2.bb
deleted file mode 100644
index 05c1b84..0000000
--- a/recipes-core/mlinux-scripts/mlinux-scripts_1.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-DESCRIPTION = "Scripts to easily get started with common mLinux use cases"
-
-require mlinux-scripts.inc
-
-PR = "r1"
-
-S = "${WORKDIR}/mlinux-scripts-${PV}"
diff --git a/recipes-core/mlinux/mlinux-feed-configs.bb b/recipes-core/mlinux/mlinux-feed-configs.bb
deleted file mode 100644
index 4291f24..0000000
--- a/recipes-core/mlinux/mlinux-feed-configs.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "Configuration files for online package repositories aka feeds"
-PR = "r1"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-feeds="all ${TUNE_PKGARCH} ${MACHINE_ARCH}"
-feed_file="mlinux-feed.conf"
-
-do_compile() {
-    mkdir -p ${S}/${sysconfdir}/opkg
-    rm -f ${S}/${sysconfdir}/opkg/${feed_file}
-    for feed in ${feeds}; do
-        echo "src/gz ${DISTRO_FEED_PREFIX}-${feed} ${DISTRO_FEED_URI}/${feed}" >> ${S}/${sysconfdir}/opkg/${feed_file}
-    done
-}
-do_install () {
-    install -d ${D}${sysconfdir}/opkg
-    install -m 0644 ${S}/${sysconfdir}/opkg/* ${D}${sysconfdir}/opkg/
-}
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-CONFFILES_${PN} += "${sysconfdir}/opkg/${feed_file}"
diff --git a/recipes-core/mlinux/mlinux-version.bb b/recipes-core/mlinux/mlinux-version.bb
deleted file mode 100644
index 85adfbb..0000000
--- a/recipes-core/mlinux/mlinux-version.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-inherit mlinux_metadata_scm
-
-# always parse this file so PV can change automatically
-BB_DONT_CACHE = "1"
-
-PV = "${DISTRO_VERSION}_${MLINUX_METADATA_REVISION}"
-PR = "r2"
-PE = "1"
-
-PACKAGES = "${PN}"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-do_install() {
-	mkdir -p ${D}${sysconfdir}
-	echo "mLinux ${DISTRO_VERSION}" > ${D}${sysconfdir}/mlinux-version
-	echo "Built from branch: ${MLINUX_METADATA_BRANCH}" >> ${D}${sysconfdir}/mlinux-version
-	echo "Revision: ${MLINUX_METADATA_REVISION}" >> ${D}${sysconfdir}/mlinux-version
-	echo "${MLINUX_LAYERS}" > ${D}${sysconfdir}/mlinux-layers
-}
diff --git a/recipes-core/multitech/cell-radio-carrierswitch/cell-radio-carrierswitch.default b/recipes-core/multitech/cell-radio-carrierswitch/cell-radio-carrierswitch.default
deleted file mode 100644
index 7128721..0000000
--- a/recipes-core/multitech/cell-radio-carrierswitch/cell-radio-carrierswitch.default
+++ /dev/null
@@ -1,6 +0,0 @@
-# set to "no" to disable cell-radio-fwswitch on boot
-ENABLED="yes"
-
-# The default timeout is 60 seconds.
-# It depends on how long your radio takes to get ready.
-# export TIMEOUT 60
diff --git a/recipes-core/multitech/cell-radio-carrierswitch/cell-radio-carrierswitch.init b/recipes-core/multitech/cell-radio-carrierswitch/cell-radio-carrierswitch.init
deleted file mode 100644
index 6b8a640..0000000
--- a/recipes-core/multitech/cell-radio-carrierswitch/cell-radio-carrierswitch.init
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# no firmware switch by default
-ENABLED="no"
-
-[ -r /etc/default/cell-radio-carrierswitch ] && source /etc/default/cell-radio-carrierswitch
-[ "$ENABLED" == "yes" ] || exit 0
-
-# It may take a couple of boots to get the APN straightened out.
-# mlinux-switch-apn is only effective for LNA3.  It will only
-# take action if it detects a different SIM from the one
-# that is configured.  It requires a RADIO that is active.
-# The script is executed in the background to prevent holding up the
-# boot.
-
-case $1 in
-  start)
-    (/usr/sbin/mlinux-switch-apn 2>&1 | logger -p daemon.notice) &
-    ;;
-
-  *)
-    echo "Usage: $0 {start}"
-    exit 2
-    ;;
-esac
-
diff --git a/recipes-core/multitech/cell-radio-carrierswitch_1.0.bb b/recipes-core/multitech/cell-radio-carrierswitch_1.0.bb
deleted file mode 100644
index 0220dba..0000000
--- a/recipes-core/multitech/cell-radio-carrierswitch_1.0.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "Radio firmware switching functionality for dual image units (only LNA3 radios for now)"
-SECTION = "base"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-PR = "r1"
-
-RDEPENDS_${PN} = "radio-query radio-cmd mlinux-scripts"
-
-inherit update-rc.d
-INITSCRIPT_NAME = "cell-radio-carrierswitch"
-INITSCRIPT_PARAMS = "start 63 5 ."
-
-SRC_URI = "\
-  file://cell-radio-carrierswitch.default \
-  file://cell-radio-carrierswitch.init \
-"
-
-do_install() {
-    install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/cell-radio-carrierswitch.init ${D}${sysconfdir}/init.d/cell-radio-carrierswitch
-
-    install -d ${D}${sysconfdir}/default
-    install -m 0644 ${WORKDIR}/cell-radio-carrierswitch.default ${D}${sysconfdir}/default/cell-radio-carrierswitch
-}
-
diff --git a/recipes-core/multitech/commissioning_1.0.1.bb b/recipes-core/multitech/commissioning_1.0.1.bb
deleted file mode 100644
index 06e1904..0000000
--- a/recipes-core/multitech/commissioning_1.0.1.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-inherit update-rc.d
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=593c81e8a2bd8b4c4e310d8792372b13"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-DEPENDS = "fcgi jsoncpp shadow"
-RDEPENDS_${PN} += "jsoncpp lighttpd lighttpd-module-fastcgi lighttpd-module-openssl lighttpd-module-redirect bash"
-RDEPENDS_${PN}-php-fpm += "php-fpm ${PN}"
-PACKAGES =+ "${PN}-php-fpm"
-
-INITSCRIPT_PACKAGES = "${PN} ${PN}-php-fpm"
-INITSCRIPT_NAME_${PN} = "commission "
-INITSCRIPT_PARAMS_${PN} = "start 9 2 3 4 5 ."
-INITSCRIPT_NAME_${PN}-php-fpm = "commission-php-fpm"
-INITSCRIPT_PARAMS_${PN}-php-fpm = "start 9 2 3 4 5 ."
-
-PR = "r1"
-SRCREV = "${PV}"
-
-FILES_${PN}-php-fpm = "/etc/init.d/commission-php-fpm"
-FILES_${PN} += "/www/"
-
-SRC_URI = "git://git.multitech.net/commissioning;branch=master"
-
-S = "${WORKDIR}/git"
-do_compile() {
-    oe_runmake all
-}
-do_install() {
-
-    cp -a ${S}/${sysconfdir}/ ${D}/
-    cp -a ${S}/www/ ${D}/
-    cp -a ${S}/${prefix} ${D}/
-    chmod 755 ${D}/etc/init.d/*
-    chmod 755 ${D}/${libexecdir}/commission/*
-    chown -R root:root ${D}/
-
-    oe_runmake install DESTDIR=${D}
-    chmod 755 ${D}/usr/bin/commissioning.fcgi
-}
diff --git a/recipes-core/multitech/config/99_radio b/recipes-core/multitech/config/99_radio
deleted file mode 100644
index c2aa885..0000000
--- a/recipes-core/multitech/config/99_radio
+++ /dev/null
@@ -1,24 +0,0 @@
-# This configuration file lists filesystem objects that should get verified
-# during startup and be created if missing.
-#
-# Every line must either be a comment starting with #
-# or a definition of format:
-# <type> <owner> <group> <mode> <path> <linksource>
-# where the items are separated by whitespace !
-#
-# <type> : d|f|l : (d)irectory|(f)ile|(l)ink
-#
-# A linking example:
-# l root root 0777 /var/test /tmp/testfile
-# f root root 0644 /var/test none
-#
-# Understanding links:
-# When populate-volatile is to verify/create a directory or file, it will first
-# check it's existence. If a link is found to exist in the place of the target,
-# the path of the target is replaced with the target the link points to.
-# Thus, if a link is in the place to be verified, the object will be created
-# in the place the link points to instead.
-# This explains the order of "link before object" as in the example above, where
-# a link will be created at /var/test pointing to /tmp/testfile and due to this
-# link the file defined as /var/test will actually be created as /tmp/testfile.
-d root dialout 2775 /run/radio none
diff --git a/recipes-core/multitech/config/chat_wrapper b/recipes-core/multitech/config/chat_wrapper
deleted file mode 100755
index f1fd30c..0000000
--- a/recipes-core/multitech/config/chat_wrapper
+++ /dev/null
@@ -1,205 +0,0 @@
-#!/bin/bash
-
-# Rules for chat scripts
-# No comments allowed at the end of AT+CGDCONT in chat script
-# The last AT+CGDCONT= must use the same context as the dialer.
-# If desired, The AT+CGDCONT may be prefixed by #MT[[:space:]]+
-# Example:
-#MT AT+CGDCONT="IPV6","data","192.168.2.1",0,1,"EXTRA"
-#
-# If you do not use a comment, the entire AT+CGDCONT command
-# must be surrounded by apostrophes.  This command will be executed
-# twice, once in the chat wrapper, and a 2nd time in the chat
-# itself.
-#
-# The space after "#MT" may be any number including tabs.
-# If #MT AT+CGDCONT= is found, only the last one is chosen.
-# Any uncommented AT+CGDCONT= is then ignored.
-# If there are not #MT AT+CGDCONT= lines, then any line without
-# a comment chararacter before AT+CGDONT= is accepted, but only the
-# last one in the file.
-
-NAME=chat_wrapper
-CONFIG=/etc/default/${NAME}
-function finish
-{
-        ${LOG} "Launch:" "$@"
-	exec "$@"
-        # NOTREACHED
-}
-
-[[ -f $CONFIG ]] || exit 1
-
-. ${CONFIG} 
-
-: ${REGWAITTIME:=300}
-: ${FINALWAIT:=5}
-
-: ${LOG:="/usr/bin/logger -t ${NAME} -p daemon.notice"}
-
-${LOG} Timeout is $REGWAITTIME, execute "$@" 
-((i=$#))
-chatscript="${!i}"
-${LOG} Parsing chat script "$chatscript"
-
-# CONTEXT is last context string in chat script
-CONTEXT=$(egrep "^#MT[[:space:]]+(AT\+CGDCONT=.*)" ${chatscript} | tail -1)
-if ((${#CONTEXT} == 0)) ; then
-    CONTEXT=$(egrep "^[^#]+AT\+CGDCONT=" ${chatscript} | tail -1)
-    [[ $CONTEXT =~ \'(AT\+CGDCONT=([0-9]+)[^$\']+) ]]
-else
-    [[ $CONTEXT =~ (AT\+CGDCONT=([0-9]+).*)$ ]]
-fi
-
-# CONTEXTNUM is the context number that is configured in the dialer.
-CONTEXT="${BASH_REMATCH[1]}"
-if ((${#CONTEXT} == 0)) ; then
-	${LOG} No context specifiction in the chat script
-        finish "$@"
-	# NOTREACHED
-fi
-((CONTEXTNUM=${BASH_REMATCH[2]}))
-
-
-${LOG} "Using Context ${CONTEXTNUM} based on chat script: ${CONTEXT}"
-
-# At this point if there is no context number, we can skip everything else.
-
-# Get Modem's context settings
-MCONTEXT=$(/usr/bin/radio-cmd ${RADIOOPTION} -t10000 'AT+CGDCONT?' 2>&1 | tr -d '\r')
-if [[ $MCONTEXT =~ [Ee][Rr][Rr][Oo][Rr] ]] ; then
-    RADIOOPTION="${RADIOOPTION2}"
-    MCONTEXT=$(/usr/bin/radio-cmd ${RADIOOPTION} -t10000 'AT+CGDCONT?' 2>&1 | tr -d '\r')
-fi
-	
-if ! [[ $MCONTEXT =~ \+CGDCONT:[[:space:]]+${CONTEXTNUM},\"([^\"]*)\",\"([^\"]*)\",\"([^\"]*)\",([0-9]+),([0-9]+)([^$'\n']*) ]] ; then
-    logger -s -p daemon.error "No valid context in modem.  Is it ready?"
-    echo "$MCONTEXT" | logger -s -p daemon.error
-fi
-
-MPDP="${BASH_REMATCH[1]}"
-MAPN="${BASH_REMATCH[2]}"
-MADDR="${BASH_REMATCH[3]}"
-MDCOMP="${BASH_REMATCH[4]}"
-MHCOMP="${BASH_REMATCH[5]}"
-MFULLBOAT="${BASH_REMATCH[6]}"
-
-[[ $CONTEXT =~ AT\+CGDCONT=${CONTEXTNUM},\"([^\"]*)\",\"([^\"]*)\"(,\"([^\"]*)\"(,([0-9]+)(,([0-9]+)(,[^\']*))*)*)* ]]
-PDP="${BASH_REMATCH[1]}"
-APN="${BASH_REMATCH[2]}"
-ADDR="${BASH_REMATCH[4]}"  # Optional
-DCOMP="${BASH_REMATCH[6]}"  # Optional
-HCOMP="${BASH_REMATCH[8]}"  # Optional
-FULLBOAT="${BASH_REMATCH[9]}"  # Optional
-
-# On some modems there are more parameters than others.
-if [[ $MFULLBOAT != $FULLBOAT ]] ; then
-	${LOG} "Only the first five context parameters are considered.  The rest will be ignored."
-	${LOG} "modem: \"$MFULLBOAT\""
-	${LOG} "chat script: \"$FULLBOAT\""
-fi
-
-if ((${#DCOMP} == 0)) ; then
-	((DCOMP=0))  # Default
-fi
-if ((${#HCOMP} == 0)) ; then
-	((HCOMP=0))  # Default
-fi
-
-# Only update context on a mismatch between chat and modem.
-if [[ $MPDP != $PDP ]] || [[ $MAPN != $APN ]] || \
-	[[ $MADDR != $ADDR ]] || ((MDCOMP != DCOMP)) || \
-	((MHCOMP != HCOMP)) ; then
-   ${LOG} "Modem context $MPDP,$MAPN,$MADDR,$MDCOMP,$MHCOMP does not match chat script"
-   ${LOG} "Chat script context $PDP,$APN,$ADDR,$DCOMP,$HCOMP does not match the modem"
-   if [[ $MPDP != $PDP ]] ; then
-	${LOG} "PDP mismatch"
-   fi
-   if [[ $MAPN != $APN ]] ; then
-	${LOG} "APN mismatch"
-   fi
-   if [[ $MADDR != $ADDR ]] ; then
-	${LOG} "ADDR mismatch"
-   fi
-   if [[ $MDCOMP != $DCOMP ]] ; then
-	${LOG} "DCOMP mismatch"
-   fi
-   if [[ $MHCOMP != $HCOMP ]] ; then
-	${LOG} "HCOMP mismatch"
-   fi
-   if [[ $MFULLBOAT != $FULLBOAT ]] ; then
-	${LOG} "Final parameter mismatches ignored"
-	${LOG} "Parameter 6 and up on the modem:"
-	${LOG} "\"${MFULLBOAT}\""
-	${LOG} "Parameter 6 and up on the chat script:"
-	${LOG} "\"${FULLBOAT}\""
-   fi
-   ${LOG} "$MCONTEXT"
-   ${LOG} "Dropping registration with carrier to set context"
-   # Need to deregister
-   /usr/bin/radio-cmd ${RADIOOPTION} -t10000 'AT+COPS=2'
-   # H5 radios do not like addresses that are empty with ""
-   if ((${#ADDR} == 0)) ; then
-     CMDSTR="AT+CGDCONT=${CONTEXTNUM},\"${PDP}\",\"${APN}\",,$DCOMP,${HCOMP}${FULLBOAT}"
-   else
-     CMDSTR="AT+CGDCONT=${CONTEXTNUM},\"${PDP}\",\"${APN}\",\"${ADDR}\",$DCOMP,${HCOMP}${FULLBOAT}"
-   fi
-   ${LOG} "Issued command /usr/bin/radio-cmd ${RADIOOPTION} -t10000 ..."
-   ${LOG} "... ${CMDSTR}"
-
-   # If we fail to set the APN, sleep and try it again for up to 10 seconds.
-   result=1
-   count=10
-   while ((result != 0)) && ((count > 0)) ; do 
-     ((count--)) || true
-     LOGMSG=$(/usr/bin/radio-cmd ${RADIOOPTION} -t10000 "${CMDSTR}" 2>&1)
-     result=$?
-     ${LOG} "Result ${result}, Got response ${LOGMSG}"
-     if [[ $LOGMSG =~ ERROR ]] ; then
-	result=1
-     fi
-     sleep 1
-   done
-
-   # re-enable the modem to defaults.
-   /usr/bin/radio-cmd ${RADIOOPTION} -t10000 'AT+COPS=0'
-   sleep 1
-
-   # Some older modems will not re-register after the COPS
-   # command if you do not reset them using CFUN.
-   /usr/bin/radio-cmd ${RADIOOPTION} -t10000 'AT+CFUN=0'
-   /usr/bin/radio-cmd ${RADIOOPTION} -t10000 'AT+CFUN=1'
-
-   # Abort PPP if the Context is not correct.  We don't want
-   # to cause the carrier to disable the account by dialing
-   # out with a bad APN.
-   if ((result != 0)) ; then
-	${LOG} "AT+CGDCONT failed, aborting"
-	exit $result
-   fi
-   sleep 1
-   ${LOG} "New context is set.  Wait up to $REGWAITTIME seconds to register"
-   # Wait for registration
-   uptime=$(cat /proc/uptime)
-   [[ $uptime =~ ^([^\.]*) ]]
-   t0=${BASH_REMATCH[1]}
-   while ! [[ $(/usr/bin/radio-query ${RADIOOPTION} --netreg) =~ ^REGISTERED$ ]] ; do
-      sleep 5
-      uptime=$(cat /proc/uptime)
-      [[ $uptime =~ ^([^\.]*) ]]
-      t1=${BASH_REMATCH[1]}
-      if ((t1-t0 > REGWAITTIME)) ; then
-	   ${LOG} "$((t1-t0)) seconds has expired"
-	   exit 1
-      fi	
-   done
-   uptime=$(cat /proc/uptime)
-   [[ $uptime =~ ^([^\.]*) ]]
-   t1=${BASH_REMATCH[1]}
-   ${LOG} "Re-registered in $((t1-t0)) seconds -- wait ${FINALWAIT} more seconds"
-   sleep $FINALWAIT
-else
-   ${LOG} "Context $CONTEXTNUM matches and nothing to do."
-fi
-finish "$@"
-# NOTREACHED
diff --git a/recipes-core/multitech/config/chat_wrapper.default b/recipes-core/multitech/config/chat_wrapper.default
deleted file mode 100644
index a1b4e41..0000000
--- a/recipes-core/multitech/config/chat_wrapper.default
+++ /dev/null
@@ -1,20 +0,0 @@
-# The maximum time to wait for registration
-# when changing the modem context parameters.
-# This is ignored if the context is
-# already set correctly in the modem.
-REGWAITTIME=300
-
-# The time to wait after registration
-# when setting the context
-# before attempting a PPP connection.
-# This is ignored if the context is
-# already set correctly in the modem.
-FINALWAIT=5
-
-# Option for radio-query, radio-cmd
-# Used by /usr/libexec/ppp/chat_wrapper,
-# mlinux-switch-apn, mlinux-switch-cell-fw
-RADIOOPTION="-d /dev/modem_at1"
-
-# Device to use if RADIOOPTION fails:
-RADIOOPTION2="-d /dev/modem_at0"
diff --git a/recipes-core/multitech/config/config-mths/default/bluetooth b/recipes-core/multitech/config/config-mths/default/bluetooth
deleted file mode 100644
index ec46cfd..0000000
--- a/recipes-core/multitech/config/config-mths/default/bluetooth
+++ /dev/null
@@ -1,8 +0,0 @@
-# Set to 1 to enable bluetooth daemon
-BLUETOOTH_ENABLED=1
-
-# Use the following to setup bluetooth usability
-BLUETOOTHCTL_CMD="power on\ndiscoverable on\npairable on\n"
-
-#Compatilitity mode
-#MOREOPTIONS="-C"
diff --git a/recipes-core/multitech/config/config-mths/default/dnsmasq b/recipes-core/multitech/config/config-mths/default/dnsmasq
deleted file mode 100644
index 129fda1..0000000
--- a/recipes-core/multitech/config/config-mths/default/dnsmasq
+++ /dev/null
@@ -1,27 +0,0 @@
-# MTHS dnsmasq
-# and a hook to set up config files for MTHS
-ENABLED="yes"
-
-# This configuration is for manufacturing test.
-# Factory resets should not put back wifi defaults.
-if [[ -f /var/config/.defaults2.tar.gz ]] ; then
-	rm /var/config/.defaults2.tar.gz
-fi
-
-# Stop ntpd.  ntpd default is in root.
-sed -i 's/ENABLED="yes"/ENABLED="no"/' /etc/default/ntpd 
-# Use the ifplugd in /var/config 
-if ! [[ -L /etc/ifplugd ]] ; then         
-    rm -rf /etc/ifplugd                   
-    ln -s /var/config/ifplugd /etc/ifplugd
-    # ifplugd is already started (and probably bombed)
-    # restart it.
-    /etc/init.d/ifplugd stop
-    /etc/init.d/ifplugd start
-fi
-
-if ! [[ -L /etc/default/usb-gadget ]] && [[ -f /var/config/default/usb-gadget ]] ; then         
-    rm -rf /etc/default/usb-gadget
-    ln -s /var/config/default/usb-gadget /etc/default/usb-gadget
-fi
-
diff --git a/recipes-core/multitech/config/config-mths/default/hostapd b/recipes-core/multitech/config/config-mths/default/hostapd
deleted file mode 100644
index 75c1c8a..0000000
--- a/recipes-core/multitech/config/config-mths/default/hostapd
+++ /dev/null
@@ -1,11 +0,0 @@
-# set to "yes" to start hostapd on boot
-START_ON_BOOT="yes"
-DEVICEID=$(cat /sys/devices/platform/mts-io/device-id)
-SSID="hs-${DEVICEID}"
-CONF=/etc/hostapd.conf
-
-PREUP="ifdown wifi1
-       ifup wifi1
-       sed -ri 's/^ssid=.*/ssid=hs-'${DEVICEID}/ ${CONF}
-       logger -s -t hostapd -p daemon.alert 'hostapd SSID line is '${SSID}"
-
diff --git a/recipes-core/multitech/config/config-mths/default/ntpd b/recipes-core/multitech/config/config-mths/default/ntpd
deleted file mode 100644
index a0d3bcf..0000000
--- a/recipes-core/multitech/config/config-mths/default/ntpd
+++ /dev/null
@@ -1,36 +0,0 @@
-ENABLED="no"
-
-
-CONFIGFILE=/etc/ntp.conf
-
-# The GPSD_* parameters in this file are ignored
-# if the uBlox GPS is not present.
-
-# Require a GPS lock/fix before starting NTP
-# This is needed if we are not using NTP servers.
-# NTP will not work with the GPS if  the GPS is not
-# locked before starting.
-# See /etc/default/gpsd for the states required.
-GPSD_REQUIRED=0
-
-# Number of seconds between testing for a GPS
-# lock prior to calling ntpd.
-GPSD_WAIT_TIME=120
-
-# Since the HW Clock could be off by a second or
-# so, our GPS might get marked as a false ticker
-# if we do not set the system clock to the GPS
-# first.  The current correct way to do this
-# according to the ntp doc is ntpd -gq -c conffile
-# which must be done before ntpd is started.
-# conffile should exclude the local clock, so it is
-# ignored while doing the initial sync.
-# ntpd -gq apparently does not work with the GPS
-# when tested with the clock more than one day off
-# and no ntpd.  The gps shared memory is never polled.
-#
-# If there is a uBlox GPS present, the time is
-# read from the GPS to initialize the system time
-# before NTP is started.
-SET_SYSTEM_CLOCK=1
-
diff --git a/recipes-core/multitech/config/config-mths/default/rs9113 b/recipes-core/multitech/config/config-mths/default/rs9113
deleted file mode 100644
index 2594625..0000000
--- a/recipes-core/multitech/config/config-mths/default/rs9113
+++ /dev/null
@@ -1,14 +0,0 @@
-RS9113_LOAD=1
-RSI_ANTENNA_DIVERSITY=0
-COEX_MODE=6
-WLAN_RF_PWR_MODE=0x00
-BT_RF_PWR_MODE=0x00
-BT_RF_TX_POWER_MODE=0
-BT_RF_RX_POWER_MODE=0
-SET_COUNTRY_CODE=0
-ANT_SEL_VAL=2
-ONBOARD_ANT_SEL=1
-SET_RETRY_COUNT=15
-SLEEPTIME=100000
-INTSLEEPTIME=100000
-
diff --git a/recipes-core/multitech/config/config-mths/default/usb-gadget b/recipes-core/multitech/config/config-mths/default/usb-gadget
deleted file mode 100644
index 944ef8a..0000000
--- a/recipes-core/multitech/config/config-mths/default/usb-gadget
+++ /dev/null
@@ -1,6 +0,0 @@
-# set to "no" to disable usb-gadget
-ENABLED="yes"
-
-USB_MODE="networking"
-MODULE_OPTIONS=""
-
diff --git a/recipes-core/multitech/config/config-mths/dnsmasq.d/dhcp.conf b/recipes-core/multitech/config/config-mths/dnsmasq.d/dhcp.conf
deleted file mode 100644
index 47eb1c0..0000000
--- a/recipes-core/multitech/config/config-mths/dnsmasq.d/dhcp.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-interface=wifi1
-dhcp-range=10.0.0.100,10.0.0.250,12h
-dhcp-lease-max=200
-dhcp-leasefile=/var/config/dnsmasq_dhcp_wifi1.leases
-dhcp-option=option:netmask,255.255.255.0
-dhcp-option=option:router,10.0.0.1
-dhcp-option=option:dns-server,10.0.0.1
-dhcp-authoritative
-interface=usb0
-dhcp-range=192.168.3.100,192.168.3.250,12h
-dhcp-option=option:router,192.168.3.1
-dhcp-option=option:dns-server,192.168.3.1
diff --git a/recipes-core/multitech/config/config-mths/hostapd.conf b/recipes-core/multitech/config/config-mths/hostapd.conf
deleted file mode 100644
index 8acd72b..0000000
--- a/recipes-core/multitech/config/config-mths/hostapd.conf
+++ /dev/null
@@ -1,1996 +0,0 @@
-##### hostapd configuration file ##############################################
-# Empty lines and lines starting with # are ignored
-
-# AP netdevice name (without 'ap' postfix, i.e., wlan0 uses wlan0ap for
-# management frames with the Host AP driver); wlan0 with many nl80211 drivers
-# Note: This attribute can be overridden by the values supplied with the '-i'
-# command line parameter.
-interface=wifi1
-
-# In case of atheros and nl80211 driver interfaces, an additional
-# configuration parameter, bridge, may be used to notify hostapd if the
-# interface is included in a bridge. This parameter is not used with Host AP
-# driver. If the bridge parameter is not set, the drivers will automatically
-# figure out the bridge interface (assuming sysfs is enabled and mounted to
-# /sys) and this parameter may not be needed.
-#
-# For nl80211, this parameter can be used to request the AP interface to be
-# added to the bridge automatically (brctl may refuse to do this before hostapd
-# has been started to change the interface mode). If needed, the bridge
-# interface is also created.
-#bridge=br0
-
-# Driver interface type (hostap/wired/none/nl80211/bsd);
-# default: hostap). nl80211 is used with all Linux mac80211 drivers.
-# Use driver=none if building hostapd as a standalone RADIUS server that does
-# not control any wireless/wired driver.
-# driver=hostap
-
-# Driver interface parameters (mainly for development testing use)
-# driver_params=<params>
-
-# hostapd event logger configuration
-#
-# Two output method: syslog and stdout (only usable if not forking to
-# background).
-#
-# Module bitfield (ORed bitfield of modules that will be logged; -1 = all
-# modules):
-# bit 0 (1) = IEEE 802.11
-# bit 1 (2) = IEEE 802.1X
-# bit 2 (4) = RADIUS
-# bit 3 (8) = WPA
-# bit 4 (16) = driver interface
-# bit 5 (32) = IAPP
-# bit 6 (64) = MLME
-#
-# Levels (minimum value for logged events):
-#  0 = verbose debugging
-#  1 = debugging
-#  2 = informational messages
-#  3 = notification
-#  4 = warning
-#
-logger_syslog=-1
-logger_syslog_level=2
-logger_stdout=-1
-logger_stdout_level=2
-
-# Interface for separate control program. If this is specified, hostapd
-# will create this directory and a UNIX domain socket for listening to requests
-# from external programs (CLI/GUI, etc.) for status information and
-# configuration. The socket file will be named based on the interface name, so
-# multiple hostapd processes/interfaces can be run at the same time if more
-# than one interface is used.
-# /var/run/hostapd is the recommended directory for sockets and by default,
-# hostapd_cli will use it when trying to connect with hostapd.
-ctrl_interface=/var/run/hostapd
-
-# Access control for the control interface can be configured by setting the
-# directory to allow only members of a group to use sockets. This way, it is
-# possible to run hostapd as root (since it needs to change network
-# configuration and open raw sockets) and still allow GUI/CLI components to be
-# run as non-root users. However, since the control interface can be used to
-# change the network configuration, this access needs to be protected in many
-# cases. By default, hostapd is configured to use gid 0 (root). If you
-# want to allow non-root users to use the contron interface, add a new group
-# and change this value to match with that group. Add users that should have
-# control interface access to this group.
-#
-# This variable can be a group name or gid.
-#ctrl_interface_group=wheel
-ctrl_interface_group=0
-
-
-##### IEEE 802.11 related configuration #######################################
-
-# SSID to be used in IEEE 802.11 management frames
-ssid=hs-
-# Alternative formats for configuring SSID
-# (double quoted string, hexdump, printf-escaped string)
-#ssid2="test"
-#ssid2=74657374
-#ssid2=P"hello\nthere"
-
-# UTF-8 SSID: Whether the SSID is to be interpreted using UTF-8 encoding
-#utf8_ssid=1
-
-# Country code (ISO/IEC 3166-1). Used to set regulatory domain.
-# Set as needed to indicate country in which device is operating.
-# This can limit available channels and transmit power.
-country_code=US
-
-# Enable IEEE 802.11d. This advertises the country_code and the set of allowed
-# channels and transmit power levels based on the regulatory limits. The
-# country_code setting must be configured with the correct country for
-# IEEE 802.11d functions.
-# (default: 0 = disabled)
-#ieee80211d=1
-
-# Enable IEEE 802.11h. This enables radar detection and DFS support if
-# available. DFS support is required on outdoor 5 GHz channels in most countries
-# of the world. This can be used only with ieee80211d=1.
-# (default: 0 = disabled)
-#ieee80211h=1
-
-# Add Power Constraint element to Beacon and Probe Response frames
-# This config option adds Power Constraint element when applicable and Country
-# element is added. Power Constraint element is required by Transmit Power
-# Control. This can be used only with ieee80211d=1.
-# Valid values are 0..255.
-#local_pwr_constraint=3
-
-# Set Spectrum Management subfield in the Capability Information field.
-# This config option forces the Spectrum Management bit to be set. When this
-# option is not set, the value of the Spectrum Management bit depends on whether
-# DFS or TPC is required by regulatory authorities. This can be used only with
-# ieee80211d=1 and local_pwr_constraint configured.
-#spectrum_mgmt_required=1
-
-# Operation mode (a = IEEE 802.11a (5 GHz), b = IEEE 802.11b (2.4 GHz),
-# g = IEEE 802.11g (2.4 GHz), ad = IEEE 802.11ad (60 GHz); a/g options are used
-# with IEEE 802.11n (HT), too, to specify band). For IEEE 802.11ac (VHT), this
-# needs to be set to hw_mode=a. When using ACS (see channel parameter), a
-# special value "any" can be used to indicate that any support band can be used.
-# This special case is currently supported only with drivers with which
-# offloaded ACS is used.
-# Default: IEEE 802.11b
-hw_mode=g
-
-# Channel number (IEEE 802.11)
-# (default: 0, i.e., not set)
-# Please note that some drivers do not use this value from hostapd and the
-# channel will need to be configured separately with iwconfig.
-#
-# If CONFIG_ACS build option is enabled, the channel can be selected
-# automatically at run time by setting channel=acs_survey or channel=0, both of
-# which will enable the ACS survey based algorithm.
-channel=10
-
-# ACS tuning - Automatic Channel Selection
-# See: http://wireless.kernel.org/en/users/Documentation/acs
-#
-# You can customize the ACS survey algorithm with following variables:
-#
-# acs_num_scans requirement is 1..100 - number of scans to be performed that
-# are used to trigger survey data gathering of an underlying device driver.
-# Scans are passive and typically take a little over 100ms (depending on the
-# driver) on each available channel for given hw_mode. Increasing this value
-# means sacrificing startup time and gathering more data wrt channel
-# interference that may help choosing a better channel. This can also help fine
-# tune the ACS scan time in case a driver has different scan dwell times.
-#
-# acs_chan_bias is a space-separated list of <channel>:<bias> pairs. It can be
-# used to increase (or decrease) the likelihood of a specific channel to be
-# selected by the ACS algorithm. The total interference factor for each channel
-# gets multiplied by the specified bias value before finding the channel with
-# the lowest value. In other words, values between 0.0 and 1.0 can be used to
-# make a channel more likely to be picked while values larger than 1.0 make the
-# specified channel less likely to be picked. This can be used, e.g., to prefer
-# the commonly used 2.4 GHz band channels 1, 6, and 11 (which is the default
-# behavior on 2.4 GHz band if no acs_chan_bias parameter is specified).
-#
-# Defaults:
-#acs_num_scans=5
-#acs_chan_bias=1:0.8 6:0.8 11:0.8
-
-# Channel list restriction. This option allows hostapd to select one of the
-# provided channels when a channel should be automatically selected.
-# Channel list can be provided as range using hyphen ('-') or individual
-# channels can be specified by space (' ') separated values
-# Default: all channels allowed in selected hw_mode
-#chanlist=100 104 108 112 116
-#chanlist=1 6 11-13
-
-# Beacon interval in kus (1.024 ms) (default: 100; range 15..65535)
-beacon_int=100
-
-# DTIM (delivery traffic information message) period (range 1..255):
-# number of beacons between DTIMs (1 = every beacon includes DTIM element)
-# (default: 2)
-dtim_period=2
-
-# Maximum number of stations allowed in station table. New stations will be
-# rejected after the station table is full. IEEE 802.11 has a limit of 2007
-# different association IDs, so this number should not be larger than that.
-# (default: 2007)
-max_num_sta=255
-
-# RTS/CTS threshold; -1 = disabled (default); range -1..65535
-# If this field is not included in hostapd.conf, hostapd will not control
-# RTS threshold and 'iwconfig wlan# rts <val>' can be used to set it.
-rts_threshold=-1
-
-# Fragmentation threshold; -1 = disabled (default); range -1, 256..2346
-# If this field is not included in hostapd.conf, hostapd will not control
-# fragmentation threshold and 'iwconfig wlan# frag <val>' can be used to set
-# it.
-fragm_threshold=-1
-
-# Rate configuration
-# Default is to enable all rates supported by the hardware. This configuration
-# item allows this list be filtered so that only the listed rates will be left
-# in the list. If the list is empty, all rates are used. This list can have
-# entries that are not in the list of rates the hardware supports (such entries
-# are ignored). The entries in this list are in 100 kbps, i.e., 11 Mbps = 110.
-# If this item is present, at least one rate have to be matching with the rates
-# hardware supports.
-# default: use the most common supported rate setting for the selected
-# hw_mode (i.e., this line can be removed from configuration file in most
-# cases)
-#supported_rates=10 20 55 110 60 90 120 180 240 360 480 540
-
-# Basic rate set configuration
-# List of rates (in 100 kbps) that are included in the basic rate set.
-# If this item is not included, usually reasonable default set is used.
-#basic_rates=10 20
-#basic_rates=10 20 55 110
-#basic_rates=60 120 240
-
-# Short Preamble
-# This parameter can be used to enable optional use of short preamble for
-# frames sent at 2 Mbps, 5.5 Mbps, and 11 Mbps to improve network performance.
-# This applies only to IEEE 802.11b-compatible networks and this should only be
-# enabled if the local hardware supports use of short preamble. If any of the
-# associated STAs do not support short preamble, use of short preamble will be
-# disabled (and enabled when such STAs disassociate) dynamically.
-# 0 = do not allow use of short preamble (default)
-# 1 = allow use of short preamble
-#preamble=1
-
-# Station MAC address -based authentication
-# Please note that this kind of access control requires a driver that uses
-# hostapd to take care of management frame processing and as such, this can be
-# used with driver=hostap or driver=nl80211, but not with driver=atheros.
-# 0 = accept unless in deny list
-# 1 = deny unless in accept list
-# 2 = use external RADIUS server (accept/deny lists are searched first)
-macaddr_acl=0
-
-# Accept/deny lists are read from separate files (containing list of
-# MAC addresses, one per line). Use absolute path name to make sure that the
-# files can be read on SIGHUP configuration reloads.
-#accept_mac_file=/etc/hostapd.accept
-#deny_mac_file=/etc/hostapd.deny
-
-# IEEE 802.11 specifies two authentication algorithms. hostapd can be
-# configured to allow both of these or only one. Open system authentication
-# should be used with IEEE 802.1X.
-# Bit fields of allowed authentication algorithms:
-# bit 0 = Open System Authentication
-# bit 1 = Shared Key Authentication (requires WEP)
-auth_algs=3
-
-# Send empty SSID in beacons and ignore probe request frames that do not
-# specify full SSID, i.e., require stations to know SSID.
-# default: disabled (0)
-# 1 = send empty (length=0) SSID in beacon and ignore probe request for
-#     broadcast SSID
-# 2 = clear SSID (ASCII 0), but keep the original length (this may be required
-#     with some clients that do not support empty SSID) and ignore probe
-#     requests for broadcast SSID
-ignore_broadcast_ssid=0
-
-# Do not reply to broadcast Probe Request frames from unassociated STA if there
-# is no room for additional stations (max_num_sta). This can be used to
-# discourage a STA from trying to associate with this AP if the association
-# would be rejected due to maximum STA limit.
-# Default: 0 (disabled)
-#no_probe_resp_if_max_sta=0
-
-# Additional vendor specific elements for Beacon and Probe Response frames
-# This parameter can be used to add additional vendor specific element(s) into
-# the end of the Beacon and Probe Response frames. The format for these
-# element(s) is a hexdump of the raw information elements (id+len+payload for
-# one or more elements)
-#vendor_elements=dd0411223301
-
-# Additional vendor specific elements for (Re)Association Response frames
-# This parameter can be used to add additional vendor specific element(s) into
-# the end of the (Re)Association Response frames. The format for these
-# element(s) is a hexdump of the raw information elements (id+len+payload for
-# one or more elements)
-#assocresp_elements=dd0411223301
-
-# TX queue parameters (EDCF / bursting)
-# tx_queue_<queue name>_<param>
-# queues: data0, data1, data2, data3, after_beacon, beacon
-#		(data0 is the highest priority queue)
-# parameters:
-#   aifs: AIFS (default 2)
-#   cwmin: cwMin (1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191,
-#	   16383, 32767)
-#   cwmax: cwMax (same values as cwMin, cwMax >= cwMin)
-#   burst: maximum length (in milliseconds with precision of up to 0.1 ms) for
-#          bursting
-#
-# Default WMM parameters (IEEE 802.11 draft; 11-03-0504-03-000e):
-# These parameters are used by the access point when transmitting frames
-# to the clients.
-#
-# Low priority / AC_BK = background
-#tx_queue_data3_aifs=7
-#tx_queue_data3_cwmin=15
-#tx_queue_data3_cwmax=1023
-#tx_queue_data3_burst=0
-# Note: for IEEE 802.11b mode: cWmin=31 cWmax=1023 burst=0
-#
-# Normal priority / AC_BE = best effort
-#tx_queue_data2_aifs=3
-#tx_queue_data2_cwmin=15
-#tx_queue_data2_cwmax=63
-#tx_queue_data2_burst=0
-# Note: for IEEE 802.11b mode: cWmin=31 cWmax=127 burst=0
-#
-# High priority / AC_VI = video
-#tx_queue_data1_aifs=1
-#tx_queue_data1_cwmin=7
-#tx_queue_data1_cwmax=15
-#tx_queue_data1_burst=3.0
-# Note: for IEEE 802.11b mode: cWmin=15 cWmax=31 burst=6.0
-#
-# Highest priority / AC_VO = voice
-#tx_queue_data0_aifs=1
-#tx_queue_data0_cwmin=3
-#tx_queue_data0_cwmax=7
-#tx_queue_data0_burst=1.5
-# Note: for IEEE 802.11b mode: cWmin=7 cWmax=15 burst=3.3
-
-# 802.1D Tag (= UP) to AC mappings
-# WMM specifies following mapping of data frames to different ACs. This mapping
-# can be configured using Linux QoS/tc and sch_pktpri.o module.
-# 802.1D Tag	802.1D Designation	Access Category	WMM Designation
-# 1		BK			AC_BK		Background
-# 2		-			AC_BK		Background
-# 0		BE			AC_BE		Best Effort
-# 3		EE			AC_BE		Best Effort
-# 4		CL			AC_VI		Video
-# 5		VI			AC_VI		Video
-# 6		VO			AC_VO		Voice
-# 7		NC			AC_VO		Voice
-# Data frames with no priority information: AC_BE
-# Management frames: AC_VO
-# PS-Poll frames: AC_BE
-
-# Default WMM parameters (IEEE 802.11 draft; 11-03-0504-03-000e):
-# for 802.11a or 802.11g networks
-# These parameters are sent to WMM clients when they associate.
-# The parameters will be used by WMM clients for frames transmitted to the
-# access point.
-#
-# note - txop_limit is in units of 32microseconds
-# note - acm is admission control mandatory flag. 0 = admission control not
-# required, 1 = mandatory
-# note - Here cwMin and cmMax are in exponent form. The actual cw value used
-# will be (2^n)-1 where n is the value given here. The allowed range for these
-# wmm_ac_??_{cwmin,cwmax} is 0..15 with cwmax >= cwmin.
-#
-wmm_enabled=1
-#
-# WMM-PS Unscheduled Automatic Power Save Delivery [U-APSD]
-# Enable this flag if U-APSD supported outside hostapd (eg., Firmware/driver)
-#uapsd_advertisement_enabled=1
-#
-# Low priority / AC_BK = background
-wmm_ac_bk_cwmin=4
-wmm_ac_bk_cwmax=10
-wmm_ac_bk_aifs=7
-wmm_ac_bk_txop_limit=0
-wmm_ac_bk_acm=0
-# Note: for IEEE 802.11b mode: cWmin=5 cWmax=10
-#
-# Normal priority / AC_BE = best effort
-wmm_ac_be_aifs=3
-wmm_ac_be_cwmin=4
-wmm_ac_be_cwmax=10
-wmm_ac_be_txop_limit=0
-wmm_ac_be_acm=0
-# Note: for IEEE 802.11b mode: cWmin=5 cWmax=7
-#
-# High priority / AC_VI = video
-wmm_ac_vi_aifs=2
-wmm_ac_vi_cwmin=3
-wmm_ac_vi_cwmax=4
-wmm_ac_vi_txop_limit=94
-wmm_ac_vi_acm=0
-# Note: for IEEE 802.11b mode: cWmin=4 cWmax=5 txop_limit=188
-#
-# Highest priority / AC_VO = voice
-wmm_ac_vo_aifs=2
-wmm_ac_vo_cwmin=2
-wmm_ac_vo_cwmax=3
-wmm_ac_vo_txop_limit=47
-wmm_ac_vo_acm=0
-# Note: for IEEE 802.11b mode: cWmin=3 cWmax=4 burst=102
-
-# Static WEP key configuration
-#
-# The key number to use when transmitting.
-# It must be between 0 and 3, and the corresponding key must be set.
-# default: not set
-#wep_default_key=0
-# The WEP keys to use.
-# A key may be a quoted string or unquoted hexadecimal digits.
-# The key length should be 5, 13, or 16 characters, or 10, 26, or 32
-# digits, depending on whether 40-bit (64-bit), 104-bit (128-bit), or
-# 128-bit (152-bit) WEP is used.
-# Only the default key must be supplied; the others are optional.
-# default: not set
-#wep_key0=123456789a
-#wep_key1="vwxyz"
-#wep_key2=0102030405060708090a0b0c0d
-#wep_key3=".2.4.6.8.0.23"
-
-# Station inactivity limit
-#
-# If a station does not send anything in ap_max_inactivity seconds, an
-# empty data frame is sent to it in order to verify whether it is
-# still in range. If this frame is not ACKed, the station will be
-# disassociated and then deauthenticated. This feature is used to
-# clear station table of old entries when the STAs move out of the
-# range.
-#
-# The station can associate again with the AP if it is still in range;
-# this inactivity poll is just used as a nicer way of verifying
-# inactivity; i.e., client will not report broken connection because
-# disassociation frame is not sent immediately without first polling
-# the STA with a data frame.
-# default: 300 (i.e., 5 minutes)
-#ap_max_inactivity=300
-#
-# The inactivity polling can be disabled to disconnect stations based on
-# inactivity timeout so that idle stations are more likely to be disconnected
-# even if they are still in range of the AP. This can be done by setting
-# skip_inactivity_poll to 1 (default 0).
-#skip_inactivity_poll=0
-
-# Disassociate stations based on excessive transmission failures or other
-# indications of connection loss. This depends on the driver capabilities and
-# may not be available with all drivers.
-#disassoc_low_ack=1
-
-# Maximum allowed Listen Interval (how many Beacon periods STAs are allowed to
-# remain asleep). Default: 65535 (no limit apart from field size)
-#max_listen_interval=100
-
-# WDS (4-address frame) mode with per-station virtual interfaces
-# (only supported with driver=nl80211)
-# This mode allows associated stations to use 4-address frames to allow layer 2
-# bridging to be used.
-#wds_sta=1
-
-# If bridge parameter is set, the WDS STA interface will be added to the same
-# bridge by default. This can be overridden with the wds_bridge parameter to
-# use a separate bridge.
-#wds_bridge=wds-br0
-
-# Start the AP with beaconing disabled by default.
-#start_disabled=0
-
-# Client isolation can be used to prevent low-level bridging of frames between
-# associated stations in the BSS. By default, this bridging is allowed.
-#ap_isolate=1
-
-# BSS Load update period (in BUs)
-# This field is used to enable and configure adding a BSS Load element into
-# Beacon and Probe Response frames.
-#bss_load_update_period=50
-
-# Fixed BSS Load value for testing purposes
-# This field can be used to configure hostapd to add a fixed BSS Load element
-# into Beacon and Probe Response frames for testing purposes. The format is
-# <station count>:<channel utilization>:<available admission capacity>
-#bss_load_test=12:80:20000
-
-##### IEEE 802.11n related configuration ######################################
-
-# ieee80211n: Whether IEEE 802.11n (HT) is enabled
-# 0 = disabled (default)
-# 1 = enabled
-# Note: You will also need to enable WMM for full HT functionality.
-# Note: hw_mode=g (2.4 GHz) and hw_mode=a (5 GHz) is used to specify the band.
-#ieee80211n=1
-
-# ht_capab: HT capabilities (list of flags)
-# LDPC coding capability: [LDPC] = supported
-# Supported channel width set: [HT40-] = both 20 MHz and 40 MHz with secondary
-#	channel below the primary channel; [HT40+] = both 20 MHz and 40 MHz
-#	with secondary channel above the primary channel
-#	(20 MHz only if neither is set)
-#	Note: There are limits on which channels can be used with HT40- and
-#	HT40+. Following table shows the channels that may be available for
-#	HT40- and HT40+ use per IEEE 802.11n Annex J:
-#	freq		HT40-		HT40+
-#	2.4 GHz		5-13		1-7 (1-9 in Europe/Japan)
-#	5 GHz		40,48,56,64	36,44,52,60
-#	(depending on the location, not all of these channels may be available
-#	for use)
-#	Please note that 40 MHz channels may switch their primary and secondary
-#	channels if needed or creation of 40 MHz channel maybe rejected based
-#	on overlapping BSSes. These changes are done automatically when hostapd
-#	is setting up the 40 MHz channel.
-# Spatial Multiplexing (SM) Power Save: [SMPS-STATIC] or [SMPS-DYNAMIC]
-#	(SMPS disabled if neither is set)
-# HT-greenfield: [GF] (disabled if not set)
-# Short GI for 20 MHz: [SHORT-GI-20] (disabled if not set)
-# Short GI for 40 MHz: [SHORT-GI-40] (disabled if not set)
-# Tx STBC: [TX-STBC] (disabled if not set)
-# Rx STBC: [RX-STBC1] (one spatial stream), [RX-STBC12] (one or two spatial
-#	streams), or [RX-STBC123] (one, two, or three spatial streams); Rx STBC
-#	disabled if none of these set
-# HT-delayed Block Ack: [DELAYED-BA] (disabled if not set)
-# Maximum A-MSDU length: [MAX-AMSDU-7935] for 7935 octets (3839 octets if not
-#	set)
-# DSSS/CCK Mode in 40 MHz: [DSSS_CCK-40] = allowed (not allowed if not set)
-# 40 MHz intolerant [40-INTOLERANT] (not advertised if not set)
-# L-SIG TXOP protection support: [LSIG-TXOP-PROT] (disabled if not set)
-#ht_capab=[HT40-][SHORT-GI-20][SHORT-GI-40]
-
-# Require stations to support HT PHY (reject association if they do not)
-#require_ht=1
-
-# If set non-zero, require stations to perform scans of overlapping
-# channels to test for stations which would be affected by 40 MHz traffic.
-# This parameter sets the interval in seconds between these scans. Setting this
-# to non-zero allows 2.4 GHz band AP to move dynamically to a 40 MHz channel if
-# no co-existence issues with neighboring devices are found.
-#obss_interval=0
-
-##### IEEE 802.11ac related configuration #####################################
-
-# ieee80211ac: Whether IEEE 802.11ac (VHT) is enabled
-# 0 = disabled (default)
-# 1 = enabled
-# Note: You will also need to enable WMM for full VHT functionality.
-# Note: hw_mode=a is used to specify that 5 GHz band is used with VHT.
-#ieee80211ac=1
-
-# vht_capab: VHT capabilities (list of flags)
-#
-# vht_max_mpdu_len: [MAX-MPDU-7991] [MAX-MPDU-11454]
-# Indicates maximum MPDU length
-# 0 = 3895 octets (default)
-# 1 = 7991 octets
-# 2 = 11454 octets
-# 3 = reserved
-#
-# supported_chan_width: [VHT160] [VHT160-80PLUS80]
-# Indicates supported Channel widths
-# 0 = 160 MHz & 80+80 channel widths are not supported (default)
-# 1 = 160 MHz channel width is supported
-# 2 = 160 MHz & 80+80 channel widths are supported
-# 3 = reserved
-#
-# Rx LDPC coding capability: [RXLDPC]
-# Indicates support for receiving LDPC coded pkts
-# 0 = Not supported (default)
-# 1 = Supported
-#
-# Short GI for 80 MHz: [SHORT-GI-80]
-# Indicates short GI support for reception of packets transmitted with TXVECTOR
-# params format equal to VHT and CBW = 80Mhz
-# 0 = Not supported (default)
-# 1 = Supported
-#
-# Short GI for 160 MHz: [SHORT-GI-160]
-# Indicates short GI support for reception of packets transmitted with TXVECTOR
-# params format equal to VHT and CBW = 160Mhz
-# 0 = Not supported (default)
-# 1 = Supported
-#
-# Tx STBC: [TX-STBC-2BY1]
-# Indicates support for the transmission of at least 2x1 STBC
-# 0 = Not supported (default)
-# 1 = Supported
-#
-# Rx STBC: [RX-STBC-1] [RX-STBC-12] [RX-STBC-123] [RX-STBC-1234]
-# Indicates support for the reception of PPDUs using STBC
-# 0 = Not supported (default)
-# 1 = support of one spatial stream
-# 2 = support of one and two spatial streams
-# 3 = support of one, two and three spatial streams
-# 4 = support of one, two, three and four spatial streams
-# 5,6,7 = reserved
-#
-# SU Beamformer Capable: [SU-BEAMFORMER]
-# Indicates support for operation as a single user beamformer
-# 0 = Not supported (default)
-# 1 = Supported
-#
-# SU Beamformee Capable: [SU-BEAMFORMEE]
-# Indicates support for operation as a single user beamformee
-# 0 = Not supported (default)
-# 1 = Supported
-#
-# Compressed Steering Number of Beamformer Antennas Supported:
-# [BF-ANTENNA-2] [BF-ANTENNA-3] [BF-ANTENNA-4]
-#   Beamformee's capability indicating the maximum number of beamformer
-#   antennas the beamformee can support when sending compressed beamforming
-#   feedback
-# If SU beamformer capable, set to maximum value minus 1
-# else reserved (default)
-#
-# Number of Sounding Dimensions:
-# [SOUNDING-DIMENSION-2] [SOUNDING-DIMENSION-3] [SOUNDING-DIMENSION-4]
-# Beamformer's capability indicating the maximum value of the NUM_STS parameter
-# in the TXVECTOR of a VHT NDP
-# If SU beamformer capable, set to maximum value minus 1
-# else reserved (default)
-#
-# MU Beamformer Capable: [MU-BEAMFORMER]
-# Indicates support for operation as an MU beamformer
-# 0 = Not supported or sent by Non-AP STA (default)
-# 1 = Supported
-#
-# VHT TXOP PS: [VHT-TXOP-PS]
-# Indicates whether or not the AP supports VHT TXOP Power Save Mode
-#  or whether or not the STA is in VHT TXOP Power Save mode
-# 0 = VHT AP doesn't support VHT TXOP PS mode (OR) VHT STA not in VHT TXOP PS
-#  mode
-# 1 = VHT AP supports VHT TXOP PS mode (OR) VHT STA is in VHT TXOP power save
-#  mode
-#
-# +HTC-VHT Capable: [HTC-VHT]
-# Indicates whether or not the STA supports receiving a VHT variant HT Control
-# field.
-# 0 = Not supported (default)
-# 1 = supported
-#
-# Maximum A-MPDU Length Exponent: [MAX-A-MPDU-LEN-EXP0]..[MAX-A-MPDU-LEN-EXP7]
-# Indicates the maximum length of A-MPDU pre-EOF padding that the STA can recv
-# This field is an integer in the range of 0 to 7.
-# The length defined by this field is equal to
-# 2 pow(13 + Maximum A-MPDU Length Exponent) -1 octets
-#
-# VHT Link Adaptation Capable: [VHT-LINK-ADAPT2] [VHT-LINK-ADAPT3]
-# Indicates whether or not the STA supports link adaptation using VHT variant
-# HT Control field
-# If +HTC-VHTcapable is 1
-#  0 = (no feedback) if the STA does not provide VHT MFB (default)
-#  1 = reserved
-#  2 = (Unsolicited) if the STA provides only unsolicited VHT MFB
-#  3 = (Both) if the STA can provide VHT MFB in response to VHT MRQ and if the
-#      STA provides unsolicited VHT MFB
-# Reserved if +HTC-VHTcapable is 0
-#
-# Rx Antenna Pattern Consistency: [RX-ANTENNA-PATTERN]
-# Indicates the possibility of Rx antenna pattern change
-# 0 = Rx antenna pattern might change during the lifetime of an association
-# 1 = Rx antenna pattern does not change during the lifetime of an association
-#
-# Tx Antenna Pattern Consistency: [TX-ANTENNA-PATTERN]
-# Indicates the possibility of Tx antenna pattern change
-# 0 = Tx antenna pattern might change during the lifetime of an association
-# 1 = Tx antenna pattern does not change during the lifetime of an association
-#vht_capab=[SHORT-GI-80][HTC-VHT]
-#
-# Require stations to support VHT PHY (reject association if they do not)
-#require_vht=1
-
-# 0 = 20 or 40 MHz operating Channel width
-# 1 = 80 MHz channel width
-# 2 = 160 MHz channel width
-# 3 = 80+80 MHz channel width
-#vht_oper_chwidth=1
-#
-# center freq = 5 GHz + (5 * index)
-# So index 42 gives center freq 5.210 GHz
-# which is channel 42 in 5G band
-#
-#vht_oper_centr_freq_seg0_idx=42
-#
-# center freq = 5 GHz + (5 * index)
-# So index 159 gives center freq 5.795 GHz
-# which is channel 159 in 5G band
-#
-#vht_oper_centr_freq_seg1_idx=159
-
-# Workaround to use station's nsts capability in (Re)Association Response frame
-# This may be needed with some deployed devices as an interoperability
-# workaround for beamforming if the AP's capability is greater than the
-# station's capability. This is disabled by default and can be enabled by
-# setting use_sta_nsts=1.
-#use_sta_nsts=0
-
-##### IEEE 802.1X-2004 related configuration ##################################
-
-# Require IEEE 802.1X authorization
-#ieee8021x=1
-
-# IEEE 802.1X/EAPOL version
-# hostapd is implemented based on IEEE Std 802.1X-2004 which defines EAPOL
-# version 2. However, there are many client implementations that do not handle
-# the new version number correctly (they seem to drop the frames completely).
-# In order to make hostapd interoperate with these clients, the version number
-# can be set to the older version (1) with this configuration value.
-#eapol_version=2
-
-# Optional displayable message sent with EAP Request-Identity. The first \0
-# in this string will be converted to ASCII-0 (nul). This can be used to
-# separate network info (comma separated list of attribute=value pairs); see,
-# e.g., RFC 4284.
-#eap_message=hello
-#eap_message=hello\0networkid=netw,nasid=foo,portid=0,NAIRealms=example.com
-
-# WEP rekeying (disabled if key lengths are not set or are set to 0)
-# Key lengths for default/broadcast and individual/unicast keys:
-# 5 = 40-bit WEP (also known as 64-bit WEP with 40 secret bits)
-# 13 = 104-bit WEP (also known as 128-bit WEP with 104 secret bits)
-#wep_key_len_broadcast=5
-#wep_key_len_unicast=5
-# Rekeying period in seconds. 0 = do not rekey (i.e., set keys only once)
-#wep_rekey_period=300
-
-# EAPOL-Key index workaround (set bit7) for WinXP Supplicant (needed only if
-# only broadcast keys are used)
-eapol_key_index_workaround=0
-
-# EAP reauthentication period in seconds (default: 3600 seconds; 0 = disable
-# reauthentication).
-#eap_reauth_period=3600
-
-# Use PAE group address (01:80:c2:00:00:03) instead of individual target
-# address when sending EAPOL frames with driver=wired. This is the most common
-# mechanism used in wired authentication, but it also requires that the port
-# is only used by one station.
-#use_pae_group_addr=1
-
-# EAP Re-authentication Protocol (ERP) authenticator (RFC 6696)
-#
-# Whether to initiate EAP authentication with EAP-Initiate/Re-auth-Start before
-# EAP-Identity/Request
-#erp_send_reauth_start=1
-#
-# Domain name for EAP-Initiate/Re-auth-Start. Omitted from the message if not
-# set (no local ER server). This is also used by the integrated EAP server if
-# ERP is enabled (eap_server_erp=1).
-#erp_domain=example.com
-
-##### Integrated EAP server ###################################################
-
-# Optionally, hostapd can be configured to use an integrated EAP server
-# to process EAP authentication locally without need for an external RADIUS
-# server. This functionality can be used both as a local authentication server
-# for IEEE 802.1X/EAPOL and as a RADIUS server for other devices.
-
-# Use integrated EAP server instead of external RADIUS authentication
-# server. This is also needed if hostapd is configured to act as a RADIUS
-# authentication server.
-eap_server=0
-
-# Path for EAP server user database
-# If SQLite support is included, this can be set to "sqlite:/path/to/sqlite.db"
-# to use SQLite database instead of a text file.
-#eap_user_file=/etc/hostapd.eap_user
-
-# CA certificate (PEM or DER file) for EAP-TLS/PEAP/TTLS
-#ca_cert=/etc/hostapd.ca.pem
-
-# Server certificate (PEM or DER file) for EAP-TLS/PEAP/TTLS
-#server_cert=/etc/hostapd.server.pem
-
-# Private key matching with the server certificate for EAP-TLS/PEAP/TTLS
-# This may point to the same file as server_cert if both certificate and key
-# are included in a single file. PKCS#12 (PFX) file (.p12/.pfx) can also be
-# used by commenting out server_cert and specifying the PFX file as the
-# private_key.
-#private_key=/etc/hostapd.server.prv
-
-# Passphrase for private key
-#private_key_passwd=secret passphrase
-
-# Server identity
-# EAP methods that provide mechanism for authenticated server identity delivery
-# use this value. If not set, "hostapd" is used as a default.
-#server_id=server.example.com
-
-# Enable CRL verification.
-# Note: hostapd does not yet support CRL downloading based on CDP. Thus, a
-# valid CRL signed by the CA is required to be included in the ca_cert file.
-# This can be done by using PEM format for CA certificate and CRL and
-# concatenating these into one file. Whenever CRL changes, hostapd needs to be
-# restarted to take the new CRL into use.
-# 0 = do not verify CRLs (default)
-# 1 = check the CRL of the user certificate
-# 2 = check all CRLs in the certificate path
-#check_crl=1
-
-# TLS Session Lifetime in seconds
-# This can be used to allow TLS sessions to be cached and resumed with an
-# abbreviated handshake when using EAP-TLS/TTLS/PEAP.
-# (default: 0 = session caching and resumption disabled)
-#tls_session_lifetime=3600
-
-# Cached OCSP stapling response (DER encoded)
-# If set, this file is sent as a certificate status response by the EAP server
-# if the EAP peer requests certificate status in the ClientHello message.
-# This cache file can be updated, e.g., by running following command
-# periodically to get an update from the OCSP responder:
-# openssl ocsp \
-#	-no_nonce \
-#	-CAfile /etc/hostapd.ca.pem \
-#	-issuer /etc/hostapd.ca.pem \
-#	-cert /etc/hostapd.server.pem \
-#	-url http://ocsp.example.com:8888/ \
-#	-respout /tmp/ocsp-cache.der
-#ocsp_stapling_response=/tmp/ocsp-cache.der
-
-# Cached OCSP stapling response list (DER encoded OCSPResponseList)
-# This is similar to ocsp_stapling_response, but the extended version defined in
-# RFC 6961 to allow multiple OCSP responses to be provided.
-#ocsp_stapling_response_multi=/tmp/ocsp-multi-cache.der
-
-# dh_file: File path to DH/DSA parameters file (in PEM format)
-# This is an optional configuration file for setting parameters for an
-# ephemeral DH key exchange. In most cases, the default RSA authentication does
-# not use this configuration. However, it is possible setup RSA to use
-# ephemeral DH key exchange. In addition, ciphers with DSA keys always use
-# ephemeral DH keys. This can be used to achieve forward secrecy. If the file
-# is in DSA parameters format, it will be automatically converted into DH
-# params. This parameter is required if anonymous EAP-FAST is used.
-# You can generate DH parameters file with OpenSSL, e.g.,
-# "openssl dhparam -out /etc/hostapd.dh.pem 2048"
-#dh_file=/etc/hostapd.dh.pem
-
-# OpenSSL cipher string
-#
-# This is an OpenSSL specific configuration option for configuring the default
-# ciphers. If not set, "DEFAULT:!EXP:!LOW" is used as the default.
-# See https://www.openssl.org/docs/apps/ciphers.html for OpenSSL documentation
-# on cipher suite configuration. This is applicable only if hostapd is built to
-# use OpenSSL.
-#openssl_ciphers=DEFAULT:!EXP:!LOW
-
-# Fragment size for EAP methods
-#fragment_size=1400
-
-# Finite cyclic group for EAP-pwd. Number maps to group of domain parameters
-# using the IANA repository for IKE (RFC 2409).
-#pwd_group=19
-
-# Configuration data for EAP-SIM database/authentication gateway interface.
-# This is a text string in implementation specific format. The example
-# implementation in eap_sim_db.c uses this as the UNIX domain socket name for
-# the HLR/AuC gateway (e.g., hlr_auc_gw). In this case, the path uses "unix:"
-# prefix. If hostapd is built with SQLite support (CONFIG_SQLITE=y in .config),
-# database file can be described with an optional db=<path> parameter.
-#eap_sim_db=unix:/tmp/hlr_auc_gw.sock
-#eap_sim_db=unix:/tmp/hlr_auc_gw.sock db=/tmp/hostapd.db
-
-# EAP-SIM DB request timeout
-# This parameter sets the maximum time to wait for a database request response.
-# The parameter value is in seconds.
-#eap_sim_db_timeout=1
-
-# Encryption key for EAP-FAST PAC-Opaque values. This key must be a secret,
-# random value. It is configured as a 16-octet value in hex format. It can be
-# generated, e.g., with the following command:
-# od -tx1 -v -N16 /dev/random | colrm 1 8 | tr -d ' '
-#pac_opaque_encr_key=000102030405060708090a0b0c0d0e0f
-
-# EAP-FAST authority identity (A-ID)
-# A-ID indicates the identity of the authority that issues PACs. The A-ID
-# should be unique across all issuing servers. In theory, this is a variable
-# length field, but due to some existing implementations requiring A-ID to be
-# 16 octets in length, it is strongly recommended to use that length for the
-# field to provid interoperability with deployed peer implementations. This
-# field is configured in hex format.
-#eap_fast_a_id=101112131415161718191a1b1c1d1e1f
-
-# EAP-FAST authority identifier information (A-ID-Info)
-# This is a user-friendly name for the A-ID. For example, the enterprise name
-# and server name in a human-readable format. This field is encoded as UTF-8.
-#eap_fast_a_id_info=test server
-
-# Enable/disable different EAP-FAST provisioning modes:
-#0 = provisioning disabled
-#1 = only anonymous provisioning allowed
-#2 = only authenticated provisioning allowed
-#3 = both provisioning modes allowed (default)
-#eap_fast_prov=3
-
-# EAP-FAST PAC-Key lifetime in seconds (hard limit)
-#pac_key_lifetime=604800
-
-# EAP-FAST PAC-Key refresh time in seconds (soft limit on remaining hard
-# limit). The server will generate a new PAC-Key when this number of seconds
-# (or fewer) of the lifetime remains.
-#pac_key_refresh_time=86400
-
-# EAP-SIM and EAP-AKA protected success/failure indication using AT_RESULT_IND
-# (default: 0 = disabled).
-#eap_sim_aka_result_ind=1
-
-# Trusted Network Connect (TNC)
-# If enabled, TNC validation will be required before the peer is allowed to
-# connect. Note: This is only used with EAP-TTLS and EAP-FAST. If any other
-# EAP method is enabled, the peer will be allowed to connect without TNC.
-#tnc=1
-
-# EAP Re-authentication Protocol (ERP) - RFC 6696
-#
-# Whether to enable ERP on the EAP server.
-#eap_server_erp=1
-
-##### IEEE 802.11f - Inter-Access Point Protocol (IAPP) #######################
-
-# Interface to be used for IAPP broadcast packets
-#iapp_interface=eth0
-
-
-##### RADIUS client configuration #############################################
-# for IEEE 802.1X with external Authentication Server, IEEE 802.11
-# authentication with external ACL for MAC addresses, and accounting
-
-# The own IP address of the access point (used as NAS-IP-Address)
-own_ip_addr=127.0.0.1
-
-# NAS-Identifier string for RADIUS messages. When used, this should be unique
-# to the NAS within the scope of the RADIUS server. Please note that hostapd
-# uses a separate RADIUS client for each BSS and as such, a unique
-# nas_identifier value should be configured separately for each BSS. This is
-# particularly important for cases where RADIUS accounting is used
-# (Accounting-On/Off messages are interpreted as clearing all ongoing sessions
-# and that may get interpreted as applying to all BSSes if the same
-# NAS-Identifier value is used.) For example, a fully qualified domain name
-# prefixed with a unique identifier of the BSS (e.g., BSSID) can be used here.
-#
-# When using IEEE 802.11r, nas_identifier must be set and must be between 1 and
-# 48 octets long.
-#
-# It is mandatory to configure either own_ip_addr or nas_identifier to be
-# compliant with the RADIUS protocol. When using RADIUS accounting, it is
-# strongly recommended that nas_identifier is set to a unique value for each
-# BSS.
-#nas_identifier=ap.example.com
-
-# RADIUS client forced local IP address for the access point
-# Normally the local IP address is determined automatically based on configured
-# IP addresses, but this field can be used to force a specific address to be
-# used, e.g., when the device has multiple IP addresses.
-#radius_client_addr=127.0.0.1
-
-# RADIUS authentication server
-#auth_server_addr=127.0.0.1
-#auth_server_port=1812
-#auth_server_shared_secret=secret
-
-# RADIUS accounting server
-#acct_server_addr=127.0.0.1
-#acct_server_port=1813
-#acct_server_shared_secret=secret
-
-# Secondary RADIUS servers; to be used if primary one does not reply to
-# RADIUS packets. These are optional and there can be more than one secondary
-# server listed.
-#auth_server_addr=127.0.0.2
-#auth_server_port=1812
-#auth_server_shared_secret=secret2
-#
-#acct_server_addr=127.0.0.2
-#acct_server_port=1813
-#acct_server_shared_secret=secret2
-
-# Retry interval for trying to return to the primary RADIUS server (in
-# seconds). RADIUS client code will automatically try to use the next server
-# when the current server is not replying to requests. If this interval is set,
-# primary server will be retried after configured amount of time even if the
-# currently used secondary server is still working.
-#radius_retry_primary_interval=600
-
-
-# Interim accounting update interval
-# If this is set (larger than 0) and acct_server is configured, hostapd will
-# send interim accounting updates every N seconds. Note: if set, this overrides
-# possible Acct-Interim-Interval attribute in Access-Accept message. Thus, this
-# value should not be configured in hostapd.conf, if RADIUS server is used to
-# control the interim interval.
-# This value should not be less 600 (10 minutes) and must not be less than
-# 60 (1 minute).
-#radius_acct_interim_interval=600
-
-# Request Chargeable-User-Identity (RFC 4372)
-# This parameter can be used to configure hostapd to request CUI from the
-# RADIUS server by including Chargeable-User-Identity attribute into
-# Access-Request packets.
-#radius_request_cui=1
-
-# Dynamic VLAN mode; allow RADIUS authentication server to decide which VLAN
-# is used for the stations. This information is parsed from following RADIUS
-# attributes based on RFC 3580 and RFC 2868: Tunnel-Type (value 13 = VLAN),
-# Tunnel-Medium-Type (value 6 = IEEE 802), Tunnel-Private-Group-ID (value
-# VLANID as a string). Optionally, the local MAC ACL list (accept_mac_file) can
-# be used to set static client MAC address to VLAN ID mapping.
-# 0 = disabled (default)
-# 1 = option; use default interface if RADIUS server does not include VLAN ID
-# 2 = required; reject authentication if RADIUS server does not include VLAN ID
-#dynamic_vlan=0
-
-# Per-Station AP_VLAN interface mode
-# If enabled, each station is assigned its own AP_VLAN interface.
-# This implies per-station group keying and ebtables filtering of inter-STA
-# traffic (when passed through the AP).
-# If the sta is not assigned to any VLAN, then its AP_VLAN interface will be
-# added to the bridge given by the "bridge" configuration option (see above).
-# Otherwise, it will be added to the per-VLAN bridge.
-# 0 = disabled (default)
-# 1 = enabled
-#per_sta_vif=0
-
-# VLAN interface list for dynamic VLAN mode is read from a separate text file.
-# This list is used to map VLAN ID from the RADIUS server to a network
-# interface. Each station is bound to one interface in the same way as with
-# multiple BSSIDs or SSIDs. Each line in this text file is defining a new
-# interface and the line must include VLAN ID and interface name separated by
-# white space (space or tab).
-# If no entries are provided by this file, the station is statically mapped
-# to <bss-iface>.<vlan-id> interfaces.
-#vlan_file=/etc/hostapd.vlan
-
-# Interface where 802.1q tagged packets should appear when a RADIUS server is
-# used to determine which VLAN a station is on.  hostapd creates a bridge for
-# each VLAN.  Then hostapd adds a VLAN interface (associated with the interface
-# indicated by 'vlan_tagged_interface') and the appropriate wireless interface
-# to the bridge.
-#vlan_tagged_interface=eth0
-
-# Bridge (prefix) to add the wifi and the tagged interface to. This gets the
-# VLAN ID appended. It defaults to brvlan%d if no tagged interface is given
-# and br%s.%d if a tagged interface is given, provided %s = tagged interface
-# and %d = VLAN ID.
-#vlan_bridge=brvlan
-
-# When hostapd creates a VLAN interface on vlan_tagged_interfaces, it needs
-# to know how to name it.
-# 0 = vlan<XXX>, e.g., vlan1
-# 1 = <vlan_tagged_interface>.<XXX>, e.g. eth0.1
-#vlan_naming=0
-
-# Arbitrary RADIUS attributes can be added into Access-Request and
-# Accounting-Request packets by specifying the contents of the attributes with
-# the following configuration parameters. There can be multiple of these to
-# add multiple attributes. These parameters can also be used to override some
-# of the attributes added automatically by hostapd.
-# Format: <attr_id>[:<syntax:value>]
-# attr_id: RADIUS attribute type (e.g., 26 = Vendor-Specific)
-# syntax: s = string (UTF-8), d = integer, x = octet string
-# value: attribute value in format indicated by the syntax
-# If syntax and value parts are omitted, a null value (single 0x00 octet) is
-# used.
-#
-# Additional Access-Request attributes
-# radius_auth_req_attr=<attr_id>[:<syntax:value>]
-# Examples:
-# Operator-Name = "Operator"
-#radius_auth_req_attr=126:s:Operator
-# Service-Type = Framed (2)
-#radius_auth_req_attr=6:d:2
-# Connect-Info = "testing" (this overrides the automatically generated value)
-#radius_auth_req_attr=77:s:testing
-# Same Connect-Info value set as a hexdump
-#radius_auth_req_attr=77:x:74657374696e67
-
-#
-# Additional Accounting-Request attributes
-# radius_acct_req_attr=<attr_id>[:<syntax:value>]
-# Examples:
-# Operator-Name = "Operator"
-#radius_acct_req_attr=126:s:Operator
-
-# Dynamic Authorization Extensions (RFC 5176)
-# This mechanism can be used to allow dynamic changes to user session based on
-# commands from a RADIUS server (or some other disconnect client that has the
-# needed session information). For example, Disconnect message can be used to
-# request an associated station to be disconnected.
-#
-# This is disabled by default. Set radius_das_port to non-zero UDP port
-# number to enable.
-#radius_das_port=3799
-#
-# DAS client (the host that can send Disconnect/CoA requests) and shared secret
-#radius_das_client=192.168.1.123 shared secret here
-#
-# DAS Event-Timestamp time window in seconds
-#radius_das_time_window=300
-#
-# DAS require Event-Timestamp
-#radius_das_require_event_timestamp=1
-#
-# DAS require Message-Authenticator
-#radius_das_require_message_authenticator=1
-
-##### RADIUS authentication server configuration ##############################
-
-# hostapd can be used as a RADIUS authentication server for other hosts. This
-# requires that the integrated EAP server is also enabled and both
-# authentication services are sharing the same configuration.
-
-# File name of the RADIUS clients configuration for the RADIUS server. If this
-# commented out, RADIUS server is disabled.
-#radius_server_clients=/etc/hostapd.radius_clients
-
-# The UDP port number for the RADIUS authentication server
-#radius_server_auth_port=1812
-
-# The UDP port number for the RADIUS accounting server
-# Commenting this out or setting this to 0 can be used to disable RADIUS
-# accounting while still enabling RADIUS authentication.
-#radius_server_acct_port=1813
-
-# Use IPv6 with RADIUS server (IPv4 will also be supported using IPv6 API)
-#radius_server_ipv6=1
-
-
-##### WPA/IEEE 802.11i configuration ##########################################
-
-# Enable WPA. Setting this variable configures the AP to require WPA (either
-# WPA-PSK or WPA-RADIUS/EAP based on other configuration). For WPA-PSK, either
-# wpa_psk or wpa_passphrase must be set and wpa_key_mgmt must include WPA-PSK.
-# Instead of wpa_psk / wpa_passphrase, wpa_psk_radius might suffice.
-# For WPA-RADIUS/EAP, ieee8021x must be set (but without dynamic WEP keys),
-# RADIUS authentication server must be configured, and WPA-EAP must be included
-# in wpa_key_mgmt.
-# This field is a bit field that can be used to enable WPA (IEEE 802.11i/D3.0)
-# and/or WPA2 (full IEEE 802.11i/RSN):
-# bit0 = WPA
-# bit1 = IEEE 802.11i/RSN (WPA2) (dot11RSNAEnabled)
-#wpa=1
-
-# WPA pre-shared keys for WPA-PSK. This can be either entered as a 256-bit
-# secret in hex format (64 hex digits), wpa_psk, or as an ASCII passphrase
-# (8..63 characters) that will be converted to PSK. This conversion uses SSID
-# so the PSK changes when ASCII passphrase is used and the SSID is changed.
-# wpa_psk (dot11RSNAConfigPSKValue)
-# wpa_passphrase (dot11RSNAConfigPSKPassPhrase)
-#wpa_psk=0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
-#wpa_passphrase=secret passphrase
-
-# Optionally, WPA PSKs can be read from a separate text file (containing list
-# of (PSK,MAC address) pairs. This allows more than one PSK to be configured.
-# Use absolute path name to make sure that the files can be read on SIGHUP
-# configuration reloads.
-#wpa_psk_file=/etc/hostapd.wpa_psk
-
-# Optionally, WPA passphrase can be received from RADIUS authentication server
-# This requires macaddr_acl to be set to 2 (RADIUS)
-# 0 = disabled (default)
-# 1 = optional; use default passphrase/psk if RADIUS server does not include
-#	Tunnel-Password
-# 2 = required; reject authentication if RADIUS server does not include
-#	Tunnel-Password
-#wpa_psk_radius=0
-
-# Set of accepted key management algorithms (WPA-PSK, WPA-EAP, or both). The
-# entries are separated with a space. WPA-PSK-SHA256 and WPA-EAP-SHA256 can be
-# added to enable SHA256-based stronger algorithms.
-# (dot11RSNAConfigAuthenticationSuitesTable)
-#wpa_key_mgmt=WPA-PSK WPA-EAP
-
-# Set of accepted cipher suites (encryption algorithms) for pairwise keys
-# (unicast packets). This is a space separated list of algorithms:
-# CCMP = AES in Counter mode with CBC-MAC [RFC 3610, IEEE 802.11i/D7.0]
-# TKIP = Temporal Key Integrity Protocol [IEEE 802.11i/D7.0]
-# Group cipher suite (encryption algorithm for broadcast and multicast frames)
-# is automatically selected based on this configuration. If only CCMP is
-# allowed as the pairwise cipher, group cipher will also be CCMP. Otherwise,
-# TKIP will be used as the group cipher.
-# (dot11RSNAConfigPairwiseCiphersTable)
-# Pairwise cipher for WPA (v1) (default: TKIP)
-#wpa_pairwise=TKIP CCMP
-# Pairwise cipher for RSN/WPA2 (default: use wpa_pairwise value)
-#rsn_pairwise=CCMP
-
-# Time interval for rekeying GTK (broadcast/multicast encryption keys) in
-# seconds. (dot11RSNAConfigGroupRekeyTime)
-#wpa_group_rekey=600
-
-# Rekey GTK when any STA that possesses the current GTK is leaving the BSS.
-# (dot11RSNAConfigGroupRekeyStrict)
-#wpa_strict_rekey=1
-
-# Time interval for rekeying GMK (master key used internally to generate GTKs
-# (in seconds).
-#wpa_gmk_rekey=86400
-
-# Maximum lifetime for PTK in seconds. This can be used to enforce rekeying of
-# PTK to mitigate some attacks against TKIP deficiencies.
-#wpa_ptk_rekey=600
-
-# Enable IEEE 802.11i/RSN/WPA2 pre-authentication. This is used to speed up
-# roaming be pre-authenticating IEEE 802.1X/EAP part of the full RSN
-# authentication and key handshake before actually associating with a new AP.
-# (dot11RSNAPreauthenticationEnabled)
-#rsn_preauth=1
-#
-# Space separated list of interfaces from which pre-authentication frames are
-# accepted (e.g., 'eth0' or 'eth0 wlan0wds0'. This list should include all
-# interface that are used for connections to other APs. This could include
-# wired interfaces and WDS links. The normal wireless data interface towards
-# associated stations (e.g., wlan0) should not be added, since
-# pre-authentication is only used with APs other than the currently associated
-# one.
-#rsn_preauth_interfaces=eth0
-
-# peerkey: Whether PeerKey negotiation for direct links (IEEE 802.11e) is
-# allowed. This is only used with RSN/WPA2.
-# 0 = disabled (default)
-# 1 = enabled
-#peerkey=1
-
-# ieee80211w: Whether management frame protection (MFP) is enabled
-# 0 = disabled (default)
-# 1 = optional
-# 2 = required
-#ieee80211w=0
-
-# Group management cipher suite
-# Default: AES-128-CMAC (BIP)
-# Other options (depending on driver support):
-# BIP-GMAC-128
-# BIP-GMAC-256
-# BIP-CMAC-256
-# Note: All the stations connecting to the BSS will also need to support the
-# selected cipher. The default AES-128-CMAC is the only option that is commonly
-# available in deployed devices.
-#group_mgmt_cipher=AES-128-CMAC
-
-# Association SA Query maximum timeout (in TU = 1.024 ms; for MFP)
-# (maximum time to wait for a SA Query response)
-# dot11AssociationSAQueryMaximumTimeout, 1...4294967295
-#assoc_sa_query_max_timeout=1000
-
-# Association SA Query retry timeout (in TU = 1.024 ms; for MFP)
-# (time between two subsequent SA Query requests)
-# dot11AssociationSAQueryRetryTimeout, 1...4294967295
-#assoc_sa_query_retry_timeout=201
-
-# disable_pmksa_caching: Disable PMKSA caching
-# This parameter can be used to disable caching of PMKSA created through EAP
-# authentication. RSN preauthentication may still end up using PMKSA caching if
-# it is enabled (rsn_preauth=1).
-# 0 = PMKSA caching enabled (default)
-# 1 = PMKSA caching disabled
-#disable_pmksa_caching=0
-
-# okc: Opportunistic Key Caching (aka Proactive Key Caching)
-# Allow PMK cache to be shared opportunistically among configured interfaces
-# and BSSes (i.e., all configurations within a single hostapd process).
-# 0 = disabled (default)
-# 1 = enabled
-#okc=1
-
-# SAE threshold for anti-clogging mechanism (dot11RSNASAEAntiCloggingThreshold)
-# This parameter defines how many open SAE instances can be in progress at the
-# same time before the anti-clogging mechanism is taken into use.
-#sae_anti_clogging_threshold=5
-
-# Enabled SAE finite cyclic groups
-# SAE implementation are required to support group 19 (ECC group defined over a
-# 256-bit prime order field). All groups that are supported by the
-# implementation are enabled by default. This configuration parameter can be
-# used to specify a limited set of allowed groups. The group values are listed
-# in the IANA registry:
-# http://www.iana.org/assignments/ipsec-registry/ipsec-registry.xml#ipsec-registry-9
-#sae_groups=19 20 21 25 26
-
-##### IEEE 802.11r configuration ##############################################
-
-# Mobility Domain identifier (dot11FTMobilityDomainID, MDID)
-# MDID is used to indicate a group of APs (within an ESS, i.e., sharing the
-# same SSID) between which a STA can use Fast BSS Transition.
-# 2-octet identifier as a hex string.
-#mobility_domain=a1b2
-
-# PMK-R0 Key Holder identifier (dot11FTR0KeyHolderID)
-# 1 to 48 octet identifier.
-# This is configured with nas_identifier (see RADIUS client section above).
-
-# Default lifetime of the PMK-RO in minutes; range 1..65535
-# (dot11FTR0KeyLifetime)
-#r0_key_lifetime=10000
-
-# PMK-R1 Key Holder identifier (dot11FTR1KeyHolderID)
-# 6-octet identifier as a hex string.
-# Defaults to BSSID.
-#r1_key_holder=000102030405
-
-# Reassociation deadline in time units (TUs / 1.024 ms; range 1000..65535)
-# (dot11FTReassociationDeadline)
-#reassociation_deadline=1000
-
-# List of R0KHs in the same Mobility Domain
-# format: <MAC address> <NAS Identifier> <128-bit key as hex string>
-# This list is used to map R0KH-ID (NAS Identifier) to a destination MAC
-# address when requesting PMK-R1 key from the R0KH that the STA used during the
-# Initial Mobility Domain Association.
-#r0kh=02:01:02:03:04:05 r0kh-1.example.com 000102030405060708090a0b0c0d0e0f
-#r0kh=02:01:02:03:04:06 r0kh-2.example.com 00112233445566778899aabbccddeeff
-# And so on.. One line per R0KH.
-
-# List of R1KHs in the same Mobility Domain
-# format: <MAC address> <R1KH-ID> <128-bit key as hex string>
-# This list is used to map R1KH-ID to a destination MAC address when sending
-# PMK-R1 key from the R0KH. This is also the list of authorized R1KHs in the MD
-# that can request PMK-R1 keys.
-#r1kh=02:01:02:03:04:05 02:11:22:33:44:55 000102030405060708090a0b0c0d0e0f
-#r1kh=02:01:02:03:04:06 02:11:22:33:44:66 00112233445566778899aabbccddeeff
-# And so on.. One line per R1KH.
-
-# Whether PMK-R1 push is enabled at R0KH
-# 0 = do not push PMK-R1 to all configured R1KHs (default)
-# 1 = push PMK-R1 to all configured R1KHs whenever a new PMK-R0 is derived
-#pmk_r1_push=1
-
-# Whether to enable FT-over-DS
-# 0 = FT-over-DS disabled
-# 1 = FT-over-DS enabled (default)
-#ft_over_ds=1
-
-##### Neighbor table ##########################################################
-# Maximum number of entries kept in AP table (either for neigbor table or for
-# detecting Overlapping Legacy BSS Condition). The oldest entry will be
-# removed when adding a new entry that would make the list grow over this
-# limit. Note! WFA certification for IEEE 802.11g requires that OLBC is
-# enabled, so this field should not be set to 0 when using IEEE 802.11g.
-# default: 255
-#ap_table_max_size=255
-
-# Number of seconds of no frames received after which entries may be deleted
-# from the AP table. Since passive scanning is not usually performed frequently
-# this should not be set to very small value. In addition, there is no
-# guarantee that every scan cycle will receive beacon frames from the
-# neighboring APs.
-# default: 60
-#ap_table_expiration_time=3600
-
-# Maximum number of stations to track on the operating channel
-# This can be used to detect dualband capable stations before they have
-# associated, e.g., to provide guidance on which colocated BSS to use.
-# Default: 0 (disabled)
-#track_sta_max_num=100
-
-# Maximum age of a station tracking entry in seconds
-# Default: 180
-#track_sta_max_age=180
-
-# Do not reply to group-addressed Probe Request from a station that was seen on
-# another radio.
-# Default: Disabled
-#
-# This can be used with enabled track_sta_max_num configuration on another
-# interface controlled by the same hostapd process to restrict Probe Request
-# frame handling from replying to group-addressed Probe Request frames from a
-# station that has been detected to be capable of operating on another band,
-# e.g., to try to reduce likelihood of the station selecting a 2.4 GHz BSS when
-# the AP operates both a 2.4 GHz and 5 GHz BSS concurrently.
-#
-# Note: Enabling this can cause connectivity issues and increase latency for
-# discovering the AP.
-#no_probe_resp_if_seen_on=wlan1
-
-# Reject authentication from a station that was seen on another radio.
-# Default: Disabled
-#
-# This can be used with enabled track_sta_max_num configuration on another
-# interface controlled by the same hostapd process to reject authentication
-# attempts from a station that has been detected to be capable of operating on
-# another band, e.g., to try to reduce likelihood of the station selecting a
-# 2.4 GHz BSS when the AP operates both a 2.4 GHz and 5 GHz BSS concurrently.
-#
-# Note: Enabling this can cause connectivity issues and increase latency for
-# connecting with the AP.
-#no_auth_if_seen_on=wlan1
-
-##### Wi-Fi Protected Setup (WPS) #############################################
-
-# WPS state
-# 0 = WPS disabled (default)
-# 1 = WPS enabled, not configured
-# 2 = WPS enabled, configured
-#wps_state=2
-
-# Whether to manage this interface independently from other WPS interfaces
-# By default, a single hostapd process applies WPS operations to all configured
-# interfaces. This parameter can be used to disable that behavior for a subset
-# of interfaces. If this is set to non-zero for an interface, WPS commands
-# issued on that interface do not apply to other interfaces and WPS operations
-# performed on other interfaces do not affect this interface.
-#wps_independent=0
-
-# AP can be configured into a locked state where new WPS Registrar are not
-# accepted, but previously authorized Registrars (including the internal one)
-# can continue to add new Enrollees.
-#ap_setup_locked=1
-
-# Universally Unique IDentifier (UUID; see RFC 4122) of the device
-# This value is used as the UUID for the internal WPS Registrar. If the AP
-# is also using UPnP, this value should be set to the device's UPnP UUID.
-# If not configured, UUID will be generated based on the local MAC address.
-#uuid=12345678-9abc-def0-1234-56789abcdef0
-
-# Note: If wpa_psk_file is set, WPS is used to generate random, per-device PSKs
-# that will be appended to the wpa_psk_file. If wpa_psk_file is not set, the
-# default PSK (wpa_psk/wpa_passphrase) will be delivered to Enrollees. Use of
-# per-device PSKs is recommended as the more secure option (i.e., make sure to
-# set wpa_psk_file when using WPS with WPA-PSK).
-
-# When an Enrollee requests access to the network with PIN method, the Enrollee
-# PIN will need to be entered for the Registrar. PIN request notifications are
-# sent to hostapd ctrl_iface monitor. In addition, they can be written to a
-# text file that could be used, e.g., to populate the AP administration UI with
-# pending PIN requests. If the following variable is set, the PIN requests will
-# be written to the configured file.
-#wps_pin_requests=/var/run/hostapd_wps_pin_requests
-
-# Device Name
-# User-friendly description of device; up to 32 octets encoded in UTF-8
-#device_name=Wireless AP
-
-# Manufacturer
-# The manufacturer of the device (up to 64 ASCII characters)
-#manufacturer=Company
-
-# Model Name
-# Model of the device (up to 32 ASCII characters)
-#model_name=WAP
-
-# Model Number
-# Additional device description (up to 32 ASCII characters)
-#model_number=123
-
-# Serial Number
-# Serial number of the device (up to 32 characters)
-#serial_number=12345
-
-# Primary Device Type
-# Used format: <categ>-<OUI>-<subcateg>
-# categ = Category as an integer value
-# OUI = OUI and type octet as a 4-octet hex-encoded value; 0050F204 for
-#       default WPS OUI
-# subcateg = OUI-specific Sub Category as an integer value
-# Examples:
-#   1-0050F204-1 (Computer / PC)
-#   1-0050F204-2 (Computer / Server)
-#   5-0050F204-1 (Storage / NAS)
-#   6-0050F204-1 (Network Infrastructure / AP)
-#device_type=6-0050F204-1
-
-# OS Version
-# 4-octet operating system version number (hex string)
-#os_version=01020300
-
-# Config Methods
-# List of the supported configuration methods
-# Available methods: usba ethernet label display ext_nfc_token int_nfc_token
-#	nfc_interface push_button keypad virtual_display physical_display
-#	virtual_push_button physical_push_button
-#config_methods=label virtual_display virtual_push_button keypad
-
-# WPS capability discovery workaround for PBC with Windows 7
-# Windows 7 uses incorrect way of figuring out AP's WPS capabilities by acting
-# as a Registrar and using M1 from the AP. The config methods attribute in that
-# message is supposed to indicate only the configuration method supported by
-# the AP in Enrollee role, i.e., to add an external Registrar. For that case,
-# PBC shall not be used and as such, the PushButton config method is removed
-# from M1 by default. If pbc_in_m1=1 is included in the configuration file,
-# the PushButton config method is left in M1 (if included in config_methods
-# parameter) to allow Windows 7 to use PBC instead of PIN (e.g., from a label
-# in the AP).
-#pbc_in_m1=1
-
-# Static access point PIN for initial configuration and adding Registrars
-# If not set, hostapd will not allow external WPS Registrars to control the
-# access point. The AP PIN can also be set at runtime with hostapd_cli
-# wps_ap_pin command. Use of temporary (enabled by user action) and random
-# AP PIN is much more secure than configuring a static AP PIN here. As such,
-# use of the ap_pin parameter is not recommended if the AP device has means for
-# displaying a random PIN.
-#ap_pin=12345670
-
-# Skip building of automatic WPS credential
-# This can be used to allow the automatically generated Credential attribute to
-# be replaced with pre-configured Credential(s).
-#skip_cred_build=1
-
-# Additional Credential attribute(s)
-# This option can be used to add pre-configured Credential attributes into M8
-# message when acting as a Registrar. If skip_cred_build=1, this data will also
-# be able to override the Credential attribute that would have otherwise been
-# automatically generated based on network configuration. This configuration
-# option points to an external file that much contain the WPS Credential
-# attribute(s) as binary data.
-#extra_cred=hostapd.cred
-
-# Credential processing
-#   0 = process received credentials internally (default)
-#   1 = do not process received credentials; just pass them over ctrl_iface to
-#	external program(s)
-#   2 = process received credentials internally and pass them over ctrl_iface
-#	to external program(s)
-# Note: With wps_cred_processing=1, skip_cred_build should be set to 1 and
-# extra_cred be used to provide the Credential data for Enrollees.
-#
-# wps_cred_processing=1 will disabled automatic updates of hostapd.conf file
-# both for Credential processing and for marking AP Setup Locked based on
-# validation failures of AP PIN. An external program is responsible on updating
-# the configuration appropriately in this case.
-#wps_cred_processing=0
-
-# AP Settings Attributes for M7
-# By default, hostapd generates the AP Settings Attributes for M7 based on the
-# current configuration. It is possible to override this by providing a file
-# with pre-configured attributes. This is similar to extra_cred file format,
-# but the AP Settings attributes are not encapsulated in a Credential
-# attribute.
-#ap_settings=hostapd.ap_settings
-
-# WPS UPnP interface
-# If set, support for external Registrars is enabled.
-#upnp_iface=br0
-
-# Friendly Name (required for UPnP)
-# Short description for end use. Should be less than 64 characters.
-#friendly_name=WPS Access Point
-
-# Manufacturer URL (optional for UPnP)
-#manufacturer_url=http://www.example.com/
-
-# Model Description (recommended for UPnP)
-# Long description for end user. Should be less than 128 characters.
-#model_description=Wireless Access Point
-
-# Model URL (optional for UPnP)
-#model_url=http://www.example.com/model/
-
-# Universal Product Code (optional for UPnP)
-# 12-digit, all-numeric code that identifies the consumer package.
-#upc=123456789012
-
-# WPS RF Bands (a = 5G, b = 2.4G, g = 2.4G, ag = dual band, ad = 60 GHz)
-# This value should be set according to RF band(s) supported by the AP if
-# hw_mode is not set. For dual band dual concurrent devices, this needs to be
-# set to ag to allow both RF bands to be advertized.
-#wps_rf_bands=ag
-
-# NFC password token for WPS
-# These parameters can be used to configure a fixed NFC password token for the
-# AP. This can be generated, e.g., with nfc_pw_token from wpa_supplicant. When
-# these parameters are used, the AP is assumed to be deployed with a NFC tag
-# that includes the matching NFC password token (e.g., written based on the
-# NDEF record from nfc_pw_token).
-#
-#wps_nfc_dev_pw_id: Device Password ID (16..65535)
-#wps_nfc_dh_pubkey: Hexdump of DH Public Key
-#wps_nfc_dh_privkey: Hexdump of DH Private Key
-#wps_nfc_dev_pw: Hexdump of Device Password
-
-##### Wi-Fi Direct (P2P) ######################################################
-
-# Enable P2P Device management
-#manage_p2p=1
-
-# Allow cross connection
-#allow_cross_connection=1
-
-#### TDLS (IEEE 802.11z-2010) #################################################
-
-# Prohibit use of TDLS in this BSS
-#tdls_prohibit=1
-
-# Prohibit use of TDLS Channel Switching in this BSS
-#tdls_prohibit_chan_switch=1
-
-##### IEEE 802.11v-2011 #######################################################
-
-# Time advertisement
-# 0 = disabled (default)
-# 2 = UTC time at which the TSF timer is 0
-#time_advertisement=2
-
-# Local time zone as specified in 8.3 of IEEE Std 1003.1-2004:
-# stdoffset[dst[offset][,start[/time],end[/time]]]
-#time_zone=EST5
-
-# WNM-Sleep Mode (extended sleep mode for stations)
-# 0 = disabled (default)
-# 1 = enabled (allow stations to use WNM-Sleep Mode)
-#wnm_sleep_mode=1
-
-# BSS Transition Management
-# 0 = disabled (default)
-# 1 = enabled
-#bss_transition=1
-
-# Proxy ARP
-# 0 = disabled (default)
-# 1 = enabled
-#proxy_arp=1
-
-# IPv6 Neighbor Advertisement multicast-to-unicast conversion
-# This can be used with Proxy ARP to allow multicast NAs to be forwarded to
-# associated STAs using link layer unicast delivery.
-# 0 = disabled (default)
-# 1 = enabled
-#na_mcast_to_ucast=0
-
-##### IEEE 802.11u-2011 #######################################################
-
-# Enable Interworking service
-#interworking=1
-
-# Access Network Type
-# 0 = Private network
-# 1 = Private network with guest access
-# 2 = Chargeable public network
-# 3 = Free public network
-# 4 = Personal device network
-# 5 = Emergency services only network
-# 14 = Test or experimental
-# 15 = Wildcard
-#access_network_type=0
-
-# Whether the network provides connectivity to the Internet
-# 0 = Unspecified
-# 1 = Network provides connectivity to the Internet
-#internet=1
-
-# Additional Step Required for Access
-# Note: This is only used with open network, i.e., ASRA shall ne set to 0 if
-# RSN is used.
-#asra=0
-
-# Emergency services reachable
-#esr=0
-
-# Unauthenticated emergency service accessible
-#uesa=0
-
-# Venue Info (optional)
-# The available values are defined in IEEE Std 802.11u-2011, 7.3.1.34.
-# Example values (group,type):
-# 0,0 = Unspecified
-# 1,7 = Convention Center
-# 1,13 = Coffee Shop
-# 2,0 = Unspecified Business
-# 7,1  Private Residence
-#venue_group=7
-#venue_type=1
-
-# Homogeneous ESS identifier (optional; dot11HESSID)
-# If set, this shall be identifical to one of the BSSIDs in the homogeneous
-# ESS and this shall be set to the same value across all BSSs in homogeneous
-# ESS.
-#hessid=02:03:04:05:06:07
-
-# Roaming Consortium List
-# Arbitrary number of Roaming Consortium OIs can be configured with each line
-# adding a new OI to the list. The first three entries are available through
-# Beacon and Probe Response frames. Any additional entry will be available only
-# through ANQP queries. Each OI is between 3 and 15 octets and is configured as
-# a hexstring.
-#roaming_consortium=021122
-#roaming_consortium=2233445566
-
-# Venue Name information
-# This parameter can be used to configure one or more Venue Name Duples for
-# Venue Name ANQP information. Each entry has a two or three character language
-# code (ISO-639) separated by colon from the venue name string.
-# Note that venue_group and venue_type have to be set for Venue Name
-# information to be complete.
-#venue_name=eng:Example venue
-#venue_name=fin:Esimerkkipaikka
-# Alternative format for language:value strings:
-# (double quoted string, printf-escaped string)
-#venue_name=P"eng:Example\nvenue"
-
-# Network Authentication Type
-# This parameter indicates what type of network authentication is used in the
-# network.
-# format: <network auth type indicator (1-octet hex str)> [redirect URL]
-# Network Authentication Type Indicator values:
-# 00 = Acceptance of terms and conditions
-# 01 = On-line enrollment supported
-# 02 = http/https redirection
-# 03 = DNS redirection
-#network_auth_type=00
-#network_auth_type=02http://www.example.com/redirect/me/here/
-
-# IP Address Type Availability
-# format: <1-octet encoded value as hex str>
-# (ipv4_type & 0x3f) << 2 | (ipv6_type & 0x3)
-# ipv4_type:
-# 0 = Address type not available
-# 1 = Public IPv4 address available
-# 2 = Port-restricted IPv4 address available
-# 3 = Single NATed private IPv4 address available
-# 4 = Double NATed private IPv4 address available
-# 5 = Port-restricted IPv4 address and single NATed IPv4 address available
-# 6 = Port-restricted IPv4 address and double NATed IPv4 address available
-# 7 = Availability of the address type is not known
-# ipv6_type:
-# 0 = Address type not available
-# 1 = Address type available
-# 2 = Availability of the address type not known
-#ipaddr_type_availability=14
-
-# Domain Name
-# format: <variable-octet str>[,<variable-octet str>]
-#domain_name=example.com,another.example.com,yet-another.example.com
-
-# 3GPP Cellular Network information
-# format: <MCC1,MNC1>[;<MCC2,MNC2>][;...]
-#anqp_3gpp_cell_net=244,91;310,026;234,56
-
-# NAI Realm information
-# One or more realm can be advertised. Each nai_realm line adds a new realm to
-# the set. These parameters provide information for stations using Interworking
-# network selection to allow automatic connection to a network based on
-# credentials.
-# format: <encoding>,<NAI Realm(s)>[,<EAP Method 1>][,<EAP Method 2>][,...]
-# encoding:
-#	0 = Realm formatted in accordance with IETF RFC 4282
-#	1 = UTF-8 formatted character string that is not formatted in
-#	    accordance with IETF RFC 4282
-# NAI Realm(s): Semi-colon delimited NAI Realm(s)
-# EAP Method: <EAP Method>[:<[AuthParam1:Val1]>][<[AuthParam2:Val2]>][...]
-# EAP Method types, see:
-# http://www.iana.org/assignments/eap-numbers/eap-numbers.xhtml#eap-numbers-4
-# AuthParam (Table 8-188 in IEEE Std 802.11-2012):
-# ID 2 = Non-EAP Inner Authentication Type
-#	1 = PAP, 2 = CHAP, 3 = MSCHAP, 4 = MSCHAPV2
-# ID 3 = Inner authentication EAP Method Type
-# ID 5 = Credential Type
-#	1 = SIM, 2 = USIM, 3 = NFC Secure Element, 4 = Hardware Token,
-#	5 = Softoken, 6 = Certificate, 7 = username/password, 9 = Anonymous,
-#	10 = Vendor Specific
-#nai_realm=0,example.com;example.net
-# EAP methods EAP-TLS with certificate and EAP-TTLS/MSCHAPv2 with
-# username/password
-#nai_realm=0,example.org,13[5:6],21[2:4][5:7]
-
-# Arbitrary ANQP-element configuration
-# Additional ANQP-elements with arbitrary values can be defined by specifying
-# their contents in raw format as a hexdump of the payload. Note that these
-# values will override ANQP-element contents that may have been specified in the
-# more higher layer configuration parameters listed above.
-# format: anqp_elem=<InfoID>:<hexdump of payload>
-# For example, AP Geospatial Location ANQP-element with unknown location:
-#anqp_elem=265:0000
-# For example, AP Civic Location ANQP-element with unknown location:
-#anqp_elem=266:000000
-
-# GAS Address 3 behavior
-# 0 = P2P specification (Address3 = AP BSSID) workaround enabled by default
-#     based on GAS request Address3
-# 1 = IEEE 802.11 standard compliant regardless of GAS request Address3
-# 2 = Force non-compliant behavior (Address3 = AP BSSID for all cases)
-#gas_address3=0
-
-# QoS Map Set configuration
-#
-# Comma delimited QoS Map Set in decimal values
-# (see IEEE Std 802.11-2012, 8.4.2.97)
-#
-# format:
-# [<DSCP Exceptions[DSCP,UP]>,]<UP 0 range[low,high]>,...<UP 7 range[low,high]>
-#
-# There can be up to 21 optional DSCP Exceptions which are pairs of DSCP Value
-# (0..63 or 255) and User Priority (0..7). This is followed by eight DSCP Range
-# descriptions with DSCP Low Value and DSCP High Value pairs (0..63 or 255) for
-# each UP starting from 0. If both low and high value are set to 255, the
-# corresponding UP is not used.
-#
-# default: not set
-#qos_map_set=53,2,22,6,8,15,0,7,255,255,16,31,32,39,255,255,40,47,255,255
-
-##### Hotspot 2.0 #############################################################
-
-# Enable Hotspot 2.0 support
-#hs20=1
-
-# Disable Downstream Group-Addressed Forwarding (DGAF)
-# This can be used to configure a network where no group-addressed frames are
-# allowed. The AP will not forward any group-address frames to the stations and
-# random GTKs are issued for each station to prevent associated stations from
-# forging such frames to other stations in the BSS.
-#disable_dgaf=1
-
-# OSU Server-Only Authenticated L2 Encryption Network
-#osen=1
-
-# ANQP Domain ID (0..65535)
-# An identifier for a set of APs in an ESS that share the same common ANQP
-# information. 0 = Some of the ANQP information is unique to this AP (default).
-#anqp_domain_id=1234
-
-# Deauthentication request timeout
-# If the RADIUS server indicates that the station is not allowed to connect to
-# the BSS/ESS, the AP can allow the station some time to download a
-# notification page (URL included in the message). This parameter sets that
-# timeout in seconds.
-#hs20_deauth_req_timeout=60
-
-# Operator Friendly Name
-# This parameter can be used to configure one or more Operator Friendly Name
-# Duples. Each entry has a two or three character language code (ISO-639)
-# separated by colon from the operator friendly name string.
-#hs20_oper_friendly_name=eng:Example operator
-#hs20_oper_friendly_name=fin:Esimerkkioperaattori
-
-# Connection Capability
-# This can be used to advertise what type of IP traffic can be sent through the
-# hotspot (e.g., due to firewall allowing/blocking protocols/ports).
-# format: <IP Protocol>:<Port Number>:<Status>
-# IP Protocol: 1 = ICMP, 6 = TCP, 17 = UDP
-# Port Number: 0..65535
-# Status: 0 = Closed, 1 = Open, 2 = Unknown
-# Each hs20_conn_capab line is added to the list of advertised tuples.
-#hs20_conn_capab=1:0:2
-#hs20_conn_capab=6:22:1
-#hs20_conn_capab=17:5060:0
-
-# WAN Metrics
-# format: <WAN Info>:<DL Speed>:<UL Speed>:<DL Load>:<UL Load>:<LMD>
-# WAN Info: B0-B1: Link Status, B2: Symmetric Link, B3: At Capabity
-#    (encoded as two hex digits)
-#    Link Status: 1 = Link up, 2 = Link down, 3 = Link in test state
-# Downlink Speed: Estimate of WAN backhaul link current downlink speed in kbps;
-#	1..4294967295; 0 = unknown
-# Uplink Speed: Estimate of WAN backhaul link current uplink speed in kbps
-#	1..4294967295; 0 = unknown
-# Downlink Load: Current load of downlink WAN connection (scaled to 255 = 100%)
-# Uplink Load: Current load of uplink WAN connection (scaled to 255 = 100%)
-# Load Measurement Duration: Duration for measuring downlink/uplink load in
-# tenths of a second (1..65535); 0 if load cannot be determined
-#hs20_wan_metrics=01:8000:1000:80:240:3000
-
-# Operating Class Indication
-# List of operating classes the BSSes in this ESS use. The Global operating
-# classes in Table E-4 of IEEE Std 802.11-2012 Annex E define the values that
-# can be used in this.
-# format: hexdump of operating class octets
-# for example, operating classes 81 (2.4 GHz channels 1-13) and 115 (5 GHz
-# channels 36-48):
-#hs20_operating_class=5173
-
-# OSU icons
-# <Icon Width>:<Icon Height>:<Language code>:<Icon Type>:<Name>:<file path>
-#hs20_icon=32:32:eng:image/png:icon32:/tmp/icon32.png
-#hs20_icon=64:64:eng:image/png:icon64:/tmp/icon64.png
-
-# OSU SSID (see ssid2 for format description)
-# This is the SSID used for all OSU connections to all the listed OSU Providers.
-#osu_ssid="example"
-
-# OSU Providers
-# One or more sets of following parameter. Each OSU provider is started by the
-# mandatory osu_server_uri item. The other parameters add information for the
-# last added OSU provider.
-#
-#osu_server_uri=https://example.com/osu/
-#osu_friendly_name=eng:Example operator
-#osu_friendly_name=fin:Esimerkkipalveluntarjoaja
-#osu_nai=anonymous@example.com
-#osu_method_list=1 0
-#osu_icon=icon32
-#osu_icon=icon64
-#osu_service_desc=eng:Example services
-#osu_service_desc=fin:Esimerkkipalveluja
-#
-#osu_server_uri=...
-
-##### Fast Session Transfer (FST) support #####################################
-#
-# The options in this section are only available when the build configuration
-# option CONFIG_FST is set while compiling hostapd. They allow this interface
-# to be a part of FST setup.
-#
-# FST is the transfer of a session from a channel to another channel, in the
-# same or different frequency bands.
-#
-# For detals, see IEEE Std 802.11ad-2012.
-
-# Identifier of an FST Group the interface belongs to.
-#fst_group_id=bond0
-
-# Interface priority within the FST Group.
-# Announcing a higher priority for an interface means declaring it more
-# preferable for FST switch.
-# fst_priority is in 1..255 range with 1 being the lowest priority.
-#fst_priority=100
-
-# Default LLT value for this interface in milliseconds. The value used in case
-# no value provided during session setup. Default is 50 ms.
-# fst_llt is in 1..4294967 range (due to spec limitation, see 10.32.2.2
-# Transitioning between states).
-#fst_llt=100
-
-##### Radio measurements / location ###########################################
-
-# The content of a LCI measurement subelement
-#lci=<Hexdump of binary data of the LCI report>
-
-# The content of a location civic measurement subelement
-#civic=<Hexdump of binary data of the location civic report>
-
-# Enable neighbor report via radio measurements
-#rrm_neighbor_report=1
-
-# Publish fine timing measurement (FTM) responder functionality
-# This parameter only controls publishing via Extended Capabilities element.
-# Actual functionality is managed outside hostapd.
-#ftm_responder=0
-
-# Publish fine timing measurement (FTM) initiator functionality
-# This parameter only controls publishing via Extended Capabilities element.
-# Actual functionality is managed outside hostapd.
-#ftm_initiator=0
-
-##### TESTING OPTIONS #########################################################
-#
-# The options in this section are only available when the build configuration
-# option CONFIG_TESTING_OPTIONS is set while compiling hostapd. They allow
-# testing some scenarios that are otherwise difficult to reproduce.
-#
-# Ignore probe requests sent to hostapd with the given probability, must be a
-# floating point number in the range [0, 1).
-#ignore_probe_probability=0.0
-#
-# Ignore authentication frames with the given probability
-#ignore_auth_probability=0.0
-#
-# Ignore association requests with the given probability
-#ignore_assoc_probability=0.0
-#
-# Ignore reassociation requests with the given probability
-#ignore_reassoc_probability=0.0
-#
-# Corrupt Key MIC in GTK rekey EAPOL-Key frames with the given probability
-#corrupt_gtk_rekey_mic_probability=0.0
-#
-# Include only ECSA IE without CSA IE where possible
-# (channel switch operating class is needed)
-#ecsa_ie_only=0
-
-##### Multiple BSSID support ##################################################
-#
-# Above configuration is using the default interface (wlan#, or multi-SSID VLAN
-# interfaces). Other BSSIDs can be added by using separator 'bss' with
-# default interface name to be allocated for the data packets of the new BSS.
-#
-# hostapd will generate BSSID mask based on the BSSIDs that are
-# configured. hostapd will verify that dev_addr & MASK == dev_addr. If this is
-# not the case, the MAC address of the radio must be changed before starting
-# hostapd (ifconfig wlan0 hw ether <MAC addr>). If a BSSID is configured for
-# every secondary BSS, this limitation is not applied at hostapd and other
-# masks may be used if the driver supports them (e.g., swap the locally
-# administered bit)
-#
-# BSSIDs are assigned in order to each BSS, unless an explicit BSSID is
-# specified using the 'bssid' parameter.
-# If an explicit BSSID is specified, it must be chosen such that it:
-# - results in a valid MASK that covers it and the dev_addr
-# - is not the same as the MAC address of the radio
-# - is not the same as any other explicitly specified BSSID
-#
-# Alternatively, the 'use_driver_iface_addr' parameter can be used to request
-# hostapd to use the driver auto-generated interface address (e.g., to use the
-# exact MAC addresses allocated to the device).
-#
-# Not all drivers support multiple BSSes. The exact mechanism for determining
-# the driver capabilities is driver specific. With the current (i.e., a recent
-# kernel) drivers using nl80211, this information can be checked with "iw list"
-# (search for "valid interface combinations").
-#
-# Please note that hostapd uses some of the values configured for the first BSS
-# as the defaults for the following BSSes. However, it is recommended that all
-# BSSes include explicit configuration of all relevant configuration items.
-#
-#bss=wlan0_0
-#ssid=test2
-# most of the above items can be used here (apart from radio interface specific
-# items, like channel)
-
-#bss=wlan0_1
-#bssid=00:13:10:95:fe:0b
-# ...
diff --git a/recipes-core/multitech/config/config-mths/ifplugd/ifplugd.action b/recipes-core/multitech/config/config-mths/ifplugd/ifplugd.action
deleted file mode 100755
index e7184c7..0000000
--- a/recipes-core/multitech/config/config-mths/ifplugd/ifplugd.action
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# $Id: ifplugd.action 99 2004-02-08 20:17:59Z lennart $
-
-# This file is part of ifplugd.
-#
-# ifplugd 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 2 of the License, or (at your
-# option) any later version.
-#
-# ifplugd 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 ifplugd; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-set -e
-
-if [ -z "$1" ] || [ -z "$2" ] ; then
-        echo "Wrong arguments" > /dev/stderr
-        exit 1
-fi
-
-[ "$2" = "up" ] && exec /sbin/ifup $1
-[ "$2" = "down" ] && exec /sbin/ifdown $1
-
-exit 0
diff --git a/recipes-core/multitech/config/config-mths/ifplugd/usb0.conf b/recipes-core/multitech/config/config-mths/ifplugd/usb0.conf
deleted file mode 100644
index 2fa70b3..0000000
--- a/recipes-core/multitech/config/config-mths/ifplugd/usb0.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-INTERFACE="usb0"
-ARGS="-M -fI -i ${INTERFACE} -u 0 -d 10 -r /etc/ifplugd/ifplugd.action"
diff --git a/recipes-core/multitech/config/config-mths/ifplugd/usb1.conf b/recipes-core/multitech/config/config-mths/ifplugd/usb1.conf
deleted file mode 100644
index df70933..0000000
--- a/recipes-core/multitech/config/config-mths/ifplugd/usb1.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-INTERFACE="usb1"
-ARGS="-M -fI -i ${INTERFACE} -u 0 -d 10 -r /etc/ifplugd/ifplugd.action"
diff --git a/recipes-core/multitech/config/config-mths/modprobe.d/cfg80211.conf b/recipes-core/multitech/config/config-mths/modprobe.d/cfg80211.conf
deleted file mode 100644
index 4b6d264..0000000
--- a/recipes-core/multitech/config/config-mths/modprobe.d/cfg80211.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# IEEE 802.11 Regulatory Domain for cfg80211 driver
-# AU -- Australia
-# AT -- Austria
-# BE -- Belgium
-# US -- USA
-# 00 -- World
-options cfg80211 ieee80211_regdom=00
diff --git a/recipes-core/multitech/config/config-mths/modprobe.d/mts-io.conf b/recipes-core/multitech/config/config-mths/modprobe.d/mts-io.conf
deleted file mode 100644
index 7421ac4..0000000
--- a/recipes-core/multitech/config/config-mths/modprobe.d/mts-io.conf
+++ /dev/null
@@ -1 +0,0 @@
-blacklist mts-io
diff --git a/recipes-core/multitech/config/config-mths/network/interfaces.mths b/recipes-core/multitech/config/config-mths/network/interfaces.mths
deleted file mode 100644
index 2463e0a..0000000
--- a/recipes-core/multitech/config/config-mths/network/interfaces.mths
+++ /dev/null
@@ -1,12 +0,0 @@
-auto wifi1
-iface wifi1 inet static
-address 10.0.0.1
-netmask 255.0.0.0
-pre-up bash -c '([[ -d /sys/class/net/wifi1 ]] || /opt/rs9113/onebox_util rpine0 create_vap wifi1 ap)'
-
-# Gadget USB
-auto usb0
-iface usb0 inet static
-address 192.168.3.1
-netmask 255.255.255.0
-
diff --git a/recipes-core/multitech/config/config.init b/recipes-core/multitech/config/config.init
deleted file mode 100644
index d821f4c..0000000
--- a/recipes-core/multitech/config/config.init
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/bin/sh
-
-CONFIG_MTDC=/dev/mtd6
-CONFIG_MTDB=/dev/mtdblock6
-CONFIG_DIR=/var/config
-RUN_CONF_DIR=/run/config
-
-OEM_MTDC=/dev/mtd7
-OEM_MTDB=/dev/mtdblock7
-OEM_DIR=/var/oem
-
-FILES="network/interfaces \
-ppp/options \
-ppp/pap-secrets \
-ppp/chap-secrets \
-ppp/peers \
-"
-
-# Files used by bluetooth or wifi.
-BTWIFIFILES="\
-bluetooth/ \
-default/bluetooth \
-default/bt-pan \
-default/dnsmasq \
-default/hostapd \
-default/ifplugd \
-default/rs9113 \
-dnsmasq.d/ \
-hosts \
-hostname \
-hostapd.conf \
-modprobe.d/ \
-wpa_supplicant.conf \
-"
-
-# File hidden so it is not removed on hardware reset
-WIFITAR=".defaults2.tar.gz"
-
-mount_config() {
-	echo "Mounting ${CONFIG_DIR}"
-	mkdir -p ${CONFIG_DIR}
-	mount ${CONFIG_DIR}
-
-	# Prepare flash for JFFS2 if mount fails
-	if [ $? -ne 0 ]; then
-		echo "Creating ${CONFIG_DIR}"
-		flash_erase -j ${CONFIG_MTDC} 0 0
-		mount ${CONFIG_DIR}
-	fi
-}
-
-mount_oem() {
-	echo "Mounting ${OEM_DIR}"
-	mkdir -p ${OEM_DIR}
-	mount ${OEM_DIR}
-
-	# Prepare flash for JFFS2 if mount fails
-	if [ $? -ne 0 ]; then
-		echo "Creating ${OEM_DIR}"
-		flash_erase -j ${OEM_MTDC} 0 0
-		mount ${OEM_DIR}
-	fi
-}
-
-case $1 in
-	start)
-		# mount config if not already mounted
-		if ! grep -q "^${CONFIG_MTDB} " /proc/mounts; then
-			mount_config
-		else
-			echo "$CONFIG_DIR already mounted"
-		fi
-
-		# mount oem if specified in /etc/fstab and it isn't already mounted
-		if grep -qE "^${OEM_MTDB}\s+${OEM_DIR}\s+" /etc/fstab; then
-			if ! grep -q "^${OEM_MTDB} " /proc/mounts; then
-				mount_oem
-			else
-				echo "$OEM_DIR already mounted"
-			fi
-		fi
-
-		# Default all config files if requested
-		cd ${CONFIG_DIR}
-		if [ -f force_defaults ]; then
-			echo "Extracting default config files"
-			tar -xvf /etc/defaults.tar.gz
-			if [[ -f ${WIFITAR} ]] ; then
-				echo "Extract original wifi related files"
-				tar -xvf ${WIFITAR}
-			fi
-			if [ -f /etc/default_pass ]; then
-				echo "Defaulting root password"
-				PASSHASH=`cat /etc/default_pass`
-				PASSFILE=/etc/shadow
-				if [ ! -e /etc/shadow ]; then
-					PASSFILE=/etc/passwd
-				fi
-				sed -i "s%^root:[^:]*:%root:${PASSHASH}:%" $PASSFILE
-			fi
-
-			rm -f force_defaults
-		fi
-
-		# Extract any missing files
-		TARFILES=`tar -tf /etc/defaults.tar.gz`
-		for file in $TARFILES; do
-			if [ ! -e $file ]; then
-				tar -xvf /etc/defaults.tar.gz $file
-			fi
-		done
-
-		# Create links in /etc
-		for file in $FILES; do
-			if [ ! -L /etc/$file ]; then
-				echo "Creating link to ${CONFIG_DIR}/$file"
-				rm -rf /etc/$file
-				ln -sf ${CONFIG_DIR}/$file /etc/$file
-			fi
-		done
-		
-		# Move bluetooth wifi stuff to config directory.
-		# We don't have factory defaults.
-                ((dobackup=1))
-		for file in ${BTWIFIFILES}; do
-			if [[ -L /etc/$file ]]; then
-                        	((dobackup=0))
-                                break
-			fi
-		done
-		if ((dobackup==1)) ; then
-			tar -C /etc -czf ${CONFIG_DIR}/${WIFITAR} ${BTWIFIFILES}
-		fi
-
-		for file in ${BTWIFIFILES}; do
-                        # If last character is /, make the CONFIG directory.               
-                        if [[ ${file: -1} == / ]] ; then                            
-                                file=${file%?}
-                                echo directory $file operations      
-                                if ! [[ -d ${CONFIG_DIR}/$file ]] ; then   
-                                        rm -f ${CONFIG_DIR}/$file 2>/dev/null || true
-                                        mkdir ${CONFIG_DIR}/$file                    
-                                fi                                                   
-                        fi                                   
-			if [[ ! -L /etc/$file ]]; then
-				echo "Creating link to ${CONFIG_DIR}/$file"
-                                dir=$(dirname $file)
-                                if [[ $dir != '.' ]] ; then
-					mkdir -p "$dir"
-                                fi
-                                rm -rf old
-                                mkdir old
-                                if ! [[ -f $file ]] ; then
-                                    # Need to preserve old files which is difficult with busybox!
-				    if [[ -d $file ]] || [[ -f $file ]] ; then
-	                                    cp --parents -a $file old || true
-				    fi
-				    (
-					cd /etc
-				        if [[ -d $file ]] || [[ -f $file ]] ; then
-				            cp --parents -a $file ${CONFIG_DIR} || true
-					fi
-				    )
-				    (
-					cd old
-				        if [[ -d $file ]] || [[ -f $file ]] ; then
-				            cp --parents -a $file .. || true
-					fi
-				    )
-				    rm -rf old
-				fi
-				rm -rf /etc/$file
-				ln -sf ${CONFIG_DIR}/$file /etc/$file
-			fi
-		done
-
-
-	;;
-
-	*)
-		echo "Usage: $0 {start}"
-		exit 2
-	;;
-
-esac
diff --git a/recipes-core/multitech/config/network/interfaces b/recipes-core/multitech/config/network/interfaces
deleted file mode 100644
index 67c934b..0000000
--- a/recipes-core/multitech/config/network/interfaces
+++ /dev/null
@@ -1,81 +0,0 @@
-# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
-
-# The loopback interface
-auto lo
-iface lo inet loopback
-
-# Wired interface
-auto eth0
-iface eth0 inet static
-address 192.168.2.1
-netmask 255.255.255.0
-# Forwarding packets on eth0
-# gateway 192.168.2.2
-# pre-up bash -c 'echo 1 >/proc/sys/net/ipv4/ip_forward'
-# post-up iptables -F
-# post-up iptables -t nat -F
-# post-up iptables -t mangle -F
-# post-up iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE
-
-# Bridge interface with eth0 (comment out eth0 lines above to use with bridge)
-# iface eth0 inet manual
-#
-# auto br0
-# iface br0 inet static
-# bridge_ports eth0
-# address 192.168.2.1
-# netmask 255.255.255.0
-
-# Wifi client
-#
-# For MTR WiFi only:
-# NOTE: udev rules will bring up wlan0 automatically if a wifi device is detected
-# and the wlan0 interface is defined, therefore an "auto wlan0" line is not needed.
-# If "auto wlan0" is also specified, startup conflicts may result.
-#iface wlan0 inet dhcp
-#wpa-conf /var/config/wpa_supplicant.conf
-#wpa-driver nl80211
-#
-# For Conduit WiFi:
-# You must configure wpa_supplicant.conf as appropriate for your WiFi access point
-# and its security.  The "pre-up" section is needed to create the VAP device,
-# wifi0.  udhcpc_opts should be used to prevent DHCP from giving up too soon.  The
-# default timeout is less than 10 seconds, and in some circumstances is not enough
-# time for wifi to connect. The udhcpc options specified below are in addition to
-# those preconfigured in the ifup program.  The option "-t" specifies the number
-# of DHCP retries.  By default each trial is 3 seconds long.  As specified here,
-# udhcpc will try for thirty seconds. The option "-b" specifies that if the
-# attempts are made and all fail, the boot will proceed, and the udhcpc program
-# will continue to periodically attempt to reach the DHCP server.  Without the -b
-# option, udhcpc will fail and abort if the server is not reached within the
-# specified timeout.  The boot will continue after the timeout, but the network
-# will never be connected without some other intervention.
-#
-# Specifying "-t 0" results in udhcpc not running in the background, regardless
-# of the presence of "-b".  This causes udhcpc to enter a loop trying to reach
-# the DHCP server, and only relinquising control to the boot (or ifup) if the
-# server responds.
-#
-# The udhcpc_opts parameter will result in the following invocation
-# of udhcpc from ifup:
-# udhcpc -R -n -p /var/run/udhcpc.wifi0.pid -i wifi0 -t 10 -b
-#
-# See https://busybox.net/downloads/BusyBox.html for more information.
-#
-# auto wifi0
-# iface wifi0 inet dhcp
-# wpa-conf /etc/wpa_supplicant.conf
-# wpa-driver nl80211
-# pre-up bash -c '([[ -d /sys/class/net/wifi0 ]] || /opt/rs9113/onebox_util rpine0 create_vap wifi0 sta sw_bmiss)'
-# udhcpc_opts -t 10 -b
-
-# The pan0 interface purpose is to support bluetooth pand
-# If access to another network is required, the ip forwarding
-# for eth0 could be enabled. 
-# auto pan0
-# iface pan0 inet static
-# address 10.1.0.1
-# netmask 255.255.255.0
-# pre-up brctl addbr pan0
-# pre-up brctl setfd pan0 0
-# pre-up brctl stp pan0 off
diff --git a/recipes-core/multitech/config/ppp/chap-secrets b/recipes-core/multitech/config/ppp/chap-secrets
deleted file mode 100644
index 60efe8f..0000000
--- a/recipes-core/multitech/config/ppp/chap-secrets
+++ /dev/null
@@ -1,3 +0,0 @@
-# Secrets for authentication using CHAP
-# client	server	secret			IP addresses
-*		*	""			*
diff --git a/recipes-core/multitech/config/ppp/options b/recipes-core/multitech/config/ppp/options
deleted file mode 100644
index 3b69f47..0000000
--- a/recipes-core/multitech/config/ppp/options
+++ /dev/null
@@ -1,27 +0,0 @@
-# Select tty device
-#
-# First modem AT command port (symlink to actual device)
-/dev/modem_at0
-
-# Uncomment below to run in foreground
-#nodetach
-
-# Uncomment below to emit debug
-#debug
-
-# Uncomment to keep pppd up if the connection terminates
-#persist
-# Uncomment for unlimited connection attempts
-#maxfail 0
-
-# disable logging to /etc/ppp/connect-errors
-# and only log to syslog
-logfile /dev/null
-
-lock
-
-# Sprint modems in some cases require IPV6 to use IPV4.
-# It probably doesn't hurt to try to get IPV6, even
-# if the carrier doesn't support it.
-+ipv6
-ipv6cp-use-ipaddr
diff --git a/recipes-core/multitech/config/ppp/pap-secrets b/recipes-core/multitech/config/ppp/pap-secrets
deleted file mode 100644
index f782b4a..0000000
--- a/recipes-core/multitech/config/ppp/pap-secrets
+++ /dev/null
@@ -1,3 +0,0 @@
-# Secrets for authentication using PAP
-# client	server	secret			IP addresses
-*		*	""			*
diff --git a/recipes-core/multitech/config/ppp/peers/README.fwswitch b/recipes-core/multitech/config/ppp/peers/README.fwswitch
deleted file mode 100644
index 47ef5ef..0000000
--- a/recipes-core/multitech/config/ppp/peers/README.fwswitch
+++ /dev/null
@@ -1,76 +0,0 @@
-LNA3/L4N1 firmware/SIM switching instructions
-
-To automatically set the APN, bring up the system
-with the desired SIM installed (AT&T or Verizon).
-
-Execute with a Verizon SIM installed
-(switch to Verizon Firmware and Chat):
-
-root@mtcap:~# /usr/sbin/mlinux-switch-apn
-Cellular radio is ready.
-Setting chat script to /etc/ppp/peers/lna3_chat_vz
-
-root@mtcap:~# ls -ld /etc/ppp/peers/lna3_chat
-lrwxrwxrwx    1 root     root            27 Aug 31 16:30 /etc/ppp/peers/lna3_chat -> /etc/ppp/peers/lna3_chat_vz
-
-root@mtcap:~# radio-query --active-firmware
-1
-
-Firmware image 1 is Verizon, and lna3_chat should point at the Verizon chat scripts lna3_chat_vz.
-
-To switch to an AT&T SIM (the default):
-
-root@mtcap:~# mlinux-switch-apn
-Cellular radio is ready.
-Setting chat script to /etc/ppp/peers/lna3_chat_non_vz
-
-It is critical that you do not use an AT&T chat script with a Verizon SIM,
-because it will set the wrong APN, and it will be remembered as belonging
-to the SIM/device combination.
-
-
-The following are not recommended:
-To manually set the chat script:
-
-mlinux-switch-apn [0|1]
-
-To manually switch the firmware setting:
-mlinux-switch-cell-fw [0|1|-1] [timeout]
-
-This command sets the chat to this readme file.  Then it will be needed to
-set the symlink for the chat script, which can be done by using mlinux-switch-apn
-with 0 for AT&T, and 1 for Verizon.
-
-
-
-
-
-
-Put the desired SIM into the device.
-
-The default APN is "phone" for the LNA3.
-
-Set the APN using (does nothing for Sprint or Verizon chat scripts):
-
-# mlinux-set-apn "YOURAPN"
-
-Do not put a "AT+CGDCONT" in the lna3_chat_vz script or
-l4n1_chat_vz script.  It will cause trouble.
-
-To pick a firmware based on the
-
-To switch to the Verizon firmware and chat script:
-
-  # mlinux-switch-cell-fw 1
-
-To switch to the non-Verizon firmware and chat script:
-
-  # mlinux-switch-cell-fw 0
-
-Verizon provided APN setting over the air.  If you set the APN on a Verizon SIM,
-and they push a new APN, you will need to change the APN on the device.
-
-It is best not to set the APN.  To switch from a manually set APN or incorrect APN
-to letting Verizon set the APN, remove the SIM, and put it in another device.
-Then register with the Verizon network.  With the APN setting removed, put the SIM
-back into this device.
diff --git a/recipes-core/multitech/config/ppp/peers/cdma b/recipes-core/multitech/config/ppp/peers/cdma
deleted file mode 100644
index 3fc231f..0000000
--- a/recipes-core/multitech/config/ppp/peers/cdma
+++ /dev/null
@@ -1,9 +0,0 @@
-linkname ppp0
-230400
-defaultroute
-replacedefaultroute
-usepeerdns
-noauth
-crtscts
-novj
-connect '/usr/sbin/chat -v -t 90 -f /etc/ppp/peers/cdma_chat'
diff --git a/recipes-core/multitech/config/ppp/peers/cdma_chat b/recipes-core/multitech/config/ppp/peers/cdma_chat
deleted file mode 100644
index 6ff750e..0000000
--- a/recipes-core/multitech/config/ppp/peers/cdma_chat
+++ /dev/null
@@ -1,18 +0,0 @@
-SAY "CDMA chat\n"
-ECHO OFF
-ABORT 'NO DIAL TONE'
-ABORT 'NO DIALTONE'
-ABORT 'NO ANSWER'
-ABORT 'NO CARRIER'
-ABORT 'DELAYED'
-ABORT 'VOICE'
-ABORT 'BUSY'
-'' 'AT'
-OK 'ATZ'
-OK 'AT+CSQ'
-SAY "Dialing...\n"
-OK 'ATD#777'
-SAY "Waiting for CONNECT...\n"
-TIMEOUT 120
-CONNECT ''
-SAY "Connected\n"
diff --git a/recipes-core/multitech/config/ppp/peers/gsm b/recipes-core/multitech/config/ppp/peers/gsm
deleted file mode 100644
index 4fc4361..0000000
--- a/recipes-core/multitech/config/ppp/peers/gsm
+++ /dev/null
@@ -1,11 +0,0 @@
-linkname ppp0
-230400
-defaultroute
-replacedefaultroute
-usepeerdns
-ipcp-max-failure 10
-ipcp-restart 10
-noauth
-crtscts
-novj
-connect '/usr/libexec/ppp/chat_wrapper /usr/sbin/chat -v -t 90 -f /etc/ppp/peers/gsm_chat'
diff --git a/recipes-core/multitech/config/ppp/peers/gsm_chat b/recipes-core/multitech/config/ppp/peers/gsm_chat
deleted file mode 100644
index d952a89..0000000
--- a/recipes-core/multitech/config/ppp/peers/gsm_chat
+++ /dev/null
@@ -1,47 +0,0 @@
-SAY "GSM chat\n"
-ECHO OFF
-ABORT 'NO DIAL TONE'
-ABORT 'NO DIALTONE'
-ABORT 'NO ANSWER'
-ABORT 'NO CARRIER'
-ABORT 'DELAYED'
-ABORT 'VOICE'
-ABORT 'BUSY'
-'' 'AT'
-OK 'ATZ'
-OK 'AT+CSQ'
-# ----------------------------------
-# Set the APN for your provider here
-# Note that a comment starting with
-# #MT AT+CGDCONT=
-# will be interpretted by
-# /usr/libexec/ppp/chat_wrapper
-# as the intended context
-# setting.  Make the context number
-# (after the =) match the
-# dialer number context.
-# If the context changes, ppp/chat_wrapper
-# handles disconnecting the modem
-# from the network during the update,
-# which is required
-# by some modem firmware.
-# The chat script will be executed
-# after the ppp/chat_wrapper script
-# re-registers the modem.
-# The context will only be set if the
-# modem settings do not match the
-# settings here.
-# Lines starting with # MT are ignored.
-# ----------------------------------
-# MT AT+CGDCONT=1,"IP","proxy"
-# MT AT+CGDCONT=1,"IP","ISP.CINGULAR"
-# MT AT+CGDCONT=1,"IP","internet2.voicestream.com"
-#MT AT+CGDCONT=1,"IP","internet"
-OK 'AT+CGDCONT?'
-SAY "Dialing...\n"
-#OK 'ATD*99#'
-OK 'ATD*99***1#'
-SAY "Waiting for CONNECT...\n"
-TIMEOUT 120
-CONNECT ''
-SAY "Connected\n"
diff --git a/recipes-core/multitech/config/ppp/peers/l4e1 b/recipes-core/multitech/config/ppp/peers/l4e1
deleted file mode 100644
index 9638398..0000000
--- a/recipes-core/multitech/config/ppp/peers/l4e1
+++ /dev/null
@@ -1,11 +0,0 @@
-linkname ppp0
-230400
-defaultroute
-replacedefaultroute
-usepeerdns
-ipcp-max-failure 10
-ipcp-restart 10
-noauth
-crtscts
-novj
-connect '/usr/libexec/ppp/chat_wrapper /usr/sbin/chat -v -t 90 -f /etc/ppp/peers/l4e1_chat'
diff --git a/recipes-core/multitech/config/ppp/peers/l4e1_chat b/recipes-core/multitech/config/ppp/peers/l4e1_chat
deleted file mode 100644
index bb95881..0000000
--- a/recipes-core/multitech/config/ppp/peers/l4e1_chat
+++ /dev/null
@@ -1,43 +0,0 @@
-SAY "L4E1 chat\n"
-ECHO OFF
-ABORT 'NO DIAL TONE'
-ABORT 'NO DIALTONE'
-ABORT 'NO ANSWER'
-ABORT 'NO CARRIER'
-ABORT 'DELAYED'
-ABORT 'VOICE'
-ABORT 'BUSY'
-'' 'AT'
-OK 'ATZ'
-OK 'AT+CSQ'
-# ----------------------------------
-# Set the APN for your provider here
-# Note that a comment starting with
-# #MT AT+CGDCONT=
-# will be interpretted by
-# /usr/libexec/ppp/chat_wrapper
-# as the intended context
-# setting.  Make the context number
-# (after the =) match the
-# dialer number context.
-# If the context changes, ppp/chat_wrapper
-# handles disconnecting the modem
-# from the network during the update,
-# which is required
-# by some modem firmware.
-# The chat script will be executed
-# after the ppp/chat_wrapper script
-# re-registers the modem.
-# The context will only be set if the
-# modem settings do not match the
-# settings here.
-# Lines starting with # MT are ignored.
-# ----------------------------------
-#MT AT+CGDCONT=1,"IP","internet"
-OK 'AT+CGDCONT?'
-SAY "Dialing...\n"
-OK 'ATD*99***1#'
-SAY "Waiting for CONNECT...\n"
-TIMEOUT 120
-CONNECT ''
-SAY "Connected\n"
diff --git a/recipes-core/multitech/config/ppp/peers/l4n1 b/recipes-core/multitech/config/ppp/peers/l4n1
deleted file mode 100644
index 5c011e0..0000000
--- a/recipes-core/multitech/config/ppp/peers/l4n1
+++ /dev/null
@@ -1,11 +0,0 @@
-linkname ppp0
-230400
-defaultroute
-replacedefaultroute
-usepeerdns
-ipcp-max-failure 10
-ipcp-restart 10
-noauth
-crtscts
-novj
-connect '/usr/libexec/ppp/chat_wrapper /usr/sbin/chat -v -t 90 -f /etc/ppp/peers/l4n1_chat'
diff --git a/recipes-core/multitech/config/ppp/peers/l4n1_chat b/recipes-core/multitech/config/ppp/peers/l4n1_chat
deleted file mode 120000
index 36db4e2..0000000
--- a/recipes-core/multitech/config/ppp/peers/l4n1_chat
+++ /dev/null
@@ -1 +0,0 @@
-l4n1_chat_non_vz
\ No newline at end of file
diff --git a/recipes-core/multitech/config/ppp/peers/l4n1_chat_non_vz b/recipes-core/multitech/config/ppp/peers/l4n1_chat_non_vz
deleted file mode 100644
index 76f3aae..0000000
--- a/recipes-core/multitech/config/ppp/peers/l4n1_chat_non_vz
+++ /dev/null
@@ -1,67 +0,0 @@
-#----------------------------------------
-# Do NOT use this CHAT script with
-# Verizon wireless.  It will bind
-# this SIM and device to the wrong
-# APN.
-#
-# mlinux-set-apn can be used to set
-# the APN.
-#
-# mlinux-switch-cell-fw can be used
-# to switch the firmware settings
-# and set the correct CHAT script.
-#
-# # mlinux-set-apn "APN"
-#
-# And to switch the firmware to Verizon:
-# # mlinux-switch-cell-fw 1
-#
-# And to switch to AT&T:
-# # mlinux-switch-cell-fw 0
-#----------------------------------------
-SAY "L4N1 chat not for Verizon\n"
-ECHO OFF
-ABORT 'NO DIAL TONE'
-ABORT 'NO DIALTONE'
-ABORT 'NO ANSWER'
-ABORT 'NO CARRIER'
-ABORT 'DELAYED'
-ABORT 'VOICE'
-ABORT 'BUSY'
-'' 'AT'
-OK 'ATZ'
-OK 'AT+CSQ'
-# ----------------------------------
-# Set the APN for your provider here
-# Note that a comment starting with
-# #MT AT+CGDCONT=
-# will be interpretted by
-# /usr/libexec/ppp/chat_wrapper
-# as the intended context
-# setting.  Make the context number
-# (after the =) match the
-# dialer number context.
-# If the context changes, ppp/chat_wrapper
-# handles disconnecting the modem
-# from the network during the update,
-# which is required
-# by some modem firmware.
-# The chat script will be executed
-# after the ppp/chat_wrapper script
-# re-registers the modem.
-# The context will only be set if the
-# modem settings do not match the
-# settings here.
-# Lines starting with # MT are ignored.
-# ----------------------------------
-# MT AT+CGDCONT=1,"IP","proxy"
-# MT AT+CGDCONT=1,"IP","ISP.CINGULAR"
-# MT AT+CGDCONT=1,"IP","internet2.voicestream.com"
-#MT AT+CGDCONT=1,"IP","phone"
-OK 'AT+CGDCONT?'
-SAY "Dialing...\n"
-OK 'ATD*99***1#'
-SAY "Waiting for CONNECT...\n"
-TIMEOUT 120
-CONNECT ''
-SAY "Connected\n"
diff --git a/recipes-core/multitech/config/ppp/peers/l4n1_chat_vz b/recipes-core/multitech/config/ppp/peers/l4n1_chat_vz
deleted file mode 100644
index 1bc3652..0000000
--- a/recipes-core/multitech/config/ppp/peers/l4n1_chat_vz
+++ /dev/null
@@ -1,44 +0,0 @@
-#----------------------------
-# This chat script has no
-# APN because Verizon
-# requires the chat script
-# not set the APN. 
-# This is because Verizon
-# pushes the APN from their
-# network.  Image 1 on an
-# LNA3 product is used
-# with a Verizon SIM.
-#----------------------------
-SAY "L4N1 chat Verizon\n"
-ECHO OFF
-ABORT 'NO DIAL TONE'
-ABORT 'NO DIALTONE'
-ABORT 'NO ANSWER'
-ABORT 'NO CARRIER'
-ABORT 'DELAYED'
-ABORT 'VOICE'
-ABORT 'BUSY'
-'' 'AT'
-OK 'ATZ'
-OK 'AT+CSQ'
-# -----------------------------------------
-# Do not enter the AT+CGDCONT, because it
-# will cause
-# a fault for a Verizon SIM and will push
-# the new APN to the network, which will
-# cause failures.
-# To switch the firmware to Verizon:
-# mlinux-switch-cell-fw 1
-# And to switch to AT&T (non-Verizon):
-# mlinux-switch-cell-fw 0
-# -----------------------------------------
-# Log APN (current context) for
-# diagnostic purposes
-#-----------------------------------
-OK 'AT+CGDCONT?'
-SAY "Dialing...\n"
-OK 'ATD*99***3#'
-SAY "Waiting for CONNECT...\n"
-TIMEOUT 120
-CONNECT ''
-SAY "Connected\n"
diff --git a/recipes-core/multitech/config/ppp/peers/lap3 b/recipes-core/multitech/config/ppp/peers/lap3
deleted file mode 100644
index ddd75a5..0000000
--- a/recipes-core/multitech/config/ppp/peers/lap3
+++ /dev/null
@@ -1,11 +0,0 @@
-linkname ppp0
-230400
-defaultroute
-replacedefaultroute
-usepeerdns
-ipcp-max-failure 10
-ipcp-restart 10
-noauth
-crtscts
-novj
-connect '/usr/libexec/ppp/chat_wrapper /usr/sbin/chat -v -t 90 -f /etc/ppp/peers/lap3_chat'
diff --git a/recipes-core/multitech/config/ppp/peers/lap3_chat b/recipes-core/multitech/config/ppp/peers/lap3_chat
deleted file mode 100644
index 0f7adf6..0000000
--- a/recipes-core/multitech/config/ppp/peers/lap3_chat
+++ /dev/null
@@ -1,43 +0,0 @@
-SAY "LAP3 chat\n"
-ECHO OFF
-ABORT 'NO DIAL TONE'
-ABORT 'NO DIALTONE'
-ABORT 'NO ANSWER'
-ABORT 'NO CARRIER'
-ABORT 'DELAYED'
-ABORT 'VOICE'
-ABORT 'BUSY'
-'' 'AT'
-OK 'ATZ'
-OK 'AT+CSQ'
-# ----------------------------------
-# Set the APN for your provider here
-# Note that a comment starting with
-# #MT AT+CGDCONT=
-# will be interpretted by
-# /usr/libexec/ppp/chat_wrapper
-# as the intended context
-# setting.  Make the context number
-# (after the =) match the
-# dialer number context.
-# If the context changes, ppp/chat_wrapper
-# handles disconnecting the modem
-# from the network during the update,
-# which is required
-# by some modem firmware.
-# The chat script will be executed
-# after the ppp/chat_wrapper script
-# re-registers the modem.
-# The context will only be set if the
-# modem settings do not match the
-# settings here.
-# Lines starting with # MT are ignored.
-# ----------------------------------
-#MT AT+CGDCONT=1,"IP","internet"
-OK 'AT+CGDCONT?'
-SAY "Dialing...\n"
-OK 'ATD*99***1#'
-SAY "Waiting for CONNECT...\n"
-TIMEOUT 120
-CONNECT ''
-SAY "Connected\n"
diff --git a/recipes-core/multitech/config/ppp/peers/leu1 b/recipes-core/multitech/config/ppp/peers/leu1
deleted file mode 100644
index 5a3baec..0000000
--- a/recipes-core/multitech/config/ppp/peers/leu1
+++ /dev/null
@@ -1,11 +0,0 @@
-linkname ppp0
-230400
-defaultroute
-replacedefaultroute
-usepeerdns
-ipcp-max-failure 10
-ipcp-restart 10
-noauth
-crtscts
-novj
-connect '/usr/libexec/ppp/chat_wrapper /usr/sbin/chat -v -t 90 -f /etc/ppp/peers/leu1_chat'
diff --git a/recipes-core/multitech/config/ppp/peers/leu1_chat b/recipes-core/multitech/config/ppp/peers/leu1_chat
deleted file mode 100644
index 6aef877..0000000
--- a/recipes-core/multitech/config/ppp/peers/leu1_chat
+++ /dev/null
@@ -1,43 +0,0 @@
-SAY "LEU1 chat\n"
-ECHO OFF
-ABORT 'NO DIAL TONE'
-ABORT 'NO DIALTONE'
-ABORT 'NO ANSWER'
-ABORT 'NO CARRIER'
-ABORT 'DELAYED'
-ABORT 'VOICE'
-ABORT 'BUSY'
-'' 'AT'
-OK 'ATZ'
-OK 'AT+CSQ'
-# ----------------------------------
-# Set the APN for your provider here
-# Note that a comment starting with
-# #MT AT+CGDCONT=
-# will be interpretted by
-# /usr/libexec/ppp/chat_wrapper
-# as the intended context
-# setting.  Make the context number
-# (after the =) match the
-# dialer number context.
-# If the context changes, ppp/chat_wrapper
-# handles disconnecting the modem
-# from the network during the update,
-# which is required
-# by some modem firmware.
-# The chat script will be executed
-# after the ppp/chat_wrapper script
-# re-registers the modem.
-# The context will only be set if the
-# modem settings do not match the
-# settings here.
-# Lines starting with # MT are ignored.
-# ----------------------------------
-#MT AT+CGDCONT=1,"IP","internet"
-OK 'AT+CGDCONT?'
-SAY "Dialing...\n"
-OK 'ATD*99***1#'
-SAY "Waiting for CONNECT...\n"
-TIMEOUT 120
-CONNECT ''
-SAY "Connected\n"
diff --git a/recipes-core/multitech/config/ppp/peers/lna3 b/recipes-core/multitech/config/ppp/peers/lna3
deleted file mode 100644
index 4f6a628..0000000
--- a/recipes-core/multitech/config/ppp/peers/lna3
+++ /dev/null
@@ -1,11 +0,0 @@
-linkname ppp0
-230400
-defaultroute
-replacedefaultroute
-usepeerdns
-ipcp-max-failure 10
-ipcp-restart 10
-noauth
-crtscts
-novj
-connect '/usr/libexec/ppp/chat_wrapper /usr/sbin/chat -v -t 90 -f /etc/ppp/peers/lna3_chat'
diff --git a/recipes-core/multitech/config/ppp/peers/lna3_chat b/recipes-core/multitech/config/ppp/peers/lna3_chat
deleted file mode 120000
index e736424..0000000
--- a/recipes-core/multitech/config/ppp/peers/lna3_chat
+++ /dev/null
@@ -1 +0,0 @@
-lna3_chat_non_vz
\ No newline at end of file
diff --git a/recipes-core/multitech/config/ppp/peers/lna3_chat_non_vz b/recipes-core/multitech/config/ppp/peers/lna3_chat_non_vz
deleted file mode 100644
index a3da519..0000000
--- a/recipes-core/multitech/config/ppp/peers/lna3_chat_non_vz
+++ /dev/null
@@ -1,68 +0,0 @@
-#----------------------------------------
-# Do NOT use this CHAT script with
-# Verizon wireless.  It will bind
-# this SIM and device to the wrong
-# APN.
-#
-# mlinux-set-apn can be used to set
-# the APN.
-#
-# mlinux-switch-cell-fw can be used
-# to switch the firmware settings
-# and set the correct CHAT script.
-#
-# # mlinux-set-apn "APN"
-#
-# And to switch the firmware to Verizon:
-# # mlinux-switch-cell-fw 1
-#
-# And to switch to AT&T:
-# # mlinux-switch-cell-fw 0
-#----------------------------------------
-SAY "LNA3 chat not for Verizon\n"
-ECHO OFF
-ABORT 'NO DIAL TONE'
-ABORT 'NO DIALTONE'
-ABORT 'NO ANSWER'
-ABORT 'NO CARRIER'
-ABORT 'DELAYED'
-ABORT 'VOICE'
-ABORT 'BUSY'
-'' 'AT'
-OK 'ATZ'
-OK 'AT+CSQ'
-# ----------------------------------
-# Set the APN for your provider here
-# Note that a comment starting with
-# #MT AT+CGDCONT=
-# will be interpretted by
-# /usr/libexec/ppp/chat_wrapper
-# as the intended context
-# setting.  Make the context number
-# (after the =) match the
-# dialer number context.
-# If the context changes, ppp/chat_wrapper
-# handles disconnecting the modem
-# from the network during the update,
-# which is required
-# by some modem firmware.
-# The chat script will be executed
-# after the ppp/chat_wrapper script
-# re-registers the modem.
-# The context will only be set if the
-# modem settings do not match the
-# settings here.
-# Lines starting with # MT are ignored.
-# ----------------------------------
-# MT AT+CGDCONT=3,"IP","proxy"
-# MT AT+CGDCONT=3,"IP","ISP.CINGULAR"
-# MT AT+CGDCONT=3,"IP","internet2.voicestream.com"
-#MT AT+CGDCONT=3,"IP","phone"
-OK 'AT+CGDCONT?'
-OK 'AT+COPS=0'
-SAY "Dialing...\n"
-OK 'ATD*99***3#'
-SAY "Waiting for CONNECT...\n"
-TIMEOUT 120
-CONNECT ''
-SAY "Connected\n"
diff --git a/recipes-core/multitech/config/ppp/peers/lna3_chat_vz b/recipes-core/multitech/config/ppp/peers/lna3_chat_vz
deleted file mode 100644
index 1d2178d..0000000
--- a/recipes-core/multitech/config/ppp/peers/lna3_chat_vz
+++ /dev/null
@@ -1,44 +0,0 @@
-#----------------------------
-# This chat script has no
-# APN because Verizon
-# requires the chat script
-# not set the APN. 
-# This is because Verizon
-# pushes the APN from their
-# network.  Image 1 on an
-# LNA3 product is used
-# with a Verizon SIM.
-#----------------------------
-SAY "LNA3 chat Verizon\n"
-ECHO OFF
-ABORT 'NO DIAL TONE'
-ABORT 'NO DIALTONE'
-ABORT 'NO ANSWER'
-ABORT 'NO CARRIER'
-ABORT 'DELAYED'
-ABORT 'VOICE'
-ABORT 'BUSY'
-'' 'AT'
-OK 'ATZ'
-OK 'AT+CSQ'
-# -----------------------------------------
-# Do not enter the AT+CGDCONT, because it
-# will cause
-# a fault for a Verizon SIM and will push
-# the new APN to the network, which will
-# cause failures.
-# To switch the firmware to Verizon:
-# mlinux-switch-cell-fw 1
-# And to switch to AT&T (non-Verizon):
-# mlinux-switch-cell-fw 0
-# -----------------------------------------
-# Log APN (current context) for
-# diagnostic purposes
-#-----------------------------------
-OK 'AT+CGDCONT?'
-SAY "Dialing...\n"
-OK 'ATD*99***3#'
-SAY "Waiting for CONNECT...\n"
-TIMEOUT 120
-CONNECT ''
-SAY "Connected\n"
diff --git a/recipes-core/multitech/config/ppp/peers/lsp3 b/recipes-core/multitech/config/ppp/peers/lsp3
deleted file mode 100644
index 50433ab..0000000
--- a/recipes-core/multitech/config/ppp/peers/lsp3
+++ /dev/null
@@ -1,11 +0,0 @@
-linkname ppp0
-230400
-defaultroute
-replacedefaultroute
-usepeerdns
-ipcp-max-failure 10
-ipcp-restart 10
-noauth
-crtscts
-novj
-connect '/usr/libexec/ppp/chat_wrapper /usr/sbin/chat -v -t 90 -f /etc/ppp/peers/lsp3_chat'
diff --git a/recipes-core/multitech/config/ppp/peers/lsp3_chat b/recipes-core/multitech/config/ppp/peers/lsp3_chat
deleted file mode 100644
index 3fcdfc2..0000000
--- a/recipes-core/multitech/config/ppp/peers/lsp3_chat
+++ /dev/null
@@ -1,19 +0,0 @@
-SAY "LSP3 chat\n"
-ECHO OFF
-ABORT 'NO DIAL TONE'
-ABORT 'NO DIALTONE'
-ABORT 'NO ANSWER'
-ABORT 'NO CARRIER'
-ABORT 'DELAYED'
-ABORT 'VOICE'
-ABORT 'BUSY'
-'' 'AT'
-OK 'ATZ'
-OK 'AT+CSQ'
-OK 'AT+CGDCONT?'
-SAY "Dialing...\n"
-OK 'ATD*99***2#'
-SAY "Waiting for CONNECT...\n"
-TIMEOUT 120
-CONNECT ''
-SAY "Connected\n"
diff --git a/recipes-core/multitech/config/ppp/peers/lvw2 b/recipes-core/multitech/config/ppp/peers/lvw2
deleted file mode 100644
index 773f1dd..0000000
--- a/recipes-core/multitech/config/ppp/peers/lvw2
+++ /dev/null
@@ -1,11 +0,0 @@
-linkname ppp0
-230400
-defaultroute
-replacedefaultroute
-usepeerdns
-ipcp-max-failure 10
-ipcp-restart 10
-noauth
-crtscts
-novj
-connect '/usr/sbin/chat -v -t 90 -f /etc/ppp/peers/lvw2_chat'
diff --git a/recipes-core/multitech/config/ppp/peers/lvw2_chat b/recipes-core/multitech/config/ppp/peers/lvw2_chat
deleted file mode 100644
index c7aede7..0000000
--- a/recipes-core/multitech/config/ppp/peers/lvw2_chat
+++ /dev/null
@@ -1,27 +0,0 @@
-SAY "LVW2 chat\n"
-ECHO OFF
-ABORT 'NO DIAL TONE'
-ABORT 'NO DIALTONE'
-ABORT 'NO ANSWER'
-ABORT 'NO CARRIER'
-ABORT 'DELAYED'
-ABORT 'VOICE'
-ABORT 'BUSY'
-'' 'AT'
-OK 'ATZ'
-OK 'AT+CSQ'
-# ----------------------------------
-# Do not set the APN for Verizon.
-# It must be loaded dynamically
-# from the network.
-# ----------------------------------
-# Log APN (current context) for
-# diagnostic purposes
-#-----------------------------------
-OK 'AT+CGDCONT?'
-SAY "Dialing...\n"
-OK 'ATD*99***3#'
-SAY "Waiting for CONNECT...\n"
-TIMEOUT 120
-CONNECT ''
-SAY "Connected\n"
diff --git a/recipes-core/multitech/config_2.3.bb b/recipes-core/multitech/config_2.3.bb
deleted file mode 100644
index 3e9733a..0000000
--- a/recipes-core/multitech/config_2.3.bb
+++ /dev/null
@@ -1,95 +0,0 @@
-DESCRIPTION = "Provides default system config files and /var/config fs"
-SECTION = "base"
-LICENSE = "MIT"
-RDEPENDS_${PN} += "bash"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-PACKAGE_ARCH = "all"
-PR = "r7"
-PACKAGES =+ "${PN}-mths"
-inherit update-rc.d
-
-INITSCRIPT_NAME = "config"
-INITSCRIPT_PARAMS = "start 31 S ."
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/config:"
-FILESEXTRAPATHS_prepend_${PN} := "${THISDIR}/mths_config:"
-
-SRC_URI = "\
-  file://network \
-  file://ppp \
-  file://config.init \
-  file://config-mths \
-  file://chat_wrapper \
-  file://chat_wrapper.default \
-  file://99_radio \
-"
-
-RDEPENDS_${PN}-mths += "${PN}"
-
-CONFFILES_${PN} += "${sysconfdir}/defaults.tar.gz"
-CONFIGFILES = "network/interfaces ppp"
-
-CONFIGFILES_MTHS = "config-mths"
-
-fakeroot do_install () {
-    cd ${WORKDIR}
-
-    # default config files
-    rm -f defaults.tar.gz
-    chown root:root -R ${CONFIGFILES}
-    tar czf defaults.tar.gz ${CONFIGFILES}
-    install -d ${D}${sysconfdir}
-    install -m 0644 ${WORKDIR}/defaults.tar.gz ${D}${sysconfdir}/defaults.tar.gz
-
-    # save root password for resetting to defaults
-    echo -n '${ROOT_PASSWORD_HASH}' > ${D}${sysconfdir}/default_pass
-    chmod 400 ${D}${sysconfdir}/default_pass
-
-    # init script
-    install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/config.init ${D}${sysconfdir}/init.d/config
-
-    # mths adjustments
-    tar -C ${CONFIGFILES_MTHS} -czf defaults-mths.tar.gz .
-    install -m 0644 ${WORKDIR}/defaults-mths.tar.gz ${D}${sysconfdir}/defaults-mths.tar.gz
-
-    install -d ${D}${sysconfdir}/default
-    install -d ${D}${sysconfdir}/default/volatiles
-    install -d ${D}${libexecdir}/ppp
-    install -m 0755 ${WORKDIR}/chat_wrapper ${D}${libexecdir}/ppp/
-    install -m 0644 ${WORKDIR}/chat_wrapper.default ${D}${sysconfdir}/default/chat_wrapper
-    install -m 0644 ${WORKDIR}/99_radio ${D}${sysconfdir}/default/volatiles
-}
-
-FILES_${PN} = "${sysconfdir}/defaults.tar.gz ${sysconfdir}/default_pass"
-FILES_${PN} += "${sysconfdir}/init.d/config ${sysconfdir}/default ${libexecdir}/ppp/chat_wrapper"
-FILES_${PN} += "${sysconfdir}/default/volatiles"
-
-FILES_${PN}-mths = "${sysconfdir}/defaults-mths.tar.gz"
-
-# Create the hotspot version of defaults.tar.gz
-pkg_postinst_${PN}-mths() {
-  X=$D/tmp/mths
-  mkdir -p $X
-  export X
-  (
-    
-    set -x
-    if tar -tf $D${sysconfdir}/defaults.tar.gz | grep dnsmasq ; then
-        :
-    else
-        tb=$X/tarball # Tarball directory
-        mkdir $tb
-        tar -C $tb -xf $D/etc/defaults.tar.gz
-        tar -C $tb -xf $D/etc/defaults-mths.tar.gz
-        if ! grep '^auto wifi1' $tb/network/interfaces ; then
-            cat $tb/network/interfaces $tb/network/interfaces.mths >$tb/network/interfaces.new
-            mv $tb/network/interfaces $tb/network/interfaces.old
-            mv $tb/network/interfaces.new $tb/network/interfaces
-        fi
-        tar -C $tb -cf $D/etc/defaults.tar.gz .
-    fi
-  ) >$X/postinsttrace.txt 2>&1
-  # Comment out the final line for a trace.
-  rm -rf $X
-}
diff --git a/recipes-core/multitech/reset-handler/reset-handler.default b/recipes-core/multitech/reset-handler/reset-handler.default
deleted file mode 100644
index 71b3e24..0000000
--- a/recipes-core/multitech/reset-handler/reset-handler.default
+++ /dev/null
@@ -1,2 +0,0 @@
-# set to "no" to disable reset-handler starting on boot
-ENABLED="yes"
diff --git a/recipes-core/multitech/reset-handler/reset-handler.init b/recipes-core/multitech/reset-handler/reset-handler.init
deleted file mode 100644
index b50e7b8..0000000
--- a/recipes-core/multitech/reset-handler/reset-handler.init
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-DAEMON=/usr/sbin/reset-handler
-PIDFILE=/var/run/reset-handler.pid
-ENABLED="yes"
-
-[ -r /etc/default/reset-handler ] && . /etc/default/reset-handler
-[ -x $DAEMON ] || exit 0
-[ "$ENABLED" = "yes" ] || exit 0
-
-case "$1" in
-	start)
-		if [ -f $PIDFILE ]; then
-			echo "reset-handler pid file exists, not starting"
-			exit 1
-		else
-			echo "Starting reset-handler"
-			start-stop-daemon --start --background --make-pidfile --pidfile $PIDFILE --exec $DAEMON
-		fi
-	;;
-	stop)
-		echo "Stopping reset-handler"
-		start-stop-daemon --stop --oknodo --pidfile $PIDFILE
-		rm -f $PIDFILE
-	;;
-	*)
-		echo "Usage: $0 {start|stop}"
-		exit 2
-	;;
-esac
diff --git a/recipes-core/multitech/reset-handler/reset-handler.sh b/recipes-core/multitech/reset-handler/reset-handler.sh
deleted file mode 100755
index 50a6783..0000000
--- a/recipes-core/multitech/reset-handler/reset-handler.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2014 Multi-Tech Systems
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-name="reset-handler"
-log="logger -t $name -s"
-pid="$$"
-
-short_signal=10 # SIGUSR1
-long_signal=12 # SIGUSR2
-extralong_signal=1 # SIGHUP
-
-do_reboot() {
-	$log "Rebooting on button press"
-	sleep 1
-	reboot
-}
-
-do_restore_defaults() {
-	$log "Removing /var/config contents"
-	rm -rf /var/config/*
-	$log "Setting restore defaults on reboot"
-	touch /var/config/force_defaults
-	$log "Rebooting"
-	sleep 1
-	reboot
-}
-
-log_exit() {
-	$log "Exiting on SIGTERM"
-	exit 0
-}
-
-idle_wait() {
-	pipe=/var/tmp/$name.fifo
-	rm -f $pipe
-	mkfifo -m 400 $pipe
-
-	# sneaky way to do nothing forever
-	while true; do
-		read < $pipe
-	done
-}
-
-trap do_reboot $short_signal
-trap do_restore_defaults $long_signal
-trap do_restore_defaults $extralong_signal
-trap log_exit TERM
-
-$log "Enabling reset-monitor for pid $pid"
-mts-io-sysfs store reset-monitor "$pid $short_signal $long_signal $extralong_signal"
-# set long press to 5 seconds for reset to defaults
-mts-io-sysfs store reset-monitor-intervals "5 30"
-
-# wait for signals
-idle_wait
diff --git a/recipes-core/multitech/reset-handler_1.0.bb b/recipes-core/multitech/reset-handler_1.0.bb
deleted file mode 100644
index 39abaab..0000000
--- a/recipes-core/multitech/reset-handler_1.0.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "Default reset button handler"
-SECTION = "base"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-PR = "r1"
-RDEPENDS_${PN} += "bash"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "reset-handler"
-INITSCRIPT_PARAMS = "start 95 2 3 4 5 ."
-CONFFILES_${PN} = "${sysconfdir}/default/reset-handler"
-
-SRC_URI = "\
-  file://reset-handler.sh \
-  file://reset-handler.init \
-  file://reset-handler.default \
-"
-
-do_install () {
-    install -d ${D}${sbindir}
-    install -m 0755 ${WORKDIR}/reset-handler.sh ${D}${sbindir}/reset-handler
-
-    # init script
-    install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/reset-handler.init ${D}${sysconfdir}/init.d/reset-handler
-    
-    install -d ${D}${sysconfdir}/default
-    install -m 0644 ${WORKDIR}/reset-handler.default ${D}${sysconfdir}/default/reset-handler
-}
diff --git a/recipes-core/multitech/upgrade-reboot_1.0.0.bb b/recipes-core/multitech/upgrade-reboot_1.0.0.bb
deleted file mode 100644
index c506db3..0000000
--- a/recipes-core/multitech/upgrade-reboot_1.0.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Reboot command to run after firmware upgrade"
-HOMEPAGE = "http://www.multitech.net/"
-SECTION = "console/utils"
-PRIORITY = "optional"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r0"
-
-# tag 1.0.0
-SRCREV = "6b917d88f41a4694a85b86cd047e10ddbd8c691f"
-
-SRC_URI = "git://git.multitech.net/upgrade-reboot.git;protocol=git"
-S = "${WORKDIR}/git"
-
-inherit autotools
-
-PARALLEL_MAKE = ""
diff --git a/recipes-core/sysvinit/files/start_getty_open b/recipes-core/sysvinit/files/start_getty_open
deleted file mode 100644
index 3afce00..0000000
--- a/recipes-core/sysvinit/files/start_getty_open
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# Open console for testing
-if [ -c /dev/$2 ]
-then 
-        /sbin/getty -L $1 $2 xterm -n -l /bin/bash
-fi
diff --git a/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend b/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend
deleted file mode 100644
index be33f10..0000000
--- a/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend
+++ /dev/null
@@ -1,25 +0,0 @@
-# enable gadget serial console for supported hardware
-SUMMARY_${PN}-start-open = "Open debug console for development only"
-SUMMARY_${PN}-start = "Production console"
-SERIAL_CONSOLES_append_mtcdt = " 115200;ttyGS0"
-PACKAGES =+ "${PN}-start ${PN}-start-open"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI += "file://start_getty_open"
-
-FILES_${PN} = "${sysconfdir}/inittab"
-FILES_${PN}-start = "${base_bindir}/start_getty"
-FILES_${PN}-start-open = "${base_bindir}/start_getty_open"
-RCONFLICTS_${PN}-start = "${PN}-start-open"
-RCONFLICTS_${PN}-start-open = "${PN}-start"
-RDEPENDS_${PN}-start-open = "${PN}"
-
-do_install_append() {
-	install -m 0755 ${WORKDIR}/start_getty_open ${D}${base_bindir}/start_getty_open
-}
-pkg_postinst_${PN}-start-open() {
-	sed -i 's?^S0:.*?S0:12345:respawn:/bin/start_getty_open 115200 ttyS0?' $D/etc/inittab
-}
-
-pkg_prerm_${PN}-start-open() {
-	sed -i 's?^S0:.*?S0:12345:respawn:/bin/start_getty 115200 ttyS0?' $D/etc/inittab
-}
diff --git a/recipes-core/udev/udev-extraconf/mount.patch b/recipes-core/udev/udev-extraconf/mount.patch
index 71ccc56..1b475f3 100644
--- a/recipes-core/udev/udev-extraconf/mount.patch
+++ b/recipes-core/udev/udev-extraconf/mount.patch
@@ -1,44 +1,81 @@
-diff -Naru old/mount.sh new/mount.sh
---- old/mount.sh	2018-05-15 09:07:02.814673114 -0500
-+++ new/mount.sh	2018-05-15 09:06:30.862674060 -0500
-@@ -4,7 +4,6 @@
- #
- # Attempt to mount any added block devices and umount any removed devices
+diff -Naru orig/mount.blacklist new/mount.blacklist
+--- orig/mount.blacklist	2019-10-24 17:08:59.796796272 -0500
++++ new/mount.blacklist	2019-10-24 17:16:31.768782892 -0500
+@@ -3,3 +3,16 @@
+ /dev/mtdblock
+ /dev/md
+ /dev/dm-*
++# These should all be mounted in fstab or not at all.
++[PARTLABEL=uboot]
++[PARTLABEL=root]
++[PARTLABEL=root1]
++[PARTLABEL=root2]
++[PARTLABEL=uboot]
++[PARTLABEL=oem]
++[PARTLABEL=oem1]
++[PARTLABEL=oem2]
++[PARTLABEL=config]
++[PARTLABEL=config1]
++[PARTLABEL=config2]
++[PARTLABEL=user_data]
+diff -Naru orig/mount.sh new/mount.sh
+--- orig/mount.sh	2019-10-24 17:09:11.344795931 -0500
++++ new/mount.sh	2019-10-24 18:11:38.612684994 -0500
+@@ -25,9 +25,32 @@
+ fi
  
--
- MOUNT="/bin/mount"
  PMOUNT="/usr/bin/pmount"
- UMOUNT="/bin/umount"
-@@ -21,6 +20,10 @@
- 	name="`basename "$DEVNAME"`"
- 
- 	! test -d "/run/media/$name" && mkdir -p "/run/media/$name"
-+        if [ "$name" = mmcblk0p1 ] ;
-+        then
-+          ln -sf /run/media/$name /run/media/card
-+        fi
- 	# Silent util-linux's version of mounting auto
- 	if [ "x`readlink $MOUNT`" = "x/bin/mount.util-linux" ] ;
+-
+-for line in `grep -h -v ^# /etc/udev/mount.blacklist /etc/udev/mount.blacklist.d/*`
++for line in `grep -h -v '^#$' /etc/udev/mount.blacklist /etc/udev/mount.blacklist.d/* 2>/dev/null`
+ do
++	if [[ $line =~ ^\[([^=]*)=([^\]]*)\] ]] ; then
++	    fsspectype=${BASH_REMATCH[1]}
++	    tmp="$(lsblk -o $fsspectype $DEVNAME | sed -e '1d')"
++	    case $fsspectype in
++		PARTLABEL)
++		    if [[ ${BASH_REMATCH[2]} == $tmp ]] ; then
++			logger "udev/mount.sh $DEVNAME is blacklisted, ignoring"
++			logger "$line"
++			exit 0
++		    fi
++		    ;;
++
++		PARTUUID)
++		    if [[ ${BASH_REMATCH[2]^^} == $tmp ]] ; then
++			logger "udev/mount.sh $DEVNAME is blacklisted, ignoring"
++			logger "$line"
++			exit 0
++		    fi
++		    ;;
++                *)
++                    logger "[$fsspectype] is unsupported in blacklist -- ignoring blacklist item"
++                    ;;
++	    esac
++	fi
+ 	if [ ` expr match "$DEVNAME" "$line" ` -gt 0 ];
  	then
-@@ -31,7 +34,7 @@
- 	# grant it with  w/r/x permissions.
- 	case $ID_FS_TYPE in
- 	vfat|fat)
--		MOUNT="$MOUNT -o umask=007,gid=`awk -F':' '/^disk/{print $3}' /etc/group`"
-+		MOUNT="$MOUNT -o errors=continue -o umask=007,gid=`awk -F':' '/^disk/{print $3}' /etc/group`"
- 		;;
- 	# TODO
- 	*)
-@@ -66,7 +69,11 @@
+ 		logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring"
+@@ -49,6 +72,10 @@
+ 
+     [ -d "/run/media/$name" ] || mkdir -p "/run/media/$name"
+ 
++    if [ "$name" = mmcblk0p1 ] ; then
++        ln -sf /run/media/$name /run/media/card
++    fi
++    
+     MOUNT="$MOUNT -o silent"
+ 
+     # If filesystemtype is vfat, change the ownership group to 'disk', and
+@@ -78,7 +105,11 @@
  	if [ -x "$PMOUNT" ]; then
  		$PMOUNT $DEVNAME 2> /dev/null
  	elif [ -x $MOUNT ]; then
--    		$MOUNT $DEVNAME 2> /dev/null
-+		if [[ $ID_FS_TYPE =~ fat ]] ; then
-+	    		$MOUNT -o umask=002,gid=disk $DEVNAME 2> /dev/null
-+		else
-+	    		$MOUNT $DEVNAME 2> /dev/null
-+		fi
++	    if [[ $ID_FS_TYPE =~ fat ]] ; then
++		$MOUNT -o umask=002,gid=disk $DEVNAME 2> /dev/null
++	    else
+ 		$MOUNT $DEVNAME 2> /dev/null
++	    fi
  	fi
- 	
+ 
  	# If the device isn't mounted at this point, it isn't
diff --git a/recipes-core/useradd/useradd.bb b/recipes-core/useradd/useradd.bb
deleted file mode 100644
index d229a2f..0000000
--- a/recipes-core/useradd/useradd.bb
+++ /dev/null
@@ -1,63 +0,0 @@
-SUMMARY = "Add mtadm user"
-DESCRIPTION = "Add mtadm user for security purposes"
-SECTION = "mtadm"
-PR = "r4"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-S = "${WORKDIR}"
-
-inherit useradd
-
-# You must set USERADD_PACKAGES when you inherit useradd. This
-# lists which output packages will include the user/group
-# creation code.
-#USERADD_PACKAGES = "${PN} ${PN}-user3"
-USERADD_PACKAGES = "${PN}"
-
-# You must also set USERADD_PARAM and/or GROUPADD_PARAM when
-# you inherit useradd.
-
-# GROUPADD_PARAM works the same way, which you set to the options
-# you'd normally pass to the groupadd command. This will create
-# groups group1 and group2:
-GROUPADD_PARAM_${PN} = "-r  -g 27 sudo"
-
-# USERADD_PARAM specifies command line options to pass to the
-# useradd command. Multiple users can be created by separating
-# the commands with a semicolon. Here we'll create two users,
-# user1 and user2:
-USERADD_PARAM_${PN} = "-u 50 -G sudo,disk,dialout -m -r -s /bin/bash mtadm"
-
-do_install () {
-        # If the recipe doesn't have a file, the ipk
-        # is deleted, and it does nothing.
-        # Create a .ssh directory for mtadm.
-        install -d 0700 ${D}/home/mtadm/.ssh
-	chown mtadm:mtadm ${D}/home/mtadm
-	chown mtadm:mtadm ${D}/home/mtadm/.ssh
-}
-
-FILES_${PN} = "/home/mtadm/.ssh"
-
-# Prevents do_package failures with:
-# debugsources.list: No such file or directory:
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-
-pkg_postinst_${PN} () {
-   profile=$D/home/mtadm/.profile
-   if ! grep 'sbin' ${profile} ; then
-     Sub='${PA'
-     Sub=${Sub}'TH}:/sbin:/usr/sbin'
-     echo 'PATH='${Sub} >>${profile}
-     echo 'export PATH'  >>${profile}
-   fi
-   # If doing an update, we need to add mtadm to dialout.
-   # If the admin has been changed, then the user must
-   # do something himself.
-   if [[ -z $D ]] ; then
-     sudo groupmems -a mtadm  -g dialout || true
-   fi
-}
-
diff --git a/recipes-devtools/cppunit/cppunit_1.13.1.bbappend b/recipes-devtools/cppunit/cppunit_1.13.1.bbappend
deleted file mode 100644
index d3267ac..0000000
--- a/recipes-devtools/cppunit/cppunit_1.13.1.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND = "native"
diff --git a/recipes-devtools/node-red/node-red_0.15.3.bb b/recipes-devtools/node-red/node-red_0.15.3.bb
deleted file mode 100644
index bacf9fd..0000000
--- a/recipes-devtools/node-red/node-red_0.15.3.bb
+++ /dev/null
@@ -1,59 +0,0 @@
-DESCRIPTION = "Node-RED"
-HOMEPAGE = "http://nodered.org"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-DEPENDS = "nodejs nodejs-native"
-RDEPENDS_${PN} += "bash"
-PR = "r0"
-
-inherit npm-base
-
-
-S = "${WORKDIR}"
-
-do_install() {
-
-    # npm install locally
-    oe_runnpm install --prefix ./ node-red@0.15.3
-
-    # npm install more stuff
-    oe_runnpm install --prefix./node_modules/node-red nodemailer 
-    # Build patched serialport.
-    # Original is https://registry.npmjs.org/serialport/-/serialport-1.7.4.tgz
-    oe_runnpm install  --prefix ./node_modules/node-red http://multitech.net/mlinux/sources/node-red-serialport-1.7.4-mt1.tgz
-
-    # modules needed for loragw
-    oe_runnpm install --prefix ./node_modules/node-red extend dissolve node-constants
-
-    # install m2x node
-    oe_runnpm install --prefix ./node_modules/node-red node-red-m2x
-
-    # remove dupe deps
-    oe_runnpm dedupe
-
-    # remove Raspberry PI node
-    rm ./node_modules/node-red/nodes/core/hardware/36-rpi-gpio.html
-    rm ./node_modules/node-red/nodes/core/hardware/36-rpi-gpio.js
-    rm ./node_modules/node-red/nodes/core/hardware/nrgpio
-    rm ./node_modules/node-red/nodes/core/hardware/nrgpio.py
-
-    # remove x86_64 serialport 0.0.5
-    rm -rf ./node_modules/node-red/node_modules/node-red-node-serialport
-
-    # install node-red
-    install -d ${D}/opt/node-red
-    cp -r ./node_modules/node-red/* ${D}/opt/node-red/
-}
-pkg_preinst_${PN}() {
-   if grep 'Application Execution Platform with mLinux' /etc/issue ; then
-	((aep=1))
-   fi
-   ls /etc/init.d >/tmp/init.txt
-
-   if ((aep == 1)) ; then
-	logger -t opkg -s -p user.error 'Application Execution Platform detected in /etc/issue  -- this node-red package is for mLinux not AEP'
-        exit 1 
-   fi
-}
-
-FILES_${PN} += "/opt/node-red"
diff --git a/recipes-devtools/opkg/files/0003-opkg_conf-create-opkg.lock-in-run-lock-instead-of-run.patch b/recipes-devtools/opkg/files/0003-opkg_conf-create-opkg.lock-in-run-lock-instead-of-run.patch
deleted file mode 100644
index 794f82d..0000000
--- a/recipes-devtools/opkg/files/0003-opkg_conf-create-opkg.lock-in-run-lock-instead-of-run.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naru old/libopkg/opkg_conf.h new/libopkg/opkg_conf.h
---- old/libopkg/opkg_conf.h	2017-08-03 17:47:57.375435517 -0500
-+++ new/libopkg/opkg_conf.h	2017-08-03 17:48:55.499433796 -0500
-@@ -40,7 +40,7 @@
- #define OPKG_CONF_DEFAULT_STATUS_FILE   "/var/lib/opkg/status"
- #define OPKG_CONF_DEFAULT_CACHE_DIR     "/var/cache/opkg"
- #define OPKG_CONF_DEFAULT_CONF_FILE_DIR "/etc/opkg"
--#define OPKG_CONF_DEFAULT_LOCK_FILE     "/run/opkg.lock"
-+#define OPKG_CONF_DEFAULT_LOCK_FILE     "/run/lock/opkg.lock"
- 
- /* In case the config file defines no dest */
- #define OPKG_CONF_DEFAULT_DEST_NAME "root"
diff --git a/recipes-devtools/opkg/opkg_%.bbappend b/recipes-devtools/opkg/opkg_%.bbappend
deleted file mode 100644
index 7b45903..0000000
--- a/recipes-devtools/opkg/opkg_%.bbappend
+++ /dev/null
@@ -1,7 +0,0 @@
-PR .= ".mlinux1"
-
-SRC_URI += " file://0003-opkg_conf-create-opkg.lock-in-run-lock-instead-of-run.patch \
-                "
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-
diff --git a/recipes-devtools/php/files/init.d.php-rpm.patch b/recipes-devtools/php/files/init.d.php-rpm.patch
deleted file mode 100644
index 312f5d7..0000000
--- a/recipes-devtools/php/files/init.d.php-rpm.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naru old/sapi/fpm/init.d.php-fpm.in new/sapi/fpm/init.d.php-fpm.in
---- old/sapi/fpm/init.d.php-fpm.in	2017-08-14 16:30:30.551436717 -0500
-+++ new/sapi/fpm/init.d.php-fpm.in	2017-08-14 16:51:21.963399670 -0500
-@@ -10,12 +10,13 @@
- # Description:       starts the PHP FastCGI Process Manager daemon
- ### END INIT INFO
- 
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--
--php_fpm_BIN=@sbindir@/php-fpm
--php_fpm_CONF=@sysconfdir@/php-fpm.conf
--php_fpm_PID=@localstatedir@/run/php-fpm.pid
-+NAME="php-fpm"
-+prefix=/usr
-+exec_prefix=/usr
-+
-+php_fpm_BIN=/usr/sbin/php-fpm
-+php_fpm_CONF=/etc/php-fpm.conf
-+php_fpm_PID=/var/run/php-fpm.pid
- 
- 
- php_opts="--fpm-config $php_fpm_CONF --pid $php_fpm_PID"
-@@ -52,6 +53,12 @@
- 
- case "$1" in
- 	start)
-+                [[ -f /etc/default/$NAME ]] && . /etc/default/"$NAME"
-+		if [[ $ENABLED != "yes" ]]; then
-+		  echo "$NAME: disabled in /etc/default"
-+		  exit
-+		fi
-+
- 		echo -n "Starting php-fpm "
- 
- 		$php_fpm_BIN --daemonize $php_opts
diff --git a/recipes-devtools/php/files/php-fpm.conf.patch b/recipes-devtools/php/files/php-fpm.conf.patch
deleted file mode 100644
index 6125b67..0000000
--- a/recipes-devtools/php/files/php-fpm.conf.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naru old/php-fpm.conf new/php-fpm.conf
---- old/php-fpm.conf	2017-06-21 12:52:47.597947428 -0500
-+++ new/php-fpm.conf	2017-06-21 13:10:03.225916769 -0500
-@@ -22,7 +22,7 @@
- ; Pid file
- ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
- ; Default Value: none
--;pid = run/php-fpm.pid
-+pid = run/php-fpm.pid
- 
- ; Error log file
- ; If it's set to "syslog", log is sent to syslogd instead of being written
-@@ -161,7 +161,7 @@
- ;                            (IPv6 and IPv4-mapped) on a specific port;
- ;   '/path/to/unix/socket' - to listen on a unix socket.
- ; Note: This value is mandatory.
--listen = 127.0.0.1:9000
-+listen = /var/run/php-fpm.socket
- 
- ; Set listen(2) backlog.
- ; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
-@@ -476,7 +476,7 @@
- ; Chdir to this directory at the start.
- ; Note: relative path can be used.
- ; Default Value: current directory or / when chroot
--;chdir = /var/www
-+;chdir = /www
-  
- ; Redirect worker stdout and stderr into main error log. If not set, stdout and
- ; stderr will be redirected to /dev/null according to FastCGI specs.
diff --git a/recipes-devtools/php/files/php-fpm.default b/recipes-devtools/php/files/php-fpm.default
deleted file mode 100644
index 0f92640..0000000
--- a/recipes-devtools/php/files/php-fpm.default
+++ /dev/null
@@ -1,2 +0,0 @@
-# set to "yes" or "no" to control starting on boot
-ENABLED="no"
diff --git a/recipes-devtools/php/php_%.bbappend b/recipes-devtools/php/php_%.bbappend
deleted file mode 100644
index 004c0f8..0000000
--- a/recipes-devtools/php/php_%.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-SRC_URI_append_class-target += "file://php-fpm.conf.patch;patchdir=.. \
-                                file://init.d.php-rpm.patch \
-                                file://php-fpm.default \
-                               "
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-do_install_append_class-target() {
-    install -d  ${D}/${sysconfdir}/default
-    install -m 0644 ${WORKDIR}/php-fpm.default ${D}/${sysconfdir}/default/php-fpm
-}
-
-FILES_${PN}-fpm += "${sysconfdir}/default"
\ No newline at end of file
diff --git a/recipes-devtools/python/python-pybluez.inc b/recipes-devtools/python/python-pybluez.inc
deleted file mode 100644
index 399fe57..0000000
--- a/recipes-devtools/python/python-pybluez.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "Bluetooth Python extension module"
-HOMEPAGE = "http://karulis.github.io/pybluez/"
-SECTION = "devel/python"
-
-DEPENDS = "bluez5"
-
-LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8a71d0475d08eee76d8b6d0c6dbec543"
-
-inherit pypi
-
-SRC_URI = "https://pypi.python.org/packages/c1/98/3149481d508bee174335be6725880f00d297afebe75c15e917af8f6fe169/PyBluez-0.22.zip"
-SRC_URI[md5sum] = "49dab9d5a8f0b798c8125c7f649be3cd"
-SRC_URI[sha256sum] = "4ce006716a54d9d18e8186a3f1c8b12a8e6befecffe8fd5828a291fb694ce49d"
-
-S = "${WORKDIR}/PyBluez-${PV}"
-
-RDEPENDS_${PN} += "\
-    bluez5 \
-    ${PYTHON_PN}-fcntl \
-"
diff --git a/recipes-devtools/python/python-pybluez_0.22.bb b/recipes-devtools/python/python-pybluez_0.22.bb
deleted file mode 100644
index 3158f4b..0000000
--- a/recipes-devtools/python/python-pybluez_0.22.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require python-pybluez.inc
-inherit setuptools
diff --git a/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch b/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch
deleted file mode 100644
index a391f7e..0000000
--- a/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 5e5350d730f85957a42c6d846d347d080e7dd996 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Fri, 23 Oct 2015 12:40:34 +0300
-Subject: [PATCH] configure.ac: add sysroot path to GI_DATADIR; don't set
- introspection scanner and compiler paths
-
-Upstream-Status: Pending [review on oe-core maillist]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- configure.ac | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2c0cfbd..cfcb3bf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -194,7 +194,7 @@ PKG_CHECK_MODULES(GI,
-     gobject-introspection-1.0 >= introspection_required_version
- )
- 
--GI_DATADIR=$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0)
-+GI_DATADIR=$PKG_CONFIG_SYSROOT_DIR$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0)
- AC_SUBST(GI_DATADIR)
- 
- if test "$enable_cairo" != no; then
-@@ -219,12 +219,6 @@ AC_ARG_WITH(common,
-     with_common=yes)
- AM_CONDITIONAL(WITH_COMMON, test "$with_common" = "yes")
- 
--INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
--INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
--
--AC_SUBST(INTROSPECTION_SCANNER)
--AC_SUBST(INTROSPECTION_COMPILER)
--
- # compiler warnings, errors, required cflags, and code coverage support
- GNOME_COMPILE_WARNINGS([maximum])
- AC_MSG_CHECKING(for Gnome code coverage support)
--- 
-2.1.4
-
diff --git a/recipes-devtools/python/python-pygobject_3.22.0.bb b/recipes-devtools/python/python-pygobject_3.22.0.bb
deleted file mode 100644
index 9d2e165..0000000
--- a/recipes-devtools/python/python-pygobject_3.22.0.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-SUMMARY = "Python GObject bindings"
-HOMEPAGE = "http://www.pygtk.org/"
-SECTION = "devel/python"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
-
-inherit autotools pkgconfig gnomebase distutils-base gobject-introspection
-
-PYTHON_BASEVERSION = "2.7"
-PYTHON_PN = "python"
-
-DEPENDS += "gnome-common-native python glib-2.0"
-
-SRCNAME="pygobject"
-SRC_URI = " \
-    http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \
-    file://0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch \
-"
-
-SRC_URI[md5sum] = "ed4117ed5d554d25fd7718807fbf819f"
-SRC_URI[sha256sum] = "08b29cfb08efc80f7a8630a2734dec65a99c1b59f1e5771c671d2e4ed8a5cbe7"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-BBCLASSEXTEND = "native"
-
-EXTRA_OECONF = "--disable-cairo --with-python=${PYTHON}"
-
-RDEPENDS_${PN} += "python-setuptools python-importlib"
-RDEPENDS_${PN}_class-native = ""
-
-do_install_append() {
-    # Remove files that clash with python3-pygobject; their content is same
-    rm -rf ${D}${includedir}/pygobject-3.0//pygobject.h ${D}${libdir}/pkgconfig
-}
diff --git a/recipes-devtools/python/python-pyopenssl_0.14.bb b/recipes-devtools/python/python-pyopenssl_0.14.bb
deleted file mode 100644
index ea6452a..0000000
--- a/recipes-devtools/python/python-pyopenssl_0.14.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Simple Python wrapper around the OpenSSL library"
-SECTION = "devel/python"
-PRIORITY = "optional"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRCNAME = "pyOpenSSL"
-
-DEPENDS = "openssl"
-
-SRC_URI = "http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${PV}.tar.gz"
-SRC_URI[md5sum] = "8579ff3a1d858858acfba5f046a4ddf7"
-SRC_URI[sha256sum] = "a99db8e59c120138ad8a72eecedcc24b4510d2eed3ce48213b7e32f22cc4ee6e"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
-
-PACKAGES =+ "${PN}-tests"
-FILES_${PN}-tests = "${libdir}/${PYTHON_DIR}/site-packages/OpenSSL/test"
-
-RDEPENDS_${PN} = "python-threading"
-RDEPENDS_${PN}-tests = "${PN}"
diff --git a/recipes-devtools/python/python-pyserial_3.4.bb b/recipes-devtools/python/python-pyserial_3.4.bb
deleted file mode 100644
index 2c81416..0000000
--- a/recipes-devtools/python/python-pyserial_3.4.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "Serial Port Support for Python"
-SECTION = "devel/python"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d476d94926db6e0008a5b3860d1f5c0d"
-SRCNAME = "pyserial"
-PR = "ml5"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
-
-# FIXME might stop packaging serialwin32 and serialjava files
-
-RDEPENDS_${PN} = "\
-    python-fcntl \
-    python-io \
-    python-stringold \
-    python-importlib \
-"
-
-SRC_URI[md5sum] = "ed6183b15519a0ae96675e9c3330c69b"
-SRC_URI[sha256sum] = "6e2d401fdee0eab996cf734e67773a0143b932772ca8b42451440cfed942c627"
diff --git a/recipes-examples/multitech/helloworld-autotools_1.0.0.bb b/recipes-examples/multitech/helloworld-autotools_1.0.0.bb
deleted file mode 100644
index 8b2eafb..0000000
--- a/recipes-examples/multitech/helloworld-autotools_1.0.0.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Hello World Recipe using autotools"
-HOMEPAGE = "http://www.multitech.net/"
-SECTION = "console/utils"
-PRIORITY = "optional"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r0"
-
-SRC_URI = "git://git.multitech.net/helloworld-autotools.git;protocol=git;tag=1.0.0"
-S = "${WORKDIR}/git"
-
-inherit autotools
-
-PARALLEL_MAKE = ""
diff --git a/recipes-extended/autossh/autossh_1.4c.bb b/recipes-extended/autossh/autossh_1.4c.bb
deleted file mode 100644
index 8ba78f8..0000000
--- a/recipes-extended/autossh/autossh_1.4c.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Keeps ssh tunnels alive"
-HOMEPAGE = "http://www.harding.motd.ca/autossh"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://autossh.c;start_line=10;end_line=22;md5=60abb4e02db9c8a062426f574d2fccae"
-SECTION = "console/utils"
-PRIORITY = "optional"
-inherit autotools-brokensep
-
-PR = "r1"
-
-SRC_URI = "http://www.harding.motd.ca/autossh/autossh-1.4c.tgz"
-SRC_URI[md5sum] = "26520eea934f296be0783dabe7fcfd28"
-SRC_URI[sha256sum] = "6fcaba6a409a46bdf832086736bb8f09d245ebce11027f41d39588a95dc7fd1d"
-
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-inherit autotools
-
-do_install() {
-  install -d ${D}/${bindir}
-  install -m 755 ${S}/autossh ${D}/${bindir}/autossh
-}
diff --git a/recipes-extended/bash/bash-4.2/build-tests.patch b/recipes-extended/bash/bash-4.2/build-tests.patch
deleted file mode 100644
index 0360881..0000000
--- a/recipes-extended/bash/bash-4.2/build-tests.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Add 'ptest' target to Makefile, to run tests without checking dependencies.
-
-Signed-off-by: Anders Roxell <anders.roxell@enea.com>
-Upstream-Status: Pending
----
-diff -uNr a/Makefile.in b/Makefile.in
---- a/Makefile.in	2012-11-06 08:40:07.552403063 +0100
-+++ b/Makefile.in	2012-11-06 11:13:36.958297555 +0100
-@@ -827,20 +827,34 @@
- 	fi
- 
- recho$(EXEEXT):		$(SUPPORT_SRC)recho.c
--	@$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)recho.c ${LIBS_FOR_BUILD}
-+	@$(CC) $(CCFLAGS) -o $@ $<
- 
- zecho$(EXEEXT):		$(SUPPORT_SRC)zecho.c
--	@$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)zecho.c ${LIBS_FOR_BUILD}
-+	@$(CC) $(CCFLAGS) -o $@ $<
- 
- printenv$(EXEEXT):	$(SUPPORT_SRC)printenv.c
--	@$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)printenv.c ${LIBS_FOR_BUILD}
-+	@$(CC) $(CCFLAGS) -o $@ $<
- 
- xcase$(EXEEXT):	$(SUPPORT_SRC)xcase.c
--	@$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)xcase.c ${LIBS_FOR_BUILD}
-+	@$(CC) $(CCFLAGS) -o $@ $<
- 
--test tests check:	force $(Program) $(TESTS_SUPPORT)
-+test tests check:
-+	@$(MAKE) install-test
-+	@$(MAKE) runtest
-+
-+install-test: buildtest
-+ifeq ($(origin INSTALL_TEST_DIR), undefined)
- 	@-test -d tests || mkdir tests
- 	@cp $(TESTS_SUPPORT) tests
-+else
-+	@-test -d $(INSTALL_TEST_DIR) || mkdir -p $(INSTALL_TEST_DIR)
-+	@cp -r $(srcdir)/tests/* $(INSTALL_TEST_DIR)/
-+	@cp $(TESTS_SUPPORT) $(INSTALL_TEST_DIR)
-+endif
-+
-+buildtest: force $(Program) $(TESTS_SUPPORT)
-+
-+runtest:
- 	@( cd $(srcdir)/tests && \
- 		PATH=$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} )
- 
diff --git a/recipes-extended/bash/bash-4.2/execute_cmd.patch b/recipes-extended/bash/bash-4.2/execute_cmd.patch
deleted file mode 100644
index 81f8f0a..0000000
--- a/recipes-extended/bash/bash-4.2/execute_cmd.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
---- execute_cmd.c.orig	Fri Jun  3 13:34:42 2011
-+++ execute_cmd.c	Fri Jun  3 13:36:41 2011
-@@ -2202,7 +2202,11 @@
-   /* If the `lastpipe' option is set with shopt, and job control is not
-      enabled, execute the last element of non-async pipelines in the
-      current shell environment. */
--  if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
-+  if (lastpipe_opt && 
-+#if defined(JOB_CONTROL)
-+		job_control == 0 && 
-+#endif
-+		asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
-     {
-       lstdin = move_to_high_fd (0, 0, 255);
-       if (lstdin > 0)
diff --git a/recipes-extended/bash/bash-4.2/mkbuiltins_have_stringize.patch b/recipes-extended/bash/bash-4.2/mkbuiltins_have_stringize.patch
deleted file mode 100644
index a9391d6..0000000
--- a/recipes-extended/bash/bash-4.2/mkbuiltins_have_stringize.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-On hosts with FORTIFY_SOURCES, stringize support is required, as it's used by
-the macros to wrap functions (e.g. read and open in unistd.h). Those wrappers
-use the STRING() macro from unistd.h. A header in the bash sources overrides
-the unistd.h macro to 'x' when HAVE_STRINGIZE is not defined, causing the
-wrappers to generate calls to 'xread' and 'xopen', which do not exist,
-resulting in a failure to link.
-
-Assume we have stringize support when cross-compiling, which works around the
-issue.
-
-It may be best for upstream to either give up on supporting compilers without
-stringize support, or to not define STRING() at all when FORTIFY_SOURCES is
-defined, letting the unistd.h one be used, instead.
-
-Upstream-Status: Pending
-
---- bash-4.2.orig/builtins/mkbuiltins.c
-+++ bash-4.2/builtins/mkbuiltins.c
-@@ -28,6 +28,7 @@
- #  define HAVE_STDLIB_H
-
- #  define HAVE_RENAME
-+#  define HAVE_STRINGIZE
- #endif /* CROSS_COMPILING */
-
- #if defined (HAVE_UNISTD_H)
diff --git a/recipes-extended/bash/bash-4.2/run-ptest b/recipes-extended/bash/bash-4.2/run-ptest
deleted file mode 100644
index 8dd3b99..0000000
--- a/recipes-extended/bash/bash-4.2/run-ptest
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-make -k THIS_SH=/bin/bash BUILD_DIR=. runtest
diff --git a/recipes-extended/bash/bash-4.2/test-output.patch b/recipes-extended/bash/bash-4.2/test-output.patch
deleted file mode 100644
index 2b09b7d..0000000
--- a/recipes-extended/bash/bash-4.2/test-output.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Add FAIL/PASS output to test output.
-
-Signed-off-by: Björn Stenberg <bjst@enea.com>
-Upstream-Status: Pending
----
-diff -uNr a/tests/run-all b/tests/run-all
---- a/tests/run-all	1999-10-08 17:07:46.000000000 +0200
-+++ b/tests/run-all	2012-10-27 21:04:18.663331887 +0200
-@@ -22,7 +22,15 @@
- 	case $x in
- 	$0|run-minimal|run-gprof)	;;
- 	*.orig|*~) ;;
--	*)	echo $x ; sh $x ;;
-+    *)  echo $x
-+         output=`sh $x`
-+         if [ -n "$output" ]; then
-+             echo "$output"
-+             echo "FAIL: $x"
-+         else
-+             echo "PASS: $x"
-+         fi
-+         ;;
- 	esac
- done
- 
diff --git a/recipes-extended/bash/bash.inc b/recipes-extended/bash/bash.inc
deleted file mode 100644
index 64b476f..0000000
--- a/recipes-extended/bash/bash.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-DESCRIPTION = "An sh-compatible command language interpreter."
-HOMEPAGE = "http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html"
-SECTION = "base/shell"
-
-DEPENDS = "ncurses bison-native"
-
-inherit autotools gettext update-alternatives ptest
-
-PARALLEL_MAKE = ""
-
-EXTRA_OECONF = "--enable-job-control"
-
-ALTERNATIVE_${PN} = "sh"
-ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh"
-ALTERNATIVE_TARGET[sh] = "${base_bindir}/bash"
-ALTERNATIVE_PRIORITY = "100"
-
-export AUTOHEADER = "true"
-
-RDEPENDS_${PN}-ptest += "make"
-
-do_configure_prepend () {
-	if [ ! -e ${S}/acinclude.m4 ]; then
-		cat ${S}/aclocal.m4 > ${S}/acinclude.m4
-	fi
-}
-
-do_compile_ptest () {
-	oe_runmake buildtest
-}
-
-do_install_append () {
-	# Move /usr/bin/bash to /bin/bash, if need
-	if [ "${base_bindir}" != "${bindir}" ]; then
-		mkdir -p ${D}${base_bindir}
-		mv ${D}${bindir}/bash ${D}${base_bindir}
-	fi
-}
-
-do_install_ptest () {
-	make INSTALL_TEST_DIR=${D}${PTEST_PATH}/tests install-test
-	cp ${B}/Makefile ${D}${PTEST_PATH}
-        sed -i 's/^Makefile/_Makefile/' ${D}${PTEST_PATH}/Makefile
-}
-
-pkg_postinst_${PN} () {
-	touch $D${sysconfdir}/shells
-	grep -q "bin/bash" $D${sysconfdir}/shells || echo /bin/bash >> $D${sysconfdir}/shells
-	grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells
-}
diff --git a/recipes-extended/bash/bash_4.2.bb b/recipes-extended/bash/bash_4.2.bb
deleted file mode 100644
index df196a7..0000000
--- a/recipes-extended/bash/bash_4.2.bb
+++ /dev/null
@@ -1,173 +0,0 @@
-require bash.inc
-
-# GPLv2+ (< 4.0), GPLv3+ (>= 4.0)
-LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-PR = "r7"
-
-SRC_URI = "${GNU_MIRROR}/bash/${BPN}-${PV}.tar.gz;name=tarball \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-001;apply=yes;striplevel=0;name=patch001 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-002;apply=yes;striplevel=0;name=patch002 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-003;apply=yes;striplevel=0;name=patch003 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-004;apply=yes;striplevel=0;name=patch004 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-005;apply=yes;striplevel=0;name=patch005 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-006;apply=yes;striplevel=0;name=patch006 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-007;apply=yes;striplevel=0;name=patch007 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-008;apply=yes;striplevel=0;name=patch008 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-009;apply=yes;striplevel=0;name=patch009 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-010;apply=yes;striplevel=0;name=patch010 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-011;apply=yes;striplevel=0;name=patch011 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-012;apply=yes;striplevel=0;name=patch012 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-013;apply=yes;striplevel=0;name=patch013 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-014;apply=yes;striplevel=0;name=patch014 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-015;apply=yes;striplevel=0;name=patch015 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-016;apply=yes;striplevel=0;name=patch016 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-017;apply=yes;striplevel=0;name=patch017 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-018;apply=yes;striplevel=0;name=patch018 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-019;apply=yes;striplevel=0;name=patch019 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-020;apply=yes;striplevel=0;name=patch020 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-021;apply=yes;striplevel=0;name=patch021 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-022;apply=yes;striplevel=0;name=patch022 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-023;apply=yes;striplevel=0;name=patch023 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-024;apply=yes;striplevel=0;name=patch024 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-025;apply=yes;striplevel=0;name=patch025 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-026;apply=yes;striplevel=0;name=patch026 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-027;apply=yes;striplevel=0;name=patch027 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-028;apply=yes;striplevel=0;name=patch028 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-029;apply=yes;striplevel=0;name=patch029 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-030;apply=yes;striplevel=0;name=patch030 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-031;apply=yes;striplevel=0;name=patch031 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-032;apply=yes;striplevel=0;name=patch032 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-033;apply=yes;striplevel=0;name=patch033 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-034;apply=yes;striplevel=0;name=patch034 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-035;apply=yes;striplevel=0;name=patch035 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-036;apply=yes;striplevel=0;name=patch036 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-037;apply=yes;striplevel=0;name=patch037 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-038;apply=yes;striplevel=0;name=patch038 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-039;apply=yes;striplevel=0;name=patch039 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-040;apply=yes;striplevel=0;name=patch040 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-041;apply=yes;striplevel=0;name=patch041 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-042;apply=yes;striplevel=0;name=patch042 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-043;apply=yes;striplevel=0;name=patch043 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-044;apply=yes;striplevel=0;name=patch044 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-045;apply=yes;striplevel=0;name=patch045 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-046;apply=yes;striplevel=0;name=patch046 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-047;apply=yes;striplevel=0;name=patch047 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-048;apply=yes;striplevel=0;name=patch048 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-049;apply=yes;striplevel=0;name=patch049 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-050;apply=yes;striplevel=0;name=patch050 \
-           ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-051;apply=yes;striplevel=0;name=patch051 \
-           file://execute_cmd.patch;striplevel=0 \
-           file://mkbuiltins_have_stringize.patch \
-           file://build-tests.patch \
-           file://test-output.patch \
-           file://run-ptest \
-           "
-
-SRC_URI[tarball.md5sum] = "3fb927c7c33022f1c327f14a81c0d4b0"
-SRC_URI[tarball.sha256sum] = "a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8"
-SRC_URI[patch001.md5sum] = "1100bc1dda2cdc06ac44d7e5d17864a3"
-SRC_URI[patch001.sha256sum] = "8d6ca028576c4af23e660a2fbc2112221a11c8a785c0b37f033967e5cd12b47a"
-SRC_URI[patch002.md5sum] = "30e7948079921d3261efcc6a40722135"
-SRC_URI[patch002.sha256sum] = "febac927e199aceeba2004908d971d4afb49b521796c3f42d1166f9fbbfbcef9"
-SRC_URI[patch003.md5sum] = "9ea06decec43a198f3d7cf29acc602f8"
-SRC_URI[patch003.sha256sum] = "5a0a7c15018c87348ea87cb0beea14345faf878dbb0e25c17fa70677194cb4cd"
-SRC_URI[patch004.md5sum] = "fb48f6134d7b013135929476aa0c250c"
-SRC_URI[patch004.sha256sum] = "4e34b0f830d2583d56e14225a66937abc81f45bbafcd2eb49daf61c9462140c1"
-SRC_URI[patch005.md5sum] = "e70e45de33426b38153b390be0dbbcd4"
-SRC_URI[patch005.sha256sum] = "a81749e73004b81cfdf0fe075bec365dc1fef756ee5e3fd142821e317d1459a0"
-SRC_URI[patch006.md5sum] = "ce4e5c484993705b27daa151eca242c2"
-SRC_URI[patch006.sha256sum] = "c91148945a2ddafa792682d7c8668c59e7e645eae1334b15b0d5d9ad22634bd1"
-SRC_URI[patch007.md5sum] = "88d1f96db29461767602e2546803bda7"
-SRC_URI[patch007.sha256sum] = "405826acf443dd1084f236a15cb76d7f0ee2dbe5edff45c5fb836db571fb7e95"
-SRC_URI[patch008.md5sum] = "24c574bf6d6a581e300823d9c1276af6"
-SRC_URI[patch008.sha256sum] = "23080d11a60a78941210e2477f6bca066b45db03defa60da86fd765107ba2437"
-SRC_URI[patch009.md5sum] = "4c5835f2fbab36c4292bb334977e5b6d"
-SRC_URI[patch009.sha256sum] = "e7ed5440b4c19765786e90e4f1ded43195d38b3e4d1c4b39fcc23de9a74ccb20"
-SRC_URI[patch010.md5sum] = "0a51602b535ef661ee707be6c8bdb373"
-SRC_URI[patch010.sha256sum] = "acfc5482c25e6923116fcf4b4f7f6345b80f75ad7299749db4b736ad67aa43dc"
-SRC_URI[patch011.md5sum] = "58deacf3d57cbd75575444ff6a3b0806"
-SRC_URI[patch011.sha256sum] = "a491ae359a7ebbd7321aede561728289d71e1fc84777f402766a8afd4d261532"
-SRC_URI[patch012.md5sum] = "72d5059820015231483bb7415d09e9db"
-SRC_URI[patch012.sha256sum] = "354433f1d2da02f1b9652cd20a5b85bbfb5bc2aaf79c42461ebd929d89b9b7b8"
-SRC_URI[patch013.md5sum] = "608336ebe215984ef126e3c29d2d3409"
-SRC_URI[patch013.sha256sum] = "3412c5c6cbbce6c88592604aec054d8182ce64410038b5ecea69fc3968cf85ea"
-SRC_URI[patch014.md5sum] = "ed19da878e3f630834c62b9d9dcc6fce"
-SRC_URI[patch014.sha256sum] = "b5a678e609858532735f94faedb5fabce00dfd6577a4e9ec5eec85fe682c8b33"
-SRC_URI[patch015.md5sum] = "2d07daba0b8ca8f876d2aa052ff594b4"
-SRC_URI[patch015.sha256sum] = "2d876a8304bdf3d664e87e0a8d73bc4ccc100a9dd8c0d054e8649472d8748a98"
-SRC_URI[patch016.md5sum] = "53d246537e1fffd1aaa02ba5c056211c"
-SRC_URI[patch016.sha256sum] = "2895ccbcf7fc98da73a8fa3ba7440aaf2bfaef6c0af8bdd3a9c39403cf03e2a6"
-SRC_URI[patch017.md5sum] = "304fd129a58fee2d8a34f8b4704db0aa"
-SRC_URI[patch017.sha256sum] = "73552444498c761d6073dd67ccfe043b36ef24bb418c266d91d9750884daee7f"
-SRC_URI[patch018.md5sum] = "6921a0b4228fe89b6537a5c29f027c89"
-SRC_URI[patch018.sha256sum] = "e2a9457172370d454d31b84bbcba758ee6394316dbe755374553b52aadbb494d"
-SRC_URI[patch019.md5sum] = "1195d85447f3d048d2c9bcd075fa765c"
-SRC_URI[patch019.sha256sum] = "a8b7cd02207656976016d93cab48e073cb5da002ceb27b7a63fc5ea62007eb56"
-SRC_URI[patch020.md5sum] = "b09000bba08da6ac753124593850cdf7"
-SRC_URI[patch020.sha256sum] = "494773f0d0078cb35372d24caa523b00d8fdbbaed71e41dc14c9e47579da3c6f"
-SRC_URI[patch021.md5sum] = "09d3f96a16b881334cfaee0cf320b47e"
-SRC_URI[patch021.sha256sum] = "a887a97be226575ecf483be2c76655bd6d1edde1cdfe199c27bd2e6baf32badc"
-SRC_URI[patch022.md5sum] = "597bf71a2aac6feb510b7505cdd3d4f7"
-SRC_URI[patch022.sha256sum] = "9dcdf69df7f8cd2ba88d18c45a0d8f55fbe4f0e273411179db94dd6198b85c6b"
-SRC_URI[patch023.md5sum] = "3fab459b4e09daea529cacad025b13b3"
-SRC_URI[patch023.sha256sum] = "5dc11394f1a6c887373c081396efd4f4cc04492696722c57a4811c207965f0bf"
-SRC_URI[patch024.md5sum] = "4ad8d11e72afc6090e701073ff034cf4"
-SRC_URI[patch024.sha256sum] = "99c826bdd33bee281d0a9191550d62a24d0b256cd41c90afd10abd63a66b99e6"
-SRC_URI[patch025.md5sum] = "c7d2493e44490f01dd20bdc8feb0a6a7"
-SRC_URI[patch025.sha256sum] = "0db0646fd7a559d5702911192bdd387acbbc61cf3c29a34007c3ec840e275515"
-SRC_URI[patch026.md5sum] = "9f19c199dd8d1fa9254eebe738759272"
-SRC_URI[patch026.sha256sum] = "e7e90cfaabbce3b4b9c699994e9d9ea4a2f084fd9f37788a80b0b70b47d323d2"
-SRC_URI[patch027.md5sum] = "a6ed82daf034587aee2f2581ba5fe829"
-SRC_URI[patch027.sha256sum] = "0c1f6b7256fcc17f42c05f9bbb4138f8e8bb67e79c622c3485711b6f37f7ed42"
-SRC_URI[patch028.md5sum] = "da9265aa2527fd4a7481baa3e0550287"
-SRC_URI[patch028.sha256sum] = "204226de39ba81aaf3dd5a29cd59de052ec9f648538bb9e7f1c8150852b1ed7a"
-SRC_URI[patch029.md5sum] = "ec444d229e8899fbaaf6fc7de2d82ae6"
-SRC_URI[patch029.sha256sum] = "d0b08c0817bc5acdb28b466727622a8422ca4d61188313cf162443b7f338f581"
-SRC_URI[patch030.md5sum] = "b4bc1c4dc1b508ff9cdfc44f1a5039b5"
-SRC_URI[patch030.sha256sum] = "12594366591a136d8ccdcb8e218010f2ddab6be28a7f96d0ed32ca927e44afae"
-SRC_URI[patch031.md5sum] = "89390ff6a3c2ef7e09dd4b8b097a8e56"
-SRC_URI[patch031.sha256sum] = "55f38c4d34775fbb063510c4222b195d998dd86f88288b64a6103e3812f8d9f9"
-SRC_URI[patch032.md5sum] = "eee08003395c417f677d1a4bf8c548ee"
-SRC_URI[patch032.sha256sum] = "e3a8b563dbb1e5cb7ca85a53515da8b2941213973496d48c4cc5a11c604791ed"
-SRC_URI[patch033.md5sum] = "2fe070dd6d75d8ff16f269184a16e9c4"
-SRC_URI[patch033.sha256sum] = "f5d12790d69fdfb2f47ac86fa1ea1ecc088880141570273f38dfd3fa4a46434b"
-SRC_URI[patch034.md5sum] = "4e610506c1711bf3483b965800ac3d5d"
-SRC_URI[patch034.sha256sum] = "01c1f332101389cedf347c7736102966722a3b213900954e5d625bbc2f1e41b8"
-SRC_URI[patch035.md5sum] = "7cd9bfdf7cbfd45274d07620ee94c8d9"
-SRC_URI[patch035.sha256sum] = "cecde463b038b4849635ff0993d9b264fc92403e7ae0accb52c7877aeaed78df"
-SRC_URI[patch036.md5sum] = "9c3142956064d175a880bcb186e51ef9"
-SRC_URI[patch036.sha256sum] = "fe293a1bc92ac4d272ae9b9a0de3afef7c06145a2b52337a09cacccc5305aafa"
-SRC_URI[patch037.md5sum] = "c10692f447d4966c879f8fb8d7c8ebc9"
-SRC_URI[patch037.sha256sum] = "c7578cddd3bb2430689c740f58a03403800726dcd1268b28f91bf37f368e1674"
-SRC_URI[patch038.md5sum] = "9ef3c308cde413e95866c1266cfb4e98"
-SRC_URI[patch038.sha256sum] = "b8c9a81bdf206be58ba491dfad80373b3348af769e80aaf72f7611ddbbbe6d57"
-SRC_URI[patch039.md5sum] = "cd48f57a404498d4e5c73a3501c4b1a5"
-SRC_URI[patch039.sha256sum] = "f4f9300a60321a5088ae9e54052a64c4d3e876f9a3a17ca104d58fa38b9c1791"
-SRC_URI[patch040.md5sum] = "00a2371b6c05acbfce6bc850c6d982f8"
-SRC_URI[patch040.sha256sum] = "b265f9caf3c7321f95bc8e0b9e2c46bd86c226f00f05e823699aafb83c4aaa6c"
-SRC_URI[patch041.md5sum] = "7bc4942a66ca4024ee964db7ede07896"
-SRC_URI[patch041.sha256sum] = "05cc1951bd9f6624088dd6067486ff47f1825e333273d7df5f1b06b23baaf5eb"
-SRC_URI[patch042.md5sum] = "1cf7701017ebfc8e129de92c8f8b798c"
-SRC_URI[patch042.sha256sum] = "faaa5c1f456517b258b2a65eaa664dd6a01eeff73c8ca4447c3a6de371bbf304"
-SRC_URI[patch043.md5sum] = "9e61168fca692d8d1a733c389a63712e"
-SRC_URI[patch043.sha256sum] = "dc2683840f3e890a9c5f85338366ff6cd923285e558eb46aa818a03fa67c5c57"
-SRC_URI[patch044.md5sum] = "b4b11d64b45ea9ec50dcc74c6c3861f6"
-SRC_URI[patch044.sha256sum] = "10d32d6c9ccdedb1d826f46468631d475f9dcf983fac087766e16df7b99766e6"
-SRC_URI[patch045.md5sum] = "1661bcc83c4715f54368877452ff2247"
-SRC_URI[patch045.sha256sum] = "ddb7eff0f59d394a483b09feec3771d9026f81ba90afac32846a19b172b2986d"
-SRC_URI[patch046.md5sum] = "1b68157ac0f7140e1ceafbbad4a14fee"
-SRC_URI[patch046.sha256sum] = "95c1323b68c0ecc0ca09565ef2d5218625ced3957b702e04c8bcaad9e7b3816d"
-SRC_URI[patch047.md5sum] = "10fbe341bd6b5dd1e94c2384f24e98b4"
-SRC_URI[patch047.sha256sum] = "c1979201d0345011c419a1c82407cd2a00c60a0c75b7f07e145d17f3718daf7a"
-SRC_URI[patch048.md5sum] = "87c31c1ace423d3ce8d1e26ba13bc724"
-SRC_URI[patch048.sha256sum] = "751a5d2330b21ac9aba7323acbbc91c948285f30a4bb41f56796f9a36b983d24"
-SRC_URI[patch049.md5sum] = "07083eeb372bd8215050a8146acc1efd"
-SRC_URI[patch049.sha256sum] = "901cd74cdd9f3e9bb5cc907d563e3d4dcdf9d5f6a751e85b706a958f51bc510e"
-SRC_URI[patch050.md5sum] = "d7b28ed8e839463f4554d67afb4f15e9"
-SRC_URI[patch050.sha256sum] = "1a19b84455e83b46fcaa27759a5dd643dde2e11ceacd1e84e351970ea04d8ba6"
-SRC_URI[patch051.md5sum] = "7dfd10542744c75aa1fd9be7109573bb"
-SRC_URI[patch051.sha256sum] = "3e15347bc23a116b8ee898acec9d0ac744612ce9bbc0096fff47c4cf1149051c"
-
-BBCLASSEXTEND = "nativesdk"
diff --git a/recipes-extended/fatrace/fatrace_0.9.bb b/recipes-extended/fatrace/fatrace_0.9.bb
deleted file mode 100644
index 866a801..0000000
--- a/recipes-extended/fatrace/fatrace_0.9.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-inherit autotools-brokensep
-DESCRIPTION = "Fatrace - report system wide file access events"
-HOMEPAGE = "https://launchpad.net/fatrace"
-LICENSE = "GPL-3.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-SRC_URI = "https://launchpad.net/fatrace/trunk/0.9/+download/fatrace-0.9.tar.bz2"
-
-SRC_URI[md5sum] = "17ac66f758f200af32f493263edc6b49"
-SRC_URI[sha256sum] = "c028d822ffde68805e5d1f62c4e2d0f4b3d4ae565802cc9468c82b25b92e68cd"
-
-# install to /usr
-export PREFIX = "/usr"
-
-inherit autotools
-
-# skip installing power-usage-report
-do_install_append() {
-	rm -f ${D}${sbindir}/power-usage-report
-}
diff --git a/recipes-extended/lighttpd/lighttpd/lighttpd b/recipes-extended/lighttpd/lighttpd/lighttpd
deleted file mode 100644
index 10335f4..0000000
--- a/recipes-extended/lighttpd/lighttpd/lighttpd
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/lighttpd
-NAME=lighttpd
-DESC="Lighttpd Web Server"
-OPTS="-f /etc/lighttpd.conf"
-
-ENABLED=yes
-[ -f /etc/default/$NAME ] && . /etc/default/$NAME
-
-if [ "$ENABLED" != "yes" ]; then
-  echo "$NAME: disabled in /etc/default"
-  exit
-fi
-
-case "$1" in
-  start)
-	echo -n "Starting $DESC: "
-	start-stop-daemon --start -x "$DAEMON" -- $OPTS
-	echo "$NAME."
-	;;
-  stop)
-	echo -n "Stopping $DESC: "
-	start-stop-daemon --stop -x "$DAEMON"
-	echo "$NAME."
-	;;
-  restart|force-reload)
-	echo -n "Restarting $DESC: "
-	start-stop-daemon --stop -x "$DAEMON"
-	sleep 1
-	start-stop-daemon --start -x "$DAEMON" -- $OPTS
-	echo "$NAME."
-	;;
-  *)
-	N=/etc/init.d/$NAME
-	echo "Usage: $N {start|stop|restart|force-reload}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/recipes-extended/lighttpd/lighttpd/lighttpd.conf b/recipes-extended/lighttpd/lighttpd/lighttpd.conf
deleted file mode 100644
index 7fde9ca..0000000
--- a/recipes-extended/lighttpd/lighttpd/lighttpd.conf
+++ /dev/null
@@ -1,327 +0,0 @@
-# lighttpd configuration file
-#
-# use it as a base for lighttpd 1.0.0 and above
-#
-# $Id: lighttpd.conf,v 1.7 2004/11/03 22:26:05 weigon Exp $
-
-############ Options you really have to take care of ####################
-
-## modules to load
-# at least mod_access and mod_accesslog should be loaded
-# all other module should only be loaded if really neccesary
-# - saves some time
-# - saves memory
-server.modules              = (
-#                               "mod_rewrite",
-#                               "mod_redirect",
-#                               "mod_alias",
-                                "mod_access",
-#                               "mod_cml",
-#                               "mod_trigger_b4_dl",
-#                               "mod_auth",
-#                               "mod_status",
-#                               "mod_setenv",
-#                               "mod_fastcgi",
-#                               "mod_proxy",
-#                               "mod_simple_vhost",
-#                               "mod_evhost",
-#                               "mod_userdir",
-#                               "mod_cgi",
-#                               "mod_compress",
-#                               "mod_ssi",
-#                               "mod_usertrack",
-#                               "mod_expire",
-#                               "mod_secdownload",
-#                               "mod_rrdtool",
-#				"mod_webdav",
-                                "mod_accesslog" )
-
-## a static document-root, for virtual-hosting take look at the
-## server.virtual-* options
-server.document-root        = "/www/pages/"
-
-## where to send error-messages to
-server.errorlog             = "/var/log/lighttpd.error.log"
-
-# files to check for if .../ is requested
-index-file.names            = ( "index.php", "index.html",
-                                "index.htm", "default.htm" )
-
-## set the event-handler (read the performance section in the manual)
-# server.event-handler = "freebsd-kqueue" # needed on OS X
-
-# mimetype mapping
-mimetype.assign             = (
-  ".pdf"          =>      "application/pdf",
-  ".sig"          =>      "application/pgp-signature",
-  ".spl"          =>      "application/futuresplash",
-  ".class"        =>      "application/octet-stream",
-  ".ps"           =>      "application/postscript",
-  ".torrent"      =>      "application/x-bittorrent",
-  ".dvi"          =>      "application/x-dvi",
-  ".gz"           =>      "application/x-gzip",
-  ".pac"          =>      "application/x-ns-proxy-autoconfig",
-  ".swf"          =>      "application/x-shockwave-flash",
-  ".tar.gz"       =>      "application/x-tgz",
-  ".tgz"          =>      "application/x-tgz",
-  ".tar"          =>      "application/x-tar",
-  ".zip"          =>      "application/zip",
-  ".mp3"          =>      "audio/mpeg",
-  ".m3u"          =>      "audio/x-mpegurl",
-  ".wma"          =>      "audio/x-ms-wma",
-  ".wax"          =>      "audio/x-ms-wax",
-  ".ogg"          =>      "application/ogg",
-  ".wav"          =>      "audio/x-wav",
-  ".gif"          =>      "image/gif",
-  ".jpg"          =>      "image/jpeg",
-  ".jpeg"         =>      "image/jpeg",
-  ".png"          =>      "image/png",
-  ".xbm"          =>      "image/x-xbitmap",
-  ".xpm"          =>      "image/x-xpixmap",
-  ".xwd"          =>      "image/x-xwindowdump",
-  ".css"          =>      "text/css",
-  ".html"         =>      "text/html",
-  ".htm"          =>      "text/html",
-  ".js"           =>      "text/javascript",
-  ".asc"          =>      "text/plain",
-  ".c"            =>      "text/plain",
-  ".cpp"          =>      "text/plain",
-  ".log"          =>      "text/plain",
-  ".conf"         =>      "text/plain",
-  ".text"         =>      "text/plain",
-  ".txt"          =>      "text/plain",
-  ".dtd"          =>      "text/xml",
-  ".xml"          =>      "text/xml",
-  ".mpeg"         =>      "video/mpeg",
-  ".mpg"          =>      "video/mpeg",
-  ".mov"          =>      "video/quicktime",
-  ".qt"           =>      "video/quicktime",
-  ".avi"          =>      "video/x-msvideo",
-  ".asf"          =>      "video/x-ms-asf",
-  ".asx"          =>      "video/x-ms-asf",
-  ".wmv"          =>      "video/x-ms-wmv",
-  ".bz2"          =>      "application/x-bzip",
-  ".tbz"          =>      "application/x-bzip-compressed-tar",
-  ".tar.bz2"      =>      "application/x-bzip-compressed-tar"
- )
-
-# Use the "Content-Type" extended attribute to obtain mime type if possible
-#mimetype.use-xattr        = "enable"
-
-
-## send a different Server: header
-## be nice and keep it at lighttpd
-# server.tag                 = "lighttpd"
-
-#### accesslog module
-accesslog.filename          = "/var/log/lighttpd.access.log"
-
-## deny access the file-extensions
-#
-# ~    is for backupfiles from vi, emacs, joe, ...
-# .inc is often used for code includes which should in general not be part
-#      of the document-root
-url.access-deny             = ( "~", ".inc" )
-
-$HTTP["url"] =~ "\.pdf$" {
-  server.range-requests = "disable"
-}
-
-##
-# which extensions should not be handle via static-file transfer
-#
-# .php, .pl, .fcgi are most often handled by mod_fastcgi or mod_cgi
-static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
-
-######### Options that are good to be but not neccesary to be changed #######
-
-## bind to port (default: 80)
-#server.port                = 81
-
-## bind to localhost (default: all interfaces)
-#server.bind                = "grisu.home.kneschke.de"
-
-## error-handler for status 404
-#server.error-handler-404   = "/error-handler.html"
-#server.error-handler-404   = "/error-handler.php"
-
-## to help the rc.scripts
-#server.pid-file            = "/var/run/lighttpd.pid"
-
-
-###### virtual hosts
-##
-##  If you want name-based virtual hosting add the next three settings and load
-##  mod_simple_vhost
-##
-## document-root =
-##   virtual-server-root + virtual-server-default-host + virtual-server-docroot
-## or
-##   virtual-server-root + http-host + virtual-server-docroot
-##
-#simple-vhost.server-root   = "/home/weigon/wwwroot/servers/"
-#simple-vhost.default-host  = "grisu.home.kneschke.de"
-#simple-vhost.document-root = "/pages/"
-
-
-##
-## Format: <errorfile-prefix><status-code>.html
-## -> ..../status-404.html for 'File not found'
-#server.errorfile-prefix    = "/home/weigon/projects/lighttpd/doc/status-"
-
-## virtual directory listings
-#dir-listing.activate       = "enable"
-
-## enable debugging
-#debug.log-request-header   = "enable"
-#debug.log-response-header  = "enable"
-#debug.log-request-handling = "enable"
-#debug.log-file-not-found   = "enable"
-
-### only root can use these options
-#
-# chroot() to directory (default: no chroot() )
-#server.chroot              = "/"
-
-## change uid to <uid> (default: don't care)
-#server.username            = "wwwrun"
-
-## change uid to <uid> (default: don't care)
-#server.groupname           = "wwwrun"
-
-#### compress module
-#compress.cache-dir         = "/tmp/lighttpd/cache/compress/"
-#compress.filetype          = ("text/plain", "text/html")
-
-#### proxy module
-## read proxy.txt for more info
-#proxy.server               = ( ".php" =>
-#                               ( "localhost" =>
-#                                 (
-#                                   "host" => "192.168.0.101",
-#                                   "port" => 80
-#                                 )
-#                               )
-#                             )
-
-#### fastcgi module
-## read fastcgi.txt for more info
-## php-fpm is now the preferred method of doing fast cgi with php.
-#fastcgi.server             = ( ".php" =>
-#                               ( "localhost" =>
-#                                 (
-#                                   "socket" => "/var/run/php-fpm.socket",
-#                                   "broken-scriptfilename" => "enable"
-#                                 )
-#                               )
-#                            )
-
-#### CGI module
-#cgi.assign                 = ( ".pl"  => "/usr/bin/perl",
-#                               ".cgi" => "/usr/bin/perl" )
-#
-
-#### SSL engine
-#ssl.engine                 = "enable"
-#ssl.pemfile                = "server.pem"
-
-#### status module
-#status.status-url          = "/server-status"
-#status.config-url          = "/server-config"
-
-#### auth module
-## read authentication.txt for more info
-#auth.backend               = "plain"
-#auth.backend.plain.userfile = "lighttpd.user"
-#auth.backend.plain.groupfile = "lighttpd.group"
-
-#auth.backend.ldap.hostname = "localhost"
-#auth.backend.ldap.base-dn  = "dc=my-domain,dc=com"
-#auth.backend.ldap.filter   = "(uid=$)"
-
-#auth.require               = ( "/server-status" =>
-#                               (
-#                                 "method"  => "digest",
-#                                 "realm"   => "download archiv",
-#                                 "require" => "user=jan"
-#                               ),
-#                               "/server-config" =>
-#                               (
-#                                 "method"  => "digest",
-#                                 "realm"   => "download archiv",
-#                                 "require" => "valid-user"
-#                               )
-#                             )
-
-#### url handling modules (rewrite, redirect, access)
-#url.rewrite                = ( "^/$"             => "/server-status" )
-#url.redirect               = ( "^/wishlist/(.+)" => "http://www.123.org/$1" )
-
-#### both rewrite/redirect support back reference to regex conditional using %n
-#$HTTP["host"] =~ "^www\.(.*)" {
-#  url.redirect            = ( "^/(.*)" => "http://%1/$1" )
-#}
-
-#
-# define a pattern for the host url finding
-# %% => % sign
-# %0 => domain name + tld
-# %1 => tld
-# %2 => domain name without tld
-# %3 => subdomain 1 name
-# %4 => subdomain 2 name
-#
-#evhost.path-pattern        = "/home/storage/dev/www/%3/htdocs/"
-
-#### expire module
-#expire.url                 = ( "/buggy/" => "access 2 hours", "/asdhas/" => "access plus 1 seconds 2 minutes")
-
-#### ssi
-#ssi.extension              = ( ".shtml" )
-
-#### rrdtool
-#rrdtool.binary             = "/usr/bin/rrdtool"
-#rrdtool.db-name            = "/var/www/lighttpd.rrd"
-
-#### setenv
-#setenv.add-request-header  = ( "TRAV_ENV" => "mysql://user@host/db" )
-#setenv.add-response-header = ( "X-Secret-Message" => "42" )
-
-## for mod_trigger_b4_dl
-# trigger-before-download.gdbm-filename = "/home/weigon/testbase/trigger.db"
-# trigger-before-download.memcache-hosts = ( "127.0.0.1:11211" )
-# trigger-before-download.trigger-url = "^/trigger/"
-# trigger-before-download.download-url = "^/download/"
-# trigger-before-download.deny-url = "http://127.0.0.1/index.html"
-# trigger-before-download.trigger-timeout = 10
-
-## for mod_cml
-## don't forget to add index.cml to server.indexfiles
-# cml.extension               = ".cml"
-# cml.memcache-hosts          = ( "127.0.0.1:11211" )
-
-#### variable usage:
-## variable name without "." is auto prefixed by "var." and becomes "var.bar"
-#bar = 1
-#var.mystring = "foo"
-
-## integer add
-#bar += 1
-## string concat, with integer cast as string, result: "www.foo1.com"
-#server.name = "www." + mystring + var.bar + ".com"
-## array merge
-#index-file.names = (foo + ".php") + index-file.names
-#index-file.names += (foo + ".php")
-
-#### include
-#include /etc/lighttpd/lighttpd-inc.conf
-## same as above if you run: "lighttpd -f /etc/lighttpd/lighttpd.conf"
-#include "lighttpd-inc.conf"
-
-#### include_shell
-#include_shell "echo var.a=1"
-## the above is same as:
-#var.a=1
-
-# include other config file fragments from lighttpd.d subdir
-include_shell "find /etc/lighttpd.d -maxdepth 1 -name '*.conf' -exec cat {} \;" 
diff --git a/recipes-extended/lighttpd/lighttpd/lighttpd.default b/recipes-extended/lighttpd/lighttpd/lighttpd.default
deleted file mode 100644
index 0f92640..0000000
--- a/recipes-extended/lighttpd/lighttpd/lighttpd.default
+++ /dev/null
@@ -1,2 +0,0 @@
-# set to "yes" or "no" to control starting on boot
-ENABLED="no"
diff --git a/recipes-extended/lighttpd/lighttpd/lighttpd.logrotate.conf b/recipes-extended/lighttpd/lighttpd/lighttpd.logrotate.conf
deleted file mode 100644
index c636942..0000000
--- a/recipes-extended/lighttpd/lighttpd/lighttpd.logrotate.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/lighttpd.error.log /var/log/lighttpd.access.log {
-    size 512k
-    rotate 4
-    compress
-    copytruncate
-    missingok
-}
diff --git a/recipes-extended/lighttpd/lighttpd_1.4.41.bbappend b/recipes-extended/lighttpd/lighttpd_1.4.41.bbappend
deleted file mode 100644
index d6d4f02..0000000
--- a/recipes-extended/lighttpd/lighttpd_1.4.41.bbappend
+++ /dev/null
@@ -1,21 +0,0 @@
-PR .= ".mlinux1"
-
-# build with openssl support
-DEPENDS += " openssl "
-RDEPENDS_${PN} += " openssl logrotate "
-
-EXTRA_OECONF += "--with-openssl"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://lighttpd.logrotate.conf \
-			file://lighttpd.default"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/logrotate.d
-	install -d ${D}${sysconfdir}/default
-	install -m 0644 ${WORKDIR}/lighttpd.logrotate.conf ${D}${sysconfdir}/logrotate.d/lighttpd.conf
-	install -m 0644 ${WORKDIR}/lighttpd.default ${D}${sysconfdir}/default/lighttpd
-}
-
-CONFFILES_${PN} += "${sysconfdir}/default/lighttpd ${sysconfdir}/logrotate.d/lighttpd.conf ${sysconfdir}/init.d/lighttpd"
diff --git a/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch b/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
deleted file mode 100644
index 2e931a2..0000000
--- a/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 68f29ab490cf987aa34b5f4caf1784b58a021308 Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Tue, 17 Feb 2015 21:08:07 -0800
-Subject: [PATCH] Act as the "mv" command when rotate log
-
-Act as the "mv" command when rotate log, first rename, if failed, then
-read and write.
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- logrotate.c |   71 +++++++++++++++++++++++++++++++++++++++++++++++++----------
- 1 file changed, 59 insertions(+), 12 deletions(-)
-
-diff --git a/logrotate.c b/logrotate.c
-index d3deb6a..cf8bf2c 100644
---- a/logrotate.c
-+++ b/logrotate.c
-@@ -1157,6 +1157,53 @@ int findNeedRotating(struct logInfo *log, int logNum, int force)
-     return 0;
- }
- 
-+/* Act as the "mv" command, if rename failed, then read the old file and
-+ * write to new file. The function which invokes the mvFile will use
-+ * the strerror(errorno) to handle the error message, so we don't have
-+ * to print the error message here */
-+
-+int mvFile (char *oldName, char *newName, struct logInfo *log, acl_type acl)
-+{
-+    struct stat sbprev;
-+    int fd_old, fd_new, n;
-+    char buf[BUFSIZ];
-+
-+    /* Do the rename first */
-+    if (!rename(oldName, newName))
-+        return 0;
-+
-+    /* If the errno is EXDEV, then read old file, write newfile and
-+     * remove the oldfile */
-+    if (errno == EXDEV) {
-+        /* Open the old file to read */
-+        if ((fd_old = open(oldName, O_RDONLY)) < 0)
-+            return 1;
-+
-+        /* Create the file to write, keep the same attribute as the old file */
-+        if (stat(oldName, &sbprev))
-+            return 1;
-+        else {
-+            if ((fd_new = createOutputFile(newName,
-+                O_WRONLY | O_CREAT | O_TRUNC, &sbprev, acl, 0)) < 0 )
-+                return 1;
-+        }
-+
-+        /* Read and write */
-+        while ((n = read(fd_old, buf, BUFSIZ)) > 0)
-+            if (write(fd_new, buf, n) != n)
-+                return 1;
-+
-+        if ((close(fd_old) < 0) ||
-+            removeLogFile(oldName, log) ||
-+            (close(fd_new) < 0))
-+            return 1;
-+
-+        return 0;
-+    }
-+
-+    return 1;
-+}
-+
- int prerotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
- 		       struct logNames *rotNames)
- {
-@@ -1523,15 +1570,15 @@ int prerotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
- 		}
- 
- 	    message(MESS_DEBUG,
--		    "renaming %s to %s (rotatecount %d, logstart %d, i %d), \n",
-+		    "moving %s to %s (rotatecount %d, logstart %d, i %d), \n",
- 		    oldName, newName, rotateCount, logStart, i);
- 
--	    if (!debug && rename(oldName, newName)) {
-+	    if (!debug && mvFile(oldName, newName, log, prev_acl)) {
- 		if (errno == ENOENT) {
- 		    message(MESS_DEBUG, "old log %s does not exist\n",
- 			    oldName);
- 		} else {
--		    message(MESS_ERROR, "error renaming %s to %s: %s\n",
-+		    message(MESS_ERROR, "error moving %s to %s: %s\n",
- 			    oldName, newName, strerror(errno));
- 		    hasErrors = 1;
- 		}
-@@ -1669,21 +1716,21 @@ int rotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
- 				return 1;
- 			}
- 
--			message(MESS_DEBUG, "renaming %s to %s\n", log->files[logNum],
-+			message(MESS_DEBUG, "moving %s to %s\n", log->files[logNum],
- 				tmpFilename);
--			if (!debug && !hasErrors && rename(log->files[logNum], tmpFilename)) {
--			message(MESS_ERROR, "failed to rename %s to %s: %s\n",
-+			if (!debug && !hasErrors && mvFile(log->files[logNum], rotNames->finalName, log, prev_acl)) {
-+			message(MESS_ERROR, "failed to move %s to %s: %s\n",
- 				log->files[logNum], tmpFilename,
- 				strerror(errno));
- 				hasErrors = 1;
- 			}
- 		}
- 		else {
--			message(MESS_DEBUG, "renaming %s to %s\n", log->files[logNum],
-+			message(MESS_DEBUG, "moving %s to %s\n", log->files[logNum],
- 				rotNames->finalName);
- 			if (!debug && !hasErrors &&
--			rename(log->files[logNum], rotNames->finalName)) {
--				message(MESS_ERROR, "failed to rename %s to %s: %s\n",
-+			mvFile(log->files[logNum], rotNames->finalName, log, prev_acl)) {
-+				message(MESS_ERROR, "failed to move %s to %s: %s\n",
- 					log->files[logNum], tmpFilename,
- 					strerror(errno));
- 					hasErrors = 1;
-@@ -2063,7 +2110,7 @@ int rotateLogSet(struct logInfo *log, int force)
-     return hasErrors;
- }
- 
--static int writeState(char *stateFilename)
-+static int writeState(struct logInfo *log, char *stateFilename)
- {
- 	struct logState *p;
- 	FILE *f;
-@@ -2227,7 +2274,7 @@ static int writeState(char *stateFilename)
- 		fclose(f);
- 
- 	if (error == 0) {
--		if (rename(tmpFilename, stateFilename)) {
-+		if (mvFile(tmpFilename, stateFilename, log, prev_acl)) {
- 			unlink(tmpFilename);
- 			error = 1;
- 			message(MESS_ERROR, "error renaming temp state file %s\n",
-@@ -2525,7 +2572,7 @@ int main(int argc, const char **argv)
- 		rc |= rotateLogSet(log, force);
- 
- 	if (!debug)
--		rc |= writeState(stateFile);
-+		rc |= writeState(log, stateFile);
- 
- 	return (rc != 0);
- }
diff --git a/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch b/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
deleted file mode 100644
index 793d702..0000000
--- a/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Disable the check for different filesystems
-
-The logrotate supports rotate log across different filesystems now, so
-disable the check for different filesystems.
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- config.c |    9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/config.c b/config.c
-index dbbf563..64e66f6 100644
---- a/config.c
-+++ b/config.c
-@@ -1493,15 +1493,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
- 							goto error;
- 						}
- 					}
--
--					if (sb.st_dev != sb2.st_dev
--						&& !(newlog->flags & (LOG_FLAG_COPYTRUNCATE | LOG_FLAG_COPY | LOG_FLAG_TMPFILENAME))) {
--						message(MESS_ERROR,
--							"%s:%d olddir %s and log file %s "
--							"are on different devices\n", configFile,
--							lineNum, newlog->oldDir, newlog->files[i]);
--						goto error;
--					}
- 				}
- 			}
- 
diff --git a/recipes-extended/logrotate/logrotate/logrotate.conf b/recipes-extended/logrotate/logrotate/logrotate.conf
deleted file mode 100644
index 353d9d0..0000000
--- a/recipes-extended/logrotate/logrotate/logrotate.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-# see "man logrotate" for details
-# rotate log files weekly
-weekly
-
-# keep 4 weeks worth of backlogs
-rotate 4
-
-# create new (empty) log files after rotating old ones
-create
-
-# do not use date as a suffix of the rotated file
-# this seems to prevent multiple rotations of logs per day
-nodateext
-
-# uncomment this if you want your log files compressed
-#compress
-
-# RPM packages drop log rotation information into this directory
-include /etc/logrotate.d
-
-# no packages own wtmp and btmp -- we'll rotate them here
-/var/log/wtmp {
-    monthly
-    create 0664 root utmp
-	minsize 1M
-    rotate 1
-}
-
-/var/log/btmp {
-    missingok
-    monthly
-    create 0600 root utmp
-    rotate 1
-}
-
-# system-specific logs may be also be configured here.
diff --git a/recipes-extended/logrotate/logrotate/update-the-manual.patch b/recipes-extended/logrotate/logrotate/update-the-manual.patch
deleted file mode 100644
index 50d037d..0000000
--- a/recipes-extended/logrotate/logrotate/update-the-manual.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e0b0fe30e9c49234994a20a86aacfaf80e690087 Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Tue, 17 Feb 2015 21:14:37 -0800
-Subject: [PATCH] Update the manual
-
-Update the manual for rotating on different filesystems.
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- logrotate.8 |   10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/logrotate.8 b/logrotate.8
-index e4e5f48..84407d0 100644
---- a/logrotate.8
-+++ b/logrotate.8
-@@ -405,12 +405,10 @@ Do not rotate the log if it is empty (this overrides the \fBifempty\fR option).
- 
- .TP
- \fBolddir \fIdirectory\fR
--Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR must be
--on the same physical device as the log file being rotated, unless \fBcopy\fR,
--\fBcopytruncate\fR or \fBrenamecopy\fR option is used. The \fIdirectory\fR
--is assumed to be relative to the directory holding the log file
--unless an absolute path name is specified. When this option is used all
--old versions of the log end up in \fIdirectory\fR.  This option may be
-+Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR
-+is assumed to be relative to the directory holding the log file unless
-+an absolute path name is specified. When this option is used all old
-+versions of the log end up in \fIdirectory\fR. This option may be
- overridden by the \fBnoolddir\fR option.
- 
- .TP
--- 
-1.7.9.5
-
diff --git a/recipes-extended/logrotate/logrotate_%.bbappend b/recipes-extended/logrotate/logrotate_%.bbappend
deleted file mode 100644
index c8adb80..0000000
--- a/recipes-extended/logrotate/logrotate_%.bbappend
+++ /dev/null
@@ -1,20 +0,0 @@
-PR .= ".mlinux2"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI[md5sum] = "8572b7c2cf9ade09a8a8e10098500fb3"
-SRC_URI[sha256sum] = "5bf8e478c428e7744fefa465118f8296e7e771c981fb6dffb7527856a0ea3617"
-
-
-SRC_URI += "file://logrotate.conf"
-
-# consider Systemd here someday.  Also prevent logrotate from starting if it is already running
-# use startdaemon?
-do_install_append() {
-	# setup cron to run logrotate more often
-	rm -f ${D}${sysconfdir}/cron.daily/logrotate
-	install -d ${D}${sysconfdir}/cron.d
-	echo "*/5 * * * * root /usr/sbin/logrotate /etc/logrotate.conf" > ${D}${sysconfdir}/cron.d/logrotate
-
-	install -m 0644 ${WORKDIR}/logrotate.conf ${D}${sysconfdir}/
-}
-
diff --git a/recipes-extended/logrotate/logrotate_3.9.1-mlinux1.bb b/recipes-extended/logrotate/logrotate_3.9.1-mlinux1.bb
deleted file mode 100644
index ef26ce4..0000000
--- a/recipes-extended/logrotate/logrotate_3.9.1-mlinux1.bb
+++ /dev/null
@@ -1,73 +0,0 @@
-SUMMARY = "Rotates, compresses, removes and mails system log files"
-SECTION = "console/utils"
-HOMEPAGE = "https://github.com/logrotate/logrotate/issues"
-LICENSE = "GPLv2"
-
-# TODO: logrotate 3.8.8 adds autotools/automake support, update recipe to use it.
-# TODO: Document coreutils dependency. Why not RDEPENDS? Why not busybox?
-
-DEPENDS="coreutils popt"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
-
-# When updating logrotate to latest upstream, SRC_URI should point to
-# a proper release tarball from https://github.com/logrotate/logrotate/releases
-# and we have to take the snapshot for now because there is no such
-# tarball available for 3.9.1.
-
-S = "${WORKDIR}/${BPN}-r3-9-1"
-
-UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
-
-SRC_URI = "https://github.com/${BPN}/${BPN}/archive/r3-9-1.tar.gz;downloadfilename=${BP}.tar.gz\
-           file://act-as-mv-when-rotate.patch \
-           file://update-the-manual.patch \
-           file://disable-check-different-filesystems.patch \
-           "
-
-SRC_URI[md5sum] = "8572b7c2cf9ade09a8a8e10098500fb3"
-SRC_URI[sha256sum] = "5bf8e478c428e7744fefa465118f8296e7e771c981fb6dffb7527856a0ea3617"
-
-# PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)}"
-PACKAGECONFIG ?= "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
-"
-
-PACKAGECONFIG[acl] = ",,acl"
-PACKAGECONFIG[selinux] = ",,libselinux"
-
-CONFFILES_${PN} += "${localstatedir}/lib/logrotate.status \
-		    ${sysconfdir}/logrotate.conf"
-
-# If RPM_OPT_FLAGS is unset, it adds -g itself rather than obeying our
-# optimization variables, so use it rather than EXTRA_CFLAGS.
-EXTRA_OEMAKE = "\
-    LFS= \
-    OS_NAME='${OS_NAME}' \
-    'CC=${CC}' \
-    'RPM_OPT_FLAGS=${CFLAGS}' \
-    'EXTRA_LDFLAGS=${LDFLAGS}' \
-    ${@bb.utils.contains('PACKAGECONFIG', 'acl', 'WITH_ACL=yes', '', d)} \
-    ${@bb.utils.contains('PACKAGECONFIG', 'selinux', 'WITH_SELINUX=yes', '', d)} \
-"
-
-# OS_NAME in the makefile defaults to `uname -s`. The behavior for
-# freebsd/netbsd is questionable, so leave it as Linux, which only sets
-# INSTALL=install and BASEDIR=/usr.
-OS_NAME = "Linux"
-
-do_compile_prepend() {
-    # Make sure the recompile is OK
-    rm -f ${B}/.depend
-}
-
-do_install(){
-    oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir}
-    mkdir -p ${D}${sysconfdir}/logrotate.d
-    mkdir -p ${D}${sysconfdir}/cron.daily
-    mkdir -p ${D}${localstatedir}/lib
-    install -p -m 644 examples/logrotate-default ${D}${sysconfdir}/logrotate.conf
-    install -p -m 755 examples/logrotate.cron ${D}${sysconfdir}/cron.daily/logrotate
-    touch ${D}${localstatedir}/lib/logrotate.status
-}
diff --git a/recipes-extended/mii-diag/mii-diag-2.11/libmii.c b/recipes-extended/mii-diag/mii-diag-2.11/libmii.c
deleted file mode 100644
index 96f0060..0000000
--- a/recipes-extended/mii-diag/mii-diag-2.11/libmii.c
+++ /dev/null
@@ -1,630 +0,0 @@
-/* libmii.c: MII diagnostic and setup library.
-
-	Copyright 1997-2003 by Donald Becker.
-	This version released under the Gnu General Public License,
-	incorporated herein by reference.
-	This source code may be distributed without modification using the
-	existing notice.  Any modification to this source code must include a
-	full notice as described in the GPL
-	Contact the author for use under other terms.
-
-	The author may be reached as becker@scyld.com, or C/O
-	 Scyld Computing Corporation
-	 914 Bay Ridge Road, Suite 220
-	 Annapolis MD 21403
-
-   References
-	http://www.scyld.com/expert/NWay.html
-	http://www.national.com/pf/DP/DP83840A.html
-*/
-
-static const char version_msg[] =
-"libmii.c:v2.11 2/28/2005  Donald Becker (becker@scyld.com)\n"
-" http://www.scyld.com/diag/index.html\n";
-
-/* This library exports the following functions:
-    IOADDR: A token passed to the mdio_read() function.
-    PHY_ID: The MII transceiver address, passed uninterpreted to mdio_read().
-*/
-void show_mii_details(long ioaddr, int phy_id);
-int monitor_mii(long ioaddr, int phy_id);
-
-/* This library expects to be able to call the following functions: */
-extern int mdio_read(long ioaddr, int phy_id, int mii_reg_num);
-
-#include <unistd.h>
-#include <stdio.h>
-#include <time.h>
-#include <sys/time.h>
-
-#include <sys/types.h>
-typedef u_int32_t u32;
-typedef u_int16_t u16;
-typedef u_int8_t u8;
-
-static const char *media_names[] = {
-	"10baseT", "10baseT-FD", "100baseTx", "100baseTx-FD", "100baseT4",
-	"Flow-control", 0,
-};
-
-static void ns83843(long ioaddr, int phy_id);
-static void qs6612(long ioaddr, int phy_id);
-static void smsc83c180(long ioaddr, int phy_id);
-static void tdk78q2120(long ioaddr, int phy_id);
-static void davicom_dm9101(long ioaddr, int phy_id);
-static void intel_i553(long ioaddr, int phy_id);
-static void enablesemi(long ioaddr, int phy_id);
-static void amd_pna(long ioaddr, int phy_id);
-static void amd_tx(long ioaddr, int phy_id);
-static void admtek(long ioaddr, int phy_id);
-static void lu3x31(long ioaddr, int phy_id);
-static void myson981(long ioaddr, int phy_id);
-static void via_tahoe(long ioaddr, int phy_id);
-static void via_vt6103(long ioaddr, int phy_id);
-static void via_vt6105(long ioaddr, int phy_id);
-static void intel(long ioaddr, int phy_id);
-
-struct mii_partnum {
-	const char *vendor;				/* Vendor name. */
-	u16	 phy_id0;				/* Vendor ID (alternate ver. of ieee_oui[]) */
-	u16	 phy_id1;				/* Vendor ID (alternate ver. of ieee_oui[]) */
-	unsigned char ieee_oui[3];	/* IEEE-assigned organizationally unique ID */
-	char flags;
-	void (*(func))(long xcvr_if, int phy_id);/* Function to emit more info. */
-} static oui_map[] = {
-	{"Unknown transceiver type", 0x0000, 0x0000, {0,}, 0, NULL,},
-	{"National Semiconductor 83840A", 0x2000, 0x5c01, {0,}, 0, NULL,},
-	{"National Semiconductor 83843",  0x2000, 0x5c10, {0,}, 0, ns83843, },
-	{"Level One LXT970", 0x7810, 0x0000, {0,}, 0, NULL, },
-	{"Level One LXT971", 0x7810, 0x0001, {0,}, 0, NULL, },
-	{"Level One LXT971A",0x7810, 0x0003, {0,}, 0, NULL, },
-	{"Level One (unknown type)", 0, 0, {0x1e,0x04,0x00}, 0, NULL, },
-	{"Davicom DM9101", 0x0181, 0xB800, {0,}, 0, davicom_dm9101, },
-	{"Davicom (unknown type)", 0, 0, {0x00, 0x60, 0x6e}, 0, davicom_dm9101, },
-	{"Quality Semiconductor QS6612", 0x0181, 0x4410, {0,}, 0, qs6612},
-	{"Quality Semiconductor (unknown type)", 0,0, {0x00, 0x60, 0x51}, 0, NULL},
-	{"SMSC 83c180", 0x0282, 0x1C51, {0}, 0, smsc83c180, },
-	{"TDK Semi 78Q2120 rev. 2", 0x0300, 0xE542, {0,}, 0, tdk78q2120, },
-	{"TDK Semi 78Q2120 rev. 3", 0x0300, 0xE543, {0,}, 0, tdk78q2120, },
-	{"TDK Semi 78Q2120 rev. 11", 0x0300, 0xE54B, {0,}, 0, tdk78q2120, },
-	{"TDK transceiver (unknown type)", 0,0, {0x00, 0xc0, 0x39}, 0, tdk78q2120},
-	{"Intel (unknown type)", 0,0, {0x00, 0xf8, 0x00}, 0, intel_i553},
-	{"Enable Semiconductor EL40-331", 0x0043, 0x7411, {0,}, 0, enablesemi},
-	{"AMD 79c901A.1 HomePNA", 0x0000, 0x6B91, {0,}, 0, amd_pna},
-	{"AMD 79c901A.2 HomePNA", 0x0000, 0x6B92, {0,}, 0, amd_pna},
-	{"AMD 79c901A.3 HomePNA", 0x0000, 0x6B93, {0,}, 0, amd_pna},
-	{"AMD 79c901A.3 10baseT", 0x0000, 0x6B71, {0,}, 0, amd_tx},
-	{"AdHoc Technology AH101LF", 0x0022, 0x561B, {0,}, 0, tdk78q2120},
-	{"Altimata Communications AC101LF", 0x0022, 0x5523, {0,}, 0, tdk78q2120},
-	{"Altimata Comm (unknown type)", 0, 0, {0x00,0x10,0xA9}, 0, tdk78q2120},
-	{"ASIX (unknown type)", 0, 0, {0x00,0xC0,0xB4}, 0, tdk78q2120},
-	{"ADMtek AN983 Comet", 0x0022, 0x5410, {0,}, 0, admtek},
-	{"ADMtek AN985 Comet", 0x0022, 0x5513, {0,}, 0, admtek},
-	{"ADMtek (unknown type)", 0, 0, {0x00,0xe0,0x92}, 0, admtek},
-	{"Lucent LU6612", 0x0180, 0x7641, {0,}, 0, qs6612},
-	{"Lucent LU3X31", 0x0043, 0x7411, {0,}, 0, lu3x31},
-	{"LSI Logic (Seeq) 80225", 0, 0, {0x00,0xA0,0x7D}, 0, NULL},
-	{"Myson MTD981", 0x0302, 0xD000, {0,}, 0, myson981},
-	{"Myson (unknown type)", 0, 0, {0x00,0xC0,0xB4,}, 0, myson981},
-	{"Alta/Kendin Sundance", 0x0022, 0x1720, {0,}, 0, NULL},
-	{"Alta/Kendin Sundance", 0, 0, {0x00,0x08,0x85}, 0, NULL},
-	{"VIA Tahoe VT6103", 0x0101, 0x8f20, {0,}, 0, via_vt6103},
-	{"VIA Tahoe VT6104", 0x0101, 0x8f30, {0,}, 0, via_tahoe},
-	{"VIA Rhine VT6105", 0x0101, 0x8f22, {0,}, 0, via_vt6105},
-	{"Intel 82557 series", 0x02a8, 0x0150, {0,}, 0, intel},
-	{"Intel 82555 rev 1", 0x02a8, 0x0151, {0,}, 0, intel},
-	{"Intel 82559 transceiver", 0x02a8, 0x0154, {0,}, 0, intel},
-	{"Intel 82555 series transceiver", 0,0, {0x00,0xaa,0x00}, 0, intel},
-	{0, },
-};
-
-static u16 mii_val[32];
-
-void show_mii_details(long ioaddr, int phy_id)
-{
-	int mii_reg, i, vendor = 0;
-	u16 bmcr, bmsr, new_bmsr;
-
-	/* This may not be omitted from the output. */
-	printf("%s", version_msg);
-	printf(" MII PHY #%d transceiver registers:", phy_id);
-	for (mii_reg = 0; mii_reg < 32; mii_reg++) {
-		mii_val[mii_reg] = mdio_read(ioaddr, phy_id, mii_reg);
-		printf("%s %4.4x", (mii_reg % 8) == 0 ? "\n  " : "",
-			   mii_val[mii_reg]);
-	}
-	printf(".\n");
-	if (mii_val[0] == 0xffff) {
-		printf("  No MII transceiver present!.\n");
-		return;
-	}
-	bmcr = mii_val[0];
-	bmsr = mii_val[1];
-	printf(" Basic mode control register 0x%4.4x:", bmcr);
-	if (bmcr & 0x1000)
-		printf(" Auto-negotiation enabled.\n");
-	else
-		printf(" Auto-negotiation disabled!\n"
-			   "   Speed fixed at 10%s mbps, %s-duplex.\n",
-			   bmcr & 0x2000 ? "0" : "",
-			   bmcr & 0x0100 ? "full":"half");
-	if (bmcr & 0x8000)
-		printf("  Transceiver currently being reset!\n");
-	if (bmcr & 0x4000)
-		printf("  Transceiver in loopback mode!\n");
-	if (bmcr & 0x0800)
-		printf("  Transceiver powered down!\n");
-	if (bmcr & 0x0400)
-		printf("  Transceiver isolated from the MII!\n");
-	if (bmcr & 0x0200)
-		printf("  Restarted auto-negotiation in progress!\n");
-	if (bmcr & 0x0080)
-		printf("  Internal Collision-Test enabled!\n");
-	
-	new_bmsr = mdio_read(ioaddr, phy_id, 1);
-	printf(" Basic mode status register 0x%4.4x ... %4.4x.\n"
-		   "   Link status: %sestablished.\n"
-		   "   Capable of ",
-		   bmsr, new_bmsr,
-		   bmsr & 0x0004 ? "" :
-		    (new_bmsr & 0x0004) ? "previously broken, but now re" : "not ");
-	if (bmsr & 0xF800) {
-		for (i = 15; i >= 11; i--)
-			if (bmsr & (1<<i))
-				printf(" %s", media_names[i-11]);
-	} else
-		printf("<Warning! No media capabilities>");
-
-	printf(".\n"
-		   "   %s to perform Auto-negotiation, negotiation %scomplete.\n",
-		   bmsr & 0x0008 ? "Able" : "Unable",
-		   bmsr & 0x0020 ? "" : "not ");
-
-	if (bmsr & 0x0010)
-		printf(" Remote fault detected!\n");
-	if (bmsr & 0x0002)
-		printf("   *** Link Jabber! ***\n");
-
-	if (mii_val[2] ^ mii_val[3]) { 		/* Eliminate 0x0000 and 0xffff IDs. */
-		unsigned char oui_0 = mii_val[2] >> 10;
-		unsigned char oui_1 = mii_val[2] >> 2;
-		unsigned char oui_2 = (mii_val[2] << 6) | (mii_val[3] >> 10);
-
-		printf(" Vendor ID is %2.2x:%2.2x:%2.2x:--:--:--, model %d rev. %d.\n",
-			   oui_0, oui_1, oui_2,
-			   ((mii_val[3] >> 4) & 0x3f), mii_val[3] & 0x0f);
-		for ( i = 0; oui_map[i].vendor; i++)
-			/* We match either the Phy ID or the IEEE OUI. */
-			if ((oui_map[i].phy_id0 == mii_val[2] &&
-				 oui_map[i].phy_id1 == mii_val[3]) ||
-				(oui_map[i].ieee_oui[0] == oui_0 &&
-				 oui_map[i].ieee_oui[1] == oui_1 &&
-				 oui_map[i].ieee_oui[2] == oui_2)) {
-				printf("   Vendor/Part: %s.\n", oui_map[i].vendor);
-				vendor = i;
-				break;
-			}
-		if (oui_map[i].vendor == NULL)
-			printf("   No specific information is known about this transceiver"
-				   " type.\n");
-	} else
-		printf(" This transceiver has no vendor identification.\n");
-
-	{
-		int nway_advert = mii_val[4];
-		int lkpar = mii_val[5];
-		printf(" I'm advertising %4.4x:", nway_advert);
-		for (i = 10; i >= 5; i--)
-			if (nway_advert & (1<<i))
-				printf(" %s", media_names[i-5]);
-		printf("\n   Advertising %sadditional info pages.\n",
-			   nway_advert & 0x8000 ? "" : "no ");
-		if ((nway_advert & 31) == 1)
-			printf("   IEEE 802.3 CSMA/CD protocol.\n");
-		else
-			printf("   Using an unknown (non 802.3) encapsulation.\n");
-		printf(" Link partner capability is %4.4x:",
-			   lkpar);
-		for (i = 10; i >= 5; i--)
-			if (lkpar & (1<<i))
-				printf(" %s", media_names[i-5]);
-		printf(".\n   Negotiation %s.\n",
-			   lkpar & 0x4000 ? " completed" : "did not complete");
-	}
-	if (oui_map[vendor].func)
-		oui_map[vendor].func(ioaddr, phy_id);
-
-}
-
-int monitor_mii(long ioaddr, int phy_id)
-{
-	int i, last_event = 0;
-	unsigned short new_1, baseline_1 = mdio_read(ioaddr, phy_id, 1);
-	struct timeval tv, sleepval;
-	time_t cur_time;
-	char timebuf[12];
-
-	if (baseline_1 == 0xffff) {
-		fprintf(stderr, "No MII transceiver present to monitor.\n");
-		return -1;
-	}
-
-	gettimeofday(&tv, NULL);
-	cur_time = tv.tv_sec;
-	strftime(timebuf, sizeof(timebuf), "%H:%M:%S", localtime(&cur_time));
-
-	printf("Monitoring the MII transceiver status.\n"
-		   "%s.%03d  Baseline value of MII BMSR (basic mode status register)"
-		   " is %4.4x.\n", timebuf, (int)tv.tv_usec/1000, baseline_1);
-	while (1) {
-		new_1 = mdio_read(ioaddr, phy_id, 1);
-		if (new_1 == 0xffff) {
-			fprintf(stderr, "The MII transceiver is no longer accessable!\n");
-			return -1;
-		}
-		if (new_1 != baseline_1) {
-			gettimeofday(&tv, NULL);
-			cur_time = tv.tv_sec;
-			strftime(timebuf, sizeof(timebuf), "%H:%M:%S",
-					 localtime(&cur_time));
-			printf("%s.%03d  MII BMSR now %4.4x: %4s link, NWay %s, "
-				   "%3sJabber%s (%4.4x).\n",
-				   timebuf, (int)tv.tv_usec/1000, new_1,
-				   new_1 & 0x04 ? "Good" : "no",
-				   new_1 & 0x20 ? "done" : "busy",
-				   new_1 & 0x02 ? "" : "No ",
-				   new_1 & 0x10 ? ", remote fault" : "",
-				   mdio_read(ioaddr, phy_id, 5)
-				   );
-			if (!(baseline_1 & 0x20)  && (new_1 & 0x20)) {
-				int lkpar = mdio_read(ioaddr, phy_id, 5);
-				printf("   New link partner capability is %4.4x %4.4x:",
-					   lkpar, mdio_read(ioaddr, phy_id, 6));
-				switch (lkpar) {
-				case 0x45e1: printf(" 10/100 switch w/ flow control"); break;
-				case 0x41e1: printf(" 10/100 HD+FD switch"); break;
-				case 0x40a1: printf(" 10/100 bridged repeater"); break;
-				case 0x4081: printf(" 100baseTx repeater w/autonegotation");
-					break;
-				case 0x0081: printf(" 100baseTx (no autonegotation)"); break;
-				case 0x4021: printf(" 10baseT repeater w/autonegotation");
-					break;
-				case 0x0021: printf(" 10baseT (no autonegotation)"); break;
-				default:
-					for (i = 9; i >= 5; i--)
-						if (lkpar & (1<<i))
-							printf(" %s", media_names[i-5]);
-				}
-				printf(".\n");
-			}
-			fflush(stdout);
-			baseline_1 = new_1;
-			last_event = 0;
-		}
-		sleepval.tv_sec = 0;
-		sleepval.tv_usec = last_event++ > 30 ? 200000 : 1000;
-		select(0, 0, 0, 0, &sleepval);			/* Or just sleep(1); */
-	}
-	printf("  Value of MII BMSR (basic mode status register) is %4.4x.\n",
-		   mdio_read(ioaddr, phy_id, 1));
-	return 0;
-}
-
-/* Emit transceiver-specific info. */
-
-struct msg_tbl { int bitmask;  char *msg; };
-
-static void msg_if_set(const int val, const struct msg_tbl msg_tbl[])
-{
-	int i;
-	for (i = 0; msg_tbl[i].bitmask; i++)
-		if (msg_tbl[i].bitmask & val)
-			printf(" %s\n", msg_tbl[i].msg);
-}
-
-static void msg_if_set_fmt(const int val, const struct msg_tbl msg_tbl[],
-						   const char *fmt)
-{
-	int i;
-	for (i = 0; msg_tbl[i].bitmask; i++)
-		if (msg_tbl[i].bitmask & val)
-			printf(fmt, msg_tbl[i].msg);
-}
-
-static void qs6612(long ioaddr, int phy_id)
-{
-	printf("  QS6612 extra registers: Mode %4.4x.\n"
-		   "    Interrupt source %4.4x, mask %4.4x.\n"
-		   "    PHY control %4.4x.\n",
-		   mii_val[17], mii_val[29], mii_val[30], mii_val[31]);
-	return;
-}
-
-static void ns83843(long ioaddr, int phy_id)
-{
-	printf("  NatSemi 83843 extra registers:\n"
-		   "    PHY status %4.4x\n"
-		   "    %s link, %d Mb/sec %s duplex\n"
-		   "    MII interrupts %sabled, %s pending.\n"
-		   "    Events since last read\n"
-		   "     Link disconnects %d\n"
-		   "     False carriers %d\n"
-		   "     Receive errors %d\n"
-		   "    Link beat is currently %sstable\n",
-		   mii_val[0x10],
-		   mii_val[10] & 0x0001 ? "Valid" : "Invalid",
-		   mii_val[10] & 0x0002 ? 10 : 100, 
-		   mii_val[10] & 0x0004 ? "full" : "half", 
-		   mii_val[0x11] & 0x0002 ? "en":"dis",
-		   mii_val[0x10] & 0x0100 ? "interrupt": "none",
-		   mii_val[0x13], mii_val[0x14], mii_val[0x15],
-		   mii_val[0x16] & 0x0010 ? "UN" : "");
-	return;
-}
-static void smsc83c180(long ioaddr, int phy_id)
-{
-	int mii_reg25 = mii_val[25];
-	printf("  SMSC 83c180 extra registers:\n"
-		   "    Auto-negotiation status 0x%4.4x.\n"
-		   "      10baseT polarity is %s.\n"
-		   "      PHY address is %d.\n"
-		   "      Auto-negotiation %scomplete, 1%s0Mbps %s duplex.\n"
-		   "    Rx symbol errors since last read %d.\n",
-		   mii_reg25,
-		   mii_reg25 & 0x2000 ? "normal" : "reversed",
-		   (mii_reg25>>8) & 0x1F,
-		   mii_reg25 & 0x0080 ? "did not " : "",
-		   mii_reg25 & 0x0020 ? "0" : "",
-		   mii_reg25 & 0x0040 ? "full" : "half",
-		   mdio_read(ioaddr, phy_id, 26));
-	return;
-}
-
-static const char *tdk_events[8] = {
-	"Jabber", "Rx error", "Negotiation page received", "Link detection fault",
-	"Link partner acknowledge", "Link status change", "Remote partner fault",
-	"Auto-Negotiation complete"};
-
-static const struct msg_tbl tdk_reg16[] = {
-	{0x8000, " Transceiver is in repeater mode!"},
-	{0x4000, " Interrupt pin set to active high."},
-	{0x2000, " Reserved bit 12 is unexpectedly set."},
-	{0x1000, " Transmit pins are internally disconnected."},
-	{0x0800, " 10baseT signal quality test is disabled."},
-	{0x0400, " 10baseT loopback mode."},
-	{0, 0},
-};
-
-static void tdk78q2120(long ioaddr, int phy_id)
-{
-	int mii_reg16 = mii_val[16];
-	int mii_reg17 = mii_val[17];
-	int mii_reg18 = mii_val[18];
-	int i;
-	printf("  TDK format vendor-specific registers 16..18 are "
-		   "0x%4.4x 0x%4.4x 0x%4.4x\n", mii_reg16, mii_reg17, mii_reg18);
-	printf("      Link polarity is %s %s.\n"
-		   "%s%s"
-		   "      Auto-negotiation %s, 1%s0Mbps %s duplex.\n"
-		   "      Rx link in %s state, PLL %s.\n",
-		   mii_reg16 & 0x0020 ? "OVERRIDDEN to" : "detected as",
-		   mii_reg16 & 0x0010 ? "reversed" : "normal",
-		   mii_reg16 & 0x0002 ?
-		   "     100baseTx Coding and scrambling is disabled!\n":"",
-		   mii_reg16 & 0x0001 ? "     Rx_CLK power-save mode is enabled!\n":"",
-		   mii_reg18 & 0x1000 ? "had no common media" : "complete",
-		   mii_reg18 & 0x0400 ? "0" : "",
-		   mii_reg18 & 0x0800 ? "full" : "half",
-		   mii_reg18 & 0x0200 ? "pass" : "fail",
-		   mii_reg18 & 0x0100 ? "slipped since last read" : "locked");
-
-	msg_if_set(mii_reg16, tdk_reg16);
-	if (mii_reg17 & 0x00ff) {
-		printf("      Events since last read:");
-		for (i = 0; i < 8; i++)
-			if (mii_reg17 & (1 << i))
-				printf("  %s", tdk_events[i]);
-	} else
-		printf("      No new link status events.");
-
-	if (mii_reg17 & 0xff00) {
-		printf("\n      Events that will raise an interrupt:");
-		for (i = 0; i < 8; i++)
-			if (mii_reg17 & (0x100 << i))
-				printf("  %s", tdk_events[i]);
-	}
-	printf("\n");
-	return;
-}
-
-static void davicom_dm9101(long ioaddr, int phy_id)
-{
-	printf("  Davicom vendor specific registers: 0x%4.4x 0x%4.4x 0x%4.4x.\n",
-		   mii_val[16], mii_val[17], mii_val[18]);
-}
-static void intel_i553(long ioaddr, int phy_id)
-{
-	printf("  This transceiver is 100baseT4 only!  Register 16 is %4.4x.\n",
-		   mii_val[16]);
-}
-/* http://www.enablesemi.com/cgi-bin/byteserve/Products/Docs/3VCardBus.pdf */
-static void enablesemi(long ioaddr, int phy_id)
-{
-	printf("  Isolated %d times, %d false carrier events, %d Rx errors.\n",
-		   mii_val[18], mii_val[19], mii_val[21]);
-	printf("  Cable polarity is %s, 100Mb PLL is %slocked.\n",
-		   mii_val[28]&0x8000 ? "reversed" : "normal",
-		   mii_val[27]&0x2000 ? "" : "un");
-}
-/* The amd79c901 contains both PNA and 10/100 management registers.
-   http://www.amd.com/products/npd/techdocs/22304.pdf
-*/
-static void amd_pna(long ioaddr, int phy_id)
-{
-	printf("  HomePNA transceiver in %s speed, %s power mode.\n",
-		   mii_val[16] & 4 ? "high" : "low",
-		   mii_val[16] & 2 ? "high" : "low");
-	printf("  HomePNA noise level %d, peak power %d..\n",
-		   mii_val[25] >> 8, mii_val[25] & 0xff);
-}
-static void amd_tx(long ioaddr, int phy_id)
-{
-	int mii_reg25 = mii_val[25];
-	printf("  AMD vendor specific registers: 0x%4.4x 0x%4.4x 0x%4.4x.\n",
-		   mii_val[16], mii_val[17], mii_val[18]);
-	printf("  The link is %s in 10%s %s duplex mode, autonegotiation state "
-		   "has%s changed.\n",
-		   mii_reg25 & 8 ? "up" : "down",
-		   mii_reg25 & 1 ? "0baseTx" : "baseT",
-		   mii_reg25 & 4 ? "full" : "half",
-		   mii_reg25 & 2 ? "" : " not");
-}
-
-static const struct msg_tbl admtek_reg21[] = {
-	{0x4000, " Link test diabled: Ignoring lack of 10baseT link beat."},
-	{0x2000, " Link forced up."},
-	{0x1000, " Tx jabber check disabled."},
-	{0x0080, " Transmitting 'Far End Fault'!"},
-	{0x0040, " Rx error count full."},
-	{0x0008, " Remote loop back enabled."},
-	{0, 0},
-};
-
-static void admtek(long ioaddr, int phy_id)
-{
-
-	printf("  ADMtek vendor specific registers information:\n"
-		   "   Cable length is approximately %d meters.\n"
-		   "   The receiver has lost lock %d times since last check and "
-		   "had %d error events.\n",
-		   ((mii_val[20] & 0x00f0) >> 4)*10,
-		   mii_val[23], mii_val[23]);
-	msg_if_set(mii_val[21], admtek_reg21);
-	tdk78q2120(ioaddr, phy_id);
-}
-
-static void lu3x31(long ioaddr, int phy_id)
-{
-	printf("  Lucent vendor specific registers 17: 0x%4.4x"
-		   " 29: 0x%4.4x 30: 0x%4.4x 31: 0x%4.4x.\n",
-		   mii_val[17], mii_val[29], mii_val[30], mii_val[31]);
-}
-
-static const struct msg_tbl myson_reg16[] = {
-	{0x0080, " Far end fault enabled."},
-	{0x0040, " Transformer ratio 1.25:1."},
-	{0x0020, " Polarity correction diabled."},
-	{0x0010, " Link is forced up regardless of link beat."},
-	{0x0004, " Bypass Jabber check."},
-	{0x0001, " 100baseFx mode selected."},
-	{0, 0},
-};
-
-static void myson981(long ioaddr, int phy_id)
-{
-	int i, mii_reg17 = mii_val[17];
-
-	printf("  Myson mtd981 extra registers: %4.4x %4.4x %4.4x %4.4x.\n",
-		   mii_val[16], mii_val[17], mii_val[18], mii_val[19]);
-	msg_if_set(mii_val[16] & 0xC800, tdk_reg16);
-	msg_if_set(mii_val[16], myson_reg16);
-
-	if (mii_reg17 & 0x00ff) {
-		printf("      Events since last read:");
-		for (i = 0; i < 8; i++)
-			if (mii_reg17 & (1 << i))
-				printf("  %s", tdk_events[i]);
-	} else
-		printf("      No new link status events.");
-	if (mii_reg17 & 0xff00) {
-		printf("\n      Events that will raise an interrupt:");
-		for (i = 0; i < 8; i++)
-			if (mii_reg17 & (0x100 << i))
-				printf("  %s", tdk_events[i]);
-	}
-	printf("\n");
-
-	return;
-}
-
-/* These are much like the TDK events in reversed order. */
-static const struct msg_tbl via_reg17[] = {
-	{0x0001, "Auto-Negotiation complete"},
-	{0x0002, "Remote fault detected"},
-	{0x0004, "Link failure detected"},
-	{0x0008, "Bad Start Stream detected"},
-	{0x0010, "Parallel detection fault"},
-	{0x0020, "Extended negotiation page received"},
-	{0x0040, "5B/4B code error detected"},
-	{0x0080, "Jabber detected"},
-	{0, 0},
-};
-
-static void via_tahoe(long ioaddr, int phy_id)
-{
-	int mii_reg16 = mii_val[16];
-	int mii_reg17 = mii_val[17];
-	int mii_reg18 = mii_val[18];
-
-	printf("  VIA Tahoe extended registers: 16 %4.4x  #17 %4.4x  #18 %4.4x.\n",
-		   mii_reg16, mii_reg17, mii_reg18);
-	msg_if_set_fmt(mii_reg17, via_reg17, "   %s\n");
-	printf("   Link %s 10%s Mbps %s duplex\n",
-		   mii_reg18 & 0x2000 ? "up" : "down",
-		   mii_reg18 & 0x0400 ? "0" : "",
-		   mii_reg18 & 0x0800 ? "full" : "half");
-}
-
-/* Information from
-   http://www.via.com.tw/en/datasheet/DS6103110.pdf
-*/
-   
-static void via_vt6103(long ioaddr, int phy_id)
-{
-	printf("  VIA vt6103 error counts since the last check:\n"
-		   "   The link has failed %d times.\n"
-		   "   The receiver has lost lock %d times.\n"
-		   "   There have been %d false carrier/SQE error.\n",
-		   mii_val[21], mii_val[22], mii_val[23]);
-}
-
-/* Information from
-   http://www.via.com.tw/en/Networking/DS6105LOM100.pdf
-*/
-
-static void via_vt6105(long ioaddr, int phy_id)
-{
-	printf("  VIA vt6105 PHY status:\n"
-		   "   Duplex %s  speed %s\n",
-		   mii_val[20] & 0x0001 ? "full" : "half",
-		   mii_val[20] & 0x0002 ? "100" : "10");
-}
-
-/* Information from
-   http://www.via.com.tw/en/Networking/DS6105LOM100.pdf
-*/
-static void intel(long ioaddr, int phy_id)
-{
-	printf("  Intel 8255* PHY #%d extended management registers:\n"
-		   "    Error counts, cleared when read:\n"
-		   "     False carriers %d\n"
-		   "     Link disconnects %d\n"
-		   "     Receive errors %d\n"
-		   "     Rx symbol errors %d.\n"
-		   "     Rx 10Mbps Early End-Of-Frame errors %d.\n"
-		   "     Rx 100Mbps Early End-Of-Frame errors %d.\n"
-		   "     Tx jabber errors %d.\n",
-		   mii_val[18],
-		   mii_val[19], mii_val[20], mii_val[21], mii_val[22], mii_val[23],
-		   mii_val[24], mii_val[25]);
-}
-
-
-/*
- * Local variables:
- *  compile-command: "cc -O -Wall -c libmii.c"
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/recipes-extended/mii-diag/mii-diag-2.11/mii-diag.c b/recipes-extended/mii-diag/mii-diag-2.11/mii-diag.c
deleted file mode 100644
index 3c47e4a..0000000
--- a/recipes-extended/mii-diag/mii-diag-2.11/mii-diag.c
+++ /dev/null
@@ -1,648 +0,0 @@
-/* Mode: C;
- * mii-diag.c: Examine and set the MII registers of a network interfaces.
-
-	Usage:	mii-diag [-vw] interface.
-
-	This program reads and writes the Media Independent Interface (MII)
-	management registers on network transceivers.  The registers control
-	and report network link settings and errors.  Examples are link speed,
-	duplex, capabilities advertised to the link partner, status LED
-	indications and link error counters.
-
-	Notes:
-	The compile-command is at the end of this source file.
-	This program works with drivers that implement MII ioctl() calls.
-
-	Written/copyright 1997-2003 by Donald Becker <becker@scyld.com>
-
-	This program 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.
-
-	The author may be reached as becker@scyld.com, or C/O
-	 Scyld Computing Corporation
-	 914 Bay Ridge Road, Suite 220
-	 Annapolis MD 21403
-
-	References
-	http://scyld.com/expert/mii-status.html
-	http://scyld.com/expert/NWay.html
-	http://www.national.com/pf/DP/DP83840.html
-*/
-
-static char version[] =
-"mii-diag.c:v2.11 3/21/2005 Donald Becker (becker@scyld.com)\n"
-" http://www.scyld.com/diag/index.html\n";
-
-static const char usage_msg[] =
-"Usage: %s [--help] [-aDfrRvVw] [-AF <speed+duplex>] [--watch] <interface>.\n";
-static const char long_usage_msg[] =
-"Usage: %s [-aDfrRvVw] [-AF <speed+duplex>] [--watch] <interface>.\n"
-"\n"
-"  This program configures and monitors the transceiver management registers\n"
-"  for network interfaces.  It uses the Media Independent Interface (MII)\n"
-"  standard with additional Linux-specific controls to communicate with the\n"
-"  underlying device driver.  The MII registers control and report network\n"
-"  link settings and errors.  Examples are link speed, duplex, capabilities\n"
-"  advertised to the link partner, status LED indications and link error\n"
-"  counters.\n"
-"\n"
-"   The common usage is\n"
-"      mii-diag eth0\n"
-"\n"
-"   The default interface is \"eth0\".\n"
-" Frequently used options are\n"
-"   -A  --advertise <speed|setting>\n"
-"   -F  --fixed-speed <speed>\n"
-"	Speed is one of: 100baseT4, 100baseTx, 100baseTx-FD, 100baseTx-HD,\n"
-"	                 10baseT, 10baseT-FD, 10baseT-HD\n"
-"   -s  --status     Return exit status 2 if there is no link beat.\n"
-"\n"
-" Less frequently used options are\n"
-"   -a  --all-interfaces  Show the status all interfaces\n"
-"              (Not recommended with options that change settings.)\n"
-"   -D  --debug\n"
-"   -g  --read-parameters 	Get driver-specific parameters.\n"
-"   -G  --set-parameters PARMS	Set driver-specific parameters.\n"
-"       Parameters are comma separated, missing elements retain existing value.\n"
-"   -M  --msg-level LEVEL 	Set the driver message bit map.\n"
-"   -p  --phy ADDR		Set the PHY (MII address) to report.\n"
-"   -r  --restart	Restart the link autonegotiation.\n"
-"   -R  --reset		Reset the transceiver.\n"
-"   -v  --verbose	Report each action taken.\n"
-"   -V  --version	Emit version information.\n"
-"   -w  --watch		Continuously monitor the transceiver and report changes.\n"
-"\n"
-"   This command returns success (zero) if the interface information can be\n"
-"   read.  If the --status option is passed, a zero return means that the\n"
-"   interface has link beat.\n";
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <getopt.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <net/if.h>
-#ifdef use_linux_libc5
-#include <linux/if_arp.h>
-#include <linux/if_ether.h>
-#endif
-
-typedef u_int32_t u32;
-typedef u_int16_t u16;
-typedef u_int8_t u8;
-
-#if defined(SIOCGPARAMS)  && SIOCGPARAMS != SIOCDEVPRIVATE+3
-#error Changed definition for SIOCGPARAMS
-#else
-#define SIOCGPARAMS (SIOCDEVPRIVATE+3) 		/* Read operational parameters. */
-#define SIOCSPARAMS (SIOCDEVPRIVATE+4) 		/* Set operational parameters. */
-#endif
-
-const char shortopts[] = "aA:C:DfF:gG:hmM:p:rRsvVw?";
-struct option longopts[] = {
- /* { name  has_arg  *flag  val } */
-    {"all-interfaces", 0, 0, 'a'},	/* Show all interfaces. */
-	{"advertise",	1, 0, 'A'},		/* Change the capabilities advertised. */
-	{"BMCR",		1, 0, 'C'},		/* Set the control register. */
-    {"debug",       0, 0, 'D'},		/* Increase the debug level. */
-    {"force",       0, 0, 'f'},		/* Force the operation. */
-    {"fixed-speed", 1, 0, 'F'},		/* Fixed speed name. */
-    {"read-parameters", 0, 0, 'g'}, /* Show general settings values. */
-    {"set-parameters",  1, 0, 'G'},	/* Write general settings values. */
-    {"help", 		0, 0, 'h'},		/* Print a long usage message. */
-    {"monitor",		0, 0, 'm'},		/* Monitor status register. */
-    {"msg-level",	1, 0, 'M'},		/* Set the driver message level. */
-    {"phy",			1, 0, 'p'},		/* Set the PHY (MII address) to report. */
-    {"restart",		0, 0, 'r'},		/* Restart the link negotiation */
-    {"reset",		0, 0, 'R'},		/* Reset the transceiver. */
-    {"status",		0, 0, 's'},		/* Non-zero exit status w/ no link beat. */
-    {"verbose", 	0, 0, 'v'},		/* Report each action taken.  */
-    {"version", 	0, 0, 'V'},		/* Emit version information.  */
-    {"watch", 		0, 0, 'w'},		/* Constantly monitor the port.  */
-    {"error", 		0, 0, '?'},		/* Return the error message. */
-    { 0, 0, 0, 0 }
-};
-
-/* Usually in libmii.c, but trivial substitions are below. */
-extern int  show_mii_details(long ioaddr, int phy_id);
-extern void monitor_mii(long ioaddr, int phy_id);
-int  show_mii_details(long ioaddr, int phy_id) __attribute__((weak));
-void monitor_mii(long ioaddr, int phy_id) __attribute__((weak));
-
-
-/* Command-line flags. */
-unsigned int opt_a = 0,					/* Show-all-interfaces flag. */
-	opt_f = 0,					/* Force the operation. */
-	opt_g = 0,
-	opt_G = 0,
-	verbose = 0,				/* Verbose flag. */
-	debug = 0,
-	opt_version = 0,
-	opt_restart = 0,
-	opt_reset = 0,
-	opt_status = 0,
-	opt_watch = 0;
-static int msg_level = -1;
-static int set_BMCR = -1;
-static int nway_advertise = 0;
-static int fixed_speed = -1;
-static int override_phy = -1;
-char *opt_G_string = NULL;
-
-/* Internal values. */
-int new_ioctl_nums;
-int skfd = -1;					/* AF_INET socket for ioctl() calls.	*/
-struct ifreq ifr;
-
-int do_one_xcvr(int skfd);
-int show_basic_mii(long ioaddr, int phy_id);
-int mdio_read(int skfd, int phy_id, int location);
-void mdio_write(int skfd, int phy_id, int location, int value);
-static int parse_advertise(const char *capabilities);
-static void monitor_status(long ioaddr, int phy_id);
-
-
-int
-main(int argc, char **argv)
-{
-	int c, errflag = 0;
-	char **spp, *ifname;
-    char *progname = rindex(argv[0], '/') ? rindex(argv[0], '/')+1 : argv[0];
-
-	while ((c = getopt_long(argc, argv, shortopts, longopts, 0)) != EOF)
-		switch (c) {
-		case 'a': opt_a++; break;
-		case 'A': nway_advertise |= parse_advertise(optarg);
-			if (nway_advertise == -1) errflag++;
-			break;
-		case 'C': set_BMCR = strtoul(optarg, NULL, 16); break;
-		case 'D': debug++;			break;
-		case 'f': opt_f++; break;
-		case 'F': fixed_speed = parse_advertise(optarg);
-			if (fixed_speed == -1) errflag++;
-			break;
-		case 'g': opt_g++; break;
-		case 'G': opt_G++; opt_G_string = strdup(optarg); break;
-		case 'm': opt_watch++; opt_status++; break;
-		case 'M': msg_level = strtoul(optarg, NULL, 0); break;
-		case 'h': fprintf(stderr, long_usage_msg, progname); return 0;
-		case 'p': override_phy = atoi(optarg); break;
-		case 'r': opt_restart++;	break;
-		case 'R': opt_reset++;		break;
-		case 's': opt_status++;		break;
-		case 'v': verbose++;		break;
-		case 'V': opt_version++;	break;
-		case 'w': opt_watch++;		break;
-		case '?': errflag++;		break;
-		}
-	if (errflag) {
-		fprintf(stderr, usage_msg, progname);
-		return 2;
-	}
-
-	if (verbose || opt_version)
-		printf(version);
-
-	/* Open a basic socket. */
-	if ((skfd = socket(AF_INET, SOCK_DGRAM,0)) < 0) {
-		perror("socket");
-		return 1;
-	}
-
-	if (debug)
-		fprintf(stderr, "DEBUG: argc=%d, optind=%d and argv[optind] is %s.\n",
-				argc, optind, argv[optind]);
-
-	/* No remaining args means show all interfaces. */
-	if (optind == argc) {
-		ifname = "eth0";
-		fprintf(stderr, "Using the default interface 'eth0'.\n");
-	} else {
-		/* Copy the interface name. */
-		spp = argv + optind;
-		ifname = *spp++;
-	}
-
-	if (ifname == NULL) {
-		ifname = "eth0";
-		fprintf(stderr, "Using the default interface 'eth0'.\n");
-	}
-
-	/* Verify that the interface supports the ioctl(), and if
-	   it is using the new or old SIOCGMIIPHY value (grrr...).
-	 */
-	{
-		u16 *data = (u16 *)(&ifr.ifr_data);
-
-		strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-		data[0] = 0;
-
-		if (ioctl(skfd, 0x8947, &ifr) >= 0) {
-			new_ioctl_nums = 1;
-		} else if (ioctl(skfd, SIOCDEVPRIVATE, &ifr) >= 0) {
-			new_ioctl_nums = 0;
-		} else {
-			fprintf(stderr, "SIOCGMIIPHY on %s failed: %s\n", ifname,
-					strerror(errno));
-			(void) close(skfd);
-			return 1;
-		}
-		if (verbose)
-			printf("  Using the %s SIOCGMIIPHY value on PHY %d "
-				   "(BMCR 0x%4.4x).\n",
-				   new_ioctl_nums ? "new" : "old", data[0], data[3]);
-	}
-
-	do_one_xcvr(skfd);
-
-	(void) close(skfd);
-	return 0;
-}
-
-int do_one_xcvr(int skfd)
-{
-	u16 *data = (u16 *)(&ifr.ifr_data);
-	u32 *data32 = (u32 *)(&ifr.ifr_data);
-	unsigned phy_id = data[0];
-
-	if (override_phy >= 0) {
-		printf("Using the specified MII PHY index %d.\n", override_phy);
-		phy_id = override_phy;
-	}
-
-	if (opt_g || opt_G || msg_level >= 0) {
-		if (ioctl(skfd, SIOCGPARAMS, &ifr) < 0) {
-			fprintf(stderr, "SIOCGPARAMS on %s failed: %s\n", ifr.ifr_name,
-					strerror(errno));
-			return -1;
-		}
-	}
-	if (opt_g) {
-		int i;
-		printf("Driver general parameter settings:");
-		for (i = 0; i*sizeof(u32) < sizeof(ifr.ifr_ifru); i++) {
-			printf(" %d", data32[i]);
-		}
-		printf(".\n");
-	}
-	if (opt_G) {
-		/* Set up to four arbitrary driver parameters from the -G parameter.
-		   The format is comma separated integers, with a missing element
-		   retaining the previous value.
-		*/
-		char *str = opt_G_string;
-		int i;
-		for (i = 0; str && i < 4; i++) {
-			char *endstr;
-			u32 newval = strtol(str, &endstr, 0);
-			if (debug)
-				printf(" parse string '%s'  value %d end '%s'.\n",
-					   str, newval, endstr);
-			if (str == endstr) {
-				if (endstr[0] == ',') /* No parameter */
-					str = endstr+1;
-				else {
-					fprintf(stderr, "Invalid driver parameter '%s'.\n", str);
-					str = index(str, ',');
-				}
-			} else if (endstr[0] == ',') {
-				data32[i] = newval;
-				str = endstr + 1;
-			} else if (endstr[0] == 0) {
-				data32[i] = newval;
-				break;
-			}
-		}
-		printf("Setting new driver general parameters:");
-		for (i = 0; i*sizeof(u32) < sizeof(ifr.ifr_ifru); i++) {
-			printf(" %d", data32[i]);
-		}
-		printf(".\n");
-		if (ioctl(skfd, SIOCSPARAMS, &ifr) < 0) {
-			fprintf(stderr, "SIOCSPARAMS on %s failed: %s\n", ifr.ifr_name,
-					strerror(errno));
-			return -1;
-		}
-	}
-	if (msg_level >= 0) {
-		data32[0] = msg_level;
-		if (ioctl(skfd, SIOCSPARAMS, &ifr) < 0) {
-			fprintf(stderr, "SIOCSPARAMS on %s failed: %s\n", ifr.ifr_name,
-					strerror(errno));
-			return -1;
-		}
-	}
-
-	if (opt_reset) {
-		printf("Resetting the transceiver...\n");
-		mdio_write(skfd, phy_id, 0, 0x8000);
-	}
-	/* Note: PHY addresses > 32 are pseudo-MII devices, usually built-in. */
-	if (phy_id < 64  &&  nway_advertise > 0) {
-		printf(" Setting the media capability advertisement register of "
-			   "PHY #%d to 0x%4.4x.\n", phy_id, nway_advertise | 1);
-		mdio_write(skfd, phy_id, 4, nway_advertise | 1);
-		mdio_write(skfd, phy_id, 0, 0x1000);
-	}
-
-	if (opt_restart) {
-		printf("Restarting negotiation...\n");
-		mdio_write(skfd, phy_id, 0, 0x0000);
-		mdio_write(skfd, phy_id, 0, 0x1200);
-	}
-	/* To force 100baseTx-HD do  mdio_write(skfd, phy_id, 0, 0x2000); */
-	if (fixed_speed >= 0) {
-		int reg0_val = 0;
-		if (fixed_speed & 0x0180) 		/* 100mpbs */
-			reg0_val |=  0x2000;
-		if ((fixed_speed & 0x0140) &&		/* A full duplex type and */
-			! (fixed_speed & 0x0820)) 		/* no half duplex types. */
-			reg0_val |= 0x0100;
-		printf("Setting the speed to \"fixed\", Control register %4.4x.\n",
-			   reg0_val);
-		mdio_write(skfd, phy_id, 0, reg0_val);
-	}
-	if (set_BMCR >= 0) {
-		printf("Setting the Basic Mode Control Register to 0x%4.4x.\n",
-			   set_BMCR);
-		mdio_write(skfd, phy_id, 0, set_BMCR);
-	}
-
-	if (opt_watch && opt_status)
-		monitor_status(skfd, phy_id);
-
-	show_basic_mii(skfd, phy_id);
-#ifdef LIBMII
-	if (verbose)
-		show_mii_details(skfd, phy_id);
-#else
-	if (verbose || debug) {
-		int mii_reg, mii_val;
-		printf(" MII PHY #%d transceiver registers:", phy_id);
-		for (mii_reg = 0; mii_reg < 32; mii_reg++) {
-			mii_val = mdio_read(skfd, phy_id, mii_reg);
-			printf("%s %4.4x", (mii_reg % 8) == 0 ? "\n  " : "",
-				   mii_val);
-		}
-		printf("\n");
-	}
-#endif
-
-	if (opt_watch)
-		monitor_mii(skfd, phy_id);
-	if (opt_status &&
-		(mdio_read(skfd, phy_id, 1) & 0x0004) == 0)
-		exit(2);
-	return 0;
-}
-
-int mdio_read(int skfd, int phy_id, int location)
-{
-	u16 *data = (u16 *)(&ifr.ifr_data);
-
-	data[0] = phy_id;
-	data[1] = location;
-
-	if (ioctl(skfd, new_ioctl_nums ? 0x8948 : SIOCDEVPRIVATE+1, &ifr) < 0) {
-		fprintf(stderr, "SIOCGMIIREG on %s failed: %s\n", ifr.ifr_name,
-				strerror(errno));
-		return -1;
-	}
-	return data[3];
-}
-
-void mdio_write(int skfd, int phy_id, int location, int value)
-{
-	u16 *data = (u16 *)(&ifr.ifr_data);
-
-	data[0] = phy_id;
-	data[1] = location;
-	data[2] = value;
-
-	if (ioctl(skfd, new_ioctl_nums ? 0x8949 : SIOCDEVPRIVATE+2, &ifr) < 0) {
-		fprintf(stderr, "SIOCSMIIREG on %s failed: %s\n", ifr.ifr_name,
-				strerror(errno));
-	}
-}
-
-/* Parse the command line argument for advertised capabilities. */
-static int parse_advertise(const char *capabilities)
-{
-	const char *mtypes[] = {
-		"100baseT4", "100baseTx", "100baseTx-FD", "100baseTx-HD",
-		"10baseT", "10baseT-FD", "10baseT-HD", 0,
-	};
-	char *endptr;
-	int cap_map[] = { 0x0200, 0x0180, 0x0100, 0x0080, 0x0060, 0x0040, 0x0020,};
-	int i;
-	if ( ! capabilities) {
-		fprintf(stderr, "You passed -A 'NULL'.  You must provide a media"
-				" list to advertise!\n");
-		return -1;
-	}
-	if (debug)
-		fprintf(stderr, "Advertise string is '%s'.\n", capabilities);
-	for (i = 0; mtypes[i]; i++)
-		if (strcasecmp(mtypes[i], capabilities) == 0)
-			return cap_map[i];
-	if ((i = strtol(capabilities, &endptr, 16)) <= 0xffff  &&  endptr[0] == 0)
-		return i;
-	fprintf(stderr, "Invalid media advertisement value '%s'.\n"
-			"  Either pass a numeric value or one of the following names:\n",
-			capabilities);
-	for (i = 0; mtypes[i]; i++)
-		fprintf(stderr, "   %-14s %3.3x\n", mtypes[i], cap_map[i]);
-	return -1;
-}
-
-/* Trivial versions if we don't link against libmii.c */
-static const char *media_names[] = {
-	"10baseT", "10baseT-FD", "100baseTx", "100baseTx-FD", "100baseT4",
-	"Flow-control", 0,
-};
-/* Various non-good bits in the command register. */
-static const char *bmcr_bits[] = {
-	"  Internal Collision-Test enabled!\n", "",		/* 0x0080,0x0100 */
-	"  Restarted auto-negotiation in progress!\n",
-	"  Transceiver isolated from the MII!\n",
-	"  Transceiver powered down!\n", "", "",
-	"  Transceiver in loopback mode!\n",
-	"  Transceiver currently being reset!\n",
-};
-
-int show_basic_mii(long ioaddr, int phy_id)
-{
-	int mii_reg, i;
-	u16 mii_val[32];
-	u16 bmcr, bmsr, new_bmsr, nway_advert, lkpar;
-
-	for (mii_reg = 0; mii_reg < 8; mii_reg++)
-		mii_val[mii_reg] = mdio_read(ioaddr, phy_id, mii_reg);
-	if ( ! verbose) {
-		printf("Basic registers of MII PHY #%d: ", phy_id);
-		for (mii_reg = 0; mii_reg < 8; mii_reg++)
-			printf(" %4.4x", mii_val[mii_reg]);
-		printf(".\n");
-	}
-
-	if (mii_val[0] == 0xffff  ||  mii_val[1] == 0x0000) {
-		printf("  No MII transceiver present!.\n");
-		if (! opt_f) {
-			printf("  Use '--force' to view the information anyway.\n");
-			return -1;
-		}
-	}
-	/* Descriptive rename. */
-	bmcr = mii_val[0];
-	bmsr = mii_val[1];
-	nway_advert = mii_val[4];
-	lkpar = mii_val[5];
-
-	if (lkpar & 0x4000) {
-		int negotiated = nway_advert & lkpar & 0x3e0;
-		int max_capability = 0;
-		/* Scan for the highest negotiated capability, highest priority
-		   (100baseTx-FDX) to lowest (10baseT-HDX). */
-		int media_priority[] = {8, 9, 7, 6, 5}; 	/* media_names[i-5] */
-		printf(" The autonegotiated capability is %4.4x.\n", negotiated);
-		for (i = 0; media_priority[i]; i++)
-			if (negotiated & (1 << media_priority[i])) {
-				max_capability = media_priority[i];
-				break;
-			}
-		if (max_capability)
-			printf("The autonegotiated media type is %s.\n",
-				   media_names[max_capability - 5]);
-		else
-			printf("No common media type was autonegotiated!\n"
-				   "This is extremely unusual and typically indicates a "
-				   "configuration error.\n" "Perhaps the advertised "
-				   "capability set was intentionally limited.\n");
-	}
-	printf(" Basic mode control register 0x%4.4x:", bmcr);
-	if (bmcr & 0x1000)
-		printf(" Auto-negotiation enabled.\n");
-	else
-		printf(" Auto-negotiation disabled, with\n"
-			   " Speed fixed at 10%s mbps, %s-duplex.\n",
-			   bmcr & 0x2000 ? "0" : "",
-			   bmcr & 0x0100 ? "full":"half");
-	for (i = 0; i < 9; i++)
-		if (bmcr & (0x0080<<i))
-			printf(bmcr_bits[i]);
-
-	new_bmsr = mdio_read(ioaddr, phy_id, 1);
-	if ((bmsr & 0x0016) == 0x0004)
-		printf( " You have link beat, and everything is working OK.\n");
-	else
-		printf(" Basic mode status register 0x%4.4x ... %4.4x.\n"
-			   "   Link status: %sestablished.\n",
-			   bmsr, new_bmsr,
-			   bmsr & 0x0004 ? "" :
-			   (new_bmsr & 0x0004) ? "previously broken, but now re" : "not ");
-	if (verbose) {
-		printf("   This transceiver is capable of ");
-		if (bmsr & 0xF800) {
-			for (i = 15; i >= 11; i--)
-				if (bmsr & (1<<i))
-					printf(" %s", media_names[i-11]);
-		} else
-			printf("<Warning! No media capabilities>");
-		printf(".\n");
-		printf("   %s to perform Auto-negotiation, negotiation %scomplete.\n",
-			   bmsr & 0x0008 ? "Able" : "Unable",
-			   bmsr & 0x0020 ? "" : "not ");
-	}
-
-	if (bmsr & 0x0010)
-		printf(" Remote fault detected!\n");
-	if (bmsr & 0x0002)
-		printf("   *** Link Jabber! ***\n");
-
-	if (lkpar & 0x4000) {
-		printf(" Your link partner advertised %4.4x:",
-			   lkpar);
-		for (i = 5; i >= 0; i--)
-			if (lkpar & (0x20<<i))
-				printf(" %s", media_names[i]);
-		printf("%s.\n", lkpar & 0x0400 ? ", w/ 802.3X flow control" : "");
-	} else if (lkpar & 0x00A0)
-		printf(" Your link partner is generating %s link beat  (no"
-			   " autonegotiation).\n",
-			   lkpar & 0x0080 ? "100baseTx" : "10baseT");
-	else if ( ! (bmcr & 0x1000))
-		printf(" Link partner information is not exchanged when in"
-			   " fixed speed mode.\n");
-	else if ( ! (new_bmsr & 0x004))
-							;	/* If no partner, do not report status. */
-	else if (lkpar == 0x0001  ||  lkpar == 0x0000) {
-		printf(" Your link partner does not do autonegotiation, and this "
-			   "transceiver type\n  does not report the sensed link "
-			   "speed.\n");
-	} else
-		printf(" Your link partner is strange, status %4.4x.\n", lkpar);
-
-	printf("   End of basic transceiver information.\n\n");
-	return 0;
-}
-
-static void monitor_status(long ioaddr, int phy_id)
-{
-	unsigned int baseline_1 = 0x55555555; 	/* Always show initial status. */
-
-	while (1) {
-		unsigned int new_1 = mdio_read(ioaddr, phy_id, 1);
-		if (new_1 != baseline_1) {
-			printf("%-12s 0x%4.4x 0x%4.4x\n",
-				   new_1 & 0x04 ? (new_1==0xffff ? "unknown" : "up") :
-				   new_1 & 0x20 ? "negotiating" : "down",
-				   new_1, mdio_read(ioaddr, phy_id, 5));
-			fflush(stdout);
-			baseline_1 = new_1;
-		}
-		sleep(1);
-	}
-}
-
-int  show_mii_details(long ioaddr, int phy_id)
-{
-	int mii_reg, mii_val;
-	printf(" MII PHY #%d transceiver registers:", phy_id);
-	for (mii_reg = 0; mii_reg < 32; mii_reg++) {
-		mii_val = mdio_read(skfd, phy_id, mii_reg);
-		printf("%s %4.4x", (mii_reg % 8) == 0 ? "\n  " : "",
-			   mii_val);
-	}
-	printf("\nThis version of 'mii-diag' has not been linked with "
-			"the libmii.c library.\n"
-			"  That library provides extended transceiver status reports.\n");
-	return 0;
-}
-
-void monitor_mii(long ioaddr, int phy_id)
-{
-	fprintf(stderr, "\nThis version of 'mii-diag' has not been linked with "
-			"the libmii.c library \n"
-			"  required for the media monitor option.\n");
-}
-
-
-
-/*
- * Local variables:
- *  version-control: t
- *  kept-new-versions: 5
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- *  compile-command: "gcc -Wall -Wstrict-prototypes -O mii-diag.c -DLIBMII libmii.c -o mii-diag"
- *  simple-compile-command: "gcc mii-diag.c -o mii-diag"
- * End:
- */
diff --git a/recipes-extended/mii-diag/mii-diag_2.11.bb b/recipes-extended/mii-diag/mii-diag_2.11.bb
deleted file mode 100644
index 708789f..0000000
--- a/recipes-extended/mii-diag/mii-diag_2.11.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "Examines and sets the MII registers of network cards."
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-SECTION = "console/network"
-PRIORITY = "optional"
-PR = "r0"
-
-S = "${WORKDIR}/"
-
-#PACKAGE_STRIP = "no"
-
-SRC_URI = "file://mii-diag.c \
-           file://libmii.c"
-
-FILES_${PN} = "${base_sbindir}/mii-diag"
-
-do_compile() {
-${CC} -O -c libmii.c
-${CC} -O -DLIBMII mii-diag.c libmii.o -o mii-diag ${LDFLAGS}
-}
-
-do_install() {
-	install -d ${D}/${base_sbindir}
-	install -m 0755 ${S}/mii-diag ${D}/${base_sbindir}/
-}
diff --git a/recipes-extended/monit/monit/monit.default b/recipes-extended/monit/monit/monit.default
deleted file mode 100644
index 0f92640..0000000
--- a/recipes-extended/monit/monit/monit.default
+++ /dev/null
@@ -1,2 +0,0 @@
-# set to "yes" or "no" to control starting on boot
-ENABLED="no"
diff --git a/recipes-extended/monit/monit/monit.init b/recipes-extended/monit/monit/monit.init
deleted file mode 100755
index 0a3c2ea..0000000
--- a/recipes-extended/monit/monit/monit.init
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-NAME=monit
-
-ENABLED=yes
-[ -f /etc/default/$NAME ] && . /etc/default/$NAME
-
-if [ "$ENABLED" != "yes" ]; then
-  echo "$NAME: disabled in /etc/default"
-  exit
-fi
-
-case $1 in
-  start)
-    echo "Starting monit"
-    monit
-    ;;
-
-  stop)
-    echo "Stopping monit"
-    monit quit
-    ;;
-
-  restart)
-    echo "Stopping monit"
-    monit quit
-    echo "Starting monit"
-    monit
-    ;;
-
-  *)
-    echo "Usage: $0 {start|stop|restart}"
-    exit 2
-    ;;
-esac
-
-
diff --git a/recipes-extended/monit/monit/monitrc b/recipes-extended/monit/monit/monitrc
deleted file mode 100644
index d04b115..0000000
--- a/recipes-extended/monit/monit/monitrc
+++ /dev/null
@@ -1,272 +0,0 @@
-###############################################################################
-## Monit control file
-###############################################################################
-##
-## Comments begin with a '#' and extend through the end of the line. Keywords
-## are case insensitive. All path's MUST BE FULLY QUALIFIED, starting with '/'.
-##
-## Below you will find examples of some frequently used statements. For 
-## information about the control file and a complete list of statements and 
-## options, please have a look in the Monit manual.
-##
-##
-###############################################################################
-## Global section
-###############################################################################
-##
-## Start Monit in the background (run as a daemon):
-#
-set daemon  30              # check services at 30 seconds intervals
-#   with start delay 240    # optional: delay the first check by 4-minutes (by 
-#                           # default Monit check immediately after Monit start)
-#
-#
-## Set syslog logging with the 'daemon' facility. If the FACILITY option is
-## omitted, Monit will use 'user' facility by default. If you want to log to 
-## a standalone log file instead, specify the full path to the log file
-#
-set logfile syslog facility log_daemon
-#
-#
-## Set the location of the Monit lock file which stores the process id of the
-## running Monit instance. By default this file is stored in $HOME/.monit.pid
-#
-# set pidfile /var/run/monit.pid
-#
-## Set the location of the Monit id file which stores the unique id for the
-## Monit instance. The id is generated and stored on first Monit start. By 
-## default the file is placed in $HOME/.monit.id.
-#
-# set idfile /var/.monit.id
-#
-## Set the location of the Monit state file which saves monitoring states
-## on each cycle. By default the file is placed in $HOME/.monit.state. If
-## the state file is stored on a persistent filesystem, Monit will recover
-## the monitoring state across reboots. If it is on temporary filesystem, the
-## state will be lost on reboot which may be convenient in some situations.
-#
-# set statefile /var/.monit.state
-#
-## Set the list of mail servers for alert delivery. Multiple servers may be 
-## specified using a comma separator. If the first mail server fails, Monit 
-# will use the second mail server in the list and so on. By default Monit uses 
-# port 25 - it is possible to override this with the PORT option.
-#
-# set mailserver mail.bar.baz,               # primary mailserver
-#                backup.bar.baz port 10025,  # backup mailserver on port 10025
-#                localhost                   # fallback relay
-#
-#
-## By default Monit will drop alert events if no mail servers are available. 
-## If you want to keep the alerts for later delivery retry, you can use the 
-## EVENTQUEUE statement. The base directory where undelivered alerts will be 
-## stored is specified by the BASEDIR option. You can limit the queue size 
-## by using the SLOTS option (if omitted, the queue is limited by space
-## available in the back end filesystem).
-#
-# set eventqueue
-#     basedir /var/monit  # set the base directory where events will be stored
-#     slots 100           # optionally limit the queue size
-#
-#
-## Send status and events to M/Monit (for more informations about M/Monit 
-## see http://mmonit.com/). By default Monit registers credentials with 
-## M/Monit so M/Monit can smoothly communicate back to Monit and you don't
-## have to register Monit credentials manually in M/Monit. It is possible to
-## disable credential registration using the commented out option below. 
-## Though, if safety is a concern we recommend instead using https when
-## communicating with M/Monit and send credentials encrypted.
-#
-# set mmonit http://monit:monit@192.168.1.10:8080/collector
-#     # and register without credentials     # Don't register credentials
-#
-#
-## Monit by default uses the following format for alerts if the the mail-format
-## statement is missing::
-## --8<--
-## set mail-format {
-##      from: monit@$HOST
-##   subject: monit alert --  $EVENT $SERVICE
-##   message: $EVENT Service $SERVICE
-##                 Date:        $DATE
-##                 Action:      $ACTION
-##                 Host:        $HOST
-##                 Description: $DESCRIPTION
-##
-##            Your faithful employee,
-##            Monit
-## }
-## --8<--
-##
-## You can override this message format or parts of it, such as subject
-## or sender using the MAIL-FORMAT statement. Macros such as $DATE, etc.
-## are expanded at runtime. For example, to override the sender, use:
-#
-# set mail-format { from: monit@foo.bar }
-#
-#
-## You can set alert recipients whom will receive alerts if/when a 
-## service defined in this file has errors. Alerts may be restricted on 
-## events by using a filter as in the second example below.
-#
-# set alert sysadm@foo.bar                       # receive all alerts
-#
-## Do not alert when Monit starts, stops or performs a user initiated action.
-## This filter is recommended to avoid getting alerts for trivial cases.
-#
-# set alert your-name@your.domain not on { instance, action }
-#
-#
-## Monit has an embedded HTTP interface which can be used to view status of 
-## services monitored and manage services from a web interface. The HTTP 
-## interface is also required if you want to issue Monit commands from the
-## command line, such as 'monit status' or 'monit restart service' The reason
-## for this is that the Monit client uses the HTTP interface to send these
-## commands to a running Monit daemon. See the Monit Wiki if you want to 
-## enable SSL for the HTTP interface. 
-#
-set httpd port 2812 and
-    use address localhost  # only accept connection from localhost
-    allow localhost        # allow localhost to connect to the server and
-    allow admin:monit      # require user 'admin' with password 'monit'
-
-###############################################################################
-## Services
-###############################################################################
-##
-## Check general system resources such as load average, cpu and memory
-## usage. Each test specifies a resource, conditions and the action to be
-## performed should a test fail.
-#
-#  check system myhost.mydomain.tld
-#    if loadavg (1min) > 4 then alert
-#    if loadavg (5min) > 2 then alert
-#    if memory usage > 75% then alert
-#    if swap usage > 25% then alert
-#    if cpu usage (user) > 70% then alert
-#    if cpu usage (system) > 30% then alert
-#    if cpu usage (wait) > 20% then alert
-#
-#    
-## Check if a file exists, checksum, permissions, uid and gid. In addition
-## to alert recipients in the global section, customized alert can be sent to 
-## additional recipients by specifying a local alert handler. The service may 
-## be grouped using the GROUP option. More than one group can be specified by
-## repeating the 'group name' statement.
-#    
-#  check file apache_bin with path /usr/local/apache/bin/httpd
-#    if failed checksum and 
-#       expect the sum 8f7f419955cefa0b33a2ba316cba3659 then unmonitor
-#    if failed permission 755 then unmonitor
-#    if failed uid root then unmonitor
-#    if failed gid root then unmonitor
-#    alert security@foo.bar on {
-#           checksum, permission, uid, gid, unmonitor
-#        } with the mail-format { subject: Alarm! }
-#    group server
-#
-#    
-## Check that a process is running, in this case Apache, and that it respond
-## to HTTP and HTTPS requests. Check its resource usage such as cpu and memory,
-## and number of children. If the process is not running, Monit will restart 
-## it by default. In case the service is restarted very often and the 
-## problem remains, it is possible to disable monitoring using the TIMEOUT
-## statement. This service depends on another service (apache_bin) which
-## is defined above.
-#    
-#  check process apache with pidfile /usr/local/apache/logs/httpd.pid
-#    start program = "/etc/init.d/httpd start" with timeout 60 seconds
-#    stop program  = "/etc/init.d/httpd stop"
-#    if cpu > 60% for 2 cycles then alert
-#    if cpu > 80% for 5 cycles then restart
-#    if totalmem > 200.0 MB for 5 cycles then restart
-#    if children > 250 then restart
-#    if loadavg(5min) greater than 10 for 8 cycles then stop
-#    if failed host www.tildeslash.com port 80 protocol http 
-#       and request "/somefile.html"
-#    then restart
-#    if failed port 443 type tcpssl protocol http
-#       with timeout 15 seconds
-#    then restart
-#    if 3 restarts within 5 cycles then timeout
-#    depends on apache_bin
-#    group server
-#    
-#    
-## Check filesystem permissions, uid, gid, space and inode usage. Other services,
-## such as databases, may depend on this resource and an automatically graceful
-## stop may be cascaded to them before the filesystem will become full and data
-## lost.
-#
-#  check filesystem datafs with path /dev/sdb1
-#    start program  = "/bin/mount /data"
-#    stop program  = "/bin/umount /data"
-#    if failed permission 660 then unmonitor
-#    if failed uid root then unmonitor
-#    if failed gid disk then unmonitor
-#    if space usage > 80% for 5 times within 15 cycles then alert
-#    if space usage > 99% then stop
-#    if inode usage > 30000 then alert
-#    if inode usage > 99% then stop
-#    group server
-#
-#
-## Check a file's timestamp. In this example, we test if a file is older 
-## than 15 minutes and assume something is wrong if its not updated. Also,
-## if the file size exceed a given limit, execute a script
-#
-#  check file database with path /data/mydatabase.db
-#    if failed permission 700 then alert
-#    if failed uid data then alert
-#    if failed gid data then alert
-#    if timestamp > 15 minutes then alert
-#    if size > 100 MB then exec "/my/cleanup/script" as uid dba and gid dba
-#
-#
-## Check directory permission, uid and gid.  An event is triggered if the 
-## directory does not belong to the user with uid 0 and gid 0.  In addition, 
-## the permissions have to match the octal description of 755 (see chmod(1)).
-#
-#  check directory bin with path /bin
-#    if failed permission 755 then unmonitor
-#    if failed uid 0 then unmonitor
-#    if failed gid 0 then unmonitor
-#
-#
-## Check a remote host availability by issuing a ping test and check the 
-## content of a response from a web server. Up to three pings are sent and 
-## connection to a port and an application level network check is performed.
-#
-#  check host myserver with address 192.168.1.1
-#    if failed ping then alert
-#    if failed port 3306 protocol mysql with timeout 15 seconds then alert
-#    if failed port 80 protocol http
-#       and request /some/path with content = "a string"
-#    then alert
-#
-#
-## Check a network link status (up/down), link capacity changes, saturation
-## and bandwidth usage.
-#
-#  check network public with interface eth0
-#    if failed link then alert
-#    if changed link then alert
-#    if saturation > 90% then alert
-#    if download > 10 MB/s then alert
-#    if total upload > 1 GB in last hour then alert
-#
-#
-## Check custom program status output.
-#
-#  check program myscript with path /usr/local/bin/myscript.sh
-#    if status != 0 then alert
-#
-#
-###############################################################################
-## Includes
-###############################################################################
-##
-## It is possible to include additional configuration parts from other files or
-## directories.
-#
-include /etc/monit.d/*
diff --git a/recipes-extended/monit/monit_5.22.0.bb b/recipes-extended/monit/monit_5.22.0.bb
deleted file mode 100644
index 3ad3074..0000000
--- a/recipes-extended/monit/monit_5.22.0.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-DESCRIPTION = "Monit"
-HOMEPAGE = "http://mmonit.com/"
-LICENSE = "AGPL-3.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51"
-DEPENDS = "libpam zlib openssl"
-
-PR = "r0"
-
-SRC_URI = "http://mmonit.com/monit/dist/monit-5.22.0.tar.gz \
-           file://monitrc \
-           file://monit.init \
-           file://monit.default \
-           "
-
-SRC_URI[md5sum] = "768a637b8d23b6cbce271a8ff125c61f"
-SRC_URI[sha256sum] = "9fc58b5e3caafd64f0b6fff3e65ae757239fab37d04fb33efce177da15176183"
-
-inherit autotools-brokensep
-
-EXTRA_OECONF += "--with-ssl-lib-dir=${STAGING_LIBDIR} \
-                --with-ssl-incl-dir=${STAGING_INCDIR} \
-                "
-
-# Regenerate autoconfig generated aclocal.m4/m4 contained in the tarball
-EXTRA_AUTORECONF += " --force"
-
-do_configure_prepend() {
-    rm ${S}/aclocal.m4
-    rm -Rf ${S}/m4
-}
-
-EXTRA_OECONF_append_arm = " libmonit_cv_setjmp_available=yes libmonit_cv_vsnprintf_c99_conformant=yes "
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "monit"
-INITSCRIPT_PARAMS = "defaults 99 10"
-
-do_install_append() {
-    install -d ${D}${sysconfdir}
-    install -d ${D}${sysconfdir}/monit.d
-    install -m 0600 ${WORKDIR}/monitrc ${D}${sysconfdir}/
-
-    install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/monit.init ${D}${sysconfdir}/init.d/monit
-
-    install -d ${D}${sysconfdir}/default
-    install -m 0644 ${WORKDIR}/monit.default ${D}${sysconfdir}/default/monit
-}
-
-CONFFILES_${PN} += "${sysconfdir}/monitrc ${sysconfdir}/default/monit"
diff --git a/recipes-extended/multitech/set-rs485/set-rs485.c b/recipes-extended/multitech/set-rs485/set-rs485.c
deleted file mode 100644
index 1e53092..0000000
--- a/recipes-extended/multitech/set-rs485/set-rs485.c
+++ /dev/null
@@ -1,81 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <termios.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <linux/serial.h>
-
-int openserial(char *devicename)
-{
-    int fd;
-
-    if ((fd = open(devicename, O_RDWR)) == -1) {
-        perror("openserial(): open()");
-        return 0;
-    }
-
-    return fd;
-}
-
-int setRS485(int fd, int state)
-{
-    struct serial_rs485 rs485;
-
-    if (ioctl(fd, TIOCGRS485, &rs485) == -1) {
-        perror("TIOCGRS485");
-        return 0;
-    }
-
-    //printf("Old RS485 flags %x\n", rs485.flags);
-
-    if (state)
-        rs485.flags |= SER_RS485_ENABLED;
-    else
-        rs485.flags &= ~SER_RS485_ENABLED;
-
-    if (ioctl(fd, TIOCSRS485, &rs485) == -1) {
-        perror("TIOCSRS485");
-        return 0;
-    }
-
-    //printf("New RS485 flags %x\n", rs485.flags);
-
-    return 1;
-}
-
-int main(int argc, char *argv[])
-{
-    int fd;
-
-    if (argc != 3) {
-        printf("Usage: set_rs485hd tty 0|1\n");
-        return 1;
-    }
-
-    char *serialdev = argv[1];
-    char *state_str = argv[2];
-
-    int state = atoi(state_str);
-
-    fd = openserial(serialdev);
-    if (!fd) {
-        fprintf(stderr, "Error while initializing %s.\n", serialdev);
-        return 1;
-    }
-
-    printf("%s: setting RS485 to ", serialdev);
-
-    if (state)
-        printf("%s\n", "enabled");
-    else
-        printf("%s\n", "disabled");
-
-    if (setRS485(fd, state))
-        return 0;
-    else
-        return 1;
-}
-
diff --git a/recipes-extended/multitech/set-rs485_0.1.bb b/recipes-extended/multitech/set-rs485_0.1.bb
deleted file mode 100644
index 09fe9f9..0000000
--- a/recipes-extended/multitech/set-rs485_0.1.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Enables RS485 mode for a serial tty device"
-HOMEPAGE = "http://www.multitech.net/"
-PRIORITY = "optional"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-PR = "r0"
-
-SRC_URI = "file://set-rs485.c"
-S = "${WORKDIR}"
-
-do_compile() {
-	${CC} ${CFLAGS} ${LDFLAGS} -o set-rs485 set-rs485.c
-}
-
-do_install() {
-	install -d ${D}${bindir}
-	install -m 0755 set-rs485 ${D}${bindir}/
-}
diff --git a/recipes-extended/multitech/sms-utils.inc b/recipes-extended/multitech/sms-utils.inc
deleted file mode 100644
index 5a13eff..0000000
--- a/recipes-extended/multitech/sms-utils.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "SMS Utilities"
-HOMEPAGE = "http://www.multitech.net/"
-SECTION = "console/utils"
-PRIORITY = "optional"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "libesmtp libyaml"
-
-SRCREV = "${PV}"
-SRC_URI = "git://git.multitech.net/sms-utils.git;protocol=git"
-S = "${WORKDIR}/git"
-
-inherit autotools-brokensep
-
-PARALLEL_MAKE = ""
-
-do_install_append() {
-	install -d ${D}${datadir}/${PN}
-	install -m 0644 src/sms.config.example ${D}${datadir}/${PN}/
-}
-
-FILES_${PN} += "${datadir}/${PN}/sms.config.example"
diff --git a/recipes-extended/multitech/sms-utils_1.0.6.bb b/recipes-extended/multitech/sms-utils_1.0.6.bb
deleted file mode 100644
index f796b24..0000000
--- a/recipes-extended/multitech/sms-utils_1.0.6.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require sms-utils.inc
-
-PR = "r0"
diff --git a/recipes-extended/multitech/venus-gps/fix_nmea_intervals.patch b/recipes-extended/multitech/venus-gps/fix_nmea_intervals.patch
deleted file mode 100644
index 41ce262..0000000
--- a/recipes-extended/multitech/venus-gps/fix_nmea_intervals.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 35e865bbe72085260bd48fdc65eba0887fe32360 Mon Sep 17 00:00:00 2001
-From: Serhii Voloshynov <serhii.voloshynov@globallogic.com>
-Date: Thu, 3 Jan 2019 09:32:41 +0200
-Subject: [PATCH] fix setting of NMEA sentences intervals, add --quit parameter
-
----
- src/venus_gps.c | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/src/venus_gps.c b/src/venus_gps.c
-index 77c7e73..2f6bf44 100644
---- a/src/venus_gps.c
-+++ b/src/venus_gps.c
-@@ -788,6 +788,8 @@ static void usage(FILE * out)
- 	fprintf(out, "         --gpzda 0-255 (default: 1) |\n");
- #endif
- 	fprintf(out, "         --gpvtg 0-255 (default: 1)\n");
-+	fprintf(out, "\n");
-+	fprintf(out, "         --quit \n");
- 	fprintf(out, "       }\n");
- 	fprintf(out, "\n");
- }
-@@ -819,6 +821,7 @@ enum {
- 	OPT_SERIAL_CLIENT,
- 	OPT_ID_PREFIX,
- 	OPT_ID,
-+	OPT_QUIT
- };
- 
- static char *short_options = "b:d:p:f";
-@@ -852,6 +855,7 @@ static struct option long_options[] = {
- 	{"longitude", 1, 0, OPT_LONGITUDE},
- 	{"altitude", 1, 0, OPT_ALTITUDE},
- #endif
-+	{"quit", 0, 0, OPT_QUIT},
- 	{"version", 0, NULL, OPT_VERSION},
- 	{"help", 0, NULL, OPT_HELP},
- 	{0, 0, 0, 0},
-@@ -864,6 +868,7 @@ int main(int argc, char *argv[])
- 	char *cp;
- 	int option_index;
- 	int tty;
-+	int quit =0;
- 	struct venus_msg msg;
- 
- 	struct socket_client_args *sc;
-@@ -883,6 +888,10 @@ int main(int argc, char *argv[])
- 			daemonize = 1;
- 			break;
- 
-+		case OPT_QUIT:
-+			quit = 1;
-+			break;
-+
- 		case OPT_DEVICE:
- 			device = optarg;
- 			break;
-@@ -1145,7 +1154,7 @@ int main(int argc, char *argv[])
- 	}
- #endif
- 
--	tmp = venus_conf_nmea(tty, 1, 1, 1, 1, 1, 1, 0, UPDATE_ATTR_SRAM);
-+	tmp = venus_conf_nmea(tty, gpgga, gpgsa, gpgsv, gpgll, gprmc, gpvtg, 0, UPDATE_ATTR_SRAM);
- 	if (tmp < 0) {
- 		log_error("failed to configure nmea sentences");
- 		exit(1);
-@@ -1158,6 +1167,9 @@ int main(int argc, char *argv[])
- 	}
- 
- 	venus_close(tty);
-+	if (quit) {
-+		exit(0);
-+	}
- 
- 	sigset_t sigset;
- 	sigemptyset(&sigset);
--- 
-2.7.4
-
diff --git a/recipes-extended/multitech/venus-gps_0.1.0.bb b/recipes-extended/multitech/venus-gps_0.1.0.bb
deleted file mode 100644
index 55d7325..0000000
--- a/recipes-extended/multitech/venus-gps_0.1.0.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "SkyTraq Venus GPS Example"
-HOMEPAGE = "http://www.multitech.net/"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r1"
-
-SRC_URI = "git://git.multitech.net/venus-gps.git;protocol=git;tag=${PV} \
-	   file://fix_nmea_intervals.patch \
-	  "
-S = "${WORKDIR}/git"
-
-inherit autotools
-
-PARALLEL_MAKE = ""
diff --git a/recipes-extended/stressapptest/stressapptest_svn.bb b/recipes-extended/stressapptest/stressapptest_svn.bb
deleted file mode 100644
index bba0077..0000000
--- a/recipes-extended/stressapptest/stressapptest_svn.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Stressful Application Test"
-HOMEPAGE = "https://code.google.com/p/stressapptest/"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=55ea9d559f985fb4834317d8ed6b9e58"
-#DEPENDS = ""
-
-SRCREV = "r48"
-PV = "1.0.7+svn${SRCPV}"
-
-SRC_URI = "svn://stressapptest.googlecode.com/svn;module=trunk;protocol=http"
-S = "${WORKDIR}/trunk"
-
-inherit autotools
diff --git a/recipes-extended/sudo/files/sudo.pam b/recipes-extended/sudo/files/sudo.pam
deleted file mode 100644
index 515eab0..0000000
--- a/recipes-extended/sudo/files/sudo.pam
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth       include      common-auth
-account    include      common-account
-password   include      common-password
-session    optional     pam_keyinit.so revoke
-session    required     pam_limits.so
diff --git a/recipes-extended/sudo/sudo.inc b/recipes-extended/sudo/sudo.inc
deleted file mode 100644
index 51748b1..0000000
--- a/recipes-extended/sudo/sudo.inc
+++ /dev/null
@@ -1,52 +0,0 @@
-SUMMARY = "Provide limited super user privileges to specific users"
-DESCRIPTION = "Sudo (superuser do) allows a system administrator to give certain users (or groups of users) the ability to run some (or all) commands as root while logging all commands and arguments."
-HOMEPAGE = "http://www.sudo.ws"
-BUGTRACKER = "http://www.sudo.ws/bugs/"
-SECTION = "admin"
-LICENSE = "ISC & BSD & Zlib"
-LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=6c76b73603ac7763ab0516ebfbe67b42 \
-                    file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=4a162fc04b86b03f5632180fe6076cda \
-                    file://lib/util/reallocarray.c;beginline=3;endline=16;md5=85b0905b795d4d58bf2e00635649eec6 \
-                    file://lib/util/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd \
-                    file://lib/util/getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \
-                    file://lib/util/glob.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \
-                    file://lib/util/snprintf.c;beginline=6;endline=34;md5=c82c1b3a5c32e08545c9ec5d71e41e50 \
-                    file://include/sudo_queue.h;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \
-                    file://lib/util/inet_pton.c;beginline=3;endline=17;md5=3970ab0518ab79cbd0bafb697f10b33a \
-                    file://lib/util/arc4random.c;beginline=3;endline=20;md5=15bdc89c1b003fa4d7353e6296ebfd68 \
-                    file://lib/util/arc4random_uniform.c;beginline=3;endline=17;md5=31e630ac814d692fd0ab7a942659b46f \
-                    file://lib/util/getentropy.c;beginline=1;endline=19;md5=9f1a275ecd44cc264a2a4d5e06a75292 \
-                    "
-
-inherit autotools
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib"
-PACKAGECONFIG[pam-wheel] = ",,,pam-plugin-wheel"
-
-CONFFILES_${PN} = "${sysconfdir}/sudoers"
-
-EXTRA_OECONF = "--with-editor=/bin/vi --with-env-editor"
-
-EXTRA_OECONF_append_libc-musl = " --disable-hardening "
-
-# mksigname/mksiglist are used on build host to generate source files
-do_compile_prepend () {
-	echo "JAK: Correct sudo.inc"
-	# Remove build host references from sudo_usage.h
-	sed -i  \
-	    -e 's,--with-libtool-sysroot=${STAGING_DIR_TARGET},,g' \
-	    -e 's,--build=${BUILD_SYS},,g' \
-	    -e 's,--host=${HOST_SYS},,g' \
-	    ${B}/src/sudo_usage.h
-	oe_runmake SSP_CFLAGS="" SSP_LDFLAGS="" CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" CPPFLAGS="$BUILD_CPPFLAGS -I${S}/include -I${S} -I${B}"  -C lib/util mksigname mksiglist
-}
-
-# Explicitly create ${localstatedir}/lib before do_install to ensure
-# the directory is accessible by all users. Otherwise the mkinstalldirs
-# script (from sudo) will recursively create ${localstatedir}/lib/sudo
-# and then chmod each directory with 0700 permissions, which isn't what
-# we want (i.e, users would not be able to access /var/lib).
-do_install_prepend (){
-	mkdir -p ${D}/${localstatedir}/lib
-}
diff --git a/recipes-extended/sudo/sudo/0001-Include-sys-types.h-for-id_t-definition.patch b/recipes-extended/sudo/sudo/0001-Include-sys-types.h-for-id_t-definition.patch
deleted file mode 100644
index eb36cd4..0000000
--- a/recipes-extended/sudo/sudo/0001-Include-sys-types.h-for-id_t-definition.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 386e2c2fa2ab2e02ef71c268a57205139be329ab Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 31 Aug 2015 07:07:49 +0000
-Subject: [PATCH] Include sys/types.h for id_t definition
-
-/sudo_util.h:219:14: error: unknown type name 'id_t'
- __dso_public id_t sudo_strtoid_v1(const char *str, const char *sep,
- char **endp, const char **errstr);
-               ^
-	       make[1]: *** [preserve_fds.o] Error 1
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- include/sudo_util.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/sudo_util.h b/include/sudo_util.h
-index 89c9f89..ac0855a 100644
---- a/include/sudo_util.h
-+++ b/include/sudo_util.h
-@@ -17,6 +17,8 @@
- #ifndef SUDO_UTIL_H
- #define SUDO_UTIL_H
- 
-+#include <sys/types.h>
-+
- #ifdef HAVE_STDBOOL_H
- # include <stdbool.h>
- #else
--- 
-2.5.1
-
diff --git a/recipes-extended/sudo/sudo/privacy b/recipes-extended/sudo/sudo/privacy
deleted file mode 100644
index 7c03615..0000000
--- a/recipes-extended/sudo/sudo/privacy
+++ /dev/null
@@ -1 +0,0 @@
-Defaults      lecture = never
diff --git a/recipes-extended/sudo/sudo/sudoers.patch b/recipes-extended/sudo/sudo/sudoers.patch
deleted file mode 100644
index aed0f10..0000000
--- a/recipes-extended/sudo/sudo/sudoers.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uprN old/plugins/sudoers/sudoers.in new/plugins/sudoers/sudoers.in
---- old/plugins/sudoers/sudoers.in	2015-10-31 18:34:59.000000000 -0500
-+++ new/plugins/sudoers/sudoers.in	2017-04-20 10:32:19.530931283 -0500
-@@ -57,7 +57,7 @@
- # Defaults env_keep += "XMODIFIERS GTK_IM_MODULE QT_IM_MODULE QT_IM_SWITCHER"
- ##
- ## Uncomment to use a hard-coded PATH instead of the user's to find commands
--# Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-+Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
- ##
- ## Uncomment to send mail if the user does not enter the correct password.
- # Defaults mail_badpass
-@@ -85,7 +85,7 @@ root ALL=(ALL) ALL
- # %wheel ALL=(ALL) NOPASSWD: ALL
- 
- ## Uncomment to allow members of group sudo to execute any command
--# %sudo	ALL=(ALL) ALL
-+%sudo	ALL=(ALL) ALL
- 
- ## Uncomment to allow any user to run sudo if they know the password
- ## of the user they are running the command as (root by default).
diff --git a/recipes-extended/sudo/sudo_%.bbappend b/recipes-extended/sudo/sudo_%.bbappend
deleted file mode 100644
index a1e4b04..0000000
--- a/recipes-extended/sudo/sudo_%.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-SRC_URI += "file://sudoers.patch \
-            file://privacy"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-
-CONFFILES_${PN} += "${sysconfdir}/sudoers.d/privacy"
-
-do_install_append() {
-    install -D -m 644 ${WORKDIR}/privacy ${D}/${sysconfdir}/sudoers.d
-}
-
diff --git a/recipes-extended/sudo/sudo_1.8.27.bb b/recipes-extended/sudo/sudo_1.8.27.bb
deleted file mode 100644
index 8f0a144..0000000
--- a/recipes-extended/sudo/sudo_1.8.27.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-require sudo.inc
-
-SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
-           ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
-           file://0001-Include-sys-types.h-for-id_t-definition.patch \
-           "
-
-PAM_SRC_URI = "file://sudo.pam"
-
-SRC_URI[md5sum] = "b5c184b13b6b5de32af630af2fd013fd"
-SRC_URI[sha256sum] = "7beb68b94471ef56d8a1036dbcdc09a7b58a949a68ffce48b83f837dd33e2ec0"
-
-DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"
-
-EXTRA_OECONF += " \
-             ac_cv_type_rsize_t=no \
-             ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \
-             ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \
-             "
-
-do_install_append () {
-        if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then
-		install -D -m 644 ${WORKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo
-	fi
-	if ${@bb.utils.contains('PACKAGECONFIG', 'pam-wheel', 'true', 'false', d)} ; then
-		echo 'auth       required     pam_wheel.so use_uid' >>${D}${sysconfdir}/pam.d/sudo
-		sed -i 's/# \(%wheel ALL=(ALL) ALL\)/\1/' ${D}${sysconfdir}/sudoers
-	fi
-
-	chmod 4111 ${D}${bindir}/sudo
-	chmod 0440 ${D}${sysconfdir}/sudoers
-
-	# Explicitly remove the /run directory to avoid QA error
-	rmdir -p --ignore-fail-on-non-empty ${D}/run/sudo
-}
-
-FILES_${PN} += "${libdir}/tmpfiles.d"
-FILES_${PN}-dev += "${libexecdir}/${BPN}/lib*${SOLIBSDEV} ${libexecdir}/${BPN}/*.la \
-                    ${libexecdir}/lib*${SOLIBSDEV} ${libexecdir}/*.la"
-
-                    
-                    
-                    
-                    
diff --git a/recipes-extended/uvccapture/files/makefile.patch b/recipes-extended/uvccapture/files/makefile.patch
deleted file mode 100644
index 4733154..0000000
--- a/recipes-extended/uvccapture/files/makefile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: uvccapture-0.5/Makefile
-===================================================================
---- uvccapture-0.5.orig/Makefile	2011-08-18 14:02:17.757628553 -0500
-+++ uvccapture-0.5/Makefile	2011-08-18 14:10:09.627899608 -0500
-@@ -1,8 +1,8 @@
--CC=gcc
--CPP=g++
-+#CC=gcc
-+#CPP=g++
- APP_BINARY=uvccapture
--VERSION = 0.4
--PREFIX=/usr/local/bin
-+VERSION = 0.5
-+PREFIX=/usr/bin
- 
- WARNINGS = -Wall
- 
-@@ -20,8 +20,9 @@
- 	rm -f *.a *.o $(APP_BINARY) core *~ log errlog
- 
- install:
--	install $(APP_BINARY) $(PREFIX)
-+	install -d $(DESTDIR)$(PREFIX)
-+	install -m755 $(APP_BINARY) $(DESTDIR)$(PREFIX)
- 
- # Applications:
- uvccapture: $(OBJECTS)
--	$(CC)   $(OBJECTS) $(XPM_LIB) $(MATH_LIB) -ljpeg -o $(APP_BINARY)
-+	$(CC) $(OBJECTS) $(XPM_LIB) $(MATH_LIB) -ljpeg $(LDFLAGS) -o $(APP_BINARY)
diff --git a/recipes-extended/uvccapture/files/uvccapture_use_videodev2.patch b/recipes-extended/uvccapture/files/uvccapture_use_videodev2.patch
deleted file mode 100644
index b6e4617..0000000
--- a/recipes-extended/uvccapture/files/uvccapture_use_videodev2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/uvccapture.c	2008-08-03 22:02:38 +0000
-+++ b/uvccapture.c	2011-06-09 16:31:30 +0000
-@@ -31,7 +31,7 @@
- #include <unistd.h>
- #include <jpeglib.h>
- #include <time.h>
--#include <linux/videodev.h>
-+#include <linux/videodev2.h>
- 
- #include "v4l2uvc.h"
- 
-
---- a/v4l2uvc.c	2008-03-28 19:13:23 +0000
-+++ b/v4l2uvc.c	2011-06-09 16:31:30 +0000
-@@ -28,7 +28,7 @@
- #include <errno.h>
- #include <unistd.h>
- #include <fcntl.h>
--#include <linux/videodev.h>
-+#include <linux/videodev2.h>
- #include <sys/mman.h>
- #include <sys/ioctl.h>
- #include "v4l2uvc.h"
-
diff --git a/recipes-extended/uvccapture/uvccapture_0.5.bb b/recipes-extended/uvccapture/uvccapture_0.5.bb
deleted file mode 100644
index 92e781e..0000000
--- a/recipes-extended/uvccapture/uvccapture_0.5.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Command-line tool to capture webcam images"
-DEPENDS = "jpeg virtual/kernel"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM="file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r1"
-
-inherit autotools-brokensep
-
-SRC_URI = "http://staticwave.ca/source/uvccapture/${PN}-${PV}.tar.bz2 \
-		   file://uvccapture_use_videodev2.patch \
-		   file://makefile.patch \
-		   "
-
-SRC_URI[md5sum] = "2ac901069a35b8954c11b11f6e036989"
-SRC_URI[sha256sum] = "b7c262d2428f23a4c64feddd2c37c43fb39ce4c92a5a6ae0dddf28e3adc5b60e"
diff --git a/recipes-java/openjdk/openjdk-8/jvm.cfg b/recipes-java/openjdk/openjdk-8/jvm.cfg
deleted file mode 100644
index 5a21e4e..0000000
--- a/recipes-java/openjdk/openjdk-8/jvm.cfg
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Sun designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Sun in the LICENSE file that accompanied this code.
-#
-# This code 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
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
-#
-# 
-# List of JVMs that can be used as an option to java, javac, etc.
-# Order is important -- first in this list is the default JVM.
-# NOTE that this both this file and its format are UNSUPPORTED and
-# WILL GO AWAY in a future release.
-#
-# You may also select a JVM in an arbitrary location with the
-# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
-# and may not be available in a future release.
-#
--jamvm ERROR
--server ERROR
--client IGNORE
--hotspot ERROR
--classic WARN
--native ERROR
--green ERROR
--zero ALIASED_TO -server
--shark ERROR
--cacao ERROR
diff --git a/recipes-java/openjdk/openjdk-8_102b14.bbappend b/recipes-java/openjdk/openjdk-8_102b14.bbappend
deleted file mode 100644
index 4a258d2..0000000
--- a/recipes-java/openjdk/openjdk-8_102b14.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-# provides custom jvm.cfg to set the default JVM
-
-# openjdk-7 recipe is prepending to FILESPATH, so use
-# FILESPATH instead of FILESEXTRAPATH or our file doesn't
-# get picked up
-FILESPATH_prepend := "${THISDIR}/openjdk-8:"
diff --git a/recipes-java/v4l4j/v4l4j-0.9.1/makefile.patch b/recipes-java/v4l4j/v4l4j-0.9.1/makefile.patch
deleted file mode 100644
index 52639fa..0000000
--- a/recipes-java/v4l4j/v4l4j-0.9.1/makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: v4l4j-0.9.1/src/Makefile
-===================================================================
---- v4l4j-0.9.1.orig/src/Makefile	2014-09-16 16:52:05.753059188 -0500
-+++ v4l4j-0.9.1/src/Makefile	2014-09-16 16:52:15.260916249 -0500
-@@ -51,7 +51,7 @@
- all: $(LIB)
- 
- $(LIB): $(OBJ)
--	$(LD) $(OBJ) $(LDFLAGS) -o $(LIB)
-+	$(CC) $(OBJ) $(LDFLAGS) -o $(LIB)
- 
- test-debug:  $(LIBVIDEO_PATH)/lib$(LIBVIDEO_NAME).so
- 	$(CC) $(INCLUDES) -DDEBUG -Wall -ggdb -DMAKETEST -c jpeg.c
diff --git a/recipes-java/v4l4j/v4l4j_0.9.1.bb b/recipes-java/v4l4j/v4l4j_0.9.1.bb
deleted file mode 100644
index 605c746..0000000
--- a/recipes-java/v4l4j/v4l4j_0.9.1.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-DESCRIPTION = "A java package to access the Capture interface of the Video4Linux API"
-DEPENDS = "jpeg icedtea6-native libv4l"
-PR = "r0"
-LICENSE = "GPL-3.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=87212b5f1ae096371049a12f80034f32"
-
-SRC_URI = "http://v4l4j.googlecode.com/files/v4l4j-${PV}.tar.gz \
-		   file://makefile.patch \
-		   "
-
-SRC_URI[md5sum] = "88756ca604a4701b7c453be24f948a09"
-SRC_URI[sha256sum] = "cb20aad827442960090660d85f9fa24eed9417e732fdefb66e57083df3c88cf7"
-
-export JDK_HOME = "${STAGING_LIBDIR_NATIVE}/jvm/icedtea6-native"
-STAGING_DATADIR_JAVA_NATIVE = "${STAGING_DATADIR_NATIVE}/java"
-
-# run ant with icedtea6-native so things get compiled with java 1.6
-ANT = "${JDK_HOME}/bin/java \
-	   -cp ${STAGING_DATADIR_JAVA_NATIVE}/ant.jar:${JDK_HOME}/lib/tools.jar \
-	   org.apache.tools.ant.launch.Launcher"
-
-do_compile () {
-	${ANT} clean all
-}
-
-do_install () {
-	install -d ${D}${libdir}
-	install libvideo/libvideo.so.0 ${D}${libdir}
-
-	install -d ${D}/usr/share/java
-	install v4l4j.jar ${D}/usr/share/java
-
-	install -d ${D}/usr/lib/jni
-	install libv4l4j.so ${D}/usr/lib/jni
-}
-
-FILES_${PN} += "/usr/share/java /usr/lib/jni"
-FILES_${PN}-dbg += "/usr/lib/jni/.debug"
diff --git a/recipes-navigation/gpsd/gpsd-3.16/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch b/recipes-navigation/gpsd/gpsd-3.16/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch
deleted file mode 100644
index 2ea3226..0000000
--- a/recipes-navigation/gpsd/gpsd-3.16/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 1e2cea8945bc2183fbe1a012dcd633a352125952 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Tue, 24 Apr 2012 18:45:14 +0200
-Subject: [PATCH] SConstruct: prefix includepy with sysroot and drop sysroot
- from python_lib_dir
-
-* without PYTHONPATH, distutil's sysconfig returns INCLUDEPY without sysroot prefix
-  and with PYTHONPATH from OE it's pointing to native python dir
-
-    $ export PYTHONPATH=/OE/shr-core/tmp-eglibc/sysroots/om-gta02/usr/lib/python2.7/
-    $ python
-    Python 2.7.2 (default, Apr 18 2012, 09:19:59)
-    [GCC 4.6.2] on linux2
-    Type "help", "copyright", "credits" or "license" for more information.
-    >>> from distutils import sysconfig
-    >>> sysconfig.get_config_vars('INCLUDEPY')
-    ['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7']
-    >>>
-    $ unset PYTHONPATH
-    $ python
-    Python 2.7.2 (default, Apr 18 2012, 09:19:59)
-    [GCC 4.6.2] on linux2
-    Type "help", "copyright", "credits" or "license" for more information.
-    >>> from distutils import sysconfig
-    >>> sysconfig.get_config_vars('INCLUDEPY')
-    ['/python2.7']
-    >>> import sysconfig
-    >>> sysconfig.get_config_vars('INCLUDEPY')
-    ['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7']
-* python_lib_dir = python_lib_dir.replace(env['sysroot'], '')
-  returns path to target sysroot
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-Signed-off-by: Peter A. Bigot <pab@pabigot.com>
----
- SConstruct | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/SConstruct b/SConstruct
-index 6c93311..cde8b3d 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -1148,6 +1148,12 @@ else:
-         basecflags += ' -coverage'
-         ldflags += ' -coverage'
-         ldshared += ' -coverage'
-+
-+    if env['sysroot']:
-+        print "Prefixing includepy '%s' with sysroot prefix" % includepy
-+        includepy = os.path.normpath("%s/%s/%s/%s" % (env['sysroot'], env['prefix'], env['includedir'], includepy))
-+        print "'%s'" % includepy
-+
-     # in case CC/CXX was set to the scan-build wrapper,
-     # ensure that we build the python modules with scan-build, too
-     if env['CC'] is None or env['CC'].find('scan-build') < 0:
-@@ -1408,11 +1414,14 @@ if not env['python']:
-     python_install = []
- else:
-     python_lib_dir = env['python_libdir']
-+    python_lib_dir = python_lib_dir.replace(env['sysroot'], '')
-     python_module_dir = python_lib_dir + os.sep + 'gps'
-     python_extensions_install = python_env.Install( DESTDIR + python_module_dir,
-                                                     python_built_extensions)
-     if not env['debug'] and not env['profiling'] and not env['nostrip'] and not sys.platform.startswith('darwin'):
-         python_env.AddPostAction(python_extensions_install, '$STRIP $TARGET')
-+    env.AddPostAction(python_extensions_install, '$CHRPATH -r "%s" "$TARGET"' \
-+                     % (python_lib_dir, ))
- 
-     python_modules_install = python_env.Install( DESTDIR + python_module_dir,
-                                                 python_modules)
--- 
-2.1.0
-
diff --git a/recipes-navigation/gpsd/gpsd-3.16/0001-include-sys-ttydefaults.h.patch b/recipes-navigation/gpsd/gpsd-3.16/0001-include-sys-ttydefaults.h.patch
deleted file mode 100644
index b27c671..0000000
--- a/recipes-navigation/gpsd/gpsd-3.16/0001-include-sys-ttydefaults.h.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 543f79222520cc6ab65d20f9fa356dac5c848e3b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 17 Aug 2016 02:16:12 +0000
-Subject: [PATCH] include sys/ttydefaults.h
-
-This is needed for CTRL definition, as exposed by musl on glibc
-this include file gets pulled indirectly.
-
-/usr/src/debug/gpsd/3.14-r0/gpsd-3.14/gpsmon.c:605: undefined reference to `CTRL'
-clang-3.9: error: linker command failed with exit code 1 (use -v to see invocation)
-scons: *** [gpsmon] Error 1
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- gpsmon.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gpsmon.c b/gpsmon.c
-index bee05b8..daed818 100644
---- a/gpsmon.c
-+++ b/gpsmon.c
-@@ -20,6 +20,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/select.h>
-+#include <sys/ttydefaults.h>
- #include <fcntl.h>
- #ifndef S_SPLINT_S
- #include <unistd.h>
--- 
-1.8.3.1
-
diff --git a/recipes-navigation/gpsd/gpsd-3.16/0002-SConstruct-remove-rpath.patch b/recipes-navigation/gpsd/gpsd-3.16/0002-SConstruct-remove-rpath.patch
deleted file mode 100644
index 083a662..0000000
--- a/recipes-navigation/gpsd/gpsd-3.16/0002-SConstruct-remove-rpath.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From d090638ff983e509162d5e3b62aa4918de4aa5fa Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Tue, 24 Apr 2012 16:24:35 +0200
-Subject: [PATCH 2/4] SConstruct: remove rpath
-
-* even with correct prefix (without DESTDIR) included it's redundant
-  WARNING: QA Issue: libgps:
-  /work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/packages-split/libgps/usr/lib/libgps.so.20.0
-  contains probably-redundant RPATH /usr/lib
-* and with prefix from scons.bbclass it's invalid
-  WARNING: QA Issue: package libgps contains bad RPATH
-  /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/image/usr/lib
-  in file
-  /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/packages-split/libgps/usr/lib/libgps.so.20.0
-
-Upstream-Status: Inapppropriate [embedded specific]
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
-Signed-off-by: Peter A. Bigot <pab@pabigot.com>
----
- SConstruct | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index f0cafa8..ff46713 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -1340,8 +1340,11 @@ if qt_env:
-     binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib))
- 
- if env["shared"] and env["chrpath"]:
--    env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \
--                      % (installdir('libdir', False), ))
-+    if not env['sysroot']:
-+        env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \
-+                          % (installdir('libdir', False), ))
-+    else:
-+        env.AddPostAction(binaryinstall, '$CHRPATH -d "$TARGET"')
- 
- if not env['debug'] and not env['profiling'] and env['strip']:
-     env.AddPostAction(binaryinstall, '$STRIP $TARGET')
--- 
-1.8.5.5
-
diff --git a/recipes-navigation/gpsd/gpsd-3.16/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch b/recipes-navigation/gpsd/gpsd-3.16/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch
deleted file mode 100644
index 8527f0d..0000000
--- a/recipes-navigation/gpsd/gpsd-3.16/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 697e2e9ff97487266d817cdd41bacc83f681e3d7 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sun, 29 Apr 2012 00:05:59 +0200
-Subject: [PATCH 4/4] SConstruct: disable html and man docs building because
- xmlto-native from OE is broken
-
-It will try to load dtd and fail:
-| xmlto man gpsctl.xml; mv `basename gpsctl.1` gpsctl.1
-| xmlto: /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml does not validate (status 3)
-| xmlto: Fix document syntax or use --skip-validation option
-| I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd
-| /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml:8: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
-|    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-|                                                               ^
-| I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd
-| warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
-| validity error : Could not load the external subset "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
-| Document /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml does not validate
-| mv: cannot stat `gpsctl.1': No such file or directory
-| scons: *** [gpsctl.1] Error 1
-| scons: building terminated because of errors.
-
-Upstream-Status: Inappropriate [disable feature]
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-Signed-off-by: Peter A. Bigot <pab@pabigot.com>
----
- SConstruct | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 0e518e7..c01a71b 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -704,12 +704,12 @@ size_t strlcpy(/*@out@*/char *dst, /*@in@*/const char *src, size_t size);
- 
-     manbuilder = mangenerator = htmlbuilder = None
-     if env['manbuild']:
--        if config.CheckXsltproc():
-+        if False and config.CheckXsltproc():
-             mangenerator = 'xsltproc'
-             build = "xsltproc --nonet %s $SOURCE >$TARGET"
-             htmlbuilder = build % docbook_html_uri
-             manbuilder = build % docbook_man_uri
--        elif WhereIs("xmlto"):
-+        elif False and WhereIs("xmlto"):
-             mangenerator = 'xmlto'
-             xmlto = "xmlto %s $SOURCE || mv `basename $TARGET` `dirname $TARGET`"
-             htmlbuilder = xmlto % "html-nochunks"
--- 
-1.8.5.5
-
diff --git a/recipes-navigation/gpsd/gpsd-3.16/0005-suppress-text-in-binary.patch b/recipes-navigation/gpsd/gpsd-3.16/0005-suppress-text-in-binary.patch
deleted file mode 100644
index f338126..0000000
--- a/recipes-navigation/gpsd/gpsd-3.16/0005-suppress-text-in-binary.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -u old/gpsctl.c new/gpsctl.c
---- old/gpsctl.c	2017-01-03 15:57:50.517120891 -0600
-+++ new/gpsctl.c	2017-01-03 18:31:21.421101434 -0600
-@@ -175,7 +175,7 @@
-     int option, status;
-     char *device = NULL, *devtype = NULL;
-     char *speed = NULL, *control = NULL, *rate = NULL;
--    bool to_binary = false, to_nmea = false, reset = false;
-+    bool to_binary = false, to_nmea = false, reset = false, control_string = false;
-     bool lowlevel=false, echo=false;
-     struct gps_data_t gpsdata;
-     const struct gps_type_t *forcetype = NULL;
-@@ -205,6 +205,7 @@
- #ifdef CONTROLSEND_ENABLE
- 	    control = optarg;
- 	    lowlevel = true;
-+	    control_string = true;
- 	    if ((cooklen = hex_escapes(cooked, control)) <= 0) {
- 		gpsd_log(&context.errout, LOG_ERROR,
- 			 "invalid escape string (error %d)\n", (int)cooklen);
-@@ -704,7 +705,8 @@
- 	    }
- 	}
- 
--	(void)printf("%s identified as a %s at %u baud.\n",
-+	if(!control_string)
-+		(void)printf("%s identified as a %s at %u baud.\n",
-                        device, gpsd_id(&session),
-                        session.gpsdata.dev.baudrate);
- 
diff --git a/recipes-navigation/gpsd/gpsd-3.16/0006-itu_r_tf_460_6.patch b/recipes-navigation/gpsd/gpsd-3.16/0006-itu_r_tf_460_6.patch
deleted file mode 100644
index 8e8d814..0000000
--- a/recipes-navigation/gpsd/gpsd-3.16/0006-itu_r_tf_460_6.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur old/ntpshmwrite.c new/ntpshmwrite.c
---- old/ntpshmwrite.c	2017-01-23 10:00:05.497129473 -0600
-+++ new/ntpshmwrite.c	2017-01-23 09:47:58.881627772 -0600
-@@ -32,11 +32,18 @@
-      * NTP expects leap pending for only 1 month prior to insertion
-      * Per http://bugs.ntp.org/1090 */
-     (void)gmtime_r( &(td->real.tv_sec), &tm);
-+/* This code contradicts page 3 section 2.1 of ITU-R RV.460-6 that
-+ * leap second may occur at the last second of a month, with
-+ * preference for December and June, 2nd preference to March and
-+ * September.
-+ *  https://www.itu.int/dms_pubrec/itu-r/rec/tf/R-REC-TF.460-6-200202-I!!PDF-E.pdf
-+ */
-+#ifdef NOTITU_R_TF_460_6
-     if ( 5 != tm.tm_mon && 11 != tm.tm_mon ) {
-         /* Not june, not December, no way */
-         leap_notify = LEAP_NOWARNING;
-     }
--
-+#endif /* NOTITU_R_TF_460_6 */
-     /* we use the shmTime mode 1 protocol
-      *
-      * ntpd does this:
diff --git a/recipes-navigation/gpsd/gpsd-3.16/0006-sysclockcrash.patch b/recipes-navigation/gpsd/gpsd-3.16/0006-sysclockcrash.patch
deleted file mode 100644
index e6b90f0..0000000
--- a/recipes-navigation/gpsd/gpsd-3.16/0006-sysclockcrash.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Before the fix, sample PPS Logs:
-gpsd:PROG: KPPS:/dev/pps0 Clear cycle: -1236963952, duration: 1000000 @ (null)
-gpsd:PROG: PPS:/dev/pps0 Clear cycle:       0, duration: 1000000 @ (null)
-
-With this fix, we see logs like this:
-gpsd:PROG: KPPS:/dev/pps0 Clear cycle: 1000010, duration:  100003 @  1577729345.554599378
-gpsd:PROG: PPS:/dev/pps0 Clear cycle: 1000010, duration:  100003 @  1577729345.554599378
-
-When the system clock changes without this fix, and the
-debug level is 4 or greater, GPSD crashes on 32 bit ARM.
-This fix prevents strlen() in vfprintf() from being given
-a garbage pointer.  cycle, cycle_kpps, duration and
-duration_kpps are defined as long long, so by the C
-standard, the format string is %lld.
-=======================================================================
-diff -Naur old/ppsthread.c new/ppsthread.c
---- old/ppsthread.c	2017-02-01 11:36:31.575212221 -0600
-+++ new/ppsthread.c	2017-02-01 11:44:48.269536679 -0600
-@@ -770,10 +770,9 @@
-             edge_str = edge ? "Assert" : "Clear";
- 	    cycle = cycle_tio;
- 	    duration = duration_tio;
--
- 	    timespec_str( &clock_ts, ts_str1, sizeof(ts_str1) );
- 	    thread_context->log_hook(thread_context, THREAD_PROG,
--		    "TPPS:%s %.10s cycle: %d, duration: %d @ %s\n",
-+		    "TPPS:%s %.10s cycle: %lld, duration: %lld @ %s\n",
- 		    thread_context->devicename, edge_str, cycle, duration,
-                     ts_str1);
- 
-@@ -840,7 +839,7 @@
- 
- 	    timespec_str( &clock_ts_kpps, ts_str1, sizeof(ts_str1) );
- 	    thread_context->log_hook(thread_context, THREAD_PROG,
--		"KPPS:%s %.10s cycle: %7d, duration: %7d @ %s\n",
-+		"KPPS:%s %.10s cycle: %7lld, duration: %7lld @ %s\n",
- 		thread_context->devicename,
- 		edge_str,
- 		cycle_kpps, duration_kpps, ts_str1);
-@@ -898,7 +897,7 @@
- 	state_last = state;
- 	timespec_str( &clock_ts, ts_str1, sizeof(ts_str1) );
- 	thread_context->log_hook(thread_context, THREAD_PROG,
--	    "PPS:%s %.10s cycle: %7d, duration: %7d @ %s\n",
-+	    "PPS:%s %.10s cycle: %7lld, duration: %7lld @ %s\n",
- 	    thread_context->devicename,
- 	    edge_str,
- 	    cycle, duration, ts_str1);
diff --git a/recipes-navigation/gpsd/gpsd-3.16/0006-ubxtimelps.patch b/recipes-navigation/gpsd/gpsd-3.16/0006-ubxtimelps.patch
deleted file mode 100644
index e715847..0000000
--- a/recipes-navigation/gpsd/gpsd-3.16/0006-ubxtimelps.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-diff -Naur old/driver_ubx.c new/driver_ubx.c
---- old/driver_ubx.c	2017-01-19 14:12:25.099231346 -0600
-+++ new/driver_ubx.c	2017-01-19 15:13:58.552152991 -0600
-@@ -57,6 +57,29 @@
- #define UBX_CFG_LEN		20
- #define outProtoMask		14
- 
-+#ifdef UBLOXTIMELS_ENABLE
-+/* UBX-NAV-TIMELS support */
-+static char *srcOfCurrLs[] = {
-+  "firmware",
-+  "GPS GLONASS difference",
-+  "GPS",
-+  "SBAS",
-+  "BeiDou",
-+  "Galileo",
-+  "Aided data",
-+  "Configured"
-+};
-+static char *srcOfLsChange[] = {
-+  "No Source",
-+  "Undefined",
-+  "GPS",
-+  "SBAS",
-+  "BeiDou",
-+  "Galileo",
-+  "GLONOSS",
-+};
-+#endif  /* UBLOXTIMELS_ENABLE */
-+
- static gps_mask_t ubx_parse(struct gps_device_t *session, unsigned char *buf,
- 			    size_t len);
- static gps_mask_t ubx_msg_nav_dop(struct gps_device_t *session,
-@@ -237,6 +260,89 @@
-     return mask;
- }
- 
-+#ifdef UBLOXTIMELS_ENABLE
-+/**
-+ * Navigation time to leap second
-+ * 
-+ * Sets leap_notify if leap second is < 23 hours away.
-+ */
-+static void
-+ubx_msg_nav_timels(struct gps_device_t *session, unsigned char *buf,
-+		size_t data_len)
-+{
-+    int version;
-+    unsigned int flags;
-+    int valid_curr_ls;
-+    int valid_time_to_ls_event;
-+    
-+    if (data_len != 24) {
-+        gpsd_log(&session->context->errout, LOG_WARN, 
-+	  "UBX-NAV-TIMELS: unexpected length %d, expecting 24\n",
-+	  data_len);
-+	return;
-+    }
-+    version = getsb(buf,4);
-+    /* Only version 0 is defined so far. */
-+    flags = (unsigned int)getub(buf, 23);
-+    gpsd_log(&session->context->errout, LOG_DATA,
-+        "UBX-NAV-TIMELS: flags 0x%x message version %d\n",flags, version);
-+    valid_curr_ls = flags & UBX_TIMELS_VALID_CURR_LS;
-+    valid_time_to_ls_event = flags & UBX_TIMELS_VALID_TIME_LS_EVT;
-+    if(valid_curr_ls) {
-+      unsigned int src_of_curr_ls = getub(buf,8);
-+      int curr_ls = getsb(buf,9);
-+      char *src = "Unknown";
-+      
-+      if(src_of_curr_ls < (sizeof srcOfCurrLs/(sizeof srcOfCurrLs[0])))
-+	src = srcOfCurrLs[src_of_curr_ls];
-+	
-+      gpsd_log(&session->context->errout, LOG_DATA,
-+	     "UBX-NAV-TIMELS: source_of_current_leapsecond=%u:%s curr_ls=%d\n",
-+	     src_of_curr_ls,src,curr_ls);
-+      session->context->leap_seconds = curr_ls;
-+      session->context->valid |= LEAP_SECOND_VALID;
-+    } /* Valid current leap second */
-+    if(valid_time_to_ls_event) {
-+      char *src="Unknown";
-+      unsigned int src_of_ls_change;
-+      unsigned short dateOfLSGpsWn, dateOfLSGpsDn;
-+      int lsChange = getsb(buf,11);
-+      int timeToLsEvent = getles32(buf,12);
-+      src_of_ls_change = getub(buf,10);
-+      if(src_of_ls_change < (sizeof srcOfLsChange/(sizeof srcOfLsChange[0])))
-+	src = srcOfLsChange[src_of_ls_change];
-+      dateOfLSGpsWn = getles16(buf,16);
-+      dateOfLSGpsDn = getles16(buf,18);
-+      gpsd_log(&session->context->errout, LOG_DATA,
-+	 "UBX_NAV_TIMELS: source_of_leapsecond_change=%u:%s "
-+	 "leapSecondChage=%d timeToLsEvent=%d\n",
-+	 src_of_ls_change,src,lsChange,timeToLsEvent);
-+      gpsd_log(&session->context->errout, LOG_DATA,
-+	       "UBX_NAV_TIMELS: dateOfLSGpsWn=%d dateOfLSGpsDn=%d\n",
-+	       dateOfLSGpsWn,dateOfLSGpsDn);
-+      if(timeToLsEvent < 60*60*23 && timeToLsEvent > 0) {
-+	if(lsChange == 0)
-+	   session->context->leap_notify = LEAP_NOWARNING;
-+	else if (lsChange == 1)
-+	  session->context->leap_notify = LEAP_ADDSECOND;
-+	else if (lsChange == -1)
-+	  session->context->leap_notify = LEAP_DELSECOND;
-+      } else
-+	session->context->leap_notify = LEAP_NOWARNING;
-+
-+      if (session->context->leap_notify == LEAP_ADDSECOND)
-+	gpsd_log(&session->context->errout,LOG_INF,
-+		"UBX_NAV_TIMELS: Add leap second today\n");
-+      else if (session->context->leap_notify == LEAP_DELSECOND)
-+	gpsd_log(&session->context->errout,LOG_INF,
-+		 "UBX_NAV_TIMELS: Remove leap second today\n");
-+      
-+      gpsd_log(&session->context->errout, LOG_DATA,
-+	       "UBX_NAV_TIMELS: leaving: leap_notify=%d\n",
-+	session->context->leap_notify);
-+    }
-+}
-+#endif  /* UBLOXTIMELS_ENABLE */
-  /**
-  * Geodetic position solution message
-  */
-@@ -523,13 +629,22 @@
-     case UBX_NAV_EKFSTATUS:
- 	gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_EKFSTATUS\n");
- 	break;
--
-+    case UBX_NAV_TIMELS:
-+    gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_TIMELS\n");
-+#ifdef UBLOXTIMELS_ENABLE
-+	ubx_msg_nav_timels(session, &buf[UBX_PREFIX_LEN],data_len);
-+#endif // UBLOXTIMELS_ENABLE
-+	break;
-     case UBX_RXM_RAW:
- 	gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_RAW\n");
- 	break;
-     case UBX_RXM_SFRB:
-+	gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_SFRB\n");
- 	mask = ubx_msg_sfrb(session, &buf[UBX_PREFIX_LEN]);
- 	break;
-+    case UBX_RXM_SFRBX:
-+	gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_SFRBX\n");
-+	break;
-     case UBX_RXM_SVSI:
- 	gpsd_log(&session->context->errout, LOG_PROG, "UBX_RXM_SVSI\n");
- 	break;
-@@ -955,6 +1070,12 @@
- 	msg[1] = 0x20;		/* msg id  = UBX_NAV_TIMEGPS */
- 	msg[2] = 0x01;		/* rate */
- 	(void)ubx_write(session, 0x06u, 0x01, msg, 3);
-+#ifdef UBLOXTIMELS_ENABLE
-+	msg[0] = 0x01;		/* class */
-+	msg[1] = 0x26;		/* msg id  = UBX_NAV_TIMELS */
-+	msg[2] = 0xff;		/* rate */
-+#endif /* UBLOXTIMELS_ENABLE */
-+	(void)ubx_write(session, 0x06u, 0x01, msg, 3);
- 	msg[0] = 0x01;		/* class */
- 	msg[1] = 0x30;		/* msg id  = NAV-SVINFO */
- 	msg[2] = 0x0a;		/* rate */
-diff -Naur old/driver_ubx.h new/driver_ubx.h
---- old/driver_ubx.h	2017-01-19 14:12:25.099231346 -0600
-+++ new/driver_ubx.h	2017-01-19 14:01:48.177653001 -0600
-@@ -35,6 +35,7 @@
-     UBX_NAV_TIMEGPS	= UBX_MSGID(UBX_CLASS_NAV, 0x20),
-     UBX_NAV_TIMEUTC	= UBX_MSGID(UBX_CLASS_NAV, 0x21),
-     UBX_NAV_CLOCK	= UBX_MSGID(UBX_CLASS_NAV, 0x22),
-+    UBX_NAV_TIMELS	= UBX_MSGID(UBX_CLASS_NAV, 0x26),
-     UBX_NAV_SVINFO	= UBX_MSGID(UBX_CLASS_NAV, 0x30),
-     UBX_NAV_DGPS	= UBX_MSGID(UBX_CLASS_NAV, 0x31),
-     UBX_NAV_SBAS	= UBX_MSGID(UBX_CLASS_NAV, 0x32),
-@@ -42,6 +43,7 @@
- 
-     UBX_RXM_RAW		= UBX_MSGID(UBX_CLASS_RXM, 0x10),
-     UBX_RXM_SFRB	= UBX_MSGID(UBX_CLASS_RXM, 0x11),
-+    UBX_RXM_SFRBX	= UBX_MSGID(UBX_CLASS_RXM, 0x13),
-     UBX_RXM_SVSI	= UBX_MSGID(UBX_CLASS_RXM, 0x20),
-     UBX_RXM_ALM		= UBX_MSGID(UBX_CLASS_RXM, 0x30),
-     UBX_RXM_EPH		= UBX_MSGID(UBX_CLASS_RXM, 0x31),
-@@ -102,6 +104,9 @@
- #define UBX_SOL_VALID_WEEK 0x04
- #define UBX_SOL_VALID_TIME 0x08
- 
-+#define UBX_TIMELS_VALID_CURR_LS 0x01
-+#define UBX_TIMELS_VALID_TIME_LS_EVT 0x01
-+
- /* from UBX_NAV_SVINFO */
- #define UBX_SAT_USED 0x01
- #define UBX_SAT_DGPS 0x02
-diff -Naur old/SConstruct new/SConstruct
---- old/SConstruct	2017-01-19 14:51:35.638466569 -0600
-+++ new/SConstruct	2017-01-19 15:20:02.488159765 -0600
-@@ -113,6 +113,7 @@
-     ("tripmate",      True,  "DeLorme TripMate support"),
-     ("tsip",          True,  "Trimble TSIP support"),
-     ("ublox",         True,  "u-blox Protocol support"),
-+    ("ubloxtimels",   False, "u-blox UBX-NAV-TIMELS support (leap second)"),
-     ("fury",          True,  "Jackson Labs Fury and Firefly support"),
-     ("nmea2000",      True,  "NMEA2000/CAN support"),
-     # Non-GPS protocols
diff --git a/recipes-navigation/gpsd/gpsd-3.16/leap2017Aug31.patch b/recipes-navigation/gpsd/gpsd-3.16/leap2017Aug31.patch
deleted file mode 100644
index 658b757..0000000
--- a/recipes-navigation/gpsd/gpsd-3.16/leap2017Aug31.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-diff -Naur old/driver_ubx.c new/driver_ubx.c
---- old/driver_ubx.c	2017-08-01 10:56:05.757282801 -0500
-+++ new/driver_ubx.c	2017-08-01 10:53:49.785286827 -0500
-@@ -57,6 +57,29 @@
- #define UBX_CFG_LEN		20
- #define outProtoMask		14
- 
-+#ifdef UBLOXTIMELS_ENABLE
-+/* UBX-NAV-TIMELS support */
-+static char *srcOfCurrLs[] = {
-+  "firmware",
-+  "GPS GLONASS difference",
-+  "GPS",
-+  "SBAS",
-+  "BeiDou",
-+  "Galileo",
-+  "Aided data",
-+  "Configured"
-+};
-+static char *srcOfLsChange[] = {
-+  "No Source",
-+  "Undefined",
-+  "GPS",
-+  "SBAS",
-+  "BeiDou",
-+  "Galileo",
-+  "GLONOSS",
-+};
-+#endif  /* UBLOXTIMELS_ENABLE */
-+
- static gps_mask_t ubx_parse(struct gps_device_t *session, unsigned char *buf,
- 			    size_t len);
- static gps_mask_t ubx_msg_nav_dop(struct gps_device_t *session,
-@@ -237,6 +260,96 @@
-     return mask;
- }
- 
-+#ifdef UBLOXTIMELS_ENABLE
-+/**
-+ * Navigation time to leap second
-+ * 
-+ * Sets leap_notify if leap second is < 23 hours away.
-+ */
-+static void
-+ubx_msg_nav_timels(struct gps_device_t *session, unsigned char *buf,
-+		size_t data_len)
-+{
-+    int version;
-+    unsigned int flags;
-+    int valid_curr_ls;
-+    int valid_time_to_ls_event;
-+    
-+    if (data_len != 24) {
-+        gpsd_log(&session->context->errout, LOG_WARN, 
-+	  "UBX-NAV-TIMELS: unexpected length %d, expecting 24\n",
-+	  data_len);
-+	return;
-+    }
-+    version = getsb(buf,4);
-+    /* Only version 0 is defined so far. */
-+    flags = (unsigned int)getub(buf, 23);
-+    gpsd_log(&session->context->errout, LOG_DATA,
-+        "UBX-NAV-TIMELS: flags 0x%x message version %d\n",flags, version);
-+    valid_curr_ls = flags & UBX_TIMELS_VALID_CURR_LS;
-+    valid_time_to_ls_event = flags & UBX_TIMELS_VALID_TIME_LS_EVT;
-+    if(valid_curr_ls) {
-+      unsigned int src_of_curr_ls = getub(buf,8);
-+      int curr_ls = getsb(buf,9);
-+      char *src = "Unknown";
-+      
-+      if(src_of_curr_ls < (sizeof srcOfCurrLs/(sizeof srcOfCurrLs[0])))
-+	src = srcOfCurrLs[src_of_curr_ls];
-+	
-+      gpsd_log(&session->context->errout, LOG_DATA,
-+	     "UBX-NAV-TIMELS: source_of_current_leapsecond=%u:%s curr_ls=%d\n",
-+	     src_of_curr_ls,src,curr_ls);
-+      session->context->leap_seconds = curr_ls;
-+      session->context->valid |= LEAP_SECOND_VALID;
-+    } /* Valid current leap second */
-+    if(valid_time_to_ls_event) {
-+      char *src="Unknown";
-+      unsigned int src_of_ls_change;
-+      unsigned short dateOfLSGpsWn, dateOfLSGpsDn;
-+      int lsChange = getsb(buf,11);
-+      int timeToLsEvent = getles32(buf,12);
-+int secondsperday=24*60*60;
-+lsChange = 1;  /* JAK Forward one second */
-+      src_of_ls_change = getub(buf,10);
-+      if(src_of_ls_change < (sizeof srcOfLsChange/(sizeof srcOfLsChange[0])))
-+	src = srcOfLsChange[src_of_ls_change];
-+      dateOfLSGpsWn = getles16(buf,16);
-+      dateOfLSGpsDn = getles16(buf,18);
-+      gpsd_log(&session->context->errout, LOG_DATA,
-+	 "UBX_NAV_TIMELS: source_of_leapsecond_change=%u:%s "
-+	 "leapSecondChage=%d timeToLsEvent=%d\n",
-+	 src_of_ls_change,src,lsChange,timeToLsEvent);
-+timeToLsEvent += 212*secondsperday;   /* JAK Jul 31 Leap second for test */
-+      gpsd_log(&session->context->errout, LOG_DATA,
-+	 "UBX_NAV_TIMELS2: source_of_leapsecond_change=%u:%s "
-+	 "leapSecondChage=%d timeToLsEvent=%d\n",
-+	 src_of_ls_change,src,lsChange,timeToLsEvent);  /* JAK */
-+      gpsd_log(&session->context->errout, LOG_DATA,
-+	       "UBX_NAV_TIMELS: dateOfLSGpsWn=%d dateOfLSGpsDn=%d\n",
-+	       dateOfLSGpsWn,dateOfLSGpsDn);
-+      if(timeToLsEvent < 60*60*23 && timeToLsEvent > 0) {
-+	if(lsChange == 0)
-+	   session->context->leap_notify = LEAP_NOWARNING;
-+	else if (lsChange == 1)
-+	  session->context->leap_notify = LEAP_ADDSECOND;
-+	else if (lsChange == -1)
-+	  session->context->leap_notify = LEAP_DELSECOND;
-+      } else
-+	session->context->leap_notify = LEAP_NOWARNING;
-+
-+      if (session->context->leap_notify == LEAP_ADDSECOND)
-+	gpsd_log(&session->context->errout,LOG_INF,
-+		"UBX_NAV_TIMELS: Add leap second today\n");
-+      else if (session->context->leap_notify == LEAP_DELSECOND)
-+	gpsd_log(&session->context->errout,LOG_INF,
-+		 "UBX_NAV_TIMELS: Remove leap second today\n");
-+      
-+      gpsd_log(&session->context->errout, LOG_DATA,
-+	       "UBX_NAV_TIMELS: leaving: leap_notify=%d\n",
-+	session->context->leap_notify);
-+    }
-+}
-+#endif  /* UBLOXTIMELS_ENABLE */
-  /**
-  * Geodetic position solution message
-  */
-@@ -523,13 +636,22 @@
-     case UBX_NAV_EKFSTATUS:
- 	gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_EKFSTATUS\n");
- 	break;
--
-+    case UBX_NAV_TIMELS:
-+    gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_TIMELS\n");
-+#ifdef UBLOXTIMELS_ENABLE
-+	ubx_msg_nav_timels(session, &buf[UBX_PREFIX_LEN],data_len);
-+#endif // UBLOXTIMELS_ENABLE
-+	break;
-     case UBX_RXM_RAW:
- 	gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_RAW\n");
- 	break;
-     case UBX_RXM_SFRB:
-+	gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_SFRB\n");
- 	mask = ubx_msg_sfrb(session, &buf[UBX_PREFIX_LEN]);
- 	break;
-+    case UBX_RXM_SFRBX:
-+	gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_SFRBX\n");
-+	break;
-     case UBX_RXM_SVSI:
- 	gpsd_log(&session->context->errout, LOG_PROG, "UBX_RXM_SVSI\n");
- 	break;
-@@ -955,6 +1077,12 @@
- 	msg[1] = 0x20;		/* msg id  = UBX_NAV_TIMEGPS */
- 	msg[2] = 0x01;		/* rate */
- 	(void)ubx_write(session, 0x06u, 0x01, msg, 3);
-+#ifdef UBLOXTIMELS_ENABLE
-+	msg[0] = 0x01;		/* class */
-+	msg[1] = 0x26;		/* msg id  = UBX_NAV_TIMELS */
-+	msg[2] = 0xff;		/* rate */
-+#endif /* UBLOXTIMELS_ENABLE */
-+	(void)ubx_write(session, 0x06u, 0x01, msg, 3);
- 	msg[0] = 0x01;		/* class */
- 	msg[1] = 0x30;		/* msg id  = NAV-SVINFO */
- 	msg[2] = 0x0a;		/* rate */
diff --git a/recipes-navigation/gpsd/gpsd-3.16/leap2017Aug31.readme.txt b/recipes-navigation/gpsd/gpsd-3.16/leap2017Aug31.readme.txt
deleted file mode 100644
index d9bf4b1..0000000
--- a/recipes-navigation/gpsd/gpsd-3.16/leap2017Aug31.readme.txt
+++ /dev/null
@@ -1,169 +0,0 @@
-The purpose of this test is to verify leap second operation with ntp.  This is done
-by artificially setting the leap second offset in gpsd.  ntp is not modified.
-Software levels:
-    gpsd - 3.16-m2.9 + the Aug 31 test patch
-    ntp - 4.2.8p9-r0.mlinux3.0.  Release candidate for mLinux 4.0
-
-ntpd leap second test  gpsd artificially causes a leap second on Aug 31, 2017 23:59:59 UTC.
-
-The patch for this test is leap2017Aug31.patch.  This patch replaces 0006-ubxtimelps.patch.
-
-
-Kernel Log:
-
-2017-07-31T18:50:02.012018-05:00 leaptest CROND[5205]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf)
-2017-07-31T18:55:01.119140-05:00 leaptest CROND[5223]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf)
-2017-07-31T18:59:59.016393-05:00 leaptest kernel: Clock: inserting leap second 23:59:60 UTC
-2017-07-31T19:00:01.215873-05:00 leaptest CROND[5240]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf)
-2017-07-31T19:00:07.381218-05:00 leaptest ntpd[501]: kernel reports leap second has occurred
-2017-07-31T19:00:07.381528-05:00 leaptest ntpd[501]: kernel reports leap second has occurred
-2017-07-31T19:05:01.313170-05:00 leaptest CROND[5258]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf)
-
-
-Time log from user space.  18:59:59 repeats twice 19:00:00 appears only  once.:
-
-2017-07-31T18:59:57.855895-05:00 leaptest CTST: epoch: 1501545597.855  boot: 442607.123
-2017-07-31T18:59:58.106318-05:00 leaptest CTST: epoch: 1501545598.106  boot: 442607.373
-2017-07-31T18:59:58.356758-05:00 leaptest CTST: epoch: 1501545598.356  boot: 442607.624
-2017-07-31T18:59:58.607171-05:00 leaptest CTST: epoch: 1501545598.606  boot: 442607.874
-2017-07-31T18:59:58.857621-05:00 leaptest CTST: epoch: 1501545598.857  boot: 442608.124
-2017-07-31T18:59:59.108072-05:00 leaptest CTST: epoch: 1501545599.107  boot: 442608.375
-2017-07-31T18:59:59.358506-05:00 leaptest CTST: epoch: 1501545599.358  boot: 442608.625
-2017-07-31T18:59:59.608952-05:00 leaptest CTST: epoch: 1501545599.608  boot: 442608.876
-2017-07-31T18:59:59.859364-05:00 leaptest CTST: epoch: 1501545599.859  boot: 442609.126
-2017-07-31T18:59:59.109780-05:00 leaptest CTST: epoch: 1501545599.109  boot: 442609.377
-2017-07-31T18:59:59.360195-05:00 leaptest CTST: epoch: 1501545599.359  boot: 442609.627
-2017-07-31T18:59:59.610608-05:00 leaptest CTST: epoch: 1501545599.610  boot: 442609.877
-2017-07-31T18:59:59.861023-05:00 leaptest CTST: epoch: 1501545599.860  boot: 442610.128
-2017-07-31T19:00:00.111461-05:00 leaptest CTST: epoch: 1501545600.111  boot: 442610.378
-2017-07-31T19:00:00.361916-05:00 leaptest CTST: epoch: 1501545600.361  boot: 442610.629
-2017-07-31T19:00:00.612329-05:00 leaptest CTST: epoch: 1501545600.612  boot: 442610.879
-2017-07-31T19:00:00.862825-05:00 leaptest CTST: epoch: 1501545600.862  boot: 442611.130
-2017-07-31T19:00:01.113251-05:00 leaptest CTST: epoch: 1501545601.112  boot: 442611.380
-2017-07-31T19:00:01.363695-05:00 leaptest CTST: epoch: 1501545601.363  boot: 442611.630
-2017-07-31T19:00:01.614114-05:00 leaptest CTST: epoch: 1501545601.613  boot: 442611.881
-2017-07-31T19:00:01.864524-05:00 leaptest CTST: epoch: 1501545601.864  boot: 442612.131
-
-
-
-Leap second flag set artifically by gpsd, and noticed by ntp (leap=01 for SHM(0) and SHM(2) and leap_armed):
-2017-07-31T18:59:22.952281-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T18:59:22.962756-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum
-2017-07-31T18:59:22.964152-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T18:59:23.130829-05:00 leaptest ntpstatus.sh: ind assid status  conf reach auth condition  last_event cnt
-2017-07-31T18:59:23.131062-05:00 leaptest ntpstatus.sh: ===========================================================
-2017-07-31T18:59:23.131258-05:00 leaptest ntpstatus.sh:   1 18654  943a   yes   yes  none candidate    sys_peer  3
-2017-07-31T18:59:23.131451-05:00 leaptest ntpstatus.sh:   2 18655  9649   yes   yes  none  sys.peer  leap_armed  4
-2017-07-31T18:59:23.131647-05:00 leaptest ntpstatus.sh:   3 18656  8011   yes    no  none    reject    mobilize  1
-2017-07-31T18:59:23.131840-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0
-2017-07-31T18:59:23.132031-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0
-2017-07-31T18:59:23.132220-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14
-2017-07-31T18:59:23.138000-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T18:59:23.138206-05:00 leaptest ntpstatus.sh: ntpq -p
-2017-07-31T18:59:23.138404-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T18:59:23.434429-05:00 leaptest ntpstatus.sh:      remote           refid      st t when poll reach   delay   offset  jitter
-2017-07-31T18:59:23.434666-05:00 leaptest ntpstatus.sh: ==============================================================================
-2017-07-31T18:59:23.434863-05:00 leaptest ntpstatus.sh: +SHM(0)          .GPS.            0 l   20   64  377    0.000    6.410   1.265
-2017-07-31T18:59:23.435055-05:00 leaptest ntpstatus.sh: *SHM(2)          .PPS.            0 l   19   64  377    0.000    0.062   0.008
-2017-07-31T18:59:23.435249-05:00 leaptest ntpstatus.sh:  LOCAL(0)        .LOCL.          14 l    -   32    0    0.000    0.000   0.000
-2017-07-31T19:00:22.459905-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:00:22.460141-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum
-
-
-
-2017-07-31T19:00:22.460343-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:00:22.618627-05:00 leaptest ntpstatus.sh: ind assid status  conf reach auth condition  last_event cnt
-2017-07-31T19:00:22.618857-05:00 leaptest ntpstatus.sh: ===========================================================
-2017-07-31T19:00:22.619057-05:00 leaptest ntpstatus.sh:   1 18654  943a   yes   yes  none candidate    sys_peer  3
-2017-07-31T19:00:22.619252-05:00 leaptest ntpstatus.sh:   2 18655  9649   yes   yes  none  sys.peer  leap_armed  4
-2017-07-31T19:00:22.619444-05:00 leaptest ntpstatus.sh:   3 18656  8011   yes    no  none    reject    mobilize  1
-2017-07-31T19:00:22.619634-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0
-2017-07-31T19:00:22.619824-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0
-2017-07-31T19:00:22.620016-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14
-2017-07-31T19:00:22.628414-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:00:22.628654-05:00 leaptest ntpstatus.sh: ntpq -p
-2017-07-31T19:00:22.628868-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:00:22.922779-05:00 leaptest ntpstatus.sh:      remote           refid      st t when poll reach   delay   offset  jitter
-2017-07-31T19:00:22.924191-05:00 leaptest ntpstatus.sh: ==============================================================================
-2017-07-31T19:00:22.925595-05:00 leaptest ntpstatus.sh: +SHM(0)          .GPS.            0 l   16   64  377    0.000    7.369   0.661
-2017-07-31T19:00:22.927000-05:00 leaptest ntpstatus.sh: *SHM(2)          .PPS.            0 l   15   64  377    0.000    0.059   0.008
-2017-07-31T19:00:22.928402-05:00 leaptest ntpstatus.sh:  LOCAL(0)        .LOCL.          14 l    -   32    0    0.000    0.000   0.000
-2017-07-31T19:01:22.942937-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:01:22.943171-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum
-2017-07-31T19:01:22.943371-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:01:23.118319-05:00 leaptest ntpstatus.sh: ind assid status  conf reach auth condition  last_event cnt
-2017-07-31T19:01:23.118551-05:00 leaptest ntpstatus.sh: ===========================================================
-2017-07-31T19:01:23.118750-05:00 leaptest ntpstatus.sh:   1 18654  943a   yes   yes  none candidate    sys_peer  3
-2017-07-31T19:01:23.118943-05:00 leaptest ntpstatus.sh:   2 18655  9649   yes   yes  none  sys.peer  leap_armed  4
-2017-07-31T19:01:23.119137-05:00 leaptest ntpstatus.sh:   3 18656  8011   yes    no  none    reject    mobilize  1
-2017-07-31T19:01:23.119330-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0
-2017-07-31T19:01:23.119520-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0
-2017-07-31T19:01:23.119710-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14
-2017-07-31T19:01:23.128565-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:01:23.128809-05:00 leaptest ntpstatus.sh: ntpq -p
-2017-07-31T19:01:23.129026-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:01:23.417707-05:00 leaptest ntpstatus.sh:      remote           refid      st t when poll reach   delay   offset  jitter
-2017-07-31T19:01:23.417942-05:00 leaptest ntpstatus.sh: ==============================================================================
-2017-07-31T19:01:23.418140-05:00 leaptest ntpstatus.sh: +SHM(0)          .GPS.            0 l   13   64  377    0.000  1007.48 1000.36
-2017-07-31T19:01:23.418337-05:00 leaptest ntpstatus.sh: *SHM(2)          .PPS.            0 l   12   64  377    0.000  1000.05 999.994
-2017-07-31T19:01:23.418529-05:00 leaptest ntpstatus.sh:  LOCAL(0)        .LOCL.          14 l    -   32    0    0.000    0.000   0.000
-2017-07-31T19:02:23.442898-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:02:23.443131-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum
-2017-07-31T19:02:23.443332-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:02:23.617413-05:00 leaptest ntpstatus.sh: ind assid status  conf reach auth condition  last_event cnt
-
-
-Offset goes to one second, because there was no leap second:
-2017-07-31T19:00:22.618857-05:00 leaptest ntpstatus.sh: ===========================================================
-2017-07-31T19:00:22.619057-05:00 leaptest ntpstatus.sh:   1 18654  943a   yes   yes  none candidate    sys_peer  3
-2017-07-31T19:00:22.619252-05:00 leaptest ntpstatus.sh:   2 18655  9649   yes   yes  none  sys.peer  leap_armed  4
-2017-07-31T19:00:22.619444-05:00 leaptest ntpstatus.sh:   3 18656  8011   yes    no  none    reject    mobilize  1
-2017-07-31T19:00:22.619634-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0
-2017-07-31T19:00:22.619824-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0
-2017-07-31T19:00:22.620016-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14
-2017-07-31T19:00:22.628414-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:00:22.628654-05:00 leaptest ntpstatus.sh: ntpq -p
-2017-07-31T19:00:22.628868-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:00:22.922779-05:00 leaptest ntpstatus.sh:      remote           refid      st t when poll reach   delay   offset  jitter
-2017-07-31T19:00:22.924191-05:00 leaptest ntpstatus.sh: ==============================================================================
-2017-07-31T19:00:22.925595-05:00 leaptest ntpstatus.sh: +SHM(0)          .GPS.            0 l   16   64  377    0.000    7.369   0.661
-2017-07-31T19:00:22.927000-05:00 leaptest ntpstatus.sh: *SHM(2)          .PPS.            0 l   15   64  377    0.000    0.059   0.008
-2017-07-31T19:00:22.928402-05:00 leaptest ntpstatus.sh:  LOCAL(0)        .LOCL.          14 l    -   32    0    0.000    0.000   0.000
-2017-07-31T19:01:22.942937-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:01:22.943171-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum
-2017-07-31T19:01:22.943371-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:01:23.118319-05:00 leaptest ntpstatus.sh: ind assid status  conf reach auth condition  last_event cnt
-2017-07-31T19:01:23.118551-05:00 leaptest ntpstatus.sh: ===========================================================
-2017-07-31T19:01:23.118750-05:00 leaptest ntpstatus.sh:   1 18654  943a   yes   yes  none candidate    sys_peer  3
-2017-07-31T19:01:23.118943-05:00 leaptest ntpstatus.sh:   2 18655  9649   yes   yes  none  sys.peer  leap_armed  4
-2017-07-31T19:01:23.119137-05:00 leaptest ntpstatus.sh:   3 18656  8011   yes    no  none    reject    mobilize  1
-2017-07-31T19:01:23.119330-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0
-2017-07-31T19:01:23.119520-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0
-2017-07-31T19:01:23.119710-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14
-2017-07-31T19:01:23.128565-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:01:23.128809-05:00 leaptest ntpstatus.sh: ntpq -p
-2017-07-31T19:01:23.129026-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:01:23.417707-05:00 leaptest ntpstatus.sh:      remote           refid      st t when poll reach   delay   offset  jitter
-2017-07-31T19:01:23.417942-05:00 leaptest ntpstatus.sh: ==============================================================================
-2017-07-31T19:01:23.418140-05:00 leaptest ntpstatus.sh: +SHM(0)          .GPS.            0 l   13   64  377    0.000  1007.48 1000.36
-2017-07-31T19:01:23.418337-05:00 leaptest ntpstatus.sh: *SHM(2)          .PPS.            0 l   12   64  377    0.000  1000.05 999.994
-2017-07-31T19:01:23.418529-05:00 leaptest ntpstatus.sh:  LOCAL(0)        .LOCL.          14 l    -   32    0    0.000    0.000   0.000
-2017-07-31T19:02:23.442898-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:02:23.443131-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum
-2017-07-31T19:02:23.443332-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:02:23.617413-05:00 leaptest ntpstatus.sh: ind assid status  conf reach auth condition  last_event cnt
-
-
-Leap second flag is clear, leap_armed is removed so no leap second on Aug 1, 2017:
-2017-07-31T19:38:42.630432-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum
-2017-07-31T19:38:42.630636-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:38:42.791369-05:00 leaptest ntpstatus.sh: ind assid status  conf reach auth condition  last_event cnt
-2017-07-31T19:38:42.791605-05:00 leaptest ntpstatus.sh: ===========================================================
-2017-07-31T19:38:42.791803-05:00 leaptest ntpstatus.sh:   1 18654  945a   yes   yes  none candidate    sys_peer  5
-2017-07-31T19:38:42.791994-05:00 leaptest ntpstatus.sh:   2 18655  966a   yes   yes  none  sys.peer    sys_peer  6
-2017-07-31T19:38:42.792189-05:00 leaptest ntpstatus.sh:   3 18656  8033   yes    no  none    reject unreachable  3
-2017-07-31T19:38:42.792379-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=00, stratum=0
-2017-07-31T19:38:42.802875-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=00, stratum=0
-2017-07-31T19:38:42.804254-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=00, stratum=14
-
-
diff --git a/recipes-navigation/gpsd/gpsd-3.18.1/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch b/recipes-navigation/gpsd/gpsd-3.18.1/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch
deleted file mode 100644
index a1e71cf..0000000
--- a/recipes-navigation/gpsd/gpsd-3.18.1/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 1e2cea8945bc2183fbe1a012dcd633a352125952 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Tue, 24 Apr 2012 18:45:14 +0200
-Subject: [PATCH] SConstruct: prefix includepy with sysroot and drop sysroot
- from python_lib_dir
-
-* without PYTHONPATH, distutil's sysconfig returns INCLUDEPY without sysroot prefix
-  and with PYTHONPATH from OE it's pointing to native python dir
-
-    $ export PYTHONPATH=/OE/shr-core/tmp-eglibc/sysroots/om-gta02/usr/lib/python2.7/
-    $ python
-    Python 2.7.2 (default, Apr 18 2012, 09:19:59)
-    [GCC 4.6.2] on linux2
-    Type "help", "copyright", "credits" or "license" for more information.
-    >>> from distutils import sysconfig
-    >>> sysconfig.get_config_vars('INCLUDEPY')
-    ['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7']
-    >>>
-    $ unset PYTHONPATH
-    $ python
-    Python 2.7.2 (default, Apr 18 2012, 09:19:59)
-    [GCC 4.6.2] on linux2
-    Type "help", "copyright", "credits" or "license" for more information.
-    >>> from distutils import sysconfig
-    >>> sysconfig.get_config_vars('INCLUDEPY')
-    ['/python2.7']
-    >>> import sysconfig
-    >>> sysconfig.get_config_vars('INCLUDEPY')
-    ['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7']
-* python_lib_dir = python_lib_dir.replace(env['sysroot'], '')
-  returns path to target sysroot
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-Signed-off-by: Peter A. Bigot <pab@pabigot.com>
----
- SConstruct | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff -Naru gpsd-3.18.1.orig/SConstruct gpsd-3.18.1/SConstruct
---- gpsd-3.18.1.orig/SConstruct	2018-10-26 15:31:33.890410700 -0500
-+++ gpsd-3.18.1/SConstruct	2018-10-26 17:25:45.202207869 -0500
-@@ -980,7 +980,7 @@
- 
- # Set up configuration for target Python
- 
--PYTHON_LIBDIR_CALL = 'sysconfig.get_python_lib()'
-+PYTHON_LIBDIR_CALL = 'sysconfig.get_python_lib(plat_specific=1)'
- 
- PYTHON_CONFIG_NAMES = ['CC', 'CXX', 'OPT', 'BASECFLAGS',
-                        'CCSHARED', 'LDSHARED', 'SO', 'INCLUDEPY', 'LDFLAGS']
-@@ -1034,8 +1034,8 @@
-             # follow FHS, put in /usr/local/libXX, not /usr/libXX
-             # may be lib, lib32 or lib64
-             python_libdir = polystr(python_libdir)
--            python_libdir = python_libdir.replace("/usr/lib",
--                                                  "/usr/local/lib")
-+#           python_libdir = python_libdir.replace("/usr/lib",
-+#                                                 "/usr/local/lib")
- 
-         py_config_text = config.GetPythonValue('config vars',
-                                                PYTHON_SYSCONFIG_IMPORT,
-@@ -1506,7 +1506,7 @@
-                        LINK=ldshared,
-                        SHLIBPREFIX="",
-                        SHLIBSUFFIX=python_config['SO'],
--                       CPPPATH=[python_config['INCLUDEPY']],
-+                       CPPPATH=[os.path.normpath("%s/%s/%s/%s" % (env['sysroot'], env['prefix'], env['includedir'], python_config['INCLUDEPY']))] if env['sysroot'] else [python_config['INCLUDEPY']],
-                        CPPFLAGS=python_config['OPT'],
-                        CFLAGS=python_config['BASECFLAGS'],
-                        CXXFLAGS=python_config['BASECFLAGS'])
-@@ -1808,12 +1808,15 @@
-     env.AddPostAction(binaryinstall, '$STRIP $TARGET')
- 
- if env['python']:
-+    python_libdir = python_libdir.replace(env['sysroot'], '')
-     python_module_dir = str(python_libdir) + os.sep + 'gps'
-     python_extensions_install = python_env.Install(DESTDIR + python_module_dir,
-                                                    python_built_extensions)
-     if ((not env['debug'] and not env['profiling'] and
-          not env['nostrip'] and not sys.platform.startswith('darwin'))):
-         python_env.AddPostAction(python_extensions_install, '$STRIP $TARGET')
-+    env.AddPostAction(python_extensions_install, '$CHRPATH -r "%s" "$TARGET"' \
-+                         % (python_libdir, ))
- 
-     python_modules_install = python_env.Install(DESTDIR + python_module_dir,
-                                                 python_modules)
diff --git a/recipes-navigation/gpsd/gpsd-3.18.1/0001-include-sys-ttydefaults.h.patch b/recipes-navigation/gpsd/gpsd-3.18.1/0001-include-sys-ttydefaults.h.patch
deleted file mode 100644
index e91e4e9..0000000
--- a/recipes-navigation/gpsd/gpsd-3.18.1/0001-include-sys-ttydefaults.h.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f221fa959c80b43c65426500a6836a1b5cf6fe0c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 17 Aug 2016 02:16:12 +0000
-Subject: [PATCH] include sys/ttydefaults.h
-
-This is needed for CTRL definition, as exposed by musl on glibc
-this include file gets pulled indirectly.
-
-/usr/src/debug/gpsd/3.14-r0/gpsd-3.14/gpsmon.c:605: undefined reference to `CTRL'
-clang-3.9: error: linker command failed with exit code 1 (use -v to see invocation)
-scons: *** [gpsmon] Error 1
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Foreward port to gpsd 3.16
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
----
- gpsmon.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gpsmon.c b/gpsmon.c
-index 89c43ee2..5cc0dabd 100644
---- a/gpsmon.c
-+++ b/gpsmon.c
-@@ -24,6 +24,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/select.h>
-+#include <sys/ttydefaults.h>
- #include <fcntl.h>
- #include <unistd.h>
- 
--- 
-2.12.0
-
diff --git a/recipes-navigation/gpsd/gpsd-3.18.1/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch b/recipes-navigation/gpsd/gpsd-3.18.1/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch
deleted file mode 100644
index ad690ce..0000000
--- a/recipes-navigation/gpsd/gpsd-3.18.1/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 697e2e9ff97487266d817cdd41bacc83f681e3d7 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sun, 29 Apr 2012 00:05:59 +0200
-Subject: [PATCH 4/4] SConstruct: disable html and man docs building because
- xmlto-native from OE is broken
-
-It will try to load dtd and fail:
-| xmlto man gpsctl.xml; mv `basename gpsctl.1` gpsctl.1
-| xmlto: /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml does not validate (status 3)
-| xmlto: Fix document syntax or use --skip-validation option
-| I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd
-| /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml:8: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
-|    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-|                                                               ^
-| I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd
-| warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
-| validity error : Could not load the external subset "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
-| Document /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml does not validate
-| mv: cannot stat `gpsctl.1': No such file or directory
-| scons: *** [gpsctl.1] Error 1
-| scons: building terminated because of errors.
-
-Upstream-Status: Inappropriate [disable feature]
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-Signed-off-by: Peter A. Bigot <pab@pabigot.com>
----
- SConstruct | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff -Naru gpsd-3.18.1.orig/SConstruct gpsd-3.18.1/SConstruct
---- gpsd-3.18.1.orig/SConstruct	2018-10-26 18:17:17.102116334 -0500
-+++ gpsd-3.18.1/SConstruct	2018-10-26 18:18:40.102113877 -0500
-@@ -935,11 +935,11 @@
- 
-     manbuilder = htmlbuilder = None
-     if env['manbuild']:
--        if config.CheckXsltproc():
-+        if False and config.CheckXsltproc():
-             build = "xsltproc --nonet %s $SOURCE >$TARGET"
-             htmlbuilder = build % docbook_html_uri
-             manbuilder = build % docbook_man_uri
--        elif WhereIs("xmlto"):
-+        elif False and WhereIs("xmlto"):
-             xmlto = "xmlto %s $SOURCE || mv `basename $TARGET` " \
-                     "`dirname $TARGET`"
-             htmlbuilder = xmlto % "html-nochunks"
diff --git a/recipes-navigation/gpsd/gpsd-3.18.1/0006-itu_r_tf_460_6.patch b/recipes-navigation/gpsd/gpsd-3.18.1/0006-itu_r_tf_460_6.patch
deleted file mode 100644
index 8e8d814..0000000
--- a/recipes-navigation/gpsd/gpsd-3.18.1/0006-itu_r_tf_460_6.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur old/ntpshmwrite.c new/ntpshmwrite.c
---- old/ntpshmwrite.c	2017-01-23 10:00:05.497129473 -0600
-+++ new/ntpshmwrite.c	2017-01-23 09:47:58.881627772 -0600
-@@ -32,11 +32,18 @@
-      * NTP expects leap pending for only 1 month prior to insertion
-      * Per http://bugs.ntp.org/1090 */
-     (void)gmtime_r( &(td->real.tv_sec), &tm);
-+/* This code contradicts page 3 section 2.1 of ITU-R RV.460-6 that
-+ * leap second may occur at the last second of a month, with
-+ * preference for December and June, 2nd preference to March and
-+ * September.
-+ *  https://www.itu.int/dms_pubrec/itu-r/rec/tf/R-REC-TF.460-6-200202-I!!PDF-E.pdf
-+ */
-+#ifdef NOTITU_R_TF_460_6
-     if ( 5 != tm.tm_mon && 11 != tm.tm_mon ) {
-         /* Not june, not December, no way */
-         leap_notify = LEAP_NOWARNING;
-     }
--
-+#endif /* NOTITU_R_TF_460_6 */
-     /* we use the shmTime mode 1 protocol
-      *
-      * ntpd does this:
diff --git a/recipes-navigation/gpsd/gpsd-3.18.1/0006-ubxtimelps.patch b/recipes-navigation/gpsd/gpsd-3.18.1/0006-ubxtimelps.patch
deleted file mode 100644
index 030001c..0000000
--- a/recipes-navigation/gpsd/gpsd-3.18.1/0006-ubxtimelps.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-diff -Naru gpsd-3.18.1.orig/driver_ubx.c gpsd-3.18.1/driver_ubx.c
---- gpsd-3.18.1.orig/driver_ubx.c	2018-10-26 16:01:08.010358178 -0500
-+++ gpsd-3.18.1/driver_ubx.c	2018-10-29 17:30:18.354526227 -0500
-@@ -57,6 +57,29 @@
- #define UBX_CFG_LEN		20
- #define outProtoMask		14
- 
-+#ifdef UBLOXTIMELS_ENABLE
-+/* UBX-NAV-TIMELS support */
-+static char *srcOfCurrLs[] = {
-+  "firmware",
-+  "GPS GLONASS difference",
-+  "GPS",
-+  "SBAS",
-+  "BeiDou",
-+  "Galileo",
-+  "Aided data",
-+  "Configured"
-+};
-+static char *srcOfLsChange[] = {
-+  "No Source",
-+  "Undefined",
-+  "GPS",
-+  "SBAS",
-+  "BeiDou",
-+  "Galileo",
-+  "GLONOSS",
-+};
-+#endif  /* UBLOXTIMELS_ENABLE */
-+
- static gps_mask_t ubx_parse(struct gps_device_t *session, unsigned char *buf,
- 			    size_t len);
- static gps_mask_t ubx_msg_nav_eoe(struct gps_device_t *session,
-@@ -397,6 +420,90 @@
-     return mask;
- }
- 
-+#ifdef UBLOXTIMELS_ENABLE
-+/**
-+ * Navigation time to leap second
-+ * 
-+ * Sets leap_notify if leap second is < 23 hours away.
-+ */
-+static void
-+ubx_msg_nav_timels(struct gps_device_t *session, unsigned char *buf,
-+		size_t data_len)
-+{
-+    int version;
-+    unsigned int flags;
-+    int valid_curr_ls;
-+    int valid_time_to_ls_event;
-+    
-+    if (data_len != 24) {
-+        gpsd_log(&session->context->errout, LOG_WARN, 
-+	  "UBX-NAV-TIMELS: unexpected length %d, expecting 24\n",
-+	  data_len);
-+	return;
-+    }
-+    version = getsb(buf,4);
-+    /* Only version 0 is defined so far. */
-+    flags = (unsigned int)getub(buf, 23);
-+    gpsd_log(&session->context->errout, LOG_DATA,
-+        "UBX-NAV-TIMELS: flags 0x%x message version %d\n",flags, version);
-+    valid_curr_ls = flags & UBX_TIMELS_VALID_CURR_LS;
-+    valid_time_to_ls_event = flags & UBX_TIMELS_VALID_TIME_LS_EVT;
-+    if(valid_curr_ls) {
-+      unsigned int src_of_curr_ls = getub(buf,8);
-+      int curr_ls = getsb(buf,9);
-+      char *src = "Unknown";
-+      
-+      if(src_of_curr_ls < (sizeof srcOfCurrLs/(sizeof srcOfCurrLs[0])))
-+	src = srcOfCurrLs[src_of_curr_ls];
-+	
-+      gpsd_log(&session->context->errout, LOG_DATA,
-+	     "UBX-NAV-TIMELS: source_of_current_leapsecond=%u:%s curr_ls=%d\n",
-+	     src_of_curr_ls,src,curr_ls);
-+      session->context->leap_seconds = curr_ls;
-+      session->context->valid |= LEAP_SECOND_VALID;
-+    } /* Valid current leap second */
-+    if(valid_time_to_ls_event) {
-+      char *src="Unknown";
-+      unsigned int src_of_ls_change;
-+      unsigned short dateOfLSGpsWn, dateOfLSGpsDn;
-+      int lsChange = getsb(buf,11);
-+      int timeToLsEvent = getles32(buf,12);
-+      src_of_ls_change = getub(buf,10);
-+      if(src_of_ls_change < (sizeof srcOfLsChange/(sizeof srcOfLsChange[0])))
-+	src = srcOfLsChange[src_of_ls_change];
-+      dateOfLSGpsWn = getles16(buf,16);
-+      dateOfLSGpsDn = getles16(buf,18);
-+      gpsd_log(&session->context->errout, LOG_DATA,
-+	 "UBX_NAV_TIMELS: source_of_leapsecond_change=%u:%s "
-+	 "leapSecondChage=%d timeToLsEvent=%d\n",
-+	 src_of_ls_change,src,lsChange,timeToLsEvent);
-+      gpsd_log(&session->context->errout, LOG_DATA,
-+	       "UBX_NAV_TIMELS: dateOfLSGpsWn=%d dateOfLSGpsDn=%d\n",
-+	       dateOfLSGpsWn,dateOfLSGpsDn);
-+      if(timeToLsEvent < 60*60*23 && timeToLsEvent > 0) {
-+	if(lsChange == 0)
-+	   session->context->leap_notify = LEAP_NOWARNING;
-+	else if (lsChange == 1)
-+	  session->context->leap_notify = LEAP_ADDSECOND;
-+	else if (lsChange == -1)
-+	  session->context->leap_notify = LEAP_DELSECOND;
-+      } else
-+	session->context->leap_notify = LEAP_NOWARNING;
-+
-+      if (session->context->leap_notify == LEAP_ADDSECOND)
-+	gpsd_log(&session->context->errout,LOG_INF,
-+		"UBX_NAV_TIMELS: Add leap second today\n");
-+      else if (session->context->leap_notify == LEAP_DELSECOND)
-+	gpsd_log(&session->context->errout,LOG_INF,
-+		 "UBX_NAV_TIMELS: Remove leap second today\n");
-+      
-+      gpsd_log(&session->context->errout, LOG_DATA,
-+	       "UBX_NAV_TIMELS: leaving: leap_notify=%d\n",
-+	session->context->leap_notify);
-+    }
-+}
-+#endif  /* UBLOXTIMELS_ENABLE */
-+
-  /**
-  * Geodetic position solution message
-  */
-@@ -1129,6 +1236,9 @@
- 	break;
-     case UBX_NAV_TIMELS:
- 	gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_TIMELS\n");
-+#ifdef UBLOXTIMELS_ENABLE
-+	ubx_msg_nav_timels(session, &buf[UBX_PREFIX_LEN],data_len);
-+#endif // UBLOXTIMELS_ENABLE
- 	break;
-     case UBX_NAV_TIMEUTC:
- 	gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_TIMEUTC\n");
-@@ -1172,6 +1282,7 @@
- 	gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_RTCM\n");
- 	break;
-     case UBX_RXM_SFRB:
-+        gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_SFRB\n");
- 	mask = ubx_rxm_sfrb(session, &buf[UBX_PREFIX_LEN]);
- 	break;
-     case UBX_RXM_SFRBX:
-@@ -1474,6 +1585,12 @@
- 	msg[1] = 0x20;		/* msg id  = UBX_NAV_TIMEGPS */
- 	msg[2] = 0x00;		/* rate */
- 	(void)ubx_write(session, 0x06u, 0x01, msg, 3);
-+#ifdef UBLOXTIMELS_ENABLE
-+	msg[0] = 0x01;		/* class */
-+	msg[1] = 0x26;		/* msg id  = UBX_NAV_TIMELS */
-+	msg[2] = 0xff;		/* rate */
-+#endif /* UBLOXTIMELS_ENABLE */
-+	(void)ubx_write(session, 0x06u, 0x01, msg, 3);
- 	msg[0] = 0x01;		/* class */
- 	msg[1] = 0x30;		/* msg id  = NAV-SVINFO */
- 	msg[2] = 0x00;		/* rate */
-@@ -1558,6 +1675,12 @@
- 	msg[1] = 0x20;		/* msg id  = UBX_NAV_TIMEGPS */
- 	msg[2] = 0x01;		/* rate */
- 	(void)ubx_write(session, 0x06u, 0x01, msg, 3);
-+#ifdef UBLOXTIMELS_ENABLE
-+	msg[0] = 0x01;		/* class */
-+	msg[1] = 0x26;		/* msg id  = UBX_NAV_TIMELS */
-+	msg[2] = 0xff;		/* rate */
-+	(void)ubx_write(session, 0x06u, 0x01, msg, 3);
-+#endif /* UBLOXTIMELS_ENABLE */
- 	msg[0] = 0x01;		/* class */
- 	msg[1] = 0x30;		/* msg id  = NAV-SVINFO */
- 	msg[2] = 0x0a;		/* rate */
-diff -Naru gpsd-3.18.1.orig/driver_ubx.h gpsd-3.18.1/driver_ubx.h
---- gpsd-3.18.1.orig/driver_ubx.h	2018-10-26 16:01:08.010358178 -0500
-+++ gpsd-3.18.1/driver_ubx.h	2018-10-26 16:26:09.114313738 -0500
-@@ -210,6 +210,9 @@
- #define UBX_SOL_VALID_WEEK 0x04
- #define UBX_SOL_VALID_TIME 0x08
- 
-+#define UBX_TIMELS_VALID_CURR_LS 0x01
-+#define UBX_TIMELS_VALID_TIME_LS_EVT 0x01
-+
- #define UBX_TIMEGPS_VALID_TIME        0x01
- #define UBX_TIMEGPS_VALID_WEEK        0x02
- #define UBX_TIMEGPS_VALID_LEAP_SECOND 0x04
-diff -Naru gpsd-3.18.1.orig/SConstruct gpsd-3.18.1/SConstruct
---- gpsd-3.18.1.orig/SConstruct	2018-10-26 15:53:30.174371732 -0500
-+++ gpsd-3.18.1/SConstruct	2018-10-26 15:55:33.726368074 -0500
-@@ -178,6 +178,7 @@
-     ("tripmate",      True,  "DeLorme TripMate support"),
-     ("tsip",          True,  "Trimble TSIP support"),
-     ("ublox",         True,  "u-blox Protocol support"),
-+    ("ubloxtimels",   False, "u-blox UBX-NAV-TIMELS support (leap second)"),
-     # Non-GPS protocols
-     ("aivdm",         True,  "AIVDM support"),
-     ("gpsclock",      True,  "GPSClock support"),
diff --git a/recipes-navigation/gpsd/gpsd-3.18.1/leap2017Aug31.patch b/recipes-navigation/gpsd/gpsd-3.18.1/leap2017Aug31.patch
deleted file mode 100644
index 658b757..0000000
--- a/recipes-navigation/gpsd/gpsd-3.18.1/leap2017Aug31.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-diff -Naur old/driver_ubx.c new/driver_ubx.c
---- old/driver_ubx.c	2017-08-01 10:56:05.757282801 -0500
-+++ new/driver_ubx.c	2017-08-01 10:53:49.785286827 -0500
-@@ -57,6 +57,29 @@
- #define UBX_CFG_LEN		20
- #define outProtoMask		14
- 
-+#ifdef UBLOXTIMELS_ENABLE
-+/* UBX-NAV-TIMELS support */
-+static char *srcOfCurrLs[] = {
-+  "firmware",
-+  "GPS GLONASS difference",
-+  "GPS",
-+  "SBAS",
-+  "BeiDou",
-+  "Galileo",
-+  "Aided data",
-+  "Configured"
-+};
-+static char *srcOfLsChange[] = {
-+  "No Source",
-+  "Undefined",
-+  "GPS",
-+  "SBAS",
-+  "BeiDou",
-+  "Galileo",
-+  "GLONOSS",
-+};
-+#endif  /* UBLOXTIMELS_ENABLE */
-+
- static gps_mask_t ubx_parse(struct gps_device_t *session, unsigned char *buf,
- 			    size_t len);
- static gps_mask_t ubx_msg_nav_dop(struct gps_device_t *session,
-@@ -237,6 +260,96 @@
-     return mask;
- }
- 
-+#ifdef UBLOXTIMELS_ENABLE
-+/**
-+ * Navigation time to leap second
-+ * 
-+ * Sets leap_notify if leap second is < 23 hours away.
-+ */
-+static void
-+ubx_msg_nav_timels(struct gps_device_t *session, unsigned char *buf,
-+		size_t data_len)
-+{
-+    int version;
-+    unsigned int flags;
-+    int valid_curr_ls;
-+    int valid_time_to_ls_event;
-+    
-+    if (data_len != 24) {
-+        gpsd_log(&session->context->errout, LOG_WARN, 
-+	  "UBX-NAV-TIMELS: unexpected length %d, expecting 24\n",
-+	  data_len);
-+	return;
-+    }
-+    version = getsb(buf,4);
-+    /* Only version 0 is defined so far. */
-+    flags = (unsigned int)getub(buf, 23);
-+    gpsd_log(&session->context->errout, LOG_DATA,
-+        "UBX-NAV-TIMELS: flags 0x%x message version %d\n",flags, version);
-+    valid_curr_ls = flags & UBX_TIMELS_VALID_CURR_LS;
-+    valid_time_to_ls_event = flags & UBX_TIMELS_VALID_TIME_LS_EVT;
-+    if(valid_curr_ls) {
-+      unsigned int src_of_curr_ls = getub(buf,8);
-+      int curr_ls = getsb(buf,9);
-+      char *src = "Unknown";
-+      
-+      if(src_of_curr_ls < (sizeof srcOfCurrLs/(sizeof srcOfCurrLs[0])))
-+	src = srcOfCurrLs[src_of_curr_ls];
-+	
-+      gpsd_log(&session->context->errout, LOG_DATA,
-+	     "UBX-NAV-TIMELS: source_of_current_leapsecond=%u:%s curr_ls=%d\n",
-+	     src_of_curr_ls,src,curr_ls);
-+      session->context->leap_seconds = curr_ls;
-+      session->context->valid |= LEAP_SECOND_VALID;
-+    } /* Valid current leap second */
-+    if(valid_time_to_ls_event) {
-+      char *src="Unknown";
-+      unsigned int src_of_ls_change;
-+      unsigned short dateOfLSGpsWn, dateOfLSGpsDn;
-+      int lsChange = getsb(buf,11);
-+      int timeToLsEvent = getles32(buf,12);
-+int secondsperday=24*60*60;
-+lsChange = 1;  /* JAK Forward one second */
-+      src_of_ls_change = getub(buf,10);
-+      if(src_of_ls_change < (sizeof srcOfLsChange/(sizeof srcOfLsChange[0])))
-+	src = srcOfLsChange[src_of_ls_change];
-+      dateOfLSGpsWn = getles16(buf,16);
-+      dateOfLSGpsDn = getles16(buf,18);
-+      gpsd_log(&session->context->errout, LOG_DATA,
-+	 "UBX_NAV_TIMELS: source_of_leapsecond_change=%u:%s "
-+	 "leapSecondChage=%d timeToLsEvent=%d\n",
-+	 src_of_ls_change,src,lsChange,timeToLsEvent);
-+timeToLsEvent += 212*secondsperday;   /* JAK Jul 31 Leap second for test */
-+      gpsd_log(&session->context->errout, LOG_DATA,
-+	 "UBX_NAV_TIMELS2: source_of_leapsecond_change=%u:%s "
-+	 "leapSecondChage=%d timeToLsEvent=%d\n",
-+	 src_of_ls_change,src,lsChange,timeToLsEvent);  /* JAK */
-+      gpsd_log(&session->context->errout, LOG_DATA,
-+	       "UBX_NAV_TIMELS: dateOfLSGpsWn=%d dateOfLSGpsDn=%d\n",
-+	       dateOfLSGpsWn,dateOfLSGpsDn);
-+      if(timeToLsEvent < 60*60*23 && timeToLsEvent > 0) {
-+	if(lsChange == 0)
-+	   session->context->leap_notify = LEAP_NOWARNING;
-+	else if (lsChange == 1)
-+	  session->context->leap_notify = LEAP_ADDSECOND;
-+	else if (lsChange == -1)
-+	  session->context->leap_notify = LEAP_DELSECOND;
-+      } else
-+	session->context->leap_notify = LEAP_NOWARNING;
-+
-+      if (session->context->leap_notify == LEAP_ADDSECOND)
-+	gpsd_log(&session->context->errout,LOG_INF,
-+		"UBX_NAV_TIMELS: Add leap second today\n");
-+      else if (session->context->leap_notify == LEAP_DELSECOND)
-+	gpsd_log(&session->context->errout,LOG_INF,
-+		 "UBX_NAV_TIMELS: Remove leap second today\n");
-+      
-+      gpsd_log(&session->context->errout, LOG_DATA,
-+	       "UBX_NAV_TIMELS: leaving: leap_notify=%d\n",
-+	session->context->leap_notify);
-+    }
-+}
-+#endif  /* UBLOXTIMELS_ENABLE */
-  /**
-  * Geodetic position solution message
-  */
-@@ -523,13 +636,22 @@
-     case UBX_NAV_EKFSTATUS:
- 	gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_EKFSTATUS\n");
- 	break;
--
-+    case UBX_NAV_TIMELS:
-+    gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_TIMELS\n");
-+#ifdef UBLOXTIMELS_ENABLE
-+	ubx_msg_nav_timels(session, &buf[UBX_PREFIX_LEN],data_len);
-+#endif // UBLOXTIMELS_ENABLE
-+	break;
-     case UBX_RXM_RAW:
- 	gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_RAW\n");
- 	break;
-     case UBX_RXM_SFRB:
-+	gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_SFRB\n");
- 	mask = ubx_msg_sfrb(session, &buf[UBX_PREFIX_LEN]);
- 	break;
-+    case UBX_RXM_SFRBX:
-+	gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_SFRBX\n");
-+	break;
-     case UBX_RXM_SVSI:
- 	gpsd_log(&session->context->errout, LOG_PROG, "UBX_RXM_SVSI\n");
- 	break;
-@@ -955,6 +1077,12 @@
- 	msg[1] = 0x20;		/* msg id  = UBX_NAV_TIMEGPS */
- 	msg[2] = 0x01;		/* rate */
- 	(void)ubx_write(session, 0x06u, 0x01, msg, 3);
-+#ifdef UBLOXTIMELS_ENABLE
-+	msg[0] = 0x01;		/* class */
-+	msg[1] = 0x26;		/* msg id  = UBX_NAV_TIMELS */
-+	msg[2] = 0xff;		/* rate */
-+#endif /* UBLOXTIMELS_ENABLE */
-+	(void)ubx_write(session, 0x06u, 0x01, msg, 3);
- 	msg[0] = 0x01;		/* class */
- 	msg[1] = 0x30;		/* msg id  = NAV-SVINFO */
- 	msg[2] = 0x0a;		/* rate */
diff --git a/recipes-navigation/gpsd/gpsd-3.18.1/leap2017Aug31.readme.txt b/recipes-navigation/gpsd/gpsd-3.18.1/leap2017Aug31.readme.txt
deleted file mode 100644
index d9bf4b1..0000000
--- a/recipes-navigation/gpsd/gpsd-3.18.1/leap2017Aug31.readme.txt
+++ /dev/null
@@ -1,169 +0,0 @@
-The purpose of this test is to verify leap second operation with ntp.  This is done
-by artificially setting the leap second offset in gpsd.  ntp is not modified.
-Software levels:
-    gpsd - 3.16-m2.9 + the Aug 31 test patch
-    ntp - 4.2.8p9-r0.mlinux3.0.  Release candidate for mLinux 4.0
-
-ntpd leap second test  gpsd artificially causes a leap second on Aug 31, 2017 23:59:59 UTC.
-
-The patch for this test is leap2017Aug31.patch.  This patch replaces 0006-ubxtimelps.patch.
-
-
-Kernel Log:
-
-2017-07-31T18:50:02.012018-05:00 leaptest CROND[5205]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf)
-2017-07-31T18:55:01.119140-05:00 leaptest CROND[5223]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf)
-2017-07-31T18:59:59.016393-05:00 leaptest kernel: Clock: inserting leap second 23:59:60 UTC
-2017-07-31T19:00:01.215873-05:00 leaptest CROND[5240]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf)
-2017-07-31T19:00:07.381218-05:00 leaptest ntpd[501]: kernel reports leap second has occurred
-2017-07-31T19:00:07.381528-05:00 leaptest ntpd[501]: kernel reports leap second has occurred
-2017-07-31T19:05:01.313170-05:00 leaptest CROND[5258]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf)
-
-
-Time log from user space.  18:59:59 repeats twice 19:00:00 appears only  once.:
-
-2017-07-31T18:59:57.855895-05:00 leaptest CTST: epoch: 1501545597.855  boot: 442607.123
-2017-07-31T18:59:58.106318-05:00 leaptest CTST: epoch: 1501545598.106  boot: 442607.373
-2017-07-31T18:59:58.356758-05:00 leaptest CTST: epoch: 1501545598.356  boot: 442607.624
-2017-07-31T18:59:58.607171-05:00 leaptest CTST: epoch: 1501545598.606  boot: 442607.874
-2017-07-31T18:59:58.857621-05:00 leaptest CTST: epoch: 1501545598.857  boot: 442608.124
-2017-07-31T18:59:59.108072-05:00 leaptest CTST: epoch: 1501545599.107  boot: 442608.375
-2017-07-31T18:59:59.358506-05:00 leaptest CTST: epoch: 1501545599.358  boot: 442608.625
-2017-07-31T18:59:59.608952-05:00 leaptest CTST: epoch: 1501545599.608  boot: 442608.876
-2017-07-31T18:59:59.859364-05:00 leaptest CTST: epoch: 1501545599.859  boot: 442609.126
-2017-07-31T18:59:59.109780-05:00 leaptest CTST: epoch: 1501545599.109  boot: 442609.377
-2017-07-31T18:59:59.360195-05:00 leaptest CTST: epoch: 1501545599.359  boot: 442609.627
-2017-07-31T18:59:59.610608-05:00 leaptest CTST: epoch: 1501545599.610  boot: 442609.877
-2017-07-31T18:59:59.861023-05:00 leaptest CTST: epoch: 1501545599.860  boot: 442610.128
-2017-07-31T19:00:00.111461-05:00 leaptest CTST: epoch: 1501545600.111  boot: 442610.378
-2017-07-31T19:00:00.361916-05:00 leaptest CTST: epoch: 1501545600.361  boot: 442610.629
-2017-07-31T19:00:00.612329-05:00 leaptest CTST: epoch: 1501545600.612  boot: 442610.879
-2017-07-31T19:00:00.862825-05:00 leaptest CTST: epoch: 1501545600.862  boot: 442611.130
-2017-07-31T19:00:01.113251-05:00 leaptest CTST: epoch: 1501545601.112  boot: 442611.380
-2017-07-31T19:00:01.363695-05:00 leaptest CTST: epoch: 1501545601.363  boot: 442611.630
-2017-07-31T19:00:01.614114-05:00 leaptest CTST: epoch: 1501545601.613  boot: 442611.881
-2017-07-31T19:00:01.864524-05:00 leaptest CTST: epoch: 1501545601.864  boot: 442612.131
-
-
-
-Leap second flag set artifically by gpsd, and noticed by ntp (leap=01 for SHM(0) and SHM(2) and leap_armed):
-2017-07-31T18:59:22.952281-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T18:59:22.962756-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum
-2017-07-31T18:59:22.964152-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T18:59:23.130829-05:00 leaptest ntpstatus.sh: ind assid status  conf reach auth condition  last_event cnt
-2017-07-31T18:59:23.131062-05:00 leaptest ntpstatus.sh: ===========================================================
-2017-07-31T18:59:23.131258-05:00 leaptest ntpstatus.sh:   1 18654  943a   yes   yes  none candidate    sys_peer  3
-2017-07-31T18:59:23.131451-05:00 leaptest ntpstatus.sh:   2 18655  9649   yes   yes  none  sys.peer  leap_armed  4
-2017-07-31T18:59:23.131647-05:00 leaptest ntpstatus.sh:   3 18656  8011   yes    no  none    reject    mobilize  1
-2017-07-31T18:59:23.131840-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0
-2017-07-31T18:59:23.132031-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0
-2017-07-31T18:59:23.132220-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14
-2017-07-31T18:59:23.138000-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T18:59:23.138206-05:00 leaptest ntpstatus.sh: ntpq -p
-2017-07-31T18:59:23.138404-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T18:59:23.434429-05:00 leaptest ntpstatus.sh:      remote           refid      st t when poll reach   delay   offset  jitter
-2017-07-31T18:59:23.434666-05:00 leaptest ntpstatus.sh: ==============================================================================
-2017-07-31T18:59:23.434863-05:00 leaptest ntpstatus.sh: +SHM(0)          .GPS.            0 l   20   64  377    0.000    6.410   1.265
-2017-07-31T18:59:23.435055-05:00 leaptest ntpstatus.sh: *SHM(2)          .PPS.            0 l   19   64  377    0.000    0.062   0.008
-2017-07-31T18:59:23.435249-05:00 leaptest ntpstatus.sh:  LOCAL(0)        .LOCL.          14 l    -   32    0    0.000    0.000   0.000
-2017-07-31T19:00:22.459905-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:00:22.460141-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum
-
-
-
-2017-07-31T19:00:22.460343-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:00:22.618627-05:00 leaptest ntpstatus.sh: ind assid status  conf reach auth condition  last_event cnt
-2017-07-31T19:00:22.618857-05:00 leaptest ntpstatus.sh: ===========================================================
-2017-07-31T19:00:22.619057-05:00 leaptest ntpstatus.sh:   1 18654  943a   yes   yes  none candidate    sys_peer  3
-2017-07-31T19:00:22.619252-05:00 leaptest ntpstatus.sh:   2 18655  9649   yes   yes  none  sys.peer  leap_armed  4
-2017-07-31T19:00:22.619444-05:00 leaptest ntpstatus.sh:   3 18656  8011   yes    no  none    reject    mobilize  1
-2017-07-31T19:00:22.619634-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0
-2017-07-31T19:00:22.619824-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0
-2017-07-31T19:00:22.620016-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14
-2017-07-31T19:00:22.628414-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:00:22.628654-05:00 leaptest ntpstatus.sh: ntpq -p
-2017-07-31T19:00:22.628868-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:00:22.922779-05:00 leaptest ntpstatus.sh:      remote           refid      st t when poll reach   delay   offset  jitter
-2017-07-31T19:00:22.924191-05:00 leaptest ntpstatus.sh: ==============================================================================
-2017-07-31T19:00:22.925595-05:00 leaptest ntpstatus.sh: +SHM(0)          .GPS.            0 l   16   64  377    0.000    7.369   0.661
-2017-07-31T19:00:22.927000-05:00 leaptest ntpstatus.sh: *SHM(2)          .PPS.            0 l   15   64  377    0.000    0.059   0.008
-2017-07-31T19:00:22.928402-05:00 leaptest ntpstatus.sh:  LOCAL(0)        .LOCL.          14 l    -   32    0    0.000    0.000   0.000
-2017-07-31T19:01:22.942937-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:01:22.943171-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum
-2017-07-31T19:01:22.943371-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:01:23.118319-05:00 leaptest ntpstatus.sh: ind assid status  conf reach auth condition  last_event cnt
-2017-07-31T19:01:23.118551-05:00 leaptest ntpstatus.sh: ===========================================================
-2017-07-31T19:01:23.118750-05:00 leaptest ntpstatus.sh:   1 18654  943a   yes   yes  none candidate    sys_peer  3
-2017-07-31T19:01:23.118943-05:00 leaptest ntpstatus.sh:   2 18655  9649   yes   yes  none  sys.peer  leap_armed  4
-2017-07-31T19:01:23.119137-05:00 leaptest ntpstatus.sh:   3 18656  8011   yes    no  none    reject    mobilize  1
-2017-07-31T19:01:23.119330-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0
-2017-07-31T19:01:23.119520-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0
-2017-07-31T19:01:23.119710-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14
-2017-07-31T19:01:23.128565-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:01:23.128809-05:00 leaptest ntpstatus.sh: ntpq -p
-2017-07-31T19:01:23.129026-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:01:23.417707-05:00 leaptest ntpstatus.sh:      remote           refid      st t when poll reach   delay   offset  jitter
-2017-07-31T19:01:23.417942-05:00 leaptest ntpstatus.sh: ==============================================================================
-2017-07-31T19:01:23.418140-05:00 leaptest ntpstatus.sh: +SHM(0)          .GPS.            0 l   13   64  377    0.000  1007.48 1000.36
-2017-07-31T19:01:23.418337-05:00 leaptest ntpstatus.sh: *SHM(2)          .PPS.            0 l   12   64  377    0.000  1000.05 999.994
-2017-07-31T19:01:23.418529-05:00 leaptest ntpstatus.sh:  LOCAL(0)        .LOCL.          14 l    -   32    0    0.000    0.000   0.000
-2017-07-31T19:02:23.442898-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:02:23.443131-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum
-2017-07-31T19:02:23.443332-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:02:23.617413-05:00 leaptest ntpstatus.sh: ind assid status  conf reach auth condition  last_event cnt
-
-
-Offset goes to one second, because there was no leap second:
-2017-07-31T19:00:22.618857-05:00 leaptest ntpstatus.sh: ===========================================================
-2017-07-31T19:00:22.619057-05:00 leaptest ntpstatus.sh:   1 18654  943a   yes   yes  none candidate    sys_peer  3
-2017-07-31T19:00:22.619252-05:00 leaptest ntpstatus.sh:   2 18655  9649   yes   yes  none  sys.peer  leap_armed  4
-2017-07-31T19:00:22.619444-05:00 leaptest ntpstatus.sh:   3 18656  8011   yes    no  none    reject    mobilize  1
-2017-07-31T19:00:22.619634-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0
-2017-07-31T19:00:22.619824-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0
-2017-07-31T19:00:22.620016-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14
-2017-07-31T19:00:22.628414-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:00:22.628654-05:00 leaptest ntpstatus.sh: ntpq -p
-2017-07-31T19:00:22.628868-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:00:22.922779-05:00 leaptest ntpstatus.sh:      remote           refid      st t when poll reach   delay   offset  jitter
-2017-07-31T19:00:22.924191-05:00 leaptest ntpstatus.sh: ==============================================================================
-2017-07-31T19:00:22.925595-05:00 leaptest ntpstatus.sh: +SHM(0)          .GPS.            0 l   16   64  377    0.000    7.369   0.661
-2017-07-31T19:00:22.927000-05:00 leaptest ntpstatus.sh: *SHM(2)          .PPS.            0 l   15   64  377    0.000    0.059   0.008
-2017-07-31T19:00:22.928402-05:00 leaptest ntpstatus.sh:  LOCAL(0)        .LOCL.          14 l    -   32    0    0.000    0.000   0.000
-2017-07-31T19:01:22.942937-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:01:22.943171-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum
-2017-07-31T19:01:22.943371-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:01:23.118319-05:00 leaptest ntpstatus.sh: ind assid status  conf reach auth condition  last_event cnt
-2017-07-31T19:01:23.118551-05:00 leaptest ntpstatus.sh: ===========================================================
-2017-07-31T19:01:23.118750-05:00 leaptest ntpstatus.sh:   1 18654  943a   yes   yes  none candidate    sys_peer  3
-2017-07-31T19:01:23.118943-05:00 leaptest ntpstatus.sh:   2 18655  9649   yes   yes  none  sys.peer  leap_armed  4
-2017-07-31T19:01:23.119137-05:00 leaptest ntpstatus.sh:   3 18656  8011   yes    no  none    reject    mobilize  1
-2017-07-31T19:01:23.119330-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0
-2017-07-31T19:01:23.119520-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0
-2017-07-31T19:01:23.119710-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14
-2017-07-31T19:01:23.128565-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:01:23.128809-05:00 leaptest ntpstatus.sh: ntpq -p
-2017-07-31T19:01:23.129026-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:01:23.417707-05:00 leaptest ntpstatus.sh:      remote           refid      st t when poll reach   delay   offset  jitter
-2017-07-31T19:01:23.417942-05:00 leaptest ntpstatus.sh: ==============================================================================
-2017-07-31T19:01:23.418140-05:00 leaptest ntpstatus.sh: +SHM(0)          .GPS.            0 l   13   64  377    0.000  1007.48 1000.36
-2017-07-31T19:01:23.418337-05:00 leaptest ntpstatus.sh: *SHM(2)          .PPS.            0 l   12   64  377    0.000  1000.05 999.994
-2017-07-31T19:01:23.418529-05:00 leaptest ntpstatus.sh:  LOCAL(0)        .LOCL.          14 l    -   32    0    0.000    0.000   0.000
-2017-07-31T19:02:23.442898-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:02:23.443131-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum
-2017-07-31T19:02:23.443332-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:02:23.617413-05:00 leaptest ntpstatus.sh: ind assid status  conf reach auth condition  last_event cnt
-
-
-Leap second flag is clear, leap_armed is removed so no leap second on Aug 1, 2017:
-2017-07-31T19:38:42.630432-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum
-2017-07-31T19:38:42.630636-05:00 leaptest ntpstatus.sh: ==========================================================
-2017-07-31T19:38:42.791369-05:00 leaptest ntpstatus.sh: ind assid status  conf reach auth condition  last_event cnt
-2017-07-31T19:38:42.791605-05:00 leaptest ntpstatus.sh: ===========================================================
-2017-07-31T19:38:42.791803-05:00 leaptest ntpstatus.sh:   1 18654  945a   yes   yes  none candidate    sys_peer  5
-2017-07-31T19:38:42.791994-05:00 leaptest ntpstatus.sh:   2 18655  966a   yes   yes  none  sys.peer    sys_peer  6
-2017-07-31T19:38:42.792189-05:00 leaptest ntpstatus.sh:   3 18656  8033   yes    no  none    reject unreachable  3
-2017-07-31T19:38:42.792379-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=00, stratum=0
-2017-07-31T19:38:42.802875-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=00, stratum=0
-2017-07-31T19:38:42.804254-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=00, stratum=14
-
-
diff --git a/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb b/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb
deleted file mode 100644
index d2058ba..0000000
--- a/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-SUMMARY = "Machine specific gpsd config"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD;md5=3775480a712fc46a69647678acb234cb"
-
-# empty by default
-# BSP layers can add stuff like meta-openmoko example:
-#
diff --git a/recipes-navigation/gpsd/gpsd/gpsd b/recipes-navigation/gpsd/gpsd/gpsd
deleted file mode 100755
index b4068c9..0000000
--- a/recipes-navigation/gpsd/gpsd/gpsd
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/bin/bash
-### BEGIN INIT INFO
-# Provides:          gpsd
-# Required-Start:    $remote_fs $network
-# Should-Start:      bluetooth dbus udev
-# Required-Stop:     $remote_fs $network
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: GPS (Global Positioning System) daemon start/stop script
-# Description:       Start/Stop script for the gpsd service daemon,
-#                    which is able to monitor one or more GPS devices
-#                    connected to a host computer, making all data on
-#                    the location and movements of the sensors available
-#                    to be queried on TCP port 2947.
-### END INIT INFO
-
-# Author: Bernd Zeimetz <bzed@debian.org>
-#
-# Please remove the "Author" lines above and replace them
-# with your own name if you copy and modify this script.
-
-# Do NOT "set -e"
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="GPS (Global Positioning System) daemon"
-NAME=gpsd
-DAEMON=/usr/sbin/$NAME
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-CAPABILITY=/sys/devices/platform/mts-io/capability/gps
-
-# Read configuration, if present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Exit if we have no GPS capability
-( [[ -f $CAPABILITY ]] && (($(cat $CAPABILITY) == 1)) ) || exit 0
-
-# Exit if no gps found
-([[ -n $GPS_LINE ]] && [[ -c $GPS_LINE ]]) || exit 0
-
-# Assemble the GPS devices
-# PPS device is needed so GPSD finds the PPS.
-if [[ -c $GPS_PPS ]] ; then
-	: ${GPS_DEVICES:="$GPS_LINE $GPS_PPS"}
-else
-	: ${GPS_DEVICES:="$GPS_LINE"}
-fi
-
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-if [ -z "$GPSD_SOCKET" ] && [ -z "$GPS_DEVICES" ]; then
-	GPSD_SOCKET=/var/run/gpsd.sock
-fi
-
-if [ -n "$GPSD_SOCKET" ]; then
-        GPSD_OPTIONS="$GPSD_OPTIONS -F $GPSD_SOCKET"
-fi
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-	/usr/sbin/start-stop-daemon -N -20 --start --quiet --pidfile $PIDFILE --exec $DAEMON --test \
-        -- $GPSD_OPTIONS -P $PIDFILE $GPS_DEVICES > /dev/null \
-		|| return 1
-	# Return
-	#   0 if daemon has been started
-	#   1 if daemon was already running
-	#   2 if daemon could not be started
-
-        # If the SET_GPS_SPEED function exists, call it to set the GPS Speed.
-        what=$(type SET_GPS_SPEED 2>/dev/null)
-        if [[ $what =~ SET_GPS_SPEED[[:space:]]is[[:space:]]a[[:space:]]function ]] ; then
-            SET_GPS_SPEED	
-        fi
-
-	/usr/sbin/start-stop-daemon -N -20 --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-		$GPSD_OPTIONS -P $PIDFILE $GPS_DEVICES \
-		|| return 2
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-	# Return
-	#   0 if daemon has been stopped
-	#   1 if daemon was already stopped
-	#   2 if daemon could not be stopped
-	#   other if a failure occurred
-	/usr/sbin/start-stop-daemon --stop --quiet --signal KILL --pidfile $PIDFILE --name $NAME
-	RETVAL="$?"
-	[ "$RETVAL" = 2 ] && return 2
-	# Many daemons don't delete their pidfiles when they exit.
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
-	#
-	# If the daemon can reload its configuration without
-	# restarting (for example, when it is sent a SIGHUP),
-	# then implement that here.
-	#
-	/usr/sbin/start-stop-daemon -N -20 --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
-	return 0
-}
-
-do_status() {
-        NAME=$1
-        PIDFILE=$2
-        # -t: test only but not stop
-        start-stop-daemon -K -t --quiet --pidfile $PIDFILE --name $NAME
-        # exit with status 0 if process is found
-        if [ "$?" = "0" ]; then
-                return 0
-        else
-                return 1
-        fi
-}
-
-case "$1" in
-  start)
-	if ! [[ $ENABLED =~ ^[yY][eE][sS]$ ]] ; then
-		exit 0
-	fi
-	echo "Starting $DESC" "$NAME"
-	do_start
-	exit $?
-	;;
-  stop)
-	echo "Stopping $DESC" "$NAME"
-	do_stop
-	exit $?
-	;;
-  status)
-        echo -n "status $NAME ... "
-        do_status "$NAME" "$PIDFILE"
-        if [ "$?" = "0" ]; then
-                echo "running"
-                exit 0
-        else
-                echo "stopped"
-                exit 1
-        fi
-        ;;
-  reload|force-reload)
-	echo "Reloading $DESC" "$NAME"
-	do_reload
-	exit $?
-	;;
-  restart)
-	#
-	# If the "reload" option is implemented then remove the
-	# 'force-reload' alias
-	#
-	echo "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		exit $?
-		;;
-	  *)
-	 	# Failed to stop
-		exit 1
-		;;
-	esac
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:
diff --git a/recipes-navigation/gpsd/gpsd/gpsd-default b/recipes-navigation/gpsd/gpsd/gpsd-default
deleted file mode 100644
index fa67fd1..0000000
--- a/recipes-navigation/gpsd/gpsd/gpsd-default
+++ /dev/null
@@ -1,76 +0,0 @@
-ENABLED="yes"
-
-# GPSD control socket for sending GPSD commands.
-# GPSD_SOCKET="/var/run/gpsd.sock"
-
-GPSD_OPTIONS="-n -D 1" 
-
-# Conduit 0.1 GPS devices
-GPS_LINE=/dev/gps0
-GPS_PPS=/dev/pps0
-
-# Highest speed permitted by uBlox.
-GPS_BAUD=115200
-
-# Use this if you must use a specific pps
-# that does not exist prior to gpsd running.
-# GPS_DEVICES="/dev/gps1 /dev/pps1"
-
-GPS_FIXFILE=/var/run/gpsfix
-
-# GPSD Json TPV object, mode field.
-# See: http://www.catb.org/gpsd/gpsd_json.html
-#
-# 0 Unknown
-# 1 No fix
-# 2 2D fix
-# 3 3D fix
-GPSFIX="3"
-
-# U-Blox defaults to 9600.  If the
-# default speed is not set before changing
-# the baud rate, this does not work
-# except right after a boot when the speed
-# is 9600 baud.
-#
-# 115200 baud is preferred to reduce the CPU
-# load.  Also, u-blox mode is preferred to
-# nmea, as it is more efficient.
-#
-# We check for U-Blox first, because
-# we do not set the baud rate of other
-# GPS types.
-# 
-# This gpsctl does not always work, because
-# the line speed might be wrong, so if we
-# fail, we change the baud rate and try again.
-#
-# There should only be two speeds, 115200
-# or 9600.
-#
-# If the line speed is already 115200, we
-# should not need to change the baud rate.
-#
-function SET_GPS_SPEED {
-if [[ $(mts-io-sysfs show hw-version) =~ ^MTHS- ]] ; then
-     if gpsctl -t 'u-blox' -D 5 -x '\x06\x41\x00\x00\x03\x1F\x90\x47\x4F\xB1\xFF\xFF\xEA\xFF' $GPS_LINE ; then
-        logger -s -t 'gpsd info' -p daemon.info "GPS LNA set high"
-     else
-        logger -s -t 'gpsd info' -p daemon.alert "ERROR: GPS LNA not set"
-     fi
-fi
-
-if [[ $(cat /run/config/gpstype) == u-blox ]] ; then
-	# Set the baud rate.  Works better with ntp at a higher baud rate.
-	if ! gpsctl -T 20 -t 'u-blox' -s $GPS_BAUD -b  -f $GPS_LINE ; then
-	  echo 'WARNING: Unable to set GPS serial port speed.'
-	else
-	  # The next line is needed due to a bug in gpsctl.
-	  # We will go back to the default baud rate if we don't do this step.
-	  echo Expect a timeout error here.  Need this error.
-	  gpsctl -T 2 -f $GPS_LINE
-	  stty -F $GPS_LINE $GPS_BAUD
-	fi 
-fi  # End of U-Blox GPS type
-}
-
diff --git a/recipes-navigation/gpsd/gpsd/gpsd.rules b/recipes-navigation/gpsd/gpsd/gpsd.rules
deleted file mode 100644
index dc90ad6..0000000
--- a/recipes-navigation/gpsd/gpsd/gpsd.rules
+++ /dev/null
@@ -1,50 +0,0 @@
-# udev rules for gpsd
-# $Id$
-#
-# GPSes don't have their own USB device class.  They're serial-over-USB
-# devices, so what you see is actually the ID of the serial-over-USB chip.
-# Fortunately, just two of these account for over 80% of consumer-grade
-# GPS sensors.  The gpsd.hotplug.wrapper script will tell a running gpsd
-# that it should look at the device that just went active, because it
-# might be a GPS.
-#
-# The following setup works on Debian - something similar will apply on 
-# other distributions:
-# 
-#   /etc/udev/gpsd.rules
-#   /etc/udev/rules.d/025_gpsd.rules -> ../gpsd.rules
-#   /lib/udev/gpsd.hotplug.wrapper
-#   /lib/udev/gpsd.hotplug
-# 
-# Setting the link in /etc/udev/rules.d activates the rule and determines
-# when to run it on boot (similar to init.d processing).
-
-SUBSYSTEM!="tty", GOTO="gpsd_rules_end"
-
-# Prolific Technology, Inc. PL2303 Serial Port
-ATTR{idVendor}=="067b", ATTR{idProduct}=="2303", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
-# ATEN International Co., Ltd UC-232A Serial Port [pl2303]
-ATTR{idVendor}=="0557", ATTR{idProduct}=="2008", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
-# FTDI 8U232AM
-ATTR{idVendor}=="0403", ATTR{idProduct}=="6001", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
-# Cypress M8/CY7C64013 (DeLorme uses these)
-ATTR{idVendor}=="1163", ATTR{idProduct}=="0100", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
-# PS-360 OEM (Microsoft GPS sold with Street and Trips 2005)
-ATTR{idVendor}=="067b", ATTR{idProduct}=="aaa0", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
-# Garmin International GPSmap, various models (tested with Garmin GPS 18 USB)
-ATTR{idVendor}=="091e", ATTR{idProduct}=="0003", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
-# Cygnal Integrated Products, Inc. CP210x Composite Device (Used by Holux m241)
-ATTR{idVendor}=="10c4", ATTR{idProduct}=="ea60", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
-# u-blox AG, u-blox 5 (tested with Navilock NL-402U)
-ATTR{idVendor}=="1546", ATTR{idProduct}=="01a5", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
-# FTDI FT232
-ATTR{idVendor}=="0403", ATTR{idProduct}=="6001", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
-# u-blox 4
-ATTR{idVendor}=="1546", ATTR{idProduct}=="01a4", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
-
-# mLinux does not come with gpsd.hotplug.wrapper
-# ACTION=="remove", RUN+="/lib/udev/gpsd.hotplug.wrapper"
-
-KERNEL=="ttyXRUSB2", SYMLINK+="gps0"                                                                                                                                                 
-KERNEL=="pps0", OWNER="root", GROUP="tty", MODE="0660", SYMLINK+="gpspps0"                                                                                                           
-LABEL="gpsd_rules_end"
diff --git a/recipes-navigation/gpsd/gpsd/gpsd.service b/recipes-navigation/gpsd/gpsd/gpsd.service
deleted file mode 100644
index 7131a58..0000000
--- a/recipes-navigation/gpsd/gpsd/gpsd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=GPS (Global Positioning System) Daemon
-Requires=gpsd.socket
-
-[Service]
-EnvironmentFile=/etc/default/gpsd
-ExecStart=/usr/sbin/gpsd -N $GPS_DEVICES
-
-[Install]
-Also=gpsd.socket
diff --git a/recipes-navigation/gpsd/gpsd/gpsd_fixed.sh b/recipes-navigation/gpsd/gpsd/gpsd_fixed.sh
deleted file mode 100644
index 915c7be..0000000
--- a/recipes-navigation/gpsd/gpsd/gpsd_fixed.sh
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/bash
-# This script filters the gpspipe -w
-# (json) output from GPSD.  The GPS fix
-# is taken from the mode parameter of
-# the GPSD TPV object in the json output.
-# Values are:
-#
-# 0  Unseen
-# 1  No fix
-# 2  2D
-# 3  3D
-#
-# Fix file creation for GPS.
-# If GPS reaches expected
-# fix level, file GSP_FIXFILE is created.
-# This is to know when to set the system
-# and hardware clock, and when 
-# it is safe to start ntp.
-# DEBUG=1 to set debug
-NAME=gpsd_ubx_fixed
-shopt -s expand_aliases
-alias LG="logger -t ${NAME}"
-if [[ -r /etc/default/gpsd ]] ; then
-  . /etc/default/gpsd
-else
-  echo "Must configure GPSD requirements"
-  exit 1
-fi
-
-function rm_gps_file
-{
-  if [[ -n "${GPS_FIXFILE}" ]] && [[ -f ${GPS_FIXFILE} ]] ; then
-    rm -f "${GPS_FIXFILE}"
-  fi
-}
-function kill_it
-{
-    cmd=$1
-    pid=$2
-    sig=$3
-    ((DEBUG)) && LG -p user.info "terminating $cmd(${pid}) with SIG${sig}"
-    kill -SIG${sig} ${pid} >/dev/null 2>&1
-    result=$?                                                                                                                                                                                      
-    ((DEBUG)) && LG -p user.info "kill -SIG${sig} ${pid} result is $result"  
-}        
-
-# Most exits are errors, so remove the GPS fix file.
-trap rm_gps_file EXIT
-
-if ! [[ -x /usr/bin/gpspipe ]] ; then
-  LG -p user.err "Please install gpspipe"
-  exit 0
-fi
-
-# Terminate gpspipe after 10 seconds if it is our child
-# gpspipe has issues with terminals and stalling on terminal
-# read of the console.
-(
-  sleep 10
-  # We use BASHPID because our parent, $$, may have already exited, and
-  # then ps will not work.  BASHPID is the current subshell.
-  ppid=$BASHPID
-  pgid=$(ps --no-heading -o pgid -p $ppid)
-  
-  if ((${#pgid} == 0)) ; then
-    LG -p user.err "Could not find a pgid for $ppid"
-    ps -fjp $ppid | LG -p user.error
-  fi
-
-  # pgrep does not work during boot.
-  pgrpmemb=$(ps --no-heading -o pgid,pid,comm -e | grep '^ *'"${pgid}"' *' | sed -r 's/^ *[0-9]+ *//')
-  gpspipepid=$(echo "${pgrpmemb}" | egrep '[[:space:]]gpspipe$' | sed 's/[[:space:]].*//')
-
-  ((DEBUG)) && LG -p user.info "$pgid is pgid $gpspipepid is gpspipepid"
-  # Find the gpspipepid that is our grandchild
-  ((didkill=0))
-  
-  # for loop is in case gpspipepid has children.
-  for p in ${gpspipepid} ; do
-    if ((${#p})) ; then
-        kill_it gpspipe $p TERM
-        ((didkill=p))
-        break
-    fi
-  done
-  if ((didkill == 0)) ; then
-    exit 0
-  fi
-  # Do a sigkill to be sure.
-  sleep 2
-  kill_it gpspipe $didkill KILL
-) &
-
-fix=""
-status=""
-
-# egrep in busybox has a horrible buffering issue.
-# echo My shell pid is $$
-# echo Place data fix, status
-fix="$(gpspipe -w | grep -m1 '{"class":"TPV","device":"/dev/gps0",.*"mode":'  | sed -e 's/.*"mode"://' -e 's/[},].*//')"
-
-if ((${#fix} == 0)) ; then
-  LG -p user.err "No data from GPS"
-  exit 1
-fi
-
-
-# echo "status is $status.  fixOK is $fixOK"
-
-
-# echo "fix is $fix.   Is it in $GPSFIX?"
-# Test the GPS fixOK
-for x in $GPSFIX ; do
-  # echo test $x with $fix
-  if [[ $x == $fix ]] ; then
-    LG -p user.info "GPS has fix $fix found in list GPSFIX: $GPSFIX"
-    echo $x >"${GPS_FIXFILE}"
-    GPS_FIXFILE=""
-    exit 0
-  fi
-done
-
-LG -p user.info "GPS fix is bad: $fix and should be one of: $GPSFIX"
-# Start later
-exit 1
diff --git a/recipes-navigation/gpsd/gpsd/gpsd_settime.sh b/recipes-navigation/gpsd/gpsd/gpsd_settime.sh
deleted file mode 100755
index e8e8f26..0000000
--- a/recipes-navigation/gpsd/gpsd/gpsd_settime.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-# Get the time from gpspipe, and if present, set the time.
-# DEBUG=1 to set debug
-NAME=gpsd_ubx_settime
-shopt -s expand_aliases
-alias LG="logger -t $NAME"
-function kill_it
-{
-    cmd=$1
-    pid=$2
-    sig=$3
-    ((DEBUG)) && LG -p user.info "terminating $cmd(${pid}) with SIG${sig}"
-    kill -SIG${sig} ${pid}
-    result=$?
-    ((DEBUG)) && LG -p user.info "kill -SIG${sig} ${pid} result is $result"
-}        
-
-trap "stty echo icanon" exit
-
-OIFS=$IFS
-IFS=$'\n'
-if ! /usr/sbin/gpsd_fixed </dev/null ; then
-   LG -s -p user.warn "GPS does not have a fix yet.  Try again later."
-   exit 1
-fi
-
-
-# Terminate gpspipe after 10 seconds if it is our child
-# gpspipe has issues with terminals and stalling on terminal
-# read of the console.
-(
-  sleep 10
-  ppid=$BASHPID
-  pgid=$(ps --no-heading -o pgid -p $ppid)
-  
-  if ((${#pgid} == 0)) ; then
-    LG -p user.err "Could not find a pgid for $ppid"
-    ps -fjp $ppid | LG -p user.error
-  fi
-
-  # pgrep does not work during boot.
-  pgrpmemb=$(ps --no-heading -o pgid,pid,comm -e | grep '^ *'"${pgid}"' *' | sed -r 's/^ *[0-9]+ *//')
-  gpspipepid=$(echo "${pgrpmemb}" | egrep '[[:space:]]gpspipe$' | sed 's/[[:space:]].*//')
-
-  ((DEBUG)) && LG -p user.info "$pgid is pgid $gpspipepid is gpspipepid"
-  # Find the gpspipepid that is our grandchild
-  ((didkill=0))
-  
-  # for loop is in case gpspipepid has children.
-  for p in ${gpspipepid} ; do
-    if ((${#p})) ; then
-        kill_it gpspipe $p TERM
-        ((didkill=p))
-        break
-    fi
-  done
-  if ((didkill == 0)) ; then
-    exit 0
-  fi
-  # Do a sigkill to be sure.
-  sleep 2
-  kill_it gpspipe $didkill KILL
-) &
-        
-# Get the ISO8601 time from GPSD
-ISO8601=$(gpspipe -w | egrep -m1 '\{"class":"TPV","device":"/dev/gps0"(,"status":[0-9])*,"mode":3,"time":"' | sed -e 's/.*,"time":"//' -e 's/Z",.*//')
-
-if (( ${#ISO8601} > 18 )) ; then
-  LG -p user.warn "Updating time to time, ${ISO8601}."
-  [[ $ISO8601 =~ ([^-]*)-([^-]*)-([^T]*)T([^:]*):([^:]*):([^\.]*)\. ]]
-  Y=${BASH_REMATCH[1]}
-  M=${BASH_REMATCH[2]}
-  D=${BASH_REMATCH[3]}
-  h=${BASH_REMATCH[4]}
-  m=${BASH_REMATCH[5]}
-  s=${BASH_REMATCH[6]}
-fi
-if ((${#Y} == 4 )) && ((${#M} > 0)) && ((${#D} > 0)) && ((${#h} > 0)) && ((${#m} > 0)) && ((${#s} > 0)) ; then
-  date -u "${Y}.${M}.${D}-${h}:${m}:${s}" >/dev/null
-else
-  LG -p user.err "gpspipe output is bad or missing"
-  exit 1
-fi
-exit 0
diff --git a/recipes-navigation/gpsd/gpsd/gpsd_ubx_fixed.sh b/recipes-navigation/gpsd/gpsd/gpsd_ubx_fixed.sh
deleted file mode 100755
index 82254c2..0000000
--- a/recipes-navigation/gpsd/gpsd/gpsd_ubx_fixed.sh
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/bin/bash
-# This script is deprecated.
-# Use gpsd_fixed instead.
-# Fix file creation for U-Blox GPS.
-# If GPS reaches expected
-# fix level, file GSP_FIXFILE is created.
-# This is to know when to set the system
-# and hardware clock, and when 
-# it is safe to start ntp.
-# DEBUG=1 to set debug
-# 
-NAME=gpsd_ubx_fixed
-shopt -s expand_aliases
-alias LG=logger\ -t\ ${NAME}
-if [[ -r /etc/default/gpsd ]] ; then
-  . /etc/default/gpsd
-else
-  echo "Must configure GPSD requirements"
-  exit 1
-fi
-UBXNAVSOL='b56201063400'
-UBXNAVSOLLEN=60
-
-function rm_gps_file
-{
-  if [[ -n "${GPS_FIXFILE}" ]] && [[ -f ${GPS_FIXFILE} ]] ; then
-    rm -f "${GPS_FIXFILE}"
-  fi
-}
-function kill_it
-{
-    cmd=$1
-    pid=$2
-    sig=$3
-    ((DEBUG)) && LG -p user.info "terminating $cmd(${pid}) with SIG${sig}"
-    kill -SIG${sig} ${pid} >/dev/null 2>&1
-    result=$?                                                                                                                                                                                      
-    ((DEBUG)) && LG -p user.info "kill -SIG${sig} ${pid} result is $result"  
-}        
-
-
-# Most exits are errors, so remove the GPS fix file.
-trap rm_gps_file EXIT
-
-if ! [[ -x /usr/bin/gpsmon ]] ; then
-  LG -p user.err "Please install gpsmon"
-  exit 0
-fi
-
-# Terminate gpsmon after 10 seconds if it is our child
-# gpsmon has issues with terminals and stalling on terminal
-# read of the console.
-(
-  sleep 10
-  # We use BASHPID because our parent, $$, may have already exited, and
-  # then ps will not work.  BASHPID is the current subshell.
-  ppid=$BASHPID
-  pgid=$(ps --no-heading -o pgid -p $ppid)
-  
-  if ((${#pgid} == 0)) ; then
-    LG -p user.err "Could not find a pgid for $ppid"
-    ps -fjp $ppid | LG -p user.error
-  fi
-
-  # pgrep does not work during boot.
-  pgrpmemb=$(ps --no-heading -o pgid,pid,comm -e | grep '^ *'"${pgid}"' *' | sed -r 's/^ *[0-9]+ *//')
-  gpsmonpid=$(echo "${pgrpmemb}" | egrep '[[:space:]]gpsmon$' | sed 's/[[:space:]].*//')
-
-  ((DEBUG)) && LG -p user.info "$pgid is pgid $gpsmonpid is gpsmonpid"
-  # Find the gpsmonpid that is our grandchild
-  ((didkill=0))
-  
-  # for loop is in case gpsmonpid has children.
-  for p in ${gpsmonpid} ; do
-    if ((${#p})) ; then
-        kill_it gpsmon $p TERM
-        ((didkill=p))
-        break
-    fi
-  done
-  if ((didkill == 0)) ; then
-    exit 0
-  fi
-  # Do a sigkill to be sure.
-  sleep 2
-  kill_it gpsmon $didkill KILL
-) &
-
-fix=""
-status=""
-
-# egrep in busybox has a horrible buffering issue.
-# echo My shell pid is $$
-# echo Place data fix, status
-stuff="$(gpsmon -a 2>&1 | {
-  OIFS=${IFS}
-  IFS=$'\n'
-  while read ln ; do
-    if [[ $ln =~ ^[[:space:]]*\(${UBXNAVSOLLEN}\)[[:space:]]*${UBXNAVSOL}....................(..)(.) ]] ; then
-      IFS=${OIFS} 
-      fix="${BASH_REMATCH[1]}"
-      if ((${#fix} == 0)) ; then
-	fix="unknown"
-      fi
-      status=$(echo "${BASH_REMATCH[2]}")
-      if ((${#status} == 0)) ; then
-	status="unknown"
-      fi
-      break;
-    fi
-    oldln="${ln}"
-  done
-  if ((${#fix})) && ((${#status})) ; then
-    echo "$fix,$status"
-  else
-    echo "${oldln}"
-  fi
-})"
-
-if ((${#stuff} == 0)) ; then
-  LG -p user.err "No data from GPS"
-  exit 1
-fi
-
-if [[ -t 1 ]] ; then
-  stty echo icanon 2>/dev/null
-fi
-
-OIFS=${IFS}
-IFS=,
-set $stuff
-fix="$1"
-status="$2"
-IFS=${OIFS}
-
-# fixOK is the least significant bit of a hex single digit
-case $status in
-  [13579bBdDfF])
-    ((fixOK=1))
-    ;;
-  [02468aAcCeE])
-    ((fixOK=0))
-    ;;
-  *)
-    LG -p user.err "Is GPSD running?"
-    LG -p user.err "FIX OK field should be single hex digit: gpsmon data: $stuff"
-    exit 1
-    break
-    ;;
-esac
-
-# echo "status is $status.  fixOK is $fixOK"
-
-
-if ((fixOK == 0)) ; then
-  LG -p user.err "Problem with the GPS fix.  The fix is an even value, \"$status\", and should be an odd value.  fixOK=${fixOK}"
-  exit 1
-  # Retry later.  How?
-fi
-
-# echo "fix is $fix.   Is it in $GPSFIX?"
-# Test the GPS fixOK
-for x in $GPSFIX ; do
-  # echo test $x with $fix
-  if [[ $x == $fix ]] ; then
-    LG -p user.info "GPS has fix $fix found in list GPSFIX: $GPSFIX"
-    echo $x >"${GPS_FIXFILE}"
-    GPS_FIXFILE=""
-    exit 0
-  fi
-done
-
-LG -p user.info "GPS fix is bad: $fix and should be one of: $GPSFIX"
-# Start later
-exit 1
-
diff --git a/recipes-navigation/gpsd/gpsd/gpsd_ubx_settime.sh b/recipes-navigation/gpsd/gpsd/gpsd_ubx_settime.sh
deleted file mode 100755
index b497138..0000000
--- a/recipes-navigation/gpsd/gpsd/gpsd_ubx_settime.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-# This function is deprecated.
-# Use gpsd_settime instead.
-# PPS= 1484247472.29561104 clock= 1484247990.00000000 offset= 517.704388959
-# DEBUG=1 to set debug
-NAME=gpsd_ubx_settime
-shopt -s expand_aliases
-alias LG="logger -t $NAME"
-function kill_it
-{
-    cmd=$1
-    pid=$2
-    sig=$3
-    ((DEBUG)) && LG -p user.info "terminating $cmd(${pid}) with SIG${sig}"
-    kill -SIG${sig} ${pid}
-    result=$?
-    ((DEBUG)) && LG -p user.info "kill -SIG${sig} ${pid} result is $result"
-}        
-
-trap "stty echo icanon" exit
-
-OIFS=$IFS
-IFS=$'\n'
-if ! /usr/sbin/gpsd_ubx_fixed </dev/null ; then
-   LG -s -p user.warn "GPS does not have a fix yet.  Try again later."
-   exit 1
-fi
-
-
-# Terminate gpsmon after 10 seconds if it is our child
-# gpsmon has issues with terminals and stalling on terminal
-# read of the console.
-(
-  sleep 10
-  ppid=$BASHPID
-  pgid=$(ps --no-heading -o pgid -p $ppid)
-  
-  if ((${#pgid} == 0)) ; then
-    LG -p user.err "Could not find a pgid for $ppid"
-    ps -fjp $ppid | LG -p user.error
-  fi
-
-  # pgrep does not work during boot.
-  pgrpmemb=$(ps --no-heading -o pgid,pid,comm -e | grep '^ *'"${pgid}"' *' | sed -r 's/^ *[0-9]+ *//')
-  gpsmonpid=$(echo "${pgrpmemb}" | egrep '[[:space:]]gpsmon$' | sed 's/[[:space:]].*//')
-
-  ((DEBUG)) && LG -p user.info "$pgid is pgid $gpsmonpid is gpsmonpid"
-  # Find the gpsmonpid that is our grandchild
-  ((didkill=0))
-  
-  # for loop is in case gpsmonpid has children.
-  for p in ${gpsmonpid} ; do
-    if ((${#p})) ; then
-        kill_it gpsmon $p TERM
-        ((didkill=p))
-        break
-    fi
-  done
-  if ((didkill == 0)) ; then
-    exit 0
-  fi
-  # Do a sigkill to be sure.
-  sleep 2
-  kill_it gpsmon $didkill KILL
-) &
-                    
-epoch=$(gpsmon -a 2>&1 | ( while read ln ; do
-	if [[ $ln =~ ^[[:space:]]*PPS=.*clock=[[:space:]]*([0-9]*)\. ]] ; then
-		echo ${BASH_REMATCH[1]}
-		break
-	fi
-done ))
-if [[ $epoch =~ ^[0-9]+$ ]] ; then
-  LG -p user.warn "Updating time to epoch time, ${epoch}."
-  date +%s -s @${epoch} >/dev/null
-else
-  LG -p user.err "gpsmon output is bad."
-  exit 1
-fi
-exit 0
diff --git a/recipes-navigation/gpsd/gpsd_3.16.bb b/recipes-navigation/gpsd/gpsd_3.16.bb
deleted file mode 100644
index 704a928..0000000
--- a/recipes-navigation/gpsd/gpsd_3.16.bb
+++ /dev/null
@@ -1,220 +0,0 @@
-SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices"
-SECTION = "console/network"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
-DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-replacement-native pps-tools"
-PROVIDES = "virtual/gpsd"
-PR="m14"
-
-EXTRANATIVEPATH += "chrpath-native"
-
-#    file://0002-SConstruct-remove-rpath.patch
-SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \
-    file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \
-    file://0004-SConstruct-disable-html-and-man-docs-building-becaus.patch \
-    file://0001-include-sys-ttydefaults.h.patch \
-    file://0005-suppress-text-in-binary.patch \
-    file://0006-ubxtimelps.patch \
-    file://0006-itu_r_tf_460_6.patch \
-    file://0006-sysclockcrash.patch \
-    file://gpsd-default \
-    file://gpsd \
-    file://gpsd_ubx_fixed.sh \
-    file://gpsd_ubx_settime.sh \
-    file://gpsd_settime.sh \
-    file://gpsd_fixed.sh \
-    file://gpsd.rules \
-    file://gpsd.service \
-"
-# Fixed
-#    file://0001-Check-for-__STDC_NO_ATOMICS__-before-using-stdatomic.patch
-#    file://0002-Add-a-test-for-C11-and-check-we-have-C11-before-usin.patch
-#    file://0003-Whoops-check-for-C11-not-for-not-C11-in-stdatomic.h-.patch
-#    file://0001-Include-stdatomic.h-only-in-C-mode.patch
-#    file://0001-libgpsd-core-Fix-issue-with-ACTIVATE-hook-not-being-.patch
-
-SRC_URI[md5sum] = "68691b5de4c94f82ec4062b042b5eb63"
-SRC_URI[sha256sum] = "03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029"
-
-
-inherit scons update-rc.d python-dir pythonnative systemd
-
-INITSCRIPT_NAME = "gpsd"
-INITSCRIPT_PARAMS = "defaults 10"
-
-SYSTEMD_OESCONS = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',d)}"
-
-export STAGING_INCDIR
-export STAGING_LIBDIR
-
-# Necessary for python
-export BUILD_SYS
-export HOST_SYS
-
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
-PACKAGECONFIG[bluez] = "bluez='false',${BLUEZ}"
-PACKAGECONFIG[qt] = "qt='yes',qt='no',qt4-x11-free"
-EXTRA_OESCONS = " \
-    sysroot=${STAGING_DIR_TARGET} \
-    libQgpsmm='false' \
-    debug='true' \
-    strip='false' \
-    chrpath='yes' \
-    systemd='${SYSTEMD_OESCONS}' \
-    libdir='${libdir}' \
-    ashtech='no' \
-    earthmate='no' \
-    evermore='no' \
-    fury='no' \
-    fv18='no' \
-    garmin='no' \
-    garmintxt='no' \
-    geostar='no' \
-    greis='no' \
-    itrax='no' \
-    mtk3301='no' \
-    navcom='no' \
-    nmea0183='yes' \
-    nmea2000='no' \
-    oncore='no' \
-    sirf='no' \
-    skytraq='yes' \
-    superstar2='no' \
-    tnt='no' \
-    tripmate='no' \
-    tsip='no' \
-    ublox='yes' \
-    ubloxtimels='yes' \
-    aivdm='no' \
-    gpsclock='no' \
-    oceanserver='no' \
-    fixed_stop_bits='1' \
-    pps='yes' \
-    gpsd_group='gps' \
-    ntpshm='yes' \
-    ${PACKAGECONFIG_CONFARGS} \
-"
-# this cannot be used, because then chrpath is not found and only static lib is built
-# target=${HOST_SYS}
-
-do_compile_prepend() {
-    export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
-    export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config"
-    export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}"
-    export LINKFLAGS="${LDFLAGS}"
-}
-
-do_install() {
-    export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
-    export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config"
-    export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}"
-    export LINKFLAGS="${LDFLAGS}"
-
-    export DESTDIR="${D}"
-    # prefix is used for RPATH and DESTDIR/prefix for instalation
-    ${STAGING_BINDIR_NATIVE}/scons prefix=${prefix} install ${EXTRA_OESCONS}|| \
-      bbfatal "scons install execution failed."
-}
-
-do_install_append() {
-    install -d ${D}/${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/gpsd ${D}/${sysconfdir}/init.d/
-    install -d ${D}/${sysconfdir}/default
-    install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd.default
-    install -d ${D}${sbindir}
-    install -m 0755 ${WORKDIR}/gpsd_ubx_fixed.sh ${D}${sbindir}/gpsd_ubx_fixed
-    install -m 0755 ${WORKDIR}/gpsd_ubx_settime.sh ${D}${sbindir}/gpsd_ubx_settime
-    install -m 0755 ${WORKDIR}/gpsd_fixed.sh ${D}${sbindir}/gpsd_fixed
-    install -m 0755 ${WORKDIR}/gpsd_settime.sh ${D}${sbindir}/gpsd_settime
-
-    #support for udev
-    install -d ${D}/${sysconfdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/gpsd.rules ${D}/${sysconfdir}/udev/rules.d
-    install -d ${D}${base_libdir}/udev/
-    install -m 0755 ${S}/gpsd.hotplug ${D}${base_libdir}/udev/
-
-    #support for python
-    install -d ${D}/${PYTHON_SITEPACKAGES_DIR}/gps
-    install -m 755 ${S}/gps/*.py ${D}/${PYTHON_SITEPACKAGES_DIR}/gps
-
-    #support for systemd
-    install -d ${D}${systemd_unitdir}/system/
-    install -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_unitdir}/system/${BPN}.service
-    install -m 0644 ${S}/systemd/${BPN}.socket ${D}${systemd_unitdir}/system/${BPN}.socket
-    
-    # support for dev (development)
-    mkdir -p -m 0644 ${D}/${includedir}/gps
-    install -m 0644 ${S}/gpsd.h ${D}/${includedir}/gps
-    install -m 0644 ${S}/revision.h ${D}/${includedir}/gps
-    install -m 0644 ${S}/gpsdclient.h ${D}/${includedir}/gps
-    install -m 0644 ${S}/gpsd_config.h ${D}/${includedir}/gps
-    install -m 0644 ${S}/compiler.h ${D}/${includedir}/gps
-    install -m 0644 ${S}/ppsthread.h ${D}/${includedir}/gps
-}
-
-# Use libgps recipe for sysroot.
-do_populate_sysroot() {
-}
-
-RDEPENDS_${PN}-conf += "bash"
-
-pkg_postinst_${PN}-conf() {
-    update-alternatives --install ${sysconfdir}/default/gpsd gpsd-defaults ${sysconfdir}/default/gpsd.default 10
-}
-
-pkg_postrm_${PN}-conf() {
-    update-alternatives --remove gpsd-defaults ${sysconfdir}/default/gpsd.default
-}
-
-PACKAGES =+ "libgps libgpsd python-pygps-dbg python-pygps gpsd-udev gpsd-conf gpsd-gpsctl gpspipe gps-utils"
-
-# File does not exist: ${libdir}/libQgpsmm.prl 
-# FILES_${PN}-dev += "${libdir}/pkgconfdir/libgpsd.pc ${libdir}/pkgconfdir/libgps.pc \
-#                     ${includedir}/gps.h ${includedir}/libgpsmm.h ${includedir}/gps"
-
-FILES_${PN} += "${sbindir}/gpsd_*"
-
-FILES_python-pygps-dbg += " ${libdir}/python*/site-packages/gps/.debug"
-
-RDEPENDS_${PN} = "gpsd-gpsctl bash"
-RRECOMMENDS_${PN} = "gpsd-conf gpsd-machine-conf"
-
-SUMMARY_${PN}-udev = "udev relevant files to use gpsd hotplugging"
-FILES_${PN}-udev = "${base_libdir}/udev ${sysconfdir}/udev/*"
-RDEPENDS_${PN}-udev += "udev gpsd-conf"
-
-SUMMARY_libgpsd = "C service library used for communicating with gpsd"
-FILES_libgpsd = "${libdir}/libgpsd.so.*"
-
-SUMMARY_libgps = "C service library used for communicating with gpsd"
-FILES_libgps = "${libdir}/libgps.so.*"
-
-SUMMARY_${PN}-conf = "gpsd configuration files and init scripts"
-FILES_${PN}-conf = "${sysconfdir}" 
-CONFFILES_${PN}-conf = "${sysconfdir}/default/gpsd.default"
-
-SUMMARY_${PN}-gpsctl = "Tool for tweaking GPS modes"
-FILES_${PN}-gpsctl = "${bindir}/gpsctl"
-
-SUMMARY_gpspipe = "Tool to connectg to gpsd and retrieve sentences"
-FILES_gpspipe = "${bindir}/gpspipe"
-
-SUMMARY_gps-utils = "Utils used for simulating, monitoring,... a GPS"
-FILES_gps-utils = "${bindir}/*"
-RDEPENDS_gps-utils = "python-pygps"
-
-SUMMARY_python-pygps = "Python bindings to gpsd"
-FILES_python-pygps = "${PYTHON_SITEPACKAGES_DIR}/*"
-RDEPENDS_python-pygps = " \
-    python-core \
-    python-io \
-    python-threading \
-    python-terminal \
-    python-curses \
-    gpsd \
-    python-json"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "${PN}.socket"
diff --git a/recipes-navigation/gpsd/gpsd_3.18.1.bb.save b/recipes-navigation/gpsd/gpsd_3.18.1.bb.save
deleted file mode 100644
index bbc1f88..0000000
--- a/recipes-navigation/gpsd/gpsd_3.18.1.bb.save
+++ /dev/null
@@ -1,236 +0,0 @@
-SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices"
-SECTION = "console/network"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
-DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-replacement-native pps-tools"
-PROVIDES = "virtual/gpsd"
-PR="m7"
-
-EXTRANATIVEPATH += "chrpath-native"
-
-# sysclockcrash is fixed for gpsd
-# suppress text in binary is fixed for gpsctl
-
-SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \
-    file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \
-    file://0004-SConstruct-disable-html-and-man-docs-building-becaus.patch \
-    file://0001-include-sys-ttydefaults.h.patch \
-    file://0006-ubxtimelps.patch \
-    file://0006-itu_r_tf_460_6.patch \
-    file://gpsd-default \
-    file://gpsd \
-    file://gpsd_ubx_fixed.sh \
-    file://gpsd_ubx_settime.sh \
-    file://gpsd_fixed.sh \
-    file://gpsd_settime.sh \
-    file://gpsd.rules \
-    file://gpsd.service \
-"
-SRC_URI[md5sum] = "3b11f26b295010666b1767b308f90bc5"
-SRC_URI[sha256sum] = "5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e"
-
-inherit scons update-rc.d python-dir pythonnative systemd
-
-INITSCRIPT_NAME = "gpsd"
-INITSCRIPT_PARAMS = "defaults 10"
-
-SYSTEMD_OESCONS = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',d)}"
-
-export STAGING_INCDIR
-export STAGING_LIBDIR
-
-# Necessary for python
-export BUILD_SYS
-export HOST_SYS
-
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
-PACKAGECONFIG[bluez] = "bluez='false',${BLUEZ}"
-PACKAGECONFIG[qt] = "qt='yes',qt='no',qt4-x11-free"
-
-# Remove unneeded features.  netfeed is needed by gpsmon
-EXTRA_OESCONS = " \
-    sysroot=${STAGING_DIR_TARGET} \
-    libQgpsmm='false' \
-    debug='true' \
-    strip='false' \
-    chrpath='yes' \
-    systemd='${SYSTEMD_OESCONS}' \
-    libdir='${libdir}' \
-    ublox='yes' \
-    ubloxtimels='yes' \
-    pps='yes' \
-    gpsd_group='gps' \
-    ntpshm='yes' \
-    prefix='usr' \
-    control_socket='false' \
-    nofloats='yes' \
-    ashtech='false' \
-    earthmate='false' \
-    evermore='false' \
-    fury='false' \
-    fv18='false' \
-    garmin='false' \
-    garmintxt='false' \
-    geostar='false' \
-    greis='false' \
-    itrax='false' \
-    mtk3301='false' \
-    navcom='false' \
-    nmea0183='true' \
-    nmea2000='false' \
-    oncore='false' \
-    sirf='false' \
-    skytraq='false' \
-    superstar2='false' \
-    tnt='false' \
-    tripmate='false' \
-    tsip='false' \
-    ublox='true' \
-    aivdm='false' \
-    gpsclock='false' \
-    isync='false' \
-    ntrip='false' \
-    oceanserver='false' \
-    passthrough='false' \
-    rtcm104v2='false' \
-    rtcm104v3='false' \
-    bluez='false' \
-    ipv6='false' \
-    netfeed='true' \
-    usb='false' \
-    ${PACKAGECONFIG_CONFARGS} \
-"
-# this cannot be used, because then chrpath is not found and only static lib is built
-# target=${HOST_SYS}
-
-do_compile_prepend() {
-    export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
-    export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config"
-    export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}"
-    export LINKFLAGS="${LDFLAGS}"
-}
-
-do_install() {
-    export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
-    export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config"
-    export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}"
-    export LINKFLAGS="${LDFLAGS}"
-
-    export DESTDIR="${D}"
-    # prefix is used for RPATH and DESTDIR/prefix for instalation
-    ${STAGING_BINDIR_NATIVE}/scons prefix=${prefix} install ${EXTRA_OESCONS}|| \
-      bbfatal "scons install execution failed."
-}
-
-do_install_append() {
-    install -d ${D}/${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/gpsd ${D}/${sysconfdir}/init.d/
-    install -d ${D}/${sysconfdir}/default
-    install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd.default
-    install -d ${D}${sbindir}
-    install -m 0755 ${WORKDIR}/gpsd_ubx_fixed.sh ${D}${sbindir}/gpsd_ubx_fixed
-    install -m 0755 ${WORKDIR}/gpsd_ubx_settime.sh ${D}${sbindir}/gpsd_ubx_settime
-    install -m 0755 ${WORKDIR}/gpsd_fixed.sh ${D}${sbindir}/gpsd_fixed
-    install -m 0755 ${WORKDIR}/gpsd_settime.sh ${D}${sbindir}/gpsd_settime
-
-
-    #support for udev
-    install -d ${D}/${sysconfdir}/udev/rules.d
-    install -m 0644 ${S}/gpsd.rules ${D}/${sysconfdir}/udev/rules.d
-    install -d ${D}${base_libdir}/udev/
-    install -m 0755 ${S}/gpsd.hotplug ${D}${base_libdir}/udev/
-
-    #support for python
-    install -d ${D}/${PYTHON_SITEPACKAGES_DIR}/gps
-    install -m 755 ${S}/gps/*.py ${D}/${PYTHON_SITEPACKAGES_DIR}/gps
-
-    #support for systemd
-    install -d ${D}${systemd_unitdir}/system/
-    install -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_unitdir}/system/${BPN}.service
-    install -m 0644 ${S}/systemd/${BPN}.socket ${D}${systemd_unitdir}/system/${BPN}.socket
-    
-    # support for dev (development)
-    mkdir -p -m 0644 ${D}/${includedir}/gps
-    install -m 0644 ${S}/gpsd.h ${D}/${includedir}/gps
-    install -m 0644 ${S}/os_compat.h ${D}/${includedir}/gps
-    install -m 0644 ${S}/revision.h ${D}/${includedir}/gps
-    install -m 0644 ${S}/gpsdclient.h ${D}/${includedir}/gps
-    install -m 0644 ${S}/gpsd_config.h ${D}/${includedir}/gps
-    install -m 0644 ${S}/compiler.h ${D}/${includedir}/gps
-    install -m 0644 ${S}/ppsthread.h ${D}/${includedir}/gps
-
-    # New ubxtool
-    install -m 0755 ${S}/ubxtool ${D}/${bindir}
-    install -m 0644 ${S}/ubxtool.1 ${D}/${mandir}/man1
-}
-
-RDEPENDS_${PN}-conf += "bash"
-
-pkg_postinst_${PN}-conf() {
-    update-alternatives --install ${sysconfdir}/default/gpsd gpsd-defaults ${sysconfdir}/default/gpsd.default 10
-}
-
-pkg_postrm_${PN}-conf() {
-    update-alternatives --remove gpsd-defaults ${sysconfdir}/default/gpsd.default
-}
-
-PACKAGES =+ "libgps libgpsd python-pygps-dbg python-pygps gpsd-udev gpsd-conf gpsd-gpsctl gpspipe gps-utils"
-
-# File does not exist: ${libdir}/libQgpsmm.prl 
-FILES_${PN}-dev += "${libdir}/pkgconfdir/libgpsd.pc ${libdir}/pkgconfdir/libgps.pc \
-		    ${libdir}/libQgpsmm.prl \
-                    ${includedir}/gps.h ${includedir}/libgpsmm.h ${includedir}/gps"
-
-FILES_${PN} += "${sbindir}/gpsd_*"
-
-FILES_python-pygps-dbg += " ${libdir}/python*/site-packages/gps/.debug"
-
-RDEPENDS_${PN} = "gpsd-gpsctl bash"
-
-# gpsd-udev is for USB, which we are not using
-RRECOMMENDS_${PN} = "gpsd-conf gpsd-machine-conf"
-
-SUMMARY_${PN}-udev = "udev relevant files to use gpsd hotplugging"
-FILES_${PN}-udev = "${base_libdir}/udev ${sysconfdir}/udev/*"
-RDEPENDS_${PN}-udev += "eudev gpsd-conf"
-
-SUMMARY_libgpsd = "C service library used for communicating with gpsd"
-FILES_libgpsd = "${libdir}/libgpsd.so.*"
-
-SUMMARY_libgps = "C service library used for communicating with gpsd"
-FILES_libgps = "${libdir}/libgps.so.*"
-
-SUMMARY_${PN}-conf = "gpsd configuration files and init scripts"
-FILES_${PN}-conf = "${sysconfdir}" 
-CONFFILES_${PN}-conf = "${sysconfdir}/default/gpsd.default"
-
-SUMMARY_${PN}-gpsctl = "Tool for tweaking GPS modes"
-FILES_${PN}-gpsctl = "${bindir}/gpsctl"
-
-SUMMARY_gpspipe = "Tool to connectg to gpsd and retrieve sentences"
-FILES_gpspipe = "${bindir}/gpspipe"
-
-SUMMARY_gps-utils = "Utils used for simulating, monitoring,... a GPS"
-FILES_gps-utils = "${bindir}/*"
-RDEPENDS_gps-utils = "python-pygps"
-
-SUMMARY_python-pygps = "Python bindings to gpsd"
-FILES_python-pygps = "${PYTHON_SITEPACKAGES_DIR}/*"
-RDEPENDS_python-pygps = " \
-    python-core \
-    python-io \
-    python-threading \
-    python-terminal \
-    python-curses \
-    gpsd \
-    python-json"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "${BPN}.socket ${BPN}ctl@.service"
-
-
-ALTERNATIVE_${PN} = "gpsd-defaults"
-ALTERNATIVE_LINK_NAME[gpsd-defaults] = "${sysconfdir}/default/gpsd"
-ALTERNATIVE_TARGET[gpsd-defaults] = "${sysconfdir}/default/gpsd.default"
diff --git a/recipes-navigation/gpsd/gpsdupdater/bin/bldgpsd.sh b/recipes-navigation/gpsd/gpsdupdater/bin/bldgpsd.sh
deleted file mode 100755
index aeedf67..0000000
--- a/recipes-navigation/gpsd/gpsdupdater/bin/bldgpsd.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-# This program creates an installer bash script.
-# To install you execute:
-# bash gpsdipk.sh
-# Files needed
-# ~/lib/opkginstall.sh
-# ~/lib/bashinstaller.sh
-#
-function usage
-{
-  echo 'bldgpsd [mlinuxdir]' 2>&1
-  exit
-}
-function cleanup
-{
-  if [[ $tmpdir =~ ^/var/tmp/gpsdbld ]] ; then
-    rm -rf $tmpdir
-  fi
-}
-if (($# != 1)) ; then
-  usage
-fi
-trap cleanup exit
-mlpath="$1"
-
-
-fullpath=$(readlink ${mlpath})
-tmpdirtemplate=/var/tmp/gpsdbld.XXXXX
-tmpdir=$(mktemp -d $tmpdirtemplate)
-FLIST=\
-"
-libpanelw5_*_arm926ejste.ipk
-python-curses_*_arm926ejste.ipk
-python-json_*_arm926ejste.ipk
-libgps22_0*_arm926ejste.ipk  
-gpsd_*_arm926ejste.ipk 
-gpsd-conf_*_arm926ejste.ipk 
-gpsd-gpsctl_*_arm926ejste.ipk 
-gpsd-udev_*_arm926ejste.ipk 
-gps-utils_*_arm926ejste.ipk 
-python-pygps_*_arm926ejste.ipk 
-ntp_*_arm926ejste.ipk 
-ntp-utils_*_arm926ejste.ipk 
-ntp-tickadj_*_arm926ejste.ipk 
-busybox_*_arm926ejste.ipk 
-"
-armpath=${mlpath}/build/tmp/deploy/ipk/arm926ejste
-if ! [[ -d $armpath ]] ; then
-  echo $armpath does not exist.  No files to save
-  exit 1
-fi
-mkdir ${tmpdir}/packages
-cp ~/lib/bashinstaller.sh $tmpdir/packages/gpsdipk.sh
-
-echo directory is $armpath
-echo list is $FLIST
-chmod +x ~/lib/bashinstaller.sh
-(cd $armpath; cp ~/lib/opkginstall.sh . ; echo opkginstall.sh $FLIST | tr ' ' '\n' | cpio -ov -Hcrc >>${tmpdir}/packages/gpsdipk.sh ; rm opkginstall.sh)
-mv ${tmpdir}/packages/gpsdipk.sh /var/tmp
-echo installer is /var/tmp/gpsdipk.sh
-
diff --git a/recipes-navigation/gpsd/gpsdupdater/lib/bashinstaller.sh b/recipes-navigation/gpsd/gpsdupdater/lib/bashinstaller.sh
deleted file mode 100755
index 8b04288..0000000
--- a/recipes-navigation/gpsd/gpsdupdater/lib/bashinstaller.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-echo ""
-echo "Self Extracting Installer"
-echo ""
-
-export TMPDIR=`mktemp -d /tmp/selfextract.XXXXXX`
-
-ARCHIVE=`awk '/^__ARCHIVE_BELOW__/ {print NR + 1; exit 0; }' $0`
-
-tail -n+$ARCHIVE $0 | (cd $TMPDIR; pwd; ls; cpio -ivdum)
-
-CDIR=`pwd`
-cd $TMPDIR
-./opkginstall.sh
-
-cd $CDIR
-
-#rm -rf $TMPDIR
-
-exit 0
-
-__ARCHIVE_BELOW__
diff --git a/recipes-navigation/gpsd/gpsdupdater/lib/opkginstall.sh b/recipes-navigation/gpsd/gpsdupdater/lib/opkginstall.sh
deleted file mode 100755
index d1c17ba..0000000
--- a/recipes-navigation/gpsd/gpsdupdater/lib/opkginstall.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-list=""
-for f in *.ipk ; do
-  if [[ $f =~ ^busybox ]] ; then
-    continue
-  fi
-  [[ $f =~ ([^_]*) ]] && true
-  list+="${BASH_REMATCH[1]} "
-done
-list=$(echo $list | xargs)
-echo $list
-set -x
-opkg --force-depends --force-remove --force-removal-of-dependent-packages  remove $list
-opkg install *.ipk
-set +x
diff --git a/recipes-navigation/gpsd/libgps24_3.18.1.bb b/recipes-navigation/gpsd/libgps24_3.18.1.bb
deleted file mode 100644
index 8f1b811..0000000
--- a/recipes-navigation/gpsd/libgps24_3.18.1.bb
+++ /dev/null
@@ -1,142 +0,0 @@
-SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices"
-SECTION = "console/network"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
-DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-replacement-native pps-tools"
-PROVIDES = "${PN} ${PN}-dbg ${PN}-dev"
-PR="m5"
-#BPN="gpsd"
-#BP="${BPN}-${PV}"
-
-EXTRANATIVEPATH += "chrpath-native"
-FILESEXTRAPATHS_prepend = "${THISDIR}/gpsd-${PV}:"
-# sysclockcrash is fixed for gpsd
-# suppress text in binary is fixed for gpsctl
-
-S = "${WORKDIR}/gpsd-${PV}"
-
-SRC_URI = "${SAVANNAH_GNU_MIRROR}/gpsd/gpsd-${PV}.tar.gz \
-    file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \
-    file://0004-SConstruct-disable-html-and-man-docs-building-becaus.patch \
-    file://0001-include-sys-ttydefaults.h.patch \
-    file://0006-ubxtimelps.patch \
-    file://0006-itu_r_tf_460_6.patch \
-"
-SRC_URI[md5sum] = "3b11f26b295010666b1767b308f90bc5"
-SRC_URI[sha256sum] = "5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e"
-
-inherit scons python-dir pythonnative systemd
-
-SYSTEMD_OESCONS = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',d)}"
-
-export STAGING_INCDIR
-export STAGING_LIBDIR
-
-# Necessary for python
-export BUILD_SYS
-export HOST_SYS
-
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
-PACKAGECONFIG[bluez] = "bluez='false',${BLUEZ}"
-PACKAGECONFIG[qt] = "qt='yes',qt='no',qt4-x11-free"
-EXTRA_OESCONS = " \
-    sysroot=${STAGING_DIR_TARGET} \
-    libQgpsmm='false' \
-    debug='true' \
-    strip='false' \
-    chrpath='yes' \
-    systemd='${SYSTEMD_OESCONS}' \
-    ashtech='no' \
-    earthmate='no' \
-    evermore='no' \
-    fury='no' \
-    fv18='no' \
-    garmin='no' \
-    garmintxt='no' \
-    geostar='no' \
-    greis='no' \
-    itrax='no' \
-    mtk3301='no' \
-    navcom='no' \
-    nmea0183='yes' \
-    nmea2000='no' \
-    oncore='no' \
-    sirf='no' \
-    skytraq='no' \
-    superstar2='no' \
-    tnt='no' \
-    tripmate='no' \
-    tsip='no' \
-    ublox='yes' \
-    ubloxtimels='yes' \
-    aivdm='no' \
-    gpsclock='no' \
-    oceanserver='no' \
-    libdir='${libdir}' \
-    fixed_stop_bits='1' \
-    pps='yes' \
-    gpsd_group='gps' \
-    ntpshm='yes' \
-    prefix='usr' \
-    ${PACKAGECONFIG_CONFARGS} \
-"
-# this cannot be used, because then chrpath is not found and only static lib is built
-# target=${HOST_SYS}
-
-do_compile_prepend() {
-    export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
-    export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config"
-    export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}"
-    export LINKFLAGS="${LDFLAGS}"
-}
-do_install() {
-    export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
-    export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config"
-    export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}"
-    export LINKFLAGS="${LDFLAGS}"
-
-    export DESTDIR="${D}"
-    install -d 755 ${D}${libdir}
-    install libgps.so.24.* ${D}${libdir}
-    cp -a libgps.so.24 ${D}${libdir}
-    (cd ${D}${libdir};ln -sf libgps.so.24.* libgps.so)
-
-    # support for dev (development)
-    mkdir -p -m 0644 ${D}/${includedir}/gps
-    install -m 0644 ${S}/gpsd.h ${D}/${includedir}/gps
-    install -m 0644 ${S}/os_compat.h ${D}/${includedir}/gps
-    install -m 0644 ${S}/revision.h ${D}/${includedir}/gps
-    install -m 0644 ${S}/gpsdclient.h ${D}/${includedir}/gps
-    install -m 0644 ${S}/gpsd_config.h ${D}/${includedir}/gps
-    install -m 0644 ${S}/compiler.h ${D}/${includedir}/gps
-    install -m 0644 ${S}/ppsthread.h ${D}/${includedir}/gps
-    install -m 0644 ${S}/gps.h ${D}/${includedir}
-    install -m 0644 ${S}/libgpsmm.h ${D}/${includedir}
-}
-
-
-FILES_${PN}-dev_append = " ${includedir}/gps.h ${includedir}/libgpsmm.h ${includedir}/gps ${libdir}/libgps.so"
-FILES_${PN}-dev_remove = "${includedir} ${FILES_SOLIBSDEV} \
-    ${libdir}/*.la ${libdir}/*.o ${libdir}/pkgconfig \
-    ${datadir}/pkgconfig ${datadir}/aclocal \
-    ${base_libdir}/*.o ${libdir}/${BPN}/*.la ${base_libdir}/*.la"
-
-SUMMARY_${PN}-dbg = "Debug the C service library used for communicating with gpsd"
-PACKAGES = "${PN} ${PN}-dbg ${PN}-dev"
-
-FILES_${PN}-dbg_replace = "${prefix}/src/* ${libdir}/.debug/*"
-
-SUMMARY_${PN} = "C service library used for communicating with gpsd"
-
-RDEPENDS_${PN} += "dbus-lib"
-
-FILES_${PN}_append = " ${libdir}/libgps.so.* "
-FILES_${PN}_remove = "${bindir}/* ${sbindir}/*  ${libexecdir}/* \
-    ${libdir}/lib*${SOLIBS} ${sysconfdir} ${sharedstatedir} \
-    ${localstatedir} ${base_bindir}/* ${base_sbindir}/*  \
-    ${base_libdir}/*${SOLIBS} ${base_prefix}/lib/udev \
-    ${prefix}/lib/udev ${base_libdir}/udev ${libdir}/udev \
-    ${datadir}/${BPN} ${libdir}/${BPN}/* ${datadir}/pixmaps \
-    ${datadir}/applications ${datadir}/idl ${datadir}/omf \
-    ${datadir}/sounds ${libdir}/bonobo/servers \
-"
diff --git a/recipes-ruby/ruby-serialport/ruby-serialport_1.3.1.bb b/recipes-ruby/ruby-serialport/ruby-serialport_1.3.1.bb
deleted file mode 100644
index d06be09..0000000
--- a/recipes-ruby/ruby-serialport/ruby-serialport_1.3.1.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION = "A Ruby library that provides a class for using RS-232 serial ports"
-HOMEPAGE = "https://github.com/hparra/ruby-serialport"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
-SECTION = "console/utils"
-PRIORITY = "optional"
-
-DEPENDS = "ruby"
-
-PR = "r2"
-
-# tag v1.3.0
-SRCREV = "2781dbb1ffbf33d7c65478aa25dad5f954d0d3bf"
-
-SRC_URI = "git://github.com/hparra/ruby-serialport.git;protocol=git"
-
-S = "${WORKDIR}/git"
-B = "${S}"
-
-do_compile() {
-  rp=$(ls -d ${STAGING_INCDIR}/ruby-* | head -1)
-  ${CC} -v ${CFLAGS} ${LDFLAGS} -Iext/native -I${rp} -I${rp}/arm-linux-gnueabi -c ext/native/*.c
-  ${CC} -v ${CFLAGS} ${LDFLAGS} --shared -o ext/native/serialport.so serialport.o posix_serialport_impl.o
-}
-
-do_install() {
-  install -d ${D}${libdir}/ruby/serialport
-  install lib/serialport.rb ${D}${libdir}/ruby/serialport.rb
-  install ext/native/serialport.so -t ${D}${libdir}/ruby
-}
-
-FILES_${PN} = "${libdir}/ruby/serialport*"
-FILES_${PN}-dbg += "${libdir}/ruby/.debug"
diff --git a/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb b/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb
deleted file mode 100644
index 82998bc..0000000
--- a/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "Ruby bindings for the SQLite3 embedded database"
-HOMEPAGE = "https://github.com/sparklemotion/sqlite3-ruby"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f24ce0d57c8f8576a36e2803d35bcfec"
-SECTION = "console/utils"
-PRIORITY = "optional"
-
-DEPENDS = "ruby sqlite3"
-
-SRC_URI = "git://github.com/sparklemotion/sqlite3-ruby.git;branch=1-3-stable;tag=v${PV}"
-S = "${WORKDIR}/git"
-
-# Position independent code for shared lib
-CFLAGS += "-fPIC"
-
-do_compile() {
-  ${CC} ${CFLAGS} ${LDFLAGS} -Iext/sqlite3 -Iext/native -I${STAGING_INCDIR}/ruby-2.2.0 -I${STAGING_INCDIR}/ruby-2.2.0/arm-linux-gnueabi -c ext/sqlite3/*.c -DHAVE_RB_INTEGER_PACK
-  ${CC} ${CFLAGS} ${LDFLAGS} --shared -o ext/sqlite3/sqlite3_native.so *.o -lsqlite3
-}
-
-do_install() {
-  install -d ${D}${libdir}/ruby ${D}${libdir}/ruby/sqlite3
-  install lib/sqlite3.rb ${D}${libdir}/ruby/sqlite3.rb
-  install lib/sqlite3/* ext/sqlite3/sqlite3_native.so -t ${D}${libdir}/ruby/sqlite3
-}
-
-FILES_${PN} = "${libdir}/ruby/sqlite3*"
-FILES_${PN}-dbg += "${libdir}/ruby/sqlite3/.debug*"
diff --git a/recipes-ruby/ruby/ruby_%.bbappend b/recipes-ruby/ruby/ruby_%.bbappend
deleted file mode 100644
index b31d44c..0000000
--- a/recipes-ruby/ruby/ruby_%.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-# remove /usr/share/ri from main ruby package
-# using FILES_${PN}_remove doesn't work...
-FILES_ruby_remove = "${datadir}/ri"
-FILES_${PN}-doc += "${datadir}/ri"
diff --git a/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch b/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch
deleted file mode 100644
index 4a8ae5f..0000000
--- a/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-ca-certificates is a package from Debian, but some host distros such as Fedora
-have a leaner run-parts provided by cron which doesn't support --verbose or the
- -- separator between arguments and paths.
-
-This solves errors such as
-
-| Running hooks in [...]/rootfs/etc/ca-certificates/update.d...
-| [...]/usr/sbin/update-ca-certificates: line 194: Not: command not found
-| [...]/usr/sbin/update-ca-certificates: line 230: Not a directory: --: command not found
-| E: Not a directory: -- exited with code 127.
-
-
-Upstream-Status: Inappropriate
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-Signed-off-by: Maciej Borzecki <maciej.borzecki@rndity.com>
----
- sbin/update-ca-certificates | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-Index: git/sbin/update-ca-certificates
-===================================================================
---- git.orig/sbin/update-ca-certificates
-+++ git/sbin/update-ca-certificates
-@@ -191,9 +191,7 @@ if [ -d "$HOOKSDIR" ]
- then
- 
-   echo "Running hooks in $HOOKSDIR..."
--  VERBOSE_ARG=
--  [ "$verbose" = 0 ] || VERBOSE_ARG="--verbose"
--  eval run-parts "$VERBOSE_ARG" --test -- "$HOOKSDIR" | while read hook
-+  eval run-parts --test "$HOOKSDIR" | while read hook
-   do
-     ( cat "$ADDED"
-       cat "$REMOVED" ) | "$hook" || echo "E: $hook exited with code $?."
diff --git a/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch b/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch
deleted file mode 100644
index 792b403..0000000
--- a/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Upstream-Status: Pending
-
-From 724cb153ca0f607fb38b3a8db3ebb2742601cd81 Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <obi@opendreambox.org>
-Date: Tue, 19 Mar 2013 17:14:33 +0100
-Subject: [PATCH 2/2] update-ca-certificates: use $SYSROOT
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
----
- sbin/update-ca-certificates |   14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-Index: git/sbin/update-ca-certificates
-===================================================================
---- git.orig/sbin/update-ca-certificates
-+++ git/sbin/update-ca-certificates
-@@ -24,12 +24,12 @@
- verbose=0
- fresh=0
- default=0
--CERTSCONF=/etc/ca-certificates.conf
--CERTSDIR=/usr/share/ca-certificates
--LOCALCERTSDIR=/usr/local/share/ca-certificates
-+CERTSCONF=$SYSROOT/etc/ca-certificates.conf
-+CERTSDIR=$SYSROOT/usr/share/ca-certificates
-+LOCALCERTSDIR=$SYSROOT/usr/local/share/ca-certificates
- CERTBUNDLE=ca-certificates.crt
--ETCCERTSDIR=/etc/ssl/certs
--HOOKSDIR=/etc/ca-certificates/update.d
-+ETCCERTSDIR=$SYSROOT/etc/ssl/certs
-+HOOKSDIR=$SYSROOT/etc/ca-certificates/update.d
- 
- while [ $# -gt 0 ];
- do
-@@ -92,9 +92,9 @@ add() {
-   PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \
-                                                   -e 's/[()]/=/g' \
-                                                   -e 's/,/_/g').pem"
--  if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ]
-+  if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "${CERT##$SYSROOT}" ]
-   then
--    ln -sf "$CERT" "$PEM"
-+    ln -sf "${CERT##$SYSROOT}" "$PEM"
-     echo "+$PEM" >> "$ADDED"
-   fi
-   # Add trailing newline to certificate, if it is missing (#635570)
diff --git a/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch b/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch
deleted file mode 100644
index f8b0791..0000000
--- a/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Upstream-Status: Pending
-
-update-ca-certificates: find SYSROOT relative to its own location
-
-This makes the script relocatable.
-
-Index: git/sbin/update-ca-certificates
-===================================================================
---- git.orig/sbin/update-ca-certificates
-+++ git/sbin/update-ca-certificates
-@@ -66,6 +66,39 @@ do
-   shift
- done
- 
-+if [ -z "$SYSROOT" ]; then
-+  local_which () {
-+    if [ $# -lt 1 ]; then
-+      return 1
-+    fi
-+
-+    (
-+      IFS=:
-+      for entry in $PATH; do
-+        if [ -x "$entry/$1" ]; then
-+          echo "$entry/$1"
-+          exit 0
-+        fi
-+      done
-+      exit 1
-+    )
-+  }
-+
-+  case "$0" in
-+    */*)
-+      sbindir=$(cd ${0%/*} && pwd)
-+      ;;
-+    *)
-+      sbindir=$(cd $(dirname $(local_which $0)) && pwd)
-+      ;;
-+  esac
-+  prefix=${sbindir%/*}
-+  SYSROOT=${prefix%/*}
-+  if [ ! -d "$SYSROOT/usr/share/ca-certificates" ]; then
-+    SYSROOT=
-+  fi
-+fi
-+
- if [ ! -s "$CERTSCONF" ]
- then
-   fresh=1
diff --git a/recipes-support/ca-certificates/ca-certificates/sbindir.patch b/recipes-support/ca-certificates/ca-certificates/sbindir.patch
deleted file mode 100644
index a113fa8..0000000
--- a/recipes-support/ca-certificates/ca-certificates/sbindir.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Upstream-Status: Pending
-
-Let us alter the install destination of the script via SBINDIR
-
---- ca-certificates-20130119.orig/sbin/Makefile
-+++ ca-certificates-20130119/sbin/Makefile
-@@ -3,9 +3,12 @@
- #
- #
-
-+SBINDIR = /usr/sbin
-+
- all:
-
- clean:
-
- install:
--	install -m755 update-ca-certificates $(DESTDIR)/usr/sbin/
-+	install -d $(DESTDIR)$(SBINDIR)
-+	install -m755 update-ca-certificates $(DESTDIR)$(SBINDIR)/
diff --git a/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch b/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch
deleted file mode 100644
index 6e2171f..0000000
--- a/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 30378026d136efa779732e3f6664e2ecf461e458 Mon Sep 17 00:00:00 2001
-From: Patrick Ohly <patrick.ohly@intel.com>
-Date: Thu, 17 Mar 2016 12:38:09 +0100
-Subject: [PATCH] update-ca-certificates: support Toybox
-
-"mktemp -t" is deprecated and does not work when using Toybox. Replace
-with something that works also with Toybox.
-
-Upstream-Status: Pending
-
-Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
----
- sbin/update-ca-certificates | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates
-index 79c41bb..ae9e3f1 100755
---- a/sbin/update-ca-certificates
-+++ b/sbin/update-ca-certificates
-@@ -113,9 +113,9 @@ trap cleanup 0
- 
- # Helper files.  (Some of them are not simple arrays because we spawn
- # subshells later on.)
--TEMPBUNDLE="$(mktemp -t "${CERTBUNDLE}.tmp.XXXXXX")"
--ADDED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
--REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
-+TEMPBUNDLE="$(mktemp -p${TMPDIR:-/tmp} "${CERTBUNDLE}.tmp.XXXXXX")"
-+ADDED="$(mktemp -p${TMPDIR:-/tmp} "ca-certificates.tmp.XXXXXX")"
-+REMOVED="$(mktemp -p${TMPDIR:-/tmp} "ca-certificates.tmp.XXXXXX")"
- 
- # Adds a certificate to the list of trusted ones.  This includes a symlink
- # in /etc/ssl/certs to the certificate file and its inclusion into the
--- 
-2.1.4
diff --git a/recipes-support/ca-certificates/ca-certificates_20161130.bb b/recipes-support/ca-certificates/ca-certificates_20161130.bb
deleted file mode 100644
index e0b2e41..0000000
--- a/recipes-support/ca-certificates/ca-certificates_20161130.bb
+++ /dev/null
@@ -1,82 +0,0 @@
-SUMMARY = "Common CA certificates"
-DESCRIPTION = "This package includes PEM files of CA certificates to allow \
-SSL-based applications to check for the authenticity of SSL connections. \
-This derived from Debian's CA Certificates."
-HOMEPAGE = "http://packages.debian.org/sid/ca-certificates"
-SECTION = "misc"
-LICENSE = "GPL-2.0+ & MPL-2.0"
-LIC_FILES_CHKSUM = "file://debian/copyright;md5=e7358b9541ccf3029e9705ed8de57968"
-
-# This is needed to ensure we can run the postinst at image creation time
-DEPENDS = "ca-certificates-native"
-DEPENDS_class-native = "openssl-native"
-DEPENDS_class-nativesdk = "ca-certificates-native openssl-native"
-
-SRCREV = "61b70a1007dc269d56881a0d480fc841daacc77c"
-
-SRC_URI = "git://anonscm.debian.org/collab-maint/ca-certificates.git \
-           file://0002-update-ca-certificates-use-SYSROOT.patch \
-           file://0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch \
-           file://update-ca-certificates-support-Toybox.patch \
-           file://default-sysroot.patch \
-           file://sbindir.patch"
-
-S = "${WORKDIR}/git"
-
-inherit allarch
-
-EXTRA_OEMAKE = "\
-    'CERTSDIR=${datadir}/ca-certificates' \
-    'SBINDIR=${sbindir}' \
-"
-
-do_compile_prepend() {
-    oe_runmake clean
-}
-
-do_install () {
-    install -d ${D}${datadir}/ca-certificates \
-               ${D}${sysconfdir}/ssl/certs \
-               ${D}${sysconfdir}/ca-certificates/update.d
-    oe_runmake 'DESTDIR=${D}' install
-
-    install -d ${D}${mandir}/man8
-    install -m 0644 sbin/update-ca-certificates.8 ${D}${mandir}/man8/
-
-    install -d ${D}${sysconfdir}
-    {
-        echo "# Lines starting with # will be ignored"
-        echo "# Lines starting with ! will remove certificate on next update"
-        echo "#"
-        find ${D}${datadir}/ca-certificates -type f -name '*.crt' | \
-            sed 's,^${D}${datadir}/ca-certificates/,,'
-    } >${D}${sysconfdir}/ca-certificates.conf
-}
-
-do_install_append_class-target () {
-    sed -i -e 's,/etc/,${sysconfdir}/,' \
-           -e 's,/usr/share/,${datadir}/,' \
-           -e 's,/usr/local,${prefix}/local,' \
-        ${D}${sbindir}/update-ca-certificates \
-        ${D}${mandir}/man8/update-ca-certificates.8
-}
-
-pkg_postinst_${PN} () {
-    SYSROOT="$D" update-ca-certificates
-}
-
-CONFFILES_${PN} += "${sysconfdir}/ca-certificates.conf"
-
-# Postinsts don't seem to be run for nativesdk packages when populating SDKs.
-CONFFILES_${PN}_append_class-nativesdk = " ${sysconfdir}/ssl/certs/ca-certificates.crt"
-do_install_append_class-nativesdk () {
-    SYSROOT="${D}${SDKPATHNATIVE}" update-ca-certificates
-}
-
-do_install_append_class-native () {
-    SYSROOT="${D}${base_prefix}" ${D}${sbindir}/update-ca-certificates
-}
-
-RDEPENDS_${PN} += "openssl"
-
-BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-support/dnsmasq/dnsmasq.inc b/recipes-support/dnsmasq/dnsmasq.inc
deleted file mode 100644
index fdd7ab7..0000000
--- a/recipes-support/dnsmasq/dnsmasq.inc
+++ /dev/null
@@ -1,86 +0,0 @@
-SUMMARY = "Lightweight, easy to configure DNS forwarder and DHCP server"
-HOMEPAGE = "http://www.thekelleys.org.uk/dnsmasq/doc.html"
-SECTION = "net"
-# GPLv3 was added in version 2.41 as license option
-LICENSE = "GPLv2 | GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
-                    file://COPYING-v3;md5=d32239bcb673463ab874e80d47fae504"
-
-#at least versions 2.15 and prior are moved to the archive folder on the server
-SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getVar('PV',1).split('.')[1]) > 15]}dnsmasq-${PV}.tar.gz;name=dnsmasq-${PV} \
-           file://init \
-           file://default \
-           file://dnsmasq.conf \
-           file://dnsmasq-resolvconf.service \
-           file://dnsmasq-noresolvconf.service \
-"
-
-inherit pkgconfig update-rc.d systemd
-
-INITSCRIPT_NAME = "dnsmasq"
-INITSCRIPT_PARAMS = "defaults"
-
-PACKAGECONFIG ?= ""
-PACKAGECONFIG[dbus] = ",,dbus"
-PACKAGECONFIG[idn] = ",,libidn"
-PACKAGECONFIG[conntrack] = ",,libnetfilter-conntrack"
-PACKAGECONFIG[lua] = ",,lua"
-PACKAGECONFIG[resolvconf] = ",,,resolvconf"
-EXTRA_OEMAKE = "\
-    'COPTS=${@bb.utils.contains('PACKAGECONFIG', 'dbus', '-DHAVE_DBUS', '', d)} \
-           ${@bb.utils.contains('PACKAGECONFIG', 'idn', '-DHAVE_IDN', '', d)} \
-           ${@bb.utils.contains('PACKAGECONFIG', 'conntrack', '-DHAVE_CONNTRACK', '', d)} \
-           ${@bb.utils.contains('PACKAGECONFIG', 'lua', '-DHAVE_LUASCRIPT', '', d)}' \
-    'CFLAGS=${CFLAGS}' \
-    'LDFLAGS=${LDFLAGS}' \
-"
-
-SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'file://dnsmasq.resolvconf file://99_dnsmasq file://dnsmasq-resolvconf-helper', '', d)}"
-
-do_compile_append() {
-    # build dhcp_release
-    cd ${S}/contrib/lease-tools
-    oe_runmake
-}
-
-do_install () {
-    oe_runmake "PREFIX=${D}${prefix}" \
-               "BINDIR=${D}${bindir}" \
-               "MANDIR=${D}${mandir}" \
-               install
-    install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d ${D}${sysconfdir}/default
-    install -m 644 ${WORKDIR}/dnsmasq.conf ${D}${sysconfdir}/
-    install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq
-    install -m 755 ${WORKDIR}/default ${D}${sysconfdir}/default/dnsmasq
-
-    install -d ${D}${systemd_unitdir}/system
-
-    if [ "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then
-        install -m 0644 ${WORKDIR}/dnsmasq-resolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service
-    else
-        install -m 0644 ${WORKDIR}/dnsmasq-noresolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service
-    fi
-
-    install -m 0755 ${S}/contrib/lease-tools/dhcp_release ${D}${bindir}
-
-    if [ "${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'dbus', '', d)}" != "" ]; then
-        install -d ${D}${sysconfdir}/dbus-1/system.d
-        install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/
-    fi
-    if [ "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then
-        install -d ${D}${sysconfdir}/resolvconf/update.d/
-        install -m 0755 ${WORKDIR}/dnsmasq.resolvconf ${D}${sysconfdir}/resolvconf/update.d/dnsmasq
-
-        install -d ${D}${sysconfdir}/default/volatiles
-        install -m 0644 ${WORKDIR}/99_dnsmasq ${D}${sysconfdir}/default/volatiles
-        install -m 0755 ${WORKDIR}/dnsmasq-resolvconf-helper ${D}${bindir}
-    fi
-}
-
-# init.d/dnsmasq conflicts with AEP.
-CONFFILES_${PN} = "${sysconfdir}/dnsmasq.conf ${sysconfdir}/init.d/dnsmasq"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "dnsmasq.service"
diff --git a/recipes-support/dnsmasq/dnsmasq_2.78.bb b/recipes-support/dnsmasq/dnsmasq_2.78.bb
deleted file mode 100644
index a2641f1..0000000
--- a/recipes-support/dnsmasq/dnsmasq_2.78.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require dnsmasq.inc
-
-SRC_URI[dnsmasq-2.78.md5sum] = "3bb97f264c73853f802bf70610150788"
-SRC_URI[dnsmasq-2.78.sha256sum] = "c92e5d78aa6353354d02aabf74590d08980bb1385d8a00b80ef9bc80430aa1dc"
-
diff --git a/recipes-support/dnsmasq/files/99_dnsmasq b/recipes-support/dnsmasq/files/99_dnsmasq
deleted file mode 100644
index f52ce4e..0000000
--- a/recipes-support/dnsmasq/files/99_dnsmasq
+++ /dev/null
@@ -1 +0,0 @@
-d root root 0755 /run/dnsmasq none
diff --git a/recipes-support/dnsmasq/files/default b/recipes-support/dnsmasq/files/default
deleted file mode 100644
index a389aff..0000000
--- a/recipes-support/dnsmasq/files/default
+++ /dev/null
@@ -1,6 +0,0 @@
-# See /etc/init.d/dnsmasq
-ENABLED="no"
-
-
-# Ignore the resolve.conf from the resolvconf package.
-IGNORE_RESOLVCONF="yes"
diff --git a/recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service b/recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service
deleted file mode 100644
index 0c64fab..0000000
--- a/recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=DNS forwarder and DHCP server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/dnsmasq.pid
-ExecStartPre=/usr/bin/dnsmasq --test
-ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid -7 /etc/dnsmasq.d --local-service
-ExecStop=/bin/kill $MAINPID
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/recipes-support/dnsmasq/files/dnsmasq-resolvconf-helper b/recipes-support/dnsmasq/files/dnsmasq-resolvconf-helper
deleted file mode 100644
index db54d46..0000000
--- a/recipes-support/dnsmasq/files/dnsmasq-resolvconf-helper
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-#
-# Borrowing heavily from the dnsmasq initscript's version of support for
-# resolvconf, intended for use in systemd-only configurations.
-#
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/dnsmasq
-NAME=dnsmasq
-
-# Most configuration options in /etc/default/dnsmasq are deprecated
-# but still honoured.
-if [ -r /etc/default/$NAME ]; then
-   . /etc/default/$NAME
-fi
-
-start_resolvconf()
-{
-   # If interface "lo" is explicitly disabled in /etc/default/dnsmasq
-   # Then dnsmasq won't be providing local DNS, so don't add it to
-   # the resolvconf server set.
-   for interface in $DNSMASQ_EXCEPT
-   do
-      [ $interface = lo ] && return
-   done
-
-   if [ -x /sbin/resolvconf ] ; then
-      echo "nameserver 127.0.0.1" |
-      /sbin/resolvconf -a lo.$NAME
-   fi
-   return 0
-}
-
-stop_resolvconf()
-{
-   if [ -x /sbin/resolvconf ] ; then
-      /sbin/resolvconf -d lo.$NAME
-   fi
-   return 0
-}
-
-case "$1" in
-   start)
-      start_resolvconf
-      exit 0
-      ;;
-   stop)
-      stop_resolvconf
-      exit 0
-      ;;
-   restart)
-      stop_resolvconf
-      start_resolvconf
-      exit 0
-      ;;
-   *)
-      echo "Usage: /etc/init.d/$NAME {start|stop|restart}" >&2
-      exit 3
-      ;;
-esac
-
-exit 0
-
diff --git a/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service b/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service
deleted file mode 100644
index 2980f7d..0000000
--- a/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=DNS forwarder and DHCP server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/dnsmasq.pid
-ExecStartPre=/usr/bin/dnsmasq --test
-ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid -7 /etc/dnsmasq.d --local-service
-ExecStartPost=/usr/bin/dnsmasq-resolvconf-helper start
-ExecStopPre=/usr/bin/dnsmasq-resolvconf-helper stop
-ExecStop=/bin/kill $MAINPID
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/recipes-support/dnsmasq/files/dnsmasq.conf b/recipes-support/dnsmasq/files/dnsmasq.conf
deleted file mode 100755
index 34d5135..0000000
--- a/recipes-support/dnsmasq/files/dnsmasq.conf
+++ /dev/null
@@ -1,293 +0,0 @@
-# Configuration file for dnsmasq.
-#
-# Format is one option per line, legal options are the same
-# as the long options legal on the command line. See
-# "/usr/sbin/dnsmasq --help" or "man 8 dnsmasq" for details.
-
-# Change these lines if you want dnsmasq to serve MX records.
-# Only one of mx-host and mx-target need be set, the other defaults
-# to the name of the host  running dnsmasq.
-#mx-host=
-#mx-target=
-#selfmx
-#localmx
-
-# The following two options make you a better netizen, since they 
-# tell dnsmasq to filter out queries which the public DNS cannot
-# answer, and which load the servers (especially the root servers) 
-# uneccessarily. If you have a dial-on-demand link they also stop
-# these requests from bringing up the link uneccessarily.
-
-# Never forward plain names (with a dot or domain part)
-domain-needed
-# Never forward addresses in the non-routed address spaces.
-bogus-priv
-
-
-# Uncomment this to filter useless windows-originated DNS requests
-# which can trigger dial-on-demand links needlessly.
-# Note that (amongst other things) this blocks all SRV requests, 
-# so don't use it if you use eg Kerberos.
-#filterwin2k
-
-# Change this line if you want dns to get its upstream servers from
-# somewhere other that /etc/resolv.conf 
-#resolv-file=
-
-# By  default,  dnsmasq  will  send queries to any of the upstream
-# servers it knows about and tries to favour servers to are  known
-# to  be  up.  Uncommenting this forces dnsmasq to try each query
-# with  each  server  strictly  in  the  order  they   appear   in
-# /etc/resolv.conf
-#strict-order
-
-# If you don't want dnsmasq to read /etc/resolv.conf or any other
-# file, getting its servers for this file instead (see below), then
-# uncomment this
-#no-resolv
-
-# If you don't want dnsmasq to poll /etc/resolv.conf or other resolv
-# files for changes and re-read them then uncomment this.
-#no-poll
-
-# Add other name servers here, with domain specs if they are for 
-# non-public domains.
-#server=/localnet/192.168.0.1
-
-# Add local-only domains here, queries in these domains are answered
-# from /etc/hosts or DHCP only.
-#local=/localnet/
-
-# Add domains which you want to force to an IP address here.
-# The example below send any host in doubleclick.net to a local
-# webserver.
-#address=/doubleclick.net/127.0.0.1
-
-# You no longer (as of version 1.7) need to set these to enable 
-# dnsmasq to read /etc/ppp/resolv.conf since dnsmasq now uses the
-# "dip" group to achieve this.
-#user=
-#group=
-
-# If you want dnsmasq to listen for requests only on specified interfaces
-# (and the loopback) give the name of the interface (eg eth0) here. 
-# Repeat the line for more than one interface.
-#interface=
-# Or you can specify which interface _not_ to listen on
-#except-interface=
-# Or which to listen on by address (remember to include 127.0.0.1 if
-# you use this.)
-#listen-address=127.0.0.1
-
-# On systems which support it, dnsmasq binds the wildcard address,
-# even when it is listening on only some interfaces. It then discards
-# requests that it shouldn't reply to. This has the advantage of 
-# working even when interfaces come and go and change address. If you
-# want dnsmasq to really bind only the interfaces it is listening on,
-# uncomment this option. About the only time you may need this is when 
-# running another nameserver on the same machine.
-#bind-interfaces 
-
-# If you don't want dnsmasq to read /etc/hosts, uncomment the
-# following line.
-#no-hosts
-# or if you want it to read another file, as well as /etc/hosts, use
-# this.
-#addn-hosts=/etc/banner_add_hosts
-
-# Set this (and domain: see below) if you want to have a domain
-# automatically added to simple names in a hosts-file.
-#expand-hosts
-
-# Set the domain for dnsmasq. this is optional, but if it is set, it
-# does the following things.
-# 1) Allows DHCP hosts to have fully qualified domain names, as long
-#     as the domain part matches this setting.
-# 2) Sets the "domain" DHCP option thereby potentially setting the
-#    domain of all systems configured by DHCP
-# 3) Provides the domain part for "expand-hosts"
-#domain=thekelleys.org.uk
-  
-# Uncomment this to enable the integrated DHCP server, you need
-# to supply the range of addresses available for lease and optionally 
-# a lease time. If you have more than one network, you will need to
-# repeat this for each network on which you want to supply DHCP
-# service.
-#dhcp-range=192.168.0.50,192.168.0.150,12h
-#dhcp-range=10.0.0.10,10.0.0.200,2h
-
-# This is an example of a DHCP range where the netmask is given. This
-# is needed for networks we reach the dnsmasq DHCP server via a relay 
-# agent. If you don't know what a DHCP relay agent is, you probably
-# don't need to worry about this.
-#dhcp-range=192.168.0.50,192.168.0.150,255.255.255.0,12h
-
-# This is an example of a DHCP range with a network-id, so that
-# some DHCP options may be set only for this network.
-#dhcp-range=red,192.168.0.50,192.168.0.150
-
-# Supply parameters for specified hosts using DHCP. There are lots
-# of valid alternatives, so we will give examples of each. Note that
-# IP addresses DO NOT have to be in the range given above, they just
-# need to be on the same network. The order of the parameters in these
-# do not matter, it's permissble to give name,adddress and MAC in any order
-
-# Always allocate the host with ethernet address 11:22:33:44:55:66 
-# The IP address 192.168.0.60
-#dhcp-host=11:22:33:44:55:66,192.168.0.60
-
-# Always set the name of the host with hardware address
-# 11:22:33:44:55:66 to be "fred"
-#dhcp-host=11:22:33:44:55:66,fred
-
-# Always give the host with ethernet address 11:22:33:44:55:66
-# the name fred and IP address 192.168.0.60 and lease time 45 minutes
-#dhcp-host=11:22:33:44:55:66,fred,192.168.0.60,45m
-
-# Give the machine which says it's name is "bert" IP address
-# 192.168.0.70 and an infinite lease
-#dhcp-host=bert,192.168.0.70,infinite
-
-# Always give the host with client identifier 01:02:02:04 
-# the IP address 192.168.0.60
-#dhcp-host=id:01:02:02:04,192.168.0.60
-
-# Always give the host with client identifier "marjorie"
-# the IP address 192.168.0.60
-#dhcp-host=id:marjorie,192.168.0.60
-
-# Enable the address given for "judge" in /etc/hosts
-# to be given to a machine presenting the name "judge" when
-# it asks for a DHCP lease.
-#dhcp-host=judge
-
-# Never offer DHCP service to a machine whose ethernet 
-# address is 11:22:33:44:55:66
-#dhcp-host=11:22:33:44:55:66,ignore
-
-# Ignore any client-id presented by the machine with ethernet
-# address 11:22:33:44:55:66. This is useful to prevent a machine 
-# being treated differently when running under different OS's or
-# between PXE boot and OS boot.
-#dhcp-host=11:22:33:44:55:66,id:*
-
-# Send extra options which are tagged as "red" to 
-# the machine with ethernet address 11:22:33:44:55:66
-#dhcp-host=11:22:33:44:55:66,net:red
-
-# Send extra options which are tagged as "red" to any machine whose
-# DHCP vendorclass string includes the substring "Linux"
-#dhcp-vendorclass=red,Linux
-
-# Send extra options which are tagged as "red" to any machine one 
-# of whose DHCP userclass strings includes the substring "accounts"
-#dhcp-userclass=red,accounts
-
-# If this line is uncommented, dnsmasq will read /etc/ethers and act
-# on the ethernet-address/IP pairs found there just as if they had
-# been given as --dhcp-host options. Useful if you keep
-# MAC-address/host mappings there for other purposes.
-#read-ethers
-
-# Send options to hosts which ask for a DHCP lease.
-# See RFC 2132 for details of available options.
-# Note that all the common settings, such as netmask and
-# broadcast address, DNS server and default route, are given
-# sane defaults by dnsmasq. You very likely will not need any
-# any dhcp-options. If you use Windows clients and Samba, there
-# are some options which are recommended, they are detailed at the
-# end of this section.
-# For reference, the common options are:
-# subnet mask - 1
-# default router - 3
-# DNS server - 6
-# broadcast address - 28
-
-# Set the NTP time server addresses to 192.168.0.4 and 10.10.0.5
-#dhcp-option=42,192.168.0.4,10.10.0.5
-
-# Set the NTP time server address to be the same machine as 
-# is running dnsmasq
-#dhcp-option=42,0.0.0.0
-
-# Set the NIS domain name to "welly"
-#dhcp-option=40,welly
-
-# Set the default time-to-live to 50
-#dhcp-option=23,50
-
-# Set the "all subnets are local" flag
-#dhcp-option=27,1
-
-# Send the etherboot magic flag and then etherboot options (a string).
-#dhcp-option=128,e4:45:74:68:00:00
-#dhcp-option=129,NIC=eepro100
-
-# Specify an option which will only be sent to the "red" network 
-# (see dhcp-range for the declaration of the "red" network)
-#dhcp-option=red,42,192.168.1.1
-
-# The following DHCP options set up dnsmasq in the same way as is specified
-# for the ISC dhcpcd in 
-# http://www.samba.org/samba/ftp/docs/textdocs/DHCP-Server-Configuration.txt
-# adapted for a typical dnsmasq installation where the host running
-# dnsmasq is also the host running samba.
-# you may want to uncomment them if you use Windows clients and Samba.
-#dhcp-option=19,0           # option ip-forwarding off 
-#dhcp-option=44,0.0.0.0     # set netbios-over-TCP/IP nameserver(s) aka WINS server(s)
-#dhcp-option=45,0.0.0.0     # netbios datagram distribution server
-#dhcp-option=46,8           # netbios node type
-#dhcp-option=47             # empty netbios scope.
- 
-
-# Set the boot filename and tftpd server name and address
-# for BOOTP. You will only need this is you want to
-# boot machines over the network.
-#dhcp-boot=/var/ftpd/pxelinux.0,boothost,192.168.0.3
-
-# Set the limit on DHCP leases, the default is 150
-#dhcp-lease-max=150
-
-# The DHCP server needs somewhere on disk to keep its lease database.
-# This defaults to a sane location, but if you want to change it, use
-# the line below.
-#dhcp-leasefile=/var/lib/misc/dnsmasq.leases
-
-# Set the cachesize here.
-#cache-size=150
-
-# If you want to disable negative caching, uncomment this.
-#no-negcache
-
-# Normally responses which come form /etc/hosts and the DHCP lease
-# file have Time-To-Live set as zero, which conventionally means
-# do not cache further. If you are happy to trade lower load on the 
-# server for potentially stale date, you can set a time-to-live (in 
-# seconds) here.
-#local-ttl=
-
-# If you want dnsmasq to detect attempts by Verisign to send queries
-# to unregistered .com and .net hosts to its sitefinder service and
-# have dnsmasq instead return the correct NXDOMAIN response, uncomment
-# this line. You can add similar lines to do the same for other
-# registries which have implemented wildcard A records.
-#bogus-nxdomain=64.94.110.11
-
-# If you want to fix up DNS results from upstream servers, use the
-# alias option. This only works for IPv4.
-# This alias makes a result of 1.2.3.4 appear as 5.6.7.8
-#alias=1.2.3.4,5.6.7.8
-# and this maps 1.2.3.x to 5.6.7.x
-#alias=1.2.3.0,5.6.7.0,255.255.255.0
-
-# For debugging purposes, log each DNS query as it passes through
-# dnsmasq.
-#log-queries
-
-# Include a another lot of configuration options.
-#conf-file=/etc/dnsmasq.more.conf
- 
- 
-
-
-
diff --git a/recipes-support/dnsmasq/files/dnsmasq.resolvconf b/recipes-support/dnsmasq/files/dnsmasq.resolvconf
deleted file mode 100755
index 06cd25c..0000000
--- a/recipes-support/dnsmasq/files/dnsmasq.resolvconf
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh
-#
-# Script to update the resolver list for dnsmasq
-#
-# N.B. Resolvconf may run us even if dnsmasq is not (yet) running.
-# If dnsmasq is installed then we go ahead and update the resolver list
-# in case dnsmasq is started later.
-#
-# Assumption: On entry, PWD contains the resolv.conf-type files.
-#
-# This file is part of the dnsmasq package.
-#
-
-set -e
-
-RUN_DIR="/run/dnsmasq"
-RSLVRLIST_FILE="${RUN_DIR}/resolv.conf"
-TMP_FILE="${RSLVRLIST_FILE}_new.$$"
-MY_NAME_FOR_RESOLVCONF="dnsmasq"
-
-[ -x /usr/bin/dnsmasq ] || exit 0
-[ -x /lib/resolvconf/list-records ] || exit 1
-
-PATH=/bin:/sbin
-
-report_err() { echo "$0: Error: $*" >&2 ; }
-
-# Stores arguments (minus duplicates) in RSLT, separated by spaces
-# Doesn't work properly if an argument itself contains whitespace
-uniquify()
-{
-	RSLT=""
-	while [ "$1" ] ; do
-		for E in $RSLT ; do
-			[ "$1" = "$E" ] && { shift ; continue 2 ; }
-		done
-		RSLT="${RSLT:+$RSLT }$1"
-		shift
-	done
-}
-
-if [ ! -d "$RUN_DIR" ] && ! mkdir --parents --mode=0755 "$RUN_DIR" ; then
-	report_err "Failed trying to create directory $RUN_DIR"
-	exit 1
-fi
-
-RSLVCNFFILES=""
-for F in $(/lib/resolvconf/list-records --after "lo.$MY_NAME_FOR_RESOLVCONF") ; do
-	case "$F" in
-	    "lo.$MY_NAME_FOR_RESOLVCONF")
-		# Omit own record
-		;;
-	    lo.*)
-		# Include no more records after one for a local nameserver
-		RSLVCNFFILES="${RSLVCNFFILES:+$RSLVCNFFILES }$F"
-		break
-		;;
-	  *)
-		RSLVCNFFILES="${RSLVCNFFILES:+$RSLVCNFFILES }$F"
-		;;
-	esac
-done
-
-NMSRVRS=""
-if [ "$RSLVCNFFILES" ] ; then
-	uniquify $(sed -n -e 's/^[[:space:]]*nameserver[[:space:]]\+//p' $RSLVCNFFILES)
-	NMSRVRS="$RSLT"
-fi
-
-# Dnsmasq uses the mtime of $RSLVRLIST_FILE, with a resolution of one second,
-# to detect changes in the file. This means that if a resolvconf update occurs
-# within one second of the previous one then dnsmasq may fail to notice the
-# more recent change. To work around this problem we sleep one second here
-# if necessary in order to ensure that the new mtime is different.
-if [ -f "$RSLVRLIST_FILE" ] && [ "$(stat -c %X "$RSLVRLIST_FILE")" = "$(date +%s)" ] ; then
-	sleep 1
-fi
-
-clean_up() { rm -f "$TMP_FILE" ; }
-trap clean_up EXIT
-: >| "$TMP_FILE"
-for N in $NMSRVRS ; do echo "nameserver $N" >> "$TMP_FILE" ; done
-mv -f "$TMP_FILE" "$RSLVRLIST_FILE"
-
diff --git a/recipes-support/dnsmasq/files/init b/recipes-support/dnsmasq/files/init
deleted file mode 100644
index 5f457f8..0000000
--- a/recipes-support/dnsmasq/files/init
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/sh
-DAEMON=/usr/bin/dnsmasq
-NAME=dnsmasq
-DESC="DNS forwarder and DHCP server"
-ARGS="-7 /etc/dnsmasq.d"
-
-test -f $DAEMON || exit 0
-
-set -e
-
-if [ -r /etc/default/$NAME ]
-then
-	. /etc/default/$NAME
-fi
-
-[[ "$ENABLED" = "yes" ]] || exit
-
-DNSMASQ_CONF="/etc/dnsmasq.conf"
-test "/etc/dnsmasq.d/*" != '/etc/dnsmasq.d/*' && DNSMASQ_CONF="${DNSMASQ_CONF} /etc/dnsmasq.d/*"
-
-test -z "${PIDFILE}" && PIFILE="/run/dnsmasq.pid"
-
-if [ -z "$IGNORE_RESOLVCONF" ]
-then
-	egrep -h -q '^no-resolv' ${DNSMASQ_CONF} && IGNORE_RESOLVCONF="yes"
-fi
-
-# RESOLV_CONF:
-# If the resolvconf package is installed then use the resolv conf file
-# that it provides as the default.  Otherwise use /etc/resolv.conf as
-# the default.
-#
-# If IGNORE_RESOLVCONF is set in /etc/default/dnsmasq or an explicit
-# filename is set there then this inhibits the use of the resolvconf-provided
-# information.
-#
-# Note that if the resolvconf package is installed it is not possible to
-# override it just by configuration in /etc/dnsmasq.conf, it is necessary
-# to set IGNORE_RESOLVCONF=yes in /etc/default/dnsmasq.
-
-test -z "$RESOLV_CONF" -a "$IGNORE_RESOLVCONF" != "yes" -a -x /sbin/resolvconf && \
-	RESOLV_CONF=/run/dnsmasq/resolv.conf
-
-start_resolvconf()
-{
-        if [ "$IGNORE_RESOLVCONF" != "yes" -a -x /sbin/resolvconf ]
-	then
-		echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo.$NAME
-	fi
-	:
-}
-
-stop_resolvconf()
-{
-	if [ "$IGNORE_RESOLVCONF" != "yes" -a -x /sbin/resolvconf ]
-	then
-		/sbin/resolvconf -d lo.$NAME
-	fi
-	:
-}
-
-case "$1" in
-    start)
-        echo -n "starting $DESC: $NAME... "
-	test -d /var/lib/misc/ || mkdir /var/lib/misc/
-	start-stop-daemon -S -x $DAEMON -- $ARGS \
-		${RESOLV_CONF:+ -r $RESOLV_CONF} \
-		${PIDFILE:+ -x $PIDFILE}
-	test $? -eq 0 && start_resolvconf
-	echo "done."
-	;;
-    stop)
-        echo -n "stopping $DESC: $NAME... "
-	stop_resolvconf
-	start-stop-daemon -K -x $DAEMON
-	echo "done."
-	;;
-    status)
-	echo -n "dnsmasq "
-	start-stop-daemon -q -K -t -x $DAEMON
-	RET=$?
-	if [ "$RET" = "0" ]; then
-		PID=`cat ${PIDFILE}`
-		echo "($PID) is running"
-	else
-		echo "is not running"
-		exit $RET
-	fi
-	;;
-    restart)
-        echo "restarting $DESC: $NAME... "
- 	$0 stop
-	$0 start
-	echo "done."
-	;;
-    reload)
-    	echo -n "reloading $DESC: $NAME... "
-    	killall -HUP $(basename ${DAEMON})
-	echo "done."
-	;;
-    systemd-start-resolvconf)
-	start_resolvconf
-	;;
-    systemd-stop-resolvconf)
-	stop_resolvconf
-	;;
-    systemd-exec)
-	test -d /var/lib/misc/ || mkdir /var/lib/misc/
-	exec $DAEMON --keep-in-foreground $ARGS \
-		${RESOLV_CONF:+ -r $RESOLV_CONF} \
-		${PIDFILE:+ -x $PIDFILE}
-	;;
-    *)
-	echo "Usage: $0 {start|stop|status|restart|reload}"
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile b/recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile
deleted file mode 100644
index 7df3d63..0000000
--- a/recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-includedir ?= /usr/include
-libdir ?= /usr/lib
-
-CPP_SRCS += \
-src/lib_json/json_reader.cpp \
-src/lib_json/json_value.cpp \
-src/lib_json/json_writer.cpp 
-
-OBJS += \
-json_reader.o \
-json_value.o \
-json_writer.o 
-
-CPP_DEPS += \
-json_reader.d \
-json_value.d \
-json_writer.d 
-
-TARGET = libjsoncpp.so
-
-all: $(TARGET)
-
-libjsoncpp.so: $(OBJS)
-	@echo 'Building target: $@'
-	#$(AR) -r  libjsoncpp.a $(OBJS)
-	$(CXX) ${LDFLAGS} -shared -o $@ $^
-	@echo 'Finished building target: $@'
-	@echo ' '
-
-%.o: src/lib_json/%.cpp
-	@echo 'Building file: $<'
-	$(CXX) $(CFLAGS) -Iinclude -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -fPIC -o "$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
-
-install:
-	install -d $(DESTDIR)/usr/include/json
-	install -m 644 include/json/*.h $(DESTDIR)/usr/include/json
-	mkdir -p $(DESTDIR)/usr/lib
-	cp libjsoncpp.so $(DESTDIR)/usr/lib
-
-# Other Targets
-clean:
-	-$(RM) $(OBJS)$(CPP_DEPS) libjsoncpp.so
-	-@echo ' '
-
-.PHONY: all clean dependents
-.SECONDARY:
-
diff --git a/recipes-support/jsoncpp/jsoncpp_1.6.0.bb b/recipes-support/jsoncpp/jsoncpp_1.6.0.bb
deleted file mode 100644
index 8c8454d..0000000
--- a/recipes-support/jsoncpp/jsoncpp_1.6.0.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION = "Json C++ Library"
-HOMEPAGE = "https://github.com/open-source-parsers/jsoncpp"
-# Public Domain
-LICENSE = "PD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c56ee55c03a55f8105b969d8270632ce"
-DEPENDS = ""
-
-#tag 1.6.0
-SRCREV="cbe7e7c9cbd39d864588c5cf2436690634562d3f"
-
-SRC_URI = " git://github.com/open-source-parsers/jsoncpp.git;protocol=git \
-            file://Makefile \
-          "
-
-PR = "r6"
-
-S = "${WORKDIR}/git"
-
-do_compile() {
-	cp ${WORKDIR}/Makefile .
-	oe_runmake
-}
-
-do_install () {
-	install -d ${D}/usr/lib
-	install -m 0755 ${S}/libjsoncpp.so ${D}/usr/lib
-	install -d ${D}${includedir}/jsoncpp/json
-	install -m 0755 ${S}/include/json/*.h ${D}${includedir}/jsoncpp/json
-}
-
-FILES_SOLIBSDEV = ""
-FILES_${PN} += "${libdir}/*.so"
-FILES_{PN}-dev += "${libdir}/*.so"
diff --git a/recipes-support/libesmtp/libesmtp_1.0.6.bxb b/recipes-support/libesmtp/libesmtp_1.0.6.bxb
deleted file mode 100644
index e421e63..0000000
--- a/recipes-support/libesmtp/libesmtp_1.0.6.bxb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "LibESMTP is a library to manage posting \
-(or submission of) electronic mail using SMTP to a \
-preconfigured Mail Transport Agent (MTA) such as Exim or PostFix."
-LICENSE = "LGPLv2.1 GPLv2"
-LIC_FILES_CHKSUM= "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-                   file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06 \
-"
-SECTION = "libs/network"
-DEPENDS = "openssl"
-PR = "r0"
-
-SRC_URI = "http://www.stafford.uklinux.net/libesmtp/libesmtp-${PV}.tar.bz2"
-
-inherit autotools binconfig
-
-EXTRA_OECONF = "--disable-isoc --with-openssl=${STAGING_LIBDIR}/.."
-
-FILES_${PN} = "${libdir}/lib*${SOLIBS} \
-		${libdir}/esmtp-plugins/*${SOLIBSDEV}"
-FILES_${PN}-dev  += "${libdir}/esmtp-plugins/*.la"
-FILES_${PN}-staticdev += "${libdir}/esmtp-plugins/*.a"
-FILES_${PN}-dbg += "${libdir}/esmtp-plugins/.debug/"
-
-SRC_URI[md5sum] = "bf3915e627fd8f35524a8fdfeed979c8"
-SRC_URI[sha256sum] = "d0a61a5c52d99fa7ce7d00ed0a07e341dbda67101dbed1ab0cdae3f37db4eb0b"
diff --git a/recipes-support/libftdi/libftdi_1.1.bb b/recipes-support/libftdi/libftdi_1.1.bb
deleted file mode 100644
index d8b189b..0000000
--- a/recipes-support/libftdi/libftdi_1.1.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "libftdi is a library to talk to FTDI chips.\
-FT232BM/245BM, FT2232C/D and FT232/245R using libusb,\
-including the popular bitbang mode."
-HOMEPAGE = "http://www.intra2net.com/en/developer/libftdi/"
-SECTION = "libs"
-
-LICENSE = "LGPLv2.1 & GPLv2"
-LIC_FILES_CHKSUM= "\
-    file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe \
-    file://COPYING.LIB;md5=db979804f025cf55aabec7129cb671ed \
-"
-
-DEPENDS = "libusb1"
-
-SRC_URI = "http://www.intra2net.com/en/developer/${BPN}/download/${BPN}1-${PV}.tar.bz2"
-
-SRC_URI[md5sum] = "b79a6356978aa8e69f8eecc3a720ff79"
-SRC_URI[sha256sum] = "c0b1af1a13e2c6682a1d8041e5b164a1e0d90267cd378bb51e059bd62f821e21"
-
-S = "${WORKDIR}/${BPN}1-${PV}"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[cpp-wrapper] = "-DFTDI_BUILD_CPP=on,-DFTDI_BUILD_CPP=off,boost"
-
-inherit cmake binconfig pkgconfig
-
-FILES_${PN}-dev += "${libdir}/cmake"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes-support/libmpsse/libmpsse_1.3.bb b/recipes-support/libmpsse/libmpsse_1.3.bb
deleted file mode 100644
index f1d9723..0000000
--- a/recipes-support/libmpsse/libmpsse_1.3.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "FTDI Libmpsse Library"
-HOMEPAGE = "http://googlecode.com/"
-PRIORITY = "optional"
-SECTION = "console/utils"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-
-PR = "r1"
-
-DEPENDS = "libftdi"
-
-SRC_URI = "http://libmpsse.googlecode.com/files/libmpsse-1.3.tar.gz"
-
-SRC_URI[md5sum] = "628eb9a7d7250070f5841ed44a248f84"
-SRC_URI[sha256sum] = "08f2a0025074720d40e29430089b1ab78d764756cc5d2bcb3148d98131b4074b"
-
-S = "${WORKDIR}/libmpsse-${PV}/src"
-
-inherit autotools-brokensep
-
-EXTRA_OECONF += "--disable-python"
-CFLAGS += "-DLIBFTDI1=1"
-
-do_install_append() {
-	mv ${D}${libdir}/libmpsse.so ${D}${libdir}/libmpsse.so.1
-	( cd ${D}${libdir}; ln -s libmpsse.so.1 libmpsse.so )
-}
diff --git a/recipes-support/libpwquality/files/pam.configure b/recipes-support/libpwquality/files/pam.configure
deleted file mode 100644
index 1506d4f..0000000
--- a/recipes-support/libpwquality/files/pam.configure
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naru orig/etc/pam.d/common-password new/etc/pam.d/common-password
---- orig/etc/pam.d/common-password	2018-04-25 10:26:55.805688250 -0500
-+++ new/etc/pam.d/common-password	2018-04-25 10:27:48.041686704 -0500
-@@ -16,7 +16,8 @@
- # See the pam_unix manpage for other options.
- 
- # here are the per-package modules (the "Primary" block)
--password	[success=1 default=ignore]	pam_unix.so obscure sha512
-+password	requisite			pam_pwquality.so retry=3
-+password	[success=1 default=ignore]	pam_unix.so obscure use_authok try_frist_pass sha512
- # here's the fallback if no module succeeds
- password	requisite			pam_deny.so
- # prime the stack with a positive return value if there isn't one already;
diff --git a/recipes-support/libpwquality/files/pwquality_conf.patch b/recipes-support/libpwquality/files/pwquality_conf.patch
deleted file mode 100644
index 12074ce..0000000
--- a/recipes-support/libpwquality/files/pwquality_conf.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -Naru orig/src/pwquality.conf new/src/pwquality.conf
---- orig/src/pwquality.conf	2018-04-25 09:22:11.713803238 -0500
-+++ new/src/pwquality.conf	2018-04-25 09:37:00.997776911 -0500
-@@ -1,41 +1,51 @@
-+# Original values are commented out.  Minimum password length can be six
-+# characters with this configuration if there is enough complexity.
-+#
- # Configuration for systemwide password quality limits
--# Defaults:
- #
- # Number of characters in the new password that must not be present in the
- # old password.
- # difok = 1
-+difok = 6
- #
- # Minimum acceptable size for the new password (plus one if
- # credits are not disabled which is the default). (See pam_cracklib manual.)
- # Cannot be set to lower value than 6.
- # minlen = 8
-+minlen = 10
- #
- # The maximum credit for having digits in the new password. If less than 0
- # it is the minimum number of digits in the new password.
- # dcredit = 0
-+dcredit = 1
- #
- # The maximum credit for having uppercase characters in the new password.
- # If less than 0 it is the minimum number of uppercase characters in the new
- # password.
- # ucredit = 0
-+ucredit = 1
- #
- # The maximum credit for having lowercase characters in the new password.
- # If less than 0 it is the minimum number of lowercase characters in the new
- # password.
- # lcredit = 0
-+lcredit = 1
- #
- # The maximum credit for having other characters in the new password.
- # If less than 0 it is the minimum number of other characters in the new
- # password.
--# ocredit = 0
-+# lcredit = 0
-+ocredit = 1
- #
- # The minimum number of required classes of characters for the new
- # password (digits, uppercase, lowercase, others).
- # minclass = 0
-+minclass = 3
- #
- # The maximum number of allowed consecutive same characters in the new password.
- # The check is disabled if the value is 0.
- # maxrepeat = 0
-+maxrepeat = 2
- #
- # The maximum number of allowed consecutive characters of the same class in the
- # new password.
-@@ -45,6 +55,7 @@
- # Whether to check for the words from the passwd entry GECOS string of the user.
- # The check is enabled if the value is not 0.
- # gecoscheck = 0
-+gecoscheck = 1
- #
- # Path to the cracklib dictionaries. Default is to use the cracklib default.
- # dictpath =
diff --git a/recipes-support/libpwquality/libpwquality_1.3.0.bb b/recipes-support/libpwquality/libpwquality_1.3.0.bb
deleted file mode 100644
index e5179c9..0000000
--- a/recipes-support/libpwquality/libpwquality_1.3.0.bb
+++ /dev/null
@@ -1,111 +0,0 @@
-SUMMARY = "Library for password quality checking and generating random passwords"
-HOMEPAGE = "https://launchpad.net/libpwquality"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6bd2f1386df813a459a0c34fde676fc2"
-
-SRC_URI = "https://launchpad.net/${BPN}/trunk/${PV}/+download/${BPN}-${PV}.tar.bz2 \
-	   file://pwquality_conf.patch \
-	   file://pam.configure \
-	  "
-SRC_URI[md5sum] = "2a3d4ba1d11b52b4f6a7f39622ebf736"
-SRC_URI[sha256sum] = "74d2ea90e103323c1f2d6a6cc9617cdae6877573eddb31aaf31a40f354cc2d2a"
-
-inherit autotools-brokensep pkgconfig gettext pythonnative
-
-DEPENDS = "zlib cracklib libpam python"
-RDEPENDS_${PN} = "libpam-runtime"
-
-EXTRA_OECONF = " \
-    --with-python-binary=${PYTHON} \
-    --libdir=${base_libdir} \
-"
-
-do_compile() {
-    # make distustils part for python bindings happy
-    export STAGING_INCDIR=${STAGING_INCDIR}
-    export STAGING_LIBDIR=${STAGING_LIBDIR}
-    export BUILD_SYS=${BUILD_SYS}
-    export HOST_SYS=${HOST_SYS}
-    base_do_compile
-}
-
-do_install() {
-    # make distustils part for python bindings happy
-    export STAGING_INCDIR=${STAGING_INCDIR}
-    export STAGING_LIBDIR=${STAGING_LIBDIR}
-    export BUILD_SYS=${BUILD_SYS}
-    export HOST_SYS=${HOST_SYS}
-    autotools_do_install
-    install -d -m755 ${D}/${datadir_native}/${PN}
-    install ${WORKDIR}/pam.configure ${D}/${datadir_native}/${PN}
-}
-
-FILES_${PN} += " \
-    ${base_libdir}/security/*.so \
-    ${datadir_native}/ \
-"
-CONFFILES_${PN} += "${sysconfdir}"
-
-PACKAGE_BEFORE_PN += "${PN}-python"
-
-FILES_${PN}-python = " \
-    ${PYTHON_SITEPACKAGES_DIR} \
-"
-
-FILES_${PN}-staticdev += " \
-    ${PYTHON_SITEPACKAGES_DIR}/*.a \
-    ${base_libdir}/security/*.a \
-"
-FILES_${PN}-dev += " \
-    ${PYTHON_SITEPACKAGES_DIR}/*.la \
-    ${base_libdir}/security/*.la \
-    ${base_libdir}/pkgconfig/pwquality.pc \
-"
-
-FILES_${PN}-dbg += "\
-    ${PYTHON_SITEPACKAGES_DIR}/.debug \
-    ${base_libdir}/security/.debug \
-"
-
-# The postinstall installs libpwquality into PAM.
-# The prerm removes libpwquatlity from PAM.
-# The file we change is /etc/pam.d/common-password,
-# which is a configuration file for libpam-runtime.
-# We ignore failures in the post-install and pre-remove.
-# so if the patch does not apply, pam will not use us.
-pkg_postinst_${PN}() {
-    PAM_CONFIGURE="/${datadir_native}/${PN}/pam.configure"
-    if [[ -n $D ]] ; then
-        LOG='printf %s\n'
-        PAM_CONFIGURE="$D${PAM_CONFIGURE}"
-        cd $D
-    else
-        LOG="logger -s -p user.info -t opkg\ libpwquality"
-        cd /
-    fi
-    logsave=$(patch -p1 -N < "$PAM_CONFIGURE" 2>&1 || true)
-    if [[ -n ${logsave} ]] ; then
-        ${LOG} "In directory $(pwd)"
-        ${LOG} "patch -p1 -N < $PAM_CONFIGURE"
-        ${LOG} "${PN} patch: ${logsave}"
-        
-    fi
-}
-
-pkg_prerm_${PN}() {
-    PAM_CONFIGURE="/${datadir_native}/${PN}/pam.configure"
-    if [[ -n $D ]] ; then
-        LOG='printf %s\n'
-        PAM_CONFIGURE="$D${PAM_CONFIGURE}"
-        cd $D
-    else
-        LOG="logger -s -p user.info -t opkg\ libpwquality"
-        cd /
-    fi
-    logsave=$(patch -p1 -R < "$PAM_CONFIGURE" 2>&1 || true)
-    if [[ -n ${logsave} ]] ; then
-        ${LOG} "In directory $(pwd)"
-        ${LOG} "patch -p1 -R < "$PAM_CONFIGURE""
-        ${LOG} "${PN} remove patch: ${logsave}"
-    fi
-}
diff --git a/recipes-support/libpwquality/libpwquality_1.4.0.bb.new b/recipes-support/libpwquality/libpwquality_1.4.0.bb.new
deleted file mode 100644
index 2c96063..0000000
--- a/recipes-support/libpwquality/libpwquality_1.4.0.bb.new
+++ /dev/null
@@ -1,45 +0,0 @@
-DESCRIPTION = "Library for password quality checking and generating random passwords"
-HOMEPAGE = "https://github.com/libpwquality/libpwquality"
-SECTION = "devel/lib"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6bd2f1386df813a459a0c34fde676fc2"
-
-SRCNAME = "libpwquality"
-SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/${SRCNAME}-${PV}/${SRCNAME}-${PV}.tar.bz2 \
-           file://add-missing-python-include-dir-for-cross.patch \
-"
-
-SRC_URI[md5sum] = "b8defcc7280a90e9400d6689c93a279c"
-SRC_URI[sha256sum] = "1de6ff046cf2172d265a2cb6f8da439d894f3e4e8157b056c515515232fade6b"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-DEPENDS = "cracklib virtual/gettext python3"
-RDEPENDS_python3-libpwquality = "${PN}"
-
-inherit autotools python3native gettext
-
-B = "${S}"
-
-export PYTHON_DIR
-export BUILD_SYS
-export HOST_SYS
-export STAGING_LIBDIR
-export STAGING_INCDIR
-
-EXTRA_OECONF += "--with-python-rev=${PYTHON_BASEVERSION} \
-                 --with-python-binary=${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} \
-                 --with-pythonsitedir=${PYTHON_SITEPACKAGES_DIR} \
-                 --libdir=${libdir} \
-"
-
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
-PACKAGECONFIG[pam] = "--enable-pam, --disable-pam, libpam"
-
-PACKAGES += "python3-libpwquality python3-libpwquality-dbg"
-FILES_${PN} += "${libdir}/security/pam_pwquality.so"
-FILES_${PN}-dbg += "${libdir}/security/.debug"
-FILES_${PN}-staticdev += "${libdir}/security/pam_pwquality.a"
-FILES_${PN}-dev += "${libdir}/security/pam_pwquality.la"
-FILES_python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}/*"
-FILES_python3-${PN}-dbg = "${PYTHON_SITEPACKAGES_DIR}/.debug"
diff --git a/recipes-support/lxfp/lxfp-src_23a2843.bb b/recipes-support/lxfp/lxfp-src_23a2843.bb
deleted file mode 100644
index b2258b7..0000000
--- a/recipes-support/lxfp/lxfp-src_23a2843.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-# This recipe needs a manual download of
-# the proprietary Telit firmware flashing
-# program into build/downloads
-# Then it will be able to compile an
-# ipk.  The current lxfp recipe requires
-# a tar file of bin/lxfp object module.
-# This is here is an example only.
-DESCRIPTION = "Telit LXFP modem flashing tools"
-LICENSE = ""
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
-
-PR = "r1"
-
-SRC_URI = " \
-        file://lxfp-${PV}.tar.gz;md5=b4dc2f536658b3f82c91b68af1bf3dc3 \
-"
-
-S = "${WORKDIR}/lxfp-${PV}"
-
-do_compile() {
-    CC="${CC} --sysroot=${STAGING_DIR_HOST}"
-    LD="${LD} --sysroot=${STAGING_DIR_HOST}"
-    CXX="${CXX} --sysroot=${STAGING_DIR_HOST}"
-    echo "CXX is ${CXX}"
-    oe_runmake CC="${CC}" LD="${LD}" CXX="${CXX}" 
-}
-
-do_install() {
-    install -d ${D}${sbindir}
-    install -m 0755 bin/lxfp ${D}${sbindir}
-}
-
-FILES_${PN} = "${sbindir}/lxfp"
diff --git a/recipes-support/lxfp/lxfp_23a2843.bb b/recipes-support/lxfp/lxfp_23a2843.bb
deleted file mode 100644
index 2bf4958..0000000
--- a/recipes-support/lxfp/lxfp_23a2843.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Telit LXFP modem flashing tool"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
-
-PR = "r1"
-
-SRC_URI = "http://www.multitech.net/downloads/lxfp-arm926ejste-23a2843.tar.gz"
-SRC_URI[md5sum] = "4ef5d0907a880f9acdc345d57e08c53b"
-SRC_URI[sha256sum] = "09d3fd2d7102343d727fe36c818854183eaa7cdeced1af810786a9d1509541cf"
-
-do_install() {
-    install -d ${D}${sbindir}
-    echo "do_install: directory is $(pwd)"
-    install -m 0755 ${WORKDIR}/bin/lxfp ${D}${sbindir}
-}
-
-FILES_${PN} = "${sbindir}/lxfp"
diff --git a/recipes-support/multitech/jsparser/jspp b/recipes-support/multitech/jsparser/jspp
deleted file mode 100755
index 16b60e1..0000000
--- a/recipes-support/multitech/jsparser/jspp
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-if [ $# -lt 1 ]; then
-	echo "usage: $0 <filepath>"
-	echo "  prints json in readable format"
-        exit 1
-fi
-
-cat $1 | jsparser --jsobj
diff --git a/recipes-support/multitech/jsparser_0.3.bb b/recipes-support/multitech/jsparser_0.3.bb
deleted file mode 100644
index c289d30..0000000
--- a/recipes-support/multitech/jsparser_0.3.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "MultiTech Command Line JSON Parser"
-LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "jsoncpp libmts"
-RDEPENDS_${PN} += "bash"
-
-PR = "r0"
-SRCREV="${PV}"
-
-SRC_URI = "git://git.multitech.net/jsparser;branch=master \
-	       file://jspp \
-"
-
-S = "${WORKDIR}/git"
-
-do_install_append() {
-    oe_runmake install DESTDIR=${D}
-    install -d ${D}/usr/bin
-    install -m 755 ${WORKDIR}/jspp ${D}/usr/bin/jspp
-}
-
-
diff --git a/recipes-support/multitech/libmts-io_1.0.19.bb b/recipes-support/multitech/libmts-io_1.0.19.bb
deleted file mode 100644
index 34115be..0000000
--- a/recipes-support/multitech/libmts-io_1.0.19.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "MultiTech IO C++ Library"
-HOMEPAGE = "http://www.multitech.net/"
-LICENSE = "LGPL-2.1"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c"
-
-DEPENDS = "libmts jsoncpp cmake-native cppunit"
-BBCLASSEXTEND = "native"
-
-PR = "r0"
-SRCREV = "${PV}"
-SRC_URI = "git://git.multitech.net/libmts-io;branch=master"
-
-S = "${WORKDIR}/git"
-
-do_compile() {
-	oe_runmake
-}
-
-# build and run tests for native recipe
-do_compile_append_virtclass-native() {
-	cd test
-	cmake .
-	oe_runmake
-	./TestRunnerClient
-}
-
-do_install() {
-	oe_runmake install DESTDIR=${D}
-}
-
diff --git a/recipes-support/multitech/libmts_0.5.bb b/recipes-support/multitech/libmts_0.5.bb
deleted file mode 100644
index b599395..0000000
--- a/recipes-support/multitech/libmts_0.5.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "MultiTech Core C++ Library"
-HOMEPAGE = "http://www.multitech.net/"
-LICENSE = "LGPL-2.1"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c"
-
-DEPENDS = "cmake-native cppunit"
-BBCLASSEXTEND = "native"
-
-PR = "r1"
-SRCREV = "${PV}"
-SRC_URI = "git://git.multitech.net/libmts;branch=master"
-
-S = "${WORKDIR}/git"
-
-do_compile() {
-	oe_runmake
-}
-
-# build and run tests for native recipe
-do_compile_append_virtclass-native() {
-	cd test
-	cmake .
-	oe_runmake
-	./TestRunnerClient
-}
-
-do_install() {
-	oe_runmake install DESTDIR=${D}
-}
-
diff --git a/recipes-support/multitech/radio-cmd_0.6.bb b/recipes-support/multitech/radio-cmd_0.6.bb
deleted file mode 100644
index b8e5b23..0000000
--- a/recipes-support/multitech/radio-cmd_0.6.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "MultiTech cellular radio command tool"
-HOMEPAGE = "http://www.multitech.net/"
-LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-DEPENDS = "jsoncpp libmts libmts-io"
-
-PR = "r0"
-SRCREV = "${PV}"
-
-SRC_URI = "git://git.multitech.net/radio-cmd;branch=master"
-
-S = "${WORKDIR}/git"
-
-do_compile() {
-    oe_runmake
-}
-
-do_install() {
-    oe_runmake install DESTDIR=${D}
-}
-
diff --git a/recipes-support/multitech/radio-query_0.8.bb b/recipes-support/multitech/radio-query_0.8.bb
deleted file mode 100644
index 5e0b60a..0000000
--- a/recipes-support/multitech/radio-query_0.8.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "MultiTech cellular radio query tool"
-HOMEPAGE = "http://www.multitech.net/"
-LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-DEPENDS = "jsoncpp libmts libmts-io"
-
-PR = "r0"
-SRCREV = "${PV}"
-
-SRC_URI = "git://git.multitech.net/radio-query;branch=master"
-
-S = "${WORKDIR}/git"
-
-do_compile() {
-    oe_runmake
-}
-
-do_install() {
-    oe_runmake install DESTDIR=${D}
-}
-
diff --git a/recipes-support/ntp/files/logtime.patch b/recipes-support/ntp/files/logtime.patch
deleted file mode 100644
index bb253f4..0000000
--- a/recipes-support/ntp/files/logtime.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-# The logtime test is used to compare the kernel realtime
-# clock and the kernel monotonic clock, so that leap
-# second may be observed.
-diff -Naru old/tests/ntpd/logtime.c new/tests/ntpd/logtime.c
---- old/tests/ntpd/logtime.c	1969-12-31 18:00:00.000000000 -0600
-+++ new/tests/ntpd/logtime.c	2017-05-30 13:22:11.827179154 -0500
-@@ -0,0 +1,44 @@
-+#include <time.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <stdarg.h>
-+#include <syslog.h>
-+/*
-+ * Generate a log messages 4 times per second
-+ * to verify leap second.  The CLOCK_MONOTONIC_RAW
-+ * is the time since boot unaffected by adjustments.
-+ *
-+ * CLOCK_REALTIME is the UTC clock, which is affected
-+ * by leap seconds.
-+ *
-+ * Program does not exit.
-+ *
-+ */
-+main()
-+{
-+	openlog("CTST",0,LOG_LOCAL2);
-+	while(1) {
-+		struct timespec ts,unused,ep;
-+		if (clock_gettime(CLOCK_MONOTONIC,&ts) == 0) {
-+			
-+			if(ts.tv_nsec < 750000000)
-+				ts.tv_nsec += 250000000;
-+			else {
-+				ts.tv_nsec -= 750000000;
-+				ts.tv_sec += 1;
-+			}
-+			clock_nanosleep(CLOCK_MONOTONIC,TIMER_ABSTIME,&ts,&unused);	
-+		        clock_gettime(CLOCK_MONOTONIC_RAW,&ts);
-+			ts.tv_nsec /= 1000000;
-+		        clock_gettime(CLOCK_REALTIME,&ep);
-+			ep.tv_nsec /= 1000000;
-+			syslog(LOG_NOTICE,"epoch: %lu.%3.3ld  boot: %lu.%3.3ld",
-+				ep.tv_sec,ep.tv_nsec,
-+				ts.tv_sec,ts.tv_nsec);
-+			
-+		}
-+		
-+
-+	}	
-+
-+}
-diff -Naru old/tests/ntpd/Makefile.am new/tests/ntpd/Makefile.am
---- old/tests/ntpd/Makefile.am	2017-05-30 13:31:45.124160267 -0500
-+++ new/tests/ntpd/Makefile.am	2017-05-30 16:53:59.784755988 -0500
-@@ -29,6 +29,7 @@
- 	test-ntp_restrict	\
- 	test-ntp_scanner	\
- 	test-ntp_signd		\
-+        logtime		        \
- 	$(NULL)
- 
- 
-@@ -191,8 +192,8 @@
- ## check-libntp.mf - automake fragment
- ## slightly adapted for deeper directory
- 
--BUILT_SOURCES	+= check-libntpd check-libntp check-libunity
--CLEANFILES	+= check-libntpd check-libntp check-libunity
-+BUILT_SOURCES	+= check-libntpd check-libntp check-libunity logtime
-+CLEANFILES	+= check-libntpd check-libntp check-libunity logtime
- 
- check-libntpd: ../../ntpd/libntpd.a
- 	@echo stamp > $@
diff --git a/recipes-support/ntp/files/ntp.conf.patch b/recipes-support/ntp/files/ntp.conf.patch
deleted file mode 100644
index 3d7a652..0000000
--- a/recipes-support/ntp/files/ntp.conf.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Naru old/ntp.conf new/ntp.conf
---- old/ntp.conf	2017-07-18 17:48:59.436221921 -0500
-+++ new/ntp.conf	2017-07-18 18:00:54.392325489 -0500
-@@ -1,17 +1,59 @@
--# This is the most basic ntp configuration file
- # The driftfile must remain in a place specific to this
- # machine - it records the machine specific clock error
--driftfile /var/lib/ntp/drift
-+# Driftfile must be in a directory owned by ntp
-+driftfile /var/lib/ntp/ntp.drift
-+
-+# The following code is for evaluating the timeserver.
-+# Remove the # to activate the statistics
-+# statsdir must start in column 1 for the initscript to
-+# create the directory, in case it is volatile.
-+#
-+# statistics loopstats
-+# statistics peerstats
-+# statsdir /var/log/ntpstats
-+# filegen peerstats file peerstats type day link enable
-+# filegen loopstats file loopstats type day link enable
-+
-+# This is the US timeserver pool.  You should use a pool
-+# close to your location.
-+#pool us.pool.ntp.org iburst
-+
- # This should be a server that is close (in IP terms)
- # to the machine.  Add other servers as required.
--# Unless you un-comment the line below ntpd will sync
--# only against the local system clock.
- #
- # server time.server.example.com
- #
-+
-+restrict default kod nomodify notrap nopeer noquery
-+restrict -6 default kod nomodify notrap nopeer noquery
-+restrict 127.0.0.1 mask 255.255.255.0
-+restrict -6 ::1
-+
-+# GPS Serial data reference (NTP0)
-+# This sets the GPS 50 milliseconds slower than the PPS.
-+server 127.127.28.0 true
-+fudge 127.127.28.0 time1 0.050 refid GPS
-+
-+# GPS PPS reference (NTP2)
-+server 127.127.28.2 prefer true
-+fudge 127.127.28.2 time1 0.000 refid PPS
-+
-+# orphanwait says that after 30 seconds, we can't find a server, we
-+# will use the local clock.  This means ntp will hang for 30 seconds
-+# during boot if we are not configured for an NTP server.
-+tos orphanwait 30
-+
- # Using local hardware clock as fallback
--# Disable this when using ntpd -q -g -x as ntpdate or it will sync to itself
--server 127.127.1.0
-+
-+# minpoll of 5 means 2^5 seconds or 32 seconds.  So first we wait 30
-+# seconds if we can't get a response from another server, and then
-+# if we don't get the response, we will use the local clock after
-+# a 32 second poll interval.  So the NTP will hold up the boot for
-+# 32 seconds if we don't have a good NTP server.
-+server 127.127.1.0 minpoll 5
-+# the local clock should always be set to a high stratum
-+# (low priority), since it
-+# is the system clock, which is not a good choice.
- fudge 127.127.1.0 stratum 14
- # Defining a default security setting
- restrict default
diff --git a/recipes-support/ntp/files/ntpd-default b/recipes-support/ntp/files/ntpd-default
deleted file mode 100644
index ed7a6ec..0000000
--- a/recipes-support/ntp/files/ntpd-default
+++ /dev/null
@@ -1,35 +0,0 @@
-ENABLED="yes"
-
-CONFIGFILE=/etc/ntp.conf
-
-# The GPSD_* parameters in this file are ignored
-# if the uBlox GPS is not present.
-
-# Require a GPS lock/fix before starting NTP
-# This is needed if we are not using NTP servers.
-# NTP will not work with the GPS if  the GPS is not
-# locked before starting.
-# See /etc/default/gpsd for the states required.
-GPSD_REQUIRED=1
-
-# Number of seconds between testing for a GPS
-# lock prior to calling ntpd.
-GPSD_WAIT_TIME=120
-
-# Since the HW Clock could be off by a second or
-# so, our GPS might get marked as a false ticker
-# if we do not set the system clock to the GPS
-# first.  The current correct way to do this
-# according to the ntp doc is ntpd -gq -c conffile
-# which must be done before ntpd is started.
-# conffile should exclude the local clock, so it is
-# ignored while doing the initial sync.
-# ntpd -gq apparently does not work with the GPS
-# when tested with the clock more than one day off
-# and no ntpd.  The gps shared memory is never polled.
-#
-# If there is a uBlox GPS present, the time is
-# read from the GPS to initialize the system time
-# before NTP is started.
-SET_SYSTEM_CLOCK=1
-
diff --git a/recipes-support/ntp/files/ntpd-init.patch b/recipes-support/ntp/files/ntpd-init.patch
deleted file mode 100644
index 3f8129a..0000000
--- a/recipes-support/ntp/files/ntpd-init.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff -Naru orig/ntpd new/ntpd
---- orig/ntpd	2019-12-20 15:28:43.002031942 -0600
-+++ new/ntpd	2019-12-20 15:32:59.138024359 -0600
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! /bin/bash
- 
- ### BEGIN INIT INFO
- # Provides:        ntp
-@@ -9,7 +9,9 @@
- # Short-Description: Start NTP daemon
- ### END INIT INFO
- 
-+. /etc/default/ntpd
- PATH=/sbin:/bin:/usr/bin:/usr/sbin
-+GNSSRST=/sys/devices/platform/mts-io/gnss-reset
- 
- DAEMON=/usr/sbin/ntpd
- PIDFILE=/var/run/ntpd.pid
-@@ -22,6 +24,20 @@
- 
- # Source function library.
- . /etc/init.d/functions
-+has_gps=0
-+if [[ -f /sys/devices/platform/mts-io/capability/gps ]] ; then
-+	has_gps=$(cat /sys/devices/platform/mts-io/capability/gps)
-+fi
-+
-+if (( has_gps == 0 )) ; then
-+	if [[ -n ${CONFIGFILE_sha256} ]] ; then
-+		NEWCONFIGFILE_sha256=$(sha256sum $CONFIGFILE)
-+		if [[ $NEWCONFIGFILE_sha256 =~ $CONFIGFILE_sha256 ]] ; then
-+			logger -p daemon.notice -s -t etc_ntpd "No GPS, need to configure /etc/ntp.conf"
-+			exit 0
-+		fi
-+	fi
-+fi
- 
- # Functions to do individual actions
- settick(){
-@@ -34,13 +50,40 @@
- 	}
- }
- startdaemon(){
--	# The -g option allows ntpd to step the time to correct it just
--	# once.  The daemon will exit if the clock drifts too much after
--	# this.  If ntpd seems to disappear after a while assume TICKADJ
--	# above is set to a totally incorrect value.
--	echo -n "Starting ntpd: "
--	start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -u ntp:ntp -p $PIDFILE "$@"
--	echo "done"
-+	/usr/sbin/start-stop-daemon -N -20 --start -x /usr/sbin/ntpd --test -- -u ntp:ntp -p /var/run/ntp.pid "$@" \
-+	  || return 1
-+	if [[ -x /usr/sbin/gpsd_settime ]] && ((GPSD_REQUIRED == 1)) && (( has_gps == 1 )) && [[ -f "${GNSSRST}" ]]; then
-+		. /etc/default/gpsd
-+                [[ ${VERBOSE} != no ]] && logger -t 'etc_ntpd' -p daemon.info 'Have a GPS and it is required'
-+		if ((SET_SYSTEM_CLOCK == 1)) && /usr/sbin/gpsd_settime ; then
-+                   [[ ${VERBOSE} != no ]] && logger -t 'etc_ntpd' -p daemon.info 'Need to set the time next with ntpd'
-+		   # We just set the system time by the GPS.  Should be within 2 seconds.
-+		   # Now that we are close to the correct system time, we
-+		   # use the ntpd one shot option to get to less than
-+		   # 250mS error so that we don't waste time adjusting the clock.
-+		   /usr/sbin/ntpd -gq
-+	           echo -n "Starting ntpd: "
-+		   start-stop-daemon -N -20 --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -u ntp:ntp -p $PIDFILE "$@"
-+	           echo "done"
-+		else
-+                  [[ ${VERBOSE} != no ]] && logger -t 'etc_ntpd' -p daemon.info 'Clock not set, try later'
-+		  # Need a GPS fix before startint ntp.  Try again later.
-+		  /usr/sbin/start-stop-daemon -b -n z1e9d3qb -N -20 --start -x /bin/bash -- -c "sleep $GPSD_WAIT_TIME;/etc/init.d/ntpd start"
-+		fi
-+	else
-+	  # The -g option allows ntpd to step the time to correct it just
-+	  # once.  The daemon will exit if the clock drifts too much after
-+	  # this.  If ntpd seems to disappear after a while assume TICKADJ
-+	  # above is set to a totally incorrect value.
-+	  if ((SET_SYSTEM_CLOCK == 1)) ; then
-+	    # Sets the clock and exits.
-+	    ntpd -gq
-+	    shift
-+	  fi
-+	  echo -n "Starting ntpd: "
-+	  start-stop-daemon -N -20 --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -u ntp:ntp -p $PIDFILE "$@"
-+	  echo "done"
-+	fi
- }
- stopdaemon(){
- 	echo -n "Stopping ntpd: "
-@@ -50,8 +93,22 @@
- 
- case "$1" in
-   start)
--  	settick
--	startdaemon -g
-+	if ! [[ $ENABLED =~ ^[yY][eE][sS]$ ]] ; then
-+		exit 0
-+	fi
-+	if [[ -n "$CONFIGFILE" ]] ; then
-+		CONFIGOPT="-c ${CONFIGFILE}"
-+		STATSDIR=$(grep "^statsdir" ${CONFIGFILE} | sed -r 's/[^[:space:]]+[[:space:]]//')
-+		if ((${#STATSDIR} > 0)) && ! [[ -d ${STATSDIR} ]] ; then
-+			echo Make ${STATSDIR}	
-+			mkdir -m 0755 -p ${STATSDIR}
-+		fi
-+		if [[ -d ${STATSDIR} ]] ; then
-+			chown ntp:ntp ${STATSDIR} >/dev/null 2>&1
-+		fi
-+	fi
-+	settick
-+	startdaemon -g $CONFIGOPT
- 	;;
-   stop)
-   	stopdaemon
diff --git a/recipes-support/ntp/ntp_%.bbappend b/recipes-support/ntp/ntp_%.bbappend
deleted file mode 100644
index 436164a..0000000
--- a/recipes-support/ntp/ntp_%.bbappend
+++ /dev/null
@@ -1,37 +0,0 @@
-PR .= ".mlinux6"
-
-SRC_URI += " file://ntpd-default \
-    file://ntp.conf.patch;patchdir=.. \
-    file://ntpd-init.patch;patchdir=.. \
-    file://logtime.patch \
-		"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-RDEPENDS_${PN} += "bash"
-
-python do_patch_prepend () {
-    import os
-}
-
-do_install_append() {
-    install -d ${D}${sysconfdir}/default
-    install -m 0644 ${WORKDIR}/ntpd-default ${D}${sysconfdir}/default/ntpd.default
-
-    drdir=${D}${localstatedir}/lib/ntp
-    install -d -m 0755 -p ${drdir}
-    drfile="${drdir}/ntp.drift"
-    touch ${drfile}
-    chmod 664 ${drfile}
-    chown -R ntp:ntp ${drdir}
-    tmp=$(sha256sum ${D}${sysconfdir}/ntp.conf | sed 's/ .*//')
-    echo "CONFIGFILE_sha256=${tmp}" >> ${D}${sysconfdir}/default/ntpd.default
-}
-pkg_postinst_${PN}_append() {
-    update-alternatives --install ${sysconfdir}/default/ntpd ntpd-defaults ${sysconfdir}/default/ntpd.default 10
-}
-
-pkg_postrm_${PN}_append() {
-    update-alternatives --remove ntpd-defaults ${sysconfdir}/default/ntpd.default
-}
-FILES_${PN} += "${sysconfdir}/default/ntpd.default ${localstatedir}/lib/*"
-CONFFILES_${PN} += "${sysconfdir}/default/ntpd.default"
diff --git a/recipes-support/pam-script/pam-script_1.1.9.bb b/recipes-support/pam-script/pam-script_1.1.9.bb
deleted file mode 100644
index 3b9347c..0000000
--- a/recipes-support/pam-script/pam-script_1.1.9.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SUMMARY = "Library for hooking into pam authentication"
-HOMEPAGE = "https://github.com/jeroennijhof/pam_script"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e"
-
-inherit autotools-brokensep pkgconfig
-RDEPENDS_${PN} = "libpam-runtime perl"
-
-SRC_URI = "git://github.com/jeroennijhof/pam_script.git;protocol=git"
-SRCREV = "${PV}"	  
-S = "${WORKDIR}/git"
-PR="r2"
-
-EXTRA_OECONF = " \
-    --sysconfdir=${sysconfdir}/pam-script \
-    --libdir=${base_libdir}/security \
-"
-
-
-
-FILES_${PN} += "${base_libdir}"
-FILES_${PN}-doc += "${datadir_native}/man"
-
-do_install_append() {
-    oe_runmake DESTDIR=${D} install-data-hook install-exec-hook install-examples install-logger install-tally
-    install -m 0644 ${S}/etc/README.pam_script ${D}/${sysconfdir}/pam-script
-}
diff --git a/recipes-support/pps-tools/pps-tools_git.bb b/recipes-support/pps-tools/pps-tools_git.bb
deleted file mode 100644
index ddcfe67..0000000
--- a/recipes-support/pps-tools/pps-tools_git.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SUMMARY = "User-space tools for LinuxPPS"
-PRIORITY = "optional"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-
-PV = "0.0.0+git${SRCPV}"
-SRCREV = "0deb9c7e135e9380a6d09e9d2e938a146bb698c8"
-SRC_URI = "git://github.com/ago/pps-tools.git"
-
-S = "${WORKDIR}/git"
-
-do_install() {
-        install -d ${D}${bindir} ${D}${includedir} \
-                   ${D}${includedir}/sys
-        oe_runmake 'DESTDIR=${D}' install
-}
diff --git a/scripts/build-feed-extras.sh b/scripts/build-feed-extras.sh
deleted file mode 100755
index 7e1d258..0000000
--- a/scripts/build-feed-extras.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# Extra packages to build for mLinux feed
-FS_PACKAGES="sshfs-fuse fuse-exfat exfat-utils"
-NET_PACKAGES="wget netcat ipsec-tools openvpn iftop dnsmasq strongswan stunnel tunctl ethtool openobex obexftp socat openldap"
-UTIL_PACKAGES="logrotate fatrace stressapptest gawk rsyslog zip gnupg rrdtool i2c-tools"
-DEV_PACKAGES="strace mono gdb git vim python-pip python3-pip python-pyopenssl python-pygobject openjdk-8 node-red strace python-gatt-server"
-SUP_PACKAGES="pps-tools setserial boost diffutils"
-
-bitbake linux-firmware $FS_PACKAGES $NET_PACKAGES $UTIL_PACKAGES $DEV_PACKAGES $SUP_PACKAGES
diff --git a/scripts/upgrade-kernel/BUILD.txt b/scripts/upgrade-kernel/BUILD.txt
deleted file mode 100644
index 8e9e30f..0000000
--- a/scripts/upgrade-kernel/BUILD.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Look in the file truss/packages/mtcdt/README.txt and
-truss/image/README.txt.
-
-The ipk files needed for the upgrade should be built,
-and then all the files not needed for the upgrade should
-be removed, and then bitbake package-index run.
-
-The mtcdt or mtcap directory can be copied into the
-truss/packages/mtcdt or mtcap directory.  If mtcap
-is used, the install.sh script will need modification.
-
-The kernel image from build/tmp/deploy/images/mtcdt
-(or mtcap) can be copied into the image directory.
-
-truss could be renamed to suit the kernel name and
-version.  For instance kernel-3.12.70-r17.1.
-
-A tar file is then created with the truss name as the
-root of the tar.
-
diff --git a/scripts/upgrade-kernel/README.txt b/scripts/upgrade-kernel/README.txt
deleted file mode 100644
index 601f3c9..0000000
--- a/scripts/upgrade-kernel/README.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-install.txt    What the install should look like
-kernel-*.tar  Tar file with the packages and kernel image.
-
-1.  Copy kernel-*.tar and *.md5 to the Conduit directory /var/volatile.
-    scp or winscp would be good.  User mtadm.
-
-2.  Log into Conduit
-
-3.  cd /var/volatile
-
-4.  md5sum -c *.md5
-
-5.  tar -xf kernel-*.tar
-
-6.  cd kernel-*
-
-7.  sudo ./install.sh
-
-This will take about 20 minutes.
-
-The install must not be interrupted.  opkg does not always clean up after an
-aborted install.
-
-At this point the kernel image is installed, followed by the module packages.
-If there are errors you should see messages:
-ERROR: ...
-
-There is a log in file /tmp/opkglog*
-
-The log must be copied from the Conduit before rebooting if there are issues.
-
-7.  sudo reboot
-
-8.  New kernel can be verified:
-
-uname -r
-
-(Old kernel is 3.12.27)
-
-Packages can be verified:
-
-opkg list-installed | fgrep '3.12.70'
-
diff --git a/scripts/upgrade-kernel/install.txt b/scripts/upgrade-kernel/install.txt
deleted file mode 100644
index 81d2aed..0000000
--- a/scripts/upgrade-kernel/install.txt
+++ /dev/null
@@ -1,173 +0,0 @@
-# Example of an installation of a kernel upgrade.
-cd /var/volatile/
-root@mtcdt:/var/volatile# tar -xf *.tar
-root@mtcdt:/var/volatile# ls
-kernel-3.12.70-r17.2      log
-kernel-3.12.70-r17.2.tar  tmp
-root@mtcdt:/var/volatile# cd kernel-3.12.70-r17.2
-root@mtcdt:/var/volatile/kernel-3.12.70-r17.2# uname -r
-3.12.27
-root@mtcdt:/var/volatile/kernel-3.12.70-r17.2# ./install.sh
-uImage--3.12.70-r17.2-mtcdt-20180131072120.bin: OK
-Erasing the kernel partition
-Erasing 128 Kibyte @ 0 --  0 % complete Erasing 128 Kibyte @ 20000 --  2 % complete Erasing 128 Kibyte @ 40000 --  4 % complete Erasing 128 Kibyte @ 60000 --  6 % complete Erasing 128 Kibyte @ 80000 --  8 % complete Erasing 128 Kibyte @ a0000 -- 10 % complete Erasing 128 Kibyte @ c0000 -- 12 % complete Erasing 128 Kibyte @ e0000 -- 14 % complete Erasing 128 Kibyte @ 100000 -- 16 % complete Erasing 128 Kibyte @ 120000 -- 18 % complete Erasing 128 Kibyte @ 140000 -- 20 % complete Erasing 128 Kibyte @ 160000 -- 22 % complete Erasing 128 Kibyte @ 180000 -- 25 % complete Erasing 128 Kibyte @ 1a0000 -- 27 % complete Erasing 128 Kibyte @ 1c0000 -- 29 % complete Erasing 128 Kibyte @ 1e0000 -- 31 % complete Erasing 128 Kibyte @ 200000 -- 33 % complete Erasing 128 Kibyte @ 220000 -- 35 % complete Erasing 128 Kibyte @ 240000 -- 37 % complete Erasing 128 Kibyte @ 260000 -- 39 % complete Erasing 128 Kibyte @ 280000 -- 41 % complete Erasing 128 Kibyte @ 2a0000 -- 43 % complete Erasing 128 Kibyte @ 2c0000 -- 45 % complete Erasing 128 Kibyte @ 2e0000 -- 47 % complete Erasing 128 Kibyte @ 300000 -- 50 % complete Erasing 128 Kibyte @ 320000 -- 52 % complete Erasing 128 Kibyte @ 340000 -- 54 % complete Erasing 128 Kibyte @ 360000 -- 56 % complete Erasing 128 Kibyte @ 380000 -- 58 % complete Erasing 128 Kibyte @ 3a0000 -- 60 % complete Erasing 128 Kibyte @ 3c0000 -- 62 % complete Erasing 128 Kibyte @ 3e0000 -- 64 % complete Erasing 128 Kibyte @ 400000 -- 66 % complete Erasing 128 Kibyte @ 420000 -- 68 % complete Erasing 128 Kibyte @ 440000 -- 70 % complete Erasing 128 Kibyte @ 460000 -- 72 % complete Erasing 128 Kibyte @ 480000 -- 75 % complete Erasing 128 Kibyte @ 4a0000 -- 77 % complete Erasing 128 Kibyte @ 4c0000 -- 79 % complete Erasing 128 Kibyte @ 4e0000 -- 81 % complete Erasing 128 Kibyte @ 500000 -- 83 % complete Erasing 128 Kibyte @ 520000 -- 85 % complete Erasing 128 Kibyte @ 540000 -- 87 % complete Erasing 128 Kibyte @ 560000 -- 89 % complete Erasing 128 Kibyte @ 580000 -- 91 % complete Erasing 128 Kibyte @ 5a0000 -- 93 % complete Erasing 128 Kibyte @ 5c0000 -- 95 % complete Erasing 128 Kibyte @ 5e0000 -- 97 % complete Erasing 128 Kibyte @ 5e0000 -- 100 % complete 
-Writing the kernel partition
-Writing data to block 0 at offset 0x0
-Writing data to block 1 at offset 0x20000
-Writing data to block 2 at offset 0x40000
-Writing data to block 3 at offset 0x60000
-Writing data to block 4 at offset 0x80000
-Writing data to block 5 at offset 0xa0000
-Writing data to block 6 at offset 0xc0000
-Writing data to block 7 at offset 0xe0000
-Writing data to block 8 at offset 0x100000
-Writing data to block 9 at offset 0x120000
-Writing data to block 10 at offset 0x140000
-Writing data to block 11 at offset 0x160000
-Writing data to block 12 at offset 0x180000
-Writing data to block 13 at offset 0x1a0000
-Writing data to block 14 at offset 0x1c0000
-Writing data to block 15 at offset 0x1e0000
-Writing data to block 16 at offset 0x200000
-Writing data to block 17 at offset 0x220000
-Writing data to block 18 at offset 0x240000
-Writing data to block 19 at offset 0x260000
-Writing data to block 20 at offset 0x280000
-Writing data to block 21 at offset 0x2a0000
-Writing data to block 22 at offset 0x2c0000
-Writing data to block 23 at offset 0x2e0000
-Saving install results to /tmp/opkglog.P0qNTE
-  1 of 222depmod: WARNING: could not open /lib/modules/3.12.27/modules.order: No such file or directory
-depmod: WARNING: could not open /lib/modules/3.12.27/modules.builtin: No such file or directory
-  2 of 222mts-io: Unloading mts-io module
-[INFO] mts-io:cleanup:928: cleaning up....
-[INFO] mts-io:mts_io_exit:1011: exiting
-update-rc.d: /etc/init.d/mts-io exists during rc.d purge (continuing)
-  3 of 222  4 of 222  5 of 222  6 of 222  7 of 222  8 of 222  9 of 222 10 of 222 11 of 222 12 of 222 13 of 222 14 of 222 15 of 222 16 of 222 17 of 222 18 of 222date
- 19 of 222 20 of 222 21 of 222 22 of 22223 of 22224 of 222                                        25 of 22226 of 22227 of 222
- 28 of 222 29 of 222 30 of 222 31 of 222 32 of 222 33 of 222 34 of 222 35 of 222 36 of 222 37 of 222 38 of 222 39 of 222 40 of 222 41 of 222 42 of 222 43 of 222 44 of 222 45 of 222 46 of 222 47 of 222 48 of 222 49 of 222 50 of 222 51 of 222 52 of 222 53 of 222 54 of 222 55 of 222 56 of 222 57 of 222 58 of 222 59 of 222 60 of 222 61 of 222 62 of 222 63 of 222 64 of 222 65 of 222 66 of 222 67 of 222 68 of 222 69 of 222 70 of 222 71 of 222 72 of 222 73 of 222 74 of 222 75 of 222 76 of 222 77 of 222 78 of 222jffs2: warning: (266) jffs2_sum_write_data: Not enough space for summary, padsize = -243
- 79 of 222 80 of 222 81 of 222 82 of 222 83 of 222 84 of 222 85 of 222 86 of 222 87 of 222 88 of 222 89 of 222 90 of 222 91 of 222 92 of 222 93 of 222 94 of 222 95 of 222 96 of 222 97 of 222 98 of 222 99 of 222100 of 222101 of 222102 of 222103 of 222104 of 222105 of 222106 of 222107 of 222108 of 222109 of 222110 of 222111 of 222112 of 222113 of 222114 of 222115 of 222116 of 222117 of 222jffs2: warning: (2850) jffs2_sum_write_data: Not enough space for summary, padsize = -1402
-118 of 222119 of 222120 of 222121 of 222122 of 222123 of 222124 of 222125 of 222126 of 222127 of 222128 of 222129 of 222130 of 222131 of 222132 of 222133 of 222134 of 222135 of 222136 of 222137 of 222138 of 222139 of 222140 of 222141 of 222142 of 222143 of 222144 of 222145 of 222146 of 222147 of 222148 of 222149 of 222150 of 222151 of 222152 of 222153 of 222154 of 222155 of 222156 of 222157 of 222158 of 222159 of 222160 of 222161 of 222162 of 222163 of 222164 of 222165 of 222166 of 222167 of 222168 of 222169 of 222170 of 222171 of 222172 of 222173 of 222174 of 222175 of 222176 of 222177 of 222178 of 222179 of 222180 of 222181 of 222182 of 222183 of 222184 of 222185 of 222186 of 222187 of 222188 of 222189 of 222190 of 222191 of 222192 of 222193 of 222194 of 222195 of 222196 of 222197 of 222198 of 222199 of 222200 of 222201 of 222202 of 222203 of 222204 of 222205 of 222206 of 222207 of 222208 of 222209 of 222210 of 222211 of 222jffs2: warning: (4419) jffs2_sum_write_data: Not enough space for summary, padsize = -888
-212 of 222update-rc.d: /etc/init.d/vizzini exists during rc.d purge (continuing)
-213 of 222214 of 222215 of 222216 of 222217 of 222218 of 222219 of 222220 of 222221 of 222222 of 222
-depmod: WARNING: could not open /lib/modules/3.12.27/modules.order: No such file or directory
-depmod: WARNING: could not open /lib/modules/3.12.27/modules.builtin: No such file or directory
-Installed 222 packages.
-Ready for reboot
-root@mtcdt:/var/volatile/kernel-3.12.70-r17.2# date
-Tue Dec 13 12:44:06 CST 2016
-root@mtcdt:/var/volatile/kernel-3.12.70-r17.2# cd /tmp
-root@mtcdt:/tmp# ls opkg*
-opkglog.P0qNTE
-root@mtcdt:/tmp# grep ERROR opkglog*
-root@mtcdt:/tmp# uname -r
-3.12.27
-root@mtcdt:/tmp# cd /lib/modules/3.12.27
-root@mtcdt:/lib/modules/3.12.27# find . -name '*.ko'
-root@mtcdt:/lib/modules/3.12.27# cd ../3.12.70
-root@mtcdt:/lib/modules/3.12.70# find . -name '*vizzini*'
-./extra/vizzini.ko
-root@mtcdt:/lib/modules/3.12.70# opkg list-installed | grep mts
-libmts-io0 - 0.6-r0.0
-libmts0 - 0.3-r1.0
-mts-id-eeprom - 0.2.10-r0.0.0
-mts-io - 1.5.16-r9.0-3.12.70r17.0
-root@mtcdt:/lib/modules/3.12.70# opkg files mts-io
-Package mts-io (1.5.16-r9.0-3.12.70r17.0) is installed on root and has the following files:
-/usr/sbin/mts-io-sysfs
-/etc/init.d/mts-io
-/etc/init.d/radio-reset
-/lib/modules/3.12.70/extra/mts_io.ko
-/etc/rc5.d/S95led-status_heartbeat_trigger
-/etc/default/radio-reset
-/lib/modules/3.12.70/extra/
-/usr/lib/mts-io-sysfs/
-/etc/default/mts-io
-/usr/lib/mts-io-sysfs/mts-io-sysfs-inc.sh
-/etc/init.d/led-status_heartbeat_trigger
-/etc/rc6.d/S30radio-reset
-root@mtcdt:/lib/modules/3.12.70# cd extra
-root@mtcdt:/lib/modules/3.12.70/extra# ls
-mts_io.ko   vizzini.ko
-root@mtcdt:/lib/modules/3.12.70/extra# uname -r
-3.12.27
-root@mtcdt:/lib/modules/3.12.70/extra# reboot
-root@mtcdt:/lib/modules/3.12.70/extra# INIT: Switching to runlevel: 6
-
-      ...
-
-Starting reset-handler
-monit: disabled in /etc/default
-Stopping Bootlog daemon: bootlogd.
-
-            _     _                  
-  _ __ ___ | |   (_)_ __  _   ___  __
- | '_ ` _ \| |   | | '_ \| | | \ \/ /
- | | | | | | |___| | | | | |_| |>  < 
- |_| |_| |_|_____|_|_| |_|\__,_/_/\_\
-                                     
-MultiTech Systems mLinux GNU/Linux
-mLinux 3.2.3 mtcdt /dev/ttyS0
-
-
-Version: 3.2.3
-Date: 2016-12-13T11:36:05
-mtcdt login: root
-Password: 
-root@mtcdt:~# uname -r
-3.12.70
-usb 1-2.3: new high-speed USB device number 5 using atmel-ehci
-dusb 1-2.3: New USB device found, idVendor=1bc7, idProduct=1201
-usb 1-2.3: New USB device strings: Mfr=1, Product=2, SerialNumber=3
-usb 1-2.3: Product: Android
-usb 1-2.3: Manufacturer: Android
-usb 1-2.3: SerialNumber: 0123456789ABCDEF
-option 1-2.3:1.0: GSM modem (1-port) converter detected
-usb 1-2.3: GSM modem (1-port) converter now attached to ttyUSB0
-qmi_wwan 1-2.3:1.2: cdc-wdm0: USB WDM device
-qmi_wwan 1-2.3:1.2 wwan0: register 'qmi_wwan' at usb-700000.ehci-2.3, WWAN/QMI device, 86:85:cb:b4:04:d0
-option 1-2.3:1.3: GSM modem (1-port) converter detected
-usb 1-2.3: GSM modem (1-port) converter now attached to ttyUSB1
-option 1-2.3:1.4: GSM modem (1-port) converter detected
-usb 1-2.3: GSM modem (1-port) converter now attached to ttyUSB2
-option 1-2.3:1.5: GSM modem (1-port) converter detected
-usb 1-2.3: GSM modem (1-port) converter now attached to ttyUSB3
-option 1-2.3:1.6: GSM modem (1-port) converter detected
-usb 1-2.3: GSM modem (1-port) converter now attached to ttyUSB4
-root@mtcdt:~# lsmod
-Module                  Size  Used by
-usb_f_acm               4175  1 
-u_serial                8814  3 usb_f_acm
-g_serial                1702  0 
-libcomposite           26585  2 usb_f_acm,g_serial
-configfs               21926  3 usb_f_acm,libcomposite
-mts_io                 50710  0 
-qmi_wwan               11307  0 
-cdc_wdm                 9414  1 qmi_wwan
-option                 27880  0 
-usbnet                 17525  1 qmi_wwan
-spidev                  4817  0 
-mii                     3421  1 usbnet
-usb_wwan                5342  1 option
-usbserial              19164  2 option,usb_wwan
-vizzini                15702  0 
-cdc_acm                15055  0 
-tmp102                  2720  0 
-atmel_usba_udc         11424  0 
-spi_atmel              11016  0 
-udc_core                6118  2 atmel_usba_udc,libcomposite
-atmel_mci              13209  0 
-pps_gpio                2323  0 
-pps_core                7367  1 pps_gpio
-uio_pdrv_genirq         2705  0 
-uio                     6950  1 uio_pdrv_genirq
-root@mtcdt:~# ping 192.168.2.2
-PING 192.168.2.2 (192.168.2.2) 56(84) bytes of data.
-64 bytes from 192.168.2.2: icmp_seq=1 ttl=64 time=1.60 ms
-64 bytes from 192.168.2.2: icmp_seq=2 ttl=64 time=0.371 ms
-64 bytes from 192.168.2.2: icmp_seq=3 ttl=64 time=0.387 ms
-64 bytes from 192.168.2.2: icmp_seq=4 ttl=64 time=0.356 ms
-^C
---- 192.168.2.2 ping statistics ---
-4 packets transmitted, 4 received, 0% packet loss, time 3000ms
-rtt min/avg/max/mdev = 0.356/0.678/1.601/0.533 ms
diff --git a/scripts/upgrade-kernel/truss/image/README.txt b/scripts/upgrade-kernel/truss/image/README.txt
deleted file mode 100644
index 5880b8d..0000000
--- a/scripts/upgrade-kernel/truss/image/README.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-The kernel image goes in this directory,
-uImage--*.
-
-The file here is an empty placeholder.
-
-The install scripts verifies the md5sum.
diff --git a/scripts/upgrade-kernel/truss/image/uImage--3.12.70-r17.2-mtcdt-20180131072120.bin b/scripts/upgrade-kernel/truss/image/uImage--3.12.70-r17.2-mtcdt-20180131072120.bin
deleted file mode 100644
index e69de29..0000000
--- a/scripts/upgrade-kernel/truss/image/uImage--3.12.70-r17.2-mtcdt-20180131072120.bin
+++ /dev/null
diff --git a/scripts/upgrade-kernel/truss/image/uImage.md5 b/scripts/upgrade-kernel/truss/image/uImage.md5
deleted file mode 100644
index 911b0c3..0000000
--- a/scripts/upgrade-kernel/truss/image/uImage.md5
+++ /dev/null
@@ -1 +0,0 @@
-4af5d28c7f92b36705689ed215ab848e  uImage--3.12.70-r17.2-mtcdt-20180131072120.bin
diff --git a/scripts/upgrade-kernel/truss/install.sh b/scripts/upgrade-kernel/truss/install.sh
deleted file mode 100755
index 0922f0e..0000000
--- a/scripts/upgrade-kernel/truss/install.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-HOMEDIR=$(pwd)
-# kernel modules and kernel related files.
-PACKAGELIST='kernel-3* kernel-modules*  mts-io* kernel-module-*'
-if (($(id -u) != 0)) ; then
-    echo 'This script must be run as root.'
-    exit 1
-fi
-set -e
-if ! [[ -d image ]] || ! [[ -d packages ]] ; then
-    echo must be in the directory with the image and packages directory
-fi
-sed -i -e "s?TARDIR?${HOMEDIR}?" packages/opkg/opkg.conf
-cd image
-md5sum -c uImage.md5
-echo "Erasing the kernel partition"
-kernel_mtd="/dev/$(cat /proc/mtd | grep '\"uImage\"' | cut -d : -f 1)"
-flash_erase ${kernel_mtd} 0 0
-echo "Writing the kernel partition"
-nandwrite -p ${kernel_mtd} "uImage--"*
-cd ../packages/mtcdt
-
-temp=$(mktemp -p /tmp opkglog.XXXXXX)
-echo "Saving install results to $temp"
-opkg -f ${HOMEDIR}/packages/opkg/opkg.conf update 2>&1 >${temp}
-set +e
-((count=0)) || true
-((err=0)) || true
-
-max=$(ls ${PACKAGELIST} | wc -l)
-pkgname=$(opkg list-installed 2>&1  | grep '^kernel-3' | sed -r 's/[[:space:]].*//')
-# Probably due to a bug in opkg, whiteheat and vizzini conflict.
-for f in ${pkgname} kernel-module-vizzini kernel-module-whiteheat ; do
-    if ! opkg -f ${HOMEDIR}/packages/opkg/opkg.conf --force-depends remove $pkgname 2>&1 >>${temp} ; then
-        echo "ERROR: Failed to remove package $pkgname" >>${temp}
-        err++
-    fi
-done
-
-for f in ${PACKAGELIST} ; do
-    if ! opkg -f ${HOMEDIR}/packages/opkg/opkg.conf --force-downgrade --force-reinstall install $f 2>&1 >>${temp} ; then
-        echo "Remove package $f because upgrade failed" >>${temp}
-        pkgname=$(echo $f | sed -e 's/_.*//')
-        opkg -f ${HOMEDIR}/packages/opkg/opkg.conf --force-depends remove $pkgname 2>&1 >>${temp}
-        if ! opkg -f ${HOMEDIR}/packages/opkg/opkg.conf install $pkgname 2>&1 >>${temp} ; then
-            echo "ERROR: Install of $f failed" >>${temp}
-            ((err++))
-        else
-            ((count++))
-        fi
-    else
-        ((count++))
-    fi
-   printf "\r%3d of %3d" $count $max
-done
-
-opkg -f ${HOMEDIR}/packages/opkg/opkg.conf --force-depends remove $pkgname 2>&1 >>${temp}
-echo
-if ((err > 0)) ; then
-	echo "Installation failures.  See ${temp}"
-	grep '^ERROR' ${temp}
-fi
-depmod -a
-echo "Installed ${count} packages."
-echo "Ready for reboot"
diff --git a/scripts/upgrade-kernel/truss/packages/mtcdt/README.txt b/scripts/upgrade-kernel/truss/packages/mtcdt/README.txt
deleted file mode 100644
index 55dd093..0000000
--- a/scripts/upgrade-kernel/truss/packages/mtcdt/README.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-The contents of the build/tmp/deploy/ipk/mtcdt directory goes in this directory.
-
-Remember to run bitbake package-index, to create the package index for opkg.
-
-The package index is Package.gz.
-
-For a full kernel update, the files that are needed are:
-
-All kernel-module-*.ipk files.
-mts-io_*.ipk file.
-kernel_*.ipk file.
-kernel-modules_*.ipk file.
-All Package* files.
-
-Do not install kernel-vmlinux*
-Do not install kernel-dev*
-Do not install kernel-firmware*
-Do not install kernel-image*
-
-
diff --git a/scripts/upgrade-kernel/truss/packages/opkg/opkg.conf b/scripts/upgrade-kernel/truss/packages/opkg/opkg.conf
deleted file mode 100644
index cb55310..0000000
--- a/scripts/upgrade-kernel/truss/packages/opkg/opkg.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-arch all 1
-arch any 6
-arch noarch 11
-arch arm 16
-arch armv4 21
-arch armv4t 26
-arch armv5 31
-arch armv5t 36
-arch armv5e 41
-arch armv5te 46
-arch arm926ejste 51
-arch arm926ejse 56
-arch mtcdt 61
-# Must have one or more source entries of the form:
-#
-#   src <src-name> <source-url>
-#
-# and one or more destination entries of the form:
-#
-#   dest <dest-name> <target-path>
-#
-# where <src-name> and <dest-names> are identifiers that
-# should match [a-zA-Z0-9._-]+, <source-url> should be a
-# URL that points to a directory containing a Familiar
-# Packages file, and <target-path> should be a directory
-# that exists on the target system.
-
-# Proxy Support
-#option http_proxy http://proxy.tld:3128
-#option ftp_proxy http://proxy.tld:3128
-#option proxy_username <username>
-#option proxy_password <password>
-
-# Enable GPGME signature
-# option check_signature 1
-
-# Offline mode (for use in constructing flash images offline)
-#option offline_root target
-
-dest root /
-lists_dir ext /var/lib/opkg
-# The name kernel-3.12.70-r17.2 should be replace with the name
-# of the top level directory of the archive.
-src/gz mlinux-mtcdt file:///var/volatile/kernel-3.12.70-r17.2/packages/mtcdt
diff --git a/scripts/upgrade/README b/scripts/upgrade/README
deleted file mode 100644
index c94f72f..0000000
--- a/scripts/upgrade/README
+++ /dev/null
@@ -1,54 +0,0 @@
-The upgrade scripts goes in a tarball with local.conf at the top level.
-
-log.txt shows what happens when the package is installed.
-
-The script build.sh is used to create the binary update package
-used by mlinux-firmware-update.
-
-The tree is a follows:
-
-upgrade-4.0.0-4.0.1/
-├── install_list.txt
-├── local.conf
-└── repo
-    ├── arm926ejste
-    │   ├── bluez5_5.47-m3.0_arm926ejste.ipk
-    │   ├── bluez5-noinst-tools_5.47-m3.0_arm926ejste.ipk
-    │   ├── bluez5-obex_5.47-m3.0_arm926ejste.ipk
-    │   ├── bluez5-pand_5.47-m3.0_arm926ejste.ipk
-    │   ├── bluez5-rfcomm_5.47-m3.0_arm926ejste.ipk
-    │   ├── bluez5-testtools_5.47-m3.0_arm926ejste.ipk
-    │   ├── libasound-module-bluez_5.47-m3.0_arm926ejste.ipk
-    │   ├── libmts-io0_1.0.8-r0.0_arm926ejste.ipk
-    │   ├── lora-network-server_2.0.19-r4.0_arm926ejste.ipk
-    │   ├── Packages
-    │   ├── Packages.gz
-    │   ├── Packages.stamps
-    │   └── python-pybluez_0.22-r0.0_arm926ejste.ipk
-    ├── mtcap
-    │   ├── mlinux-version_4.0.1_ea6ba1e5fb287003fea33522af39a771102713b2-r2.0_mtcap.ipk
-    │   ├── mts-id-eeprom_0.3.8-r1.0.0_mtcap.ipk
-    │   ├── Packages
-    │   ├── Packages.gz
-    │   └── Packages.stamps
-    ├── mtcdt
-    │   ├── mlinux-version_4.0.1_ea6ba1e5fb287003fea33522af39a771102713b2-r2.0_mtcdt.ipk
-    │   ├── mts-id-eeprom_0.3.8-r1.0.0_mtcdt.ipk
-    │   ├── Packages
-    │   ├── Packages.gz
-    │   └── Packages.stamps
-    └── Packages
-
-
-If one puts the packages in a build tree at build/tmp/deploy/ipk,
-and run bitbake package-index, the Packages* files are refreshed.
-
-In this example, all MTCDT-like models as of today are supported.
-
-That is MTCDT, MTCDTIP, MTCDTIPHP, and MTCAP are supported in this
-update.
-
-install_list.txt would be a list of extra packages to install.
-
-We should probably have a remove_list.txt for cases where packages
-are obsolete.
diff --git a/scripts/upgrade/build.sh b/scripts/upgrade/build.sh
deleted file mode 100755
index a796c2c..0000000
--- a/scripts/upgrade/build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-dir=$(ls -d upgrade-*)
-sed "s/UPGRADE_DIR/${dir}/" install.template >install.sh
-echo "Upgrade directory is ${dir}"
-cat install.sh | md5sum >install.sh.md5
-cd upgrade-*
-cat local.conf | md5sum >local.conf.md5
-cat install_list.txt | md5sum >install_list.txt.md5
-cd ..
-set -x
-chmod +x install.sh
-tar --owner=0 --group=0 -cJf ~/${dir}.bin model install.sh* upgrade-*
diff --git a/scripts/upgrade/install.template b/scripts/upgrade/install.template
deleted file mode 100755
index 191dcf7..0000000
--- a/scripts/upgrade/install.template
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/bash
-# This script works with a tar archvie
-# called upgrade.bin in either /var/volatile
-# or on the SD card.
-#
-# This is what the tar file upgrade file
-# should look like to create an ipk upgrade
-# file.  IPK files should be in all,
-# arm926ejste, and mtcdt (for mtcdt)
-cat <<'!EOF' >/dev/null
-.
-|-- install_list.txt
-|-- install_list.txt.md5
-|-- install.sh*
-|-- local.conf
-|-- repo/
-|   |-- arm926ejste/
-|   |   |-- busybox_1.24.1-r0.mlinux2.mlinux2.1_arm926ejste.ipk
-|   |   |-- busybox-hwclock_1.24.1-r0.mlinux2.mlinux2.1_arm926ejste.ipk
-|   |   |-- busybox-ifplugd_1.24.1-r0.mlinux2.mlinux2.1_arm926ejste.ipk
-|   |   |-- busybox-syslog_1.24.1-r0.mlinux2.mlinux2.1_arm926ejste.ipk
-|   |   |-- busybox-udhcpc_1.24.1-r0.mlinux2.mlinux2.1_arm926ejste.ipk
-|   |   |-- initscripts_1.0-r155.3.40.0_arm926ejste.ipk
-|   |   |-- initscripts-functions_1.0-r155.3.40.0_arm926ejste.ipk
-|   |   |-- Packages
-|   |   |-- Packages.gz
-|   |   `-- Packages.stamps
-|   `-- Packages
-!EOF
-#
-# The tarball must be called upgrade.bin.
-#
-# The file /var/volatile/do_flash_upgrade must exist and
-# be owned by root.
-#
-# The tar file, upgrade.bin must be either in
-# /var/volatile/flash-upgrade or
-# /media/card/flash-upgrade
-#
-# Note that when this script is started, the
-# tar file is already unpacked, since this script
-# is in the tarball.
-
-# This script assumes that the rootfs and maybe /var
-# are writable.  For MTR, we may need to set
-# root and var to read/write
-
-NAME=install.sh
-echo "$NAME starting in directory $(pwd)"
-cd flash-upgrade/UPGRADE_DIR
-
-id=$(id -u)
-if ((id != 0)) ; then
-   echo 'You must be root (admin in AEP) to install packages.'
-   exit 1
-fi
-
-cat /proc/mounts
-ls /
-ls -l /tmp
-
-localcnf=local.conf
-
-if ! [[ -f ${localcnf} ]] ; then
-    echo "Cannot find ${localcnf}"
-    echo "This file must be in the current directory."
-    exit 1
-fi
-
-dir=$(pwd)
-
-sed -i "s?FLASHDIR?${dir}?" ${localcnf}
-machine=$(mts-io-sysfs show product-id | sed 's/-.*//')
-if [[ $machine == MTCAP ]] ; then
-    # remove mtcdt
-    sed -i '/mtcdt/d' ${localcnf}
-else
-    # remove mtcap
-    sed -i '/mtcap/d' ${localcnf}
-fi
-
-cat ${localcnf}
-pkglist_file="install_list.txt"
-cat ${pkglist_file} |
-(if ! md5sum -c ${pkglist_file}.md5 ; then
-    echo "md5sum bad on ${pkglist_file}"
-    umount_all error
-fi)
-
-echo "Update package list ... /usr/bin/opkg -f ${localcnf} update"
-/usr/bin/opkg -t /var/volatile/ -f "${localcnf}" update
-if [[ -r ${pkglist_file} ]] ; then
-    OIFS="${IFS}"
-    IFS=$'\n'
-    for p in $(cat ${pkglist_file}) ; do
-        echo /usr/bin/opkg -f "${localcnf}" install $p
-        /usr/bin/opkg -t /var/volatile/ -f "${localcnf}" install $p
-    done
-    IFS="${OIFS}"
-fi
-
-/usr/bin/opkg -t /var/volatile/ -f "${localcnf}" upgrade
-
-
-version=$(grep mLinux /etc/mlinux-version | sed 's/mLinux //')
-
-sed -ri "s/mLinux [0-9][^ ]* /mLinux ${version} /" /etc/issue
-sed -ri "s/Version: [0-9][^ ]*/Version: ${version} /" /etc/issue
diff --git a/scripts/upgrade/log.txt b/scripts/upgrade/log.txt
deleted file mode 100644
index 550218a..0000000
--- a/scripts/upgrade/log.txt
+++ /dev/null
@@ -1,579 +0,0 @@
-
-            _     _                  
-  _ __ ___ | |   (_)_ __  _   ___  __
- | '_ ` _ \| |   | | '_ \| | | \ \/ /
- | | | | | | |___| | | | | |_| |>  < 
- |_| |_| |_|_____|_|_| |_|\__,_/_/\_\
-                                     
-MultiTech Systems mLinux GNU/Linux
-mLinux 4.0.0 mtcdt /dev/ttyS0
-
-
-Version: 4.0.1
-Date: 2018-06-12T11:04:17
-mtcdt login: mtadm
-Password: 
-mtcdt:~$ cd /var/volatile
-mtcdt:/var/volatile$ ls
-log                                  tmp                                  upgrade-mts-io-2.1.0-3.12.70r20.bin
-mtcdt:/var/volatile$ sudo -s
-Password: 
-mtcdt:/var/volatile# mlinux-firmware-upgrade  upgrade-mts-io-2.1.0-3.12.70r20.bin
-firmware_upgrade: Checking MD5 for install.sh...
--: OK
-firmware_upgrade: Rebooting
-
-Broadcast message from root@mtcdt (ttyS0) (Wed Jun 20 15:33:59 2018):
-
-The system is going down for reboot NOW!
-INIT: Switching to runlevel: 6
-mtcdt:/var/volatile# INIT: Sending processes the TERM signal
-Stopping ifplugd: done
-Stopping OpenBSD Secure Shell server: sshdstopped /usr/sbin/sshd (pid 557)
-.
-Stopping GPS (Global Positioning System) daemon gpsd
-monit: disabled in /etc/default
-Stopping bluetooth
-/usr/libexec/bluetooth/bluetoothd
-Stopping system message bus: macb f802c000.ethernet eth0: link down
-dbus.
-Stopping HOSTAP Daemon: no /usr/sbin/hostapd found; none killed
-Stopping ntpd: done
-Stopping syslogd/klogd: stopped syslogd (pid 604)
-stopped klogd (pid 607)
-done
-bt-pan: disabled in /etc/default
-No /usr/bin/python2.7 found running; none killed.
-Stopping 
-Stopping lora-network-server: OK
-Stopping Mosquitto...
-Stopping crond: OK
-Gracefully shutting down php-fpm warning, no pid file found - php-fpm is not running ?
-lighttpd: disabled in /etc/default
-Deconfiguring network interfaces... ifdown: interface eth0 not configured
-done.
-Sending all processes the TERM signal...
-Sending all processes the KILL signal...
-Unmounting remote filesystems...
-Found /var/volatile/flash-upgrade/upgrade.bin
-Checking MD5s
--: OK
-
-Starting flash upgrade from /var/volatile/flash-upgrade/upgrade.bin...
-install.sh starting in directory /var/volatile
-rootfs / rootfs rw 0 0
-/dev/root / jffs2 rw,relatime 0 0
-devtmpfs /dev devtmpfs rw,relatime,size=126852k,nr_inodes=31713,mode=755 0 0
-proc /proc proc rw,relatime 0 0
-sysfs /sys sysfs rw,relatime 0 0
-tmpfs /run tmpfs rw,nosuid,nodev,mode=755 0 0
-tmpfs /var/volatile tmpfs rw,relatime 0 0
-/dev/mtdblock6 /var/config jffs2 rw,relatime 0 0
-/dev/mtdblock7 /var/oem jffs2 ro,relatime 0 0
-devpts /dev/pts devpts rw,relatime,gid=5,mode=620 0 0
-bin    boot   dev    etc    home   lib    media  mnt    opt    proc   run    sbin   sys    tmp    usr    var    www
-lrwxrwxrwx    1 root     root             8 Jun 12 12:13 /tmp -> /var/tmp
-kernel-module-atmel-mci - 3.12.70-r20.1
-Upgradable kernel is installed
--: OK
-Update package list ... /usr/bin/opkg -f local.conf update
-Downloading file:///var/volatile/flash-upgrade/upgrade-mts-io-2.1.0-3.12.70r20/repo/mtcdt/Packages.gz.
-Updated source 'mlinux-mtcdt'.
-/usr/bin/opkg -f local.conf install kernel-module-mts-io
-Upgrading kernel-module-mts-io from 2.0.4-r0.0-3.12.70r20.0 to 2.1.0-r0.0-3.12.70r20.0 on root.
-Installing kernel-module-mts-io (2.1.0-r0.0) on root.
-Downloading file:///var/volatile/flash-upgrade/upgrade-mts-io-2.1.0-3.12.70r20/repo/mtcdt/kernel-module-mts-io_2.1.0-r0.0-3.12.70r20.0_mtcdt.ipk.
-Configuring kernel-module-mts-io.
-Configuring useradd.
-PATH=${PATH}:/sbin:/usr/sbin
-/usr/bin/opkg -f local.conf install mts-io-noarch
-Upgrading mts-io-noarch from 2.0.4-r0.0-3.12.70r20.0 to 2.1.0-r0.0-3.12.70r20.0 on root.
-Installing mts-io-noarch (2.1.0-r0.0) on root.
-Downloading file:///var/volatile/flash-upgrade/upgrade-mts-io-2.1.0-3.12.70r20/repo/mtcdt/mts-io-noarch_2.1.0-r0.0-3.12.70r20.0_mtcdt.ipk.
-mts-io: Unloading mts-io module
-[INFO] mts-io:cleanup:1138: cleaning up....
-[INFO] mts-io:lora_teardown:203: unloading LORA accessory card in port 1
-[INFO] mts-io:mts_io_exit:1221: exiting
-OK
-mts-io: Unloading mts-io module
-OK
-update-rc.d: /etc/init.d/mts-io exists during rc.d purge (continuing)
- Removing any system startup links for mts-io ...
-  /etc/rcS.d/S39mts-io
-update-rc.d: /etc/init.d/mts-io exists during rc.d purge (continuing)
- Removing any system startup links for mts-io ...
-Configuring mts-io-noarch.
- Adding system startup for /etc/init.d/mts-io.
-mts-io: Unloading mts-io module
-OK
-mts-io: Loading mts-io module
-[INFO] mts-io:mts_io_init:1046: init: v2.1.0
-[INFO] mts-io:mts_id_eeprom_load:853: Pruning radio feature from mts-io
-[INFO] mts-io:mts_id_eeprom_load:872: Adding WiFi/BT to mts-io driver
-[INFO] mts-io:mts_id_eeprom_load:877: Adding GPS to mts-io driver
-[INFO] mts-io:mts_id_eeprom_load:889: detected board MTCDT-0.1
-[INFO] mts-io:mts_id_eeprom_load:960: sizeof: 512
-[INFO] mts-io:mts_id_eeprom_load:961: vendor-id: Multi-Tech Systems
-[INFO] mts-io:mts_id_eeprom_load:962: product-id: MTCDT-247L
-[INFO] mts-io:mts_id_eeprom_load:963: device-id: 12345678
-[INFO] mts-io:mts_id_eeprom_load:964: hw-version: MTCDT-0.1
-[INFO] mts-io:mts_id_eeprom_load:971: mac-addr: 00:08:00:10:00:00
-[INFO] mts-io:mts_id_eeprom_load:973: imei: 123456789123456789
-[INFO] mts-io:mts_id_eeprom_load:974: capa-gps: yes
-[INFO] mts-io:mts_id_eeprom_load:975: capa-din: no
-[INFO] mts-io:mts_id_eeprom_load:976: capa-dout: no
-[INFO] mts-io:mts_id_eeprom_load:977: capa-adc: no
-[INFO] mts-io:mts_id_eeprom_load:978: capa-wifi: yes
-[INFO] mts-io:mts_id_eeprom_load:979: capa-bluetooth: yes
-[INFO] mts-io:mts_id_eeprom_load:980: capa-lora: no
-[INFO] mts-io:mts_id_eeprom_load:989: mac-bluetooth: 00:00:00:00:00:00
-[INFO] mts-io:mts_id_eeprom_load:998: mac-wifi: 00:00:00:00:00:00
-[INFO] mts-io:mts_id_eeprom_load:1005: uuid: AAA00000000000000000000000000021
-[INFO] mts-io:load_port:663: accessory card 1 vendor-id: Multi-Tech Systems
-[INFO] mts-io:load_port:664: accessory card 1 product-id: MTAC-LORA-H-915
-[INFO] mts-io:load_port:665: accessory card 1 device-id: P87040004
-[INFO] mts-io:load_port:666: accessory card 1 hw-version: MTAC-LORA-1.5
-[INFO] mts-io:load_port:687: accessory card 1 eui: 00:80:00:00:00:00:00:A4
-[INFO] mts-io:lora_setup:60: loading LORA accessory card in port 1
-[INFO] mts-io:lora_setup:90: created link [lora] to [ap1], success:0
-[INFO] mts-io:lora_setup:126: Substitute pins
-[INFO] mts-io:lora_setup:131: LORA H: Replace name AP1_GPIO1 with name AP1_CDONE
-[INFO] mts-io:lora_setup:132: LORA H: Replace pin number 70 with number 70
-[INFO] mts-io:lora_setup:131: LORA H: Replace name AP1_GPIO2 with name AP1_CRESET
-[INFO] mts-io:lora_setup:132: LORA H: Replace pin number 71 with number 71
-[INFO] mts-io:lora_setup:189: ap_subdirs[port_index=0] = ce97bc60 ap_subdirs[port_index=0]=bf2b921c
-[INFO] mts-io:load_port:622: no accessory card inserted in port 2
-mts-io: Resetting system modules
-usb 1-2.2: USB disconnect, device number 8
-usb 1-2.2: new high-speed USB device number 9 using atmel-ehci
-usb 1-2.2: New USB device found, idVendor=1618, idProduct=9113
-usb 1-2.2: New USB device strings: Mfr=1, Product=2, SerialNumber=6
-usb 1-2.2: Product: Wireless USB Network Module
-usb 1-2.2: Manufacturer: Redpine Signals, Inc.
-usb 1-2.2: SerialNumber: 000000000001
-usb 1-2: USB disconnect, device number 5
-usb 1-2.1: USB disconnect, device number 6
-usb 1-2.2: USB disconnect, device number 9
-usb 1-2: new high-speed USB device number 10 using atmel-ehci
-usb 1-2: New USB device found, idVendor=0424, idProduct=2534
-usb 1-2: New USB device strings: Mfr=0, Product=0, SerialNumber=0
-hub 1-2:1.0: USB hub found
-hub 1-2:1.0: 4 ports detected
-usb 1-2.1: new high-speed USB device number 11 using atmel-ehci
-usb 1-2.1: New USB device found, idVendor=0424, idProduct=2534
-usb 1-2.1: New USB device strings: Mfr=0, Product=0, SerialNumber=0
-hub 1-2.1:1.0: USB hub found
-hub 1-2.1:1.0: 4 ports detected
-usb 1-2.2: new high-speed USB device number 12 using atmel-ehci
-usb 1-2.2: new high-speed USB device number 13 using atmel-ehci
-usb 1-2.2: New USB device found, idVendor=1618, idProduct=9113
-usb 1-2.2: New USB device strings: Mfr=1, Product=2, SerialNumber=6
-usb 1-2.2: Product: Wireless USB Network Module
-usb 1-2.2: Manufacturer: Redpine Signals, Inc.
-usb 1-2.2: SerialNumber: 000000000001
-OK
-Rebooting... reboot: Restarting system�RomBOOT
-
-
-AT91Bootstrap 3.5.3-r3 (Tue Jun 12 10:40:06 CDT 2018)
-
-NAND: ONFI flash detected
-NAND: Manufacturer ID: 0x2c Chip ID: 0x32
-NAND: Disable On-Die ECC
-NAND: Initialize PMECC params, cap: 0x4, sector: 0x200
-NAND: Image: Copy 0x80000 bytes from 0x40000 to 0x2ef00000
-NAND: Done to load image
-
-
-U-Boot 2016.09.01 (Jun 12 2018 - 10:40:13 -0500)
-
-CPU: AT91SAM9G25
-Crystal frequency:       12 MHz
-CPU clock        :      400 MHz
-Master clock     :  133.333 MHz
-       Watchdog enabled
-I2C:   ready
-DRAM:  256 MiB
-WARNING: Caches not enabled
-NAND:  256 MiB
-MMC:   mci: 0
-env_relocate_spec: crc1_ok=0 saved crc=0xffffffff calculated crc=0xf9137807 flags=255
-env_relocate_spec: crc2_ok=0 saved crc=0xffffffff calculated crc=0xf9137807 flags=255
-*** Warning - bad CRC, using default environment
-
-In:    serial
-Out:   serial
-Err:   serial
-vendor-id:  Multi-Tech Systems
-product-id: MTCDT-247L
-device-id:  12345678
-hw-version: MTCDT-0.1
-mac-addr:   00:08:00:10:00:00
-Net:   macb0
-Hit any key to stop autoboot:  0 
-
-Loading from nand0, offset 0x200000
-   Image Name:   mLinux/3.12.70/mtcdt
-   Image Type:   ARM Linux Kernel Image (uncompressed)
-   Data Size:    3095397 Bytes = 3 MiB
-   Load Address: 20008000
-   Entry Point:  20008000
-## Booting kernel from Legacy Image at 22000000 ...
-   Image Name:   mLinux/3.12.70/mtcdt
-   Image Type:   ARM Linux Kernel Image (uncompressed)
-   Data Size:    3095397 Bytes = 3 MiB
-   Load Address: 20008000
-   Entry Point:  20008000
-   Verifying Checksum ... OK
-   Loading Kernel Image ... OK
-
-Starting kernel ...
-
-Uncompressing Linux... done, booting the kernel.
-Booting Linux on physical CPU 0x0
-Linux version 3.12.70 (jenkins@frylock) (gcc version 6.2.0 (GCC) ) #1 PREEMPT Tue Jun 12 10:38:30 CDT 2018
-Machine: Atmel AT91SAM (Device Tree), model: Multi-Tech Systems MTCDT
-AT91: Detected soc type: at91sam9x5
-AT91: Detected soc subtype: at91sam9g25
-AT91: sram at 0x300000 of 0x8000 mapped at 0xfef70000
-Kernel command line: mem=256M console=ttyS0,115200 root=/dev/mtdblock8 ro rootfstype=jffs2
-PID hash table entries: 1024 (order: 0, 4096 bytes)
-Dentry cache hash table entries: 32768 (order: 5, 131072 bytes)
-Inode-cache hash table entries: 16384 (order: 4, 65536 bytes)
-Virtual kernel memory layout:
-    vector  : 0xffff0000 - 0xffff1000   (   4 kB)
-    fixmap  : 0xfff00000 - 0xfffe0000   ( 896 kB)
-    vmalloc : 0xd0800000 - 0xff000000   ( 744 MB)
-    lowmem  : 0xc0000000 - 0xd0000000   ( 256 MB)
-    modules : 0xbf000000 - 0xc0000000   (  16 MB)
-      .text : 0xc0008000 - 0xc0579324   (5573 kB)
-      .init : 0xc057a000 - 0xc05a4f84   ( 172 kB)
-      .data : 0xc05a6000 - 0xc05d1720   ( 174 kB)
-       .bss : 0xc05d172c - 0xc05f1d3c   ( 130 kB)
-Preemptible hierarchical RCU implementation.
-NR_IRQS:16 nr_irqs:16 16
-sched_clock: 32 bits at 100 Hz, resolution 10000000ns, wraps every 4294967286ms
-Calibrating delay loop... 199.06 BogoMIPS (lpj=995328)
-pid_max: default: 32768 minimum: 301
-Mount-cache hash table entries: 512
-Initializing cgroup subsys blkio
-CPU: Testing write buffer coherency: ok
-Setting up static identity map for 0xc0420670 - 0xc04206c8
-devtmpfs: initialized
-pinctrl core: initialized pinctrl subsystem
-NET: Registered protocol family 16
-DMA: preallocated 256 KiB pool for atomic coherent allocations
-AT91: Power Management (with slow clock mode)
-AT91: Starting after software reset
-gpio-at91 fffff400.gpio: at address fefff400
-gpio-at91 fffff600.gpio: at address fefff600
-gpio-at91 fffff800.gpio: at address fefff800
-gpio-at91 fffffa00.gpio: at address fefffa00
-pinctrl-at91 pinctrl.2: initialized AT91 pinctrl driver
-bio: create slab <bio-0> at 0
-at_hdmac ffffec00.dma-controller: Atmel AHB DMA Controller ( cpy slave ), 8 channels
-at_hdmac ffffee00.dma-controller: Atmel AHB DMA Controller ( cpy slave ), 8 channels
-SCSI subsystem initialized
-usbcore: registered new interface driver usbfs
-usbcore: registered new interface driver hub
-usbcore: registered new device driver usb
-i2c-gpio i2c.3: using pins 30 (SDA) and 31 (SCL)
-i2c-gpio i2c.4: using pins 64 (SDA) and 65 (SCL)
-Switched to clocksource tcb_clksrc
-NET: Registered protocol family 2
-TCP established hash table entries: 2048 (order: 2, 16384 bytes)
-TCP bind hash table entries: 2048 (order: 1, 8192 bytes)
-TCP: Hash tables configured (established 2048 bind 2048)
-TCP: reno registered
-UDP hash table entries: 256 (order: 0, 4096 bytes)
-UDP-Lite hash table entries: 256 (order: 0, 4096 bytes)
-NET: Registered protocol family 1
-RPC: Registered named UNIX socket transport module.
-RPC: Registered udp transport module.
-RPC: Registered tcp transport module.
-RPC: Registered tcp NFSv4.1 backchannel transport module.
-NFS: Registering the id_resolver key type
-Key type id_resolver registered
-Key type id_legacy registered
-jffs2: version 2.2. (NAND) (SUMMARY)  © 2001-2006 Red Hat, Inc.
-ROMFS MTD (C) 2007 Red Hat, Inc.
-msgmni has been set to 495
-Block layer SCSI generic (bsg) driver version 0.4 loaded (major 252)
-io scheduler noop registered (default)
-io scheduler deadline registered
-io scheduler cfq registered
-fffff200.serial: ttyS0 at MMIO 0xfffff200 (irq = 16, base_baud = 8333333) is a ATMEL_SERIAL
-console [ttyS0] enabled
-f8040000.serial: ttyS1 at MMIO 0xf8040000 (irq = 26, base_baud = 8333333) is a ATMEL_SERIAL
-brd: module loaded
-loop: module loaded
-at24_get_setup: found a match for eeprom at 56
-at24 0-0056: 512 byte 24c04 EEPROM, writable, 16 bytes/write
-sam9x5: read 512 bytes from id eeprom
-at24_get_setup: found a match for eeprom at 50
-at24 1-0050: 512 byte 24c04 EEPROM, writable, 16 bytes/write
-sam9x5: read 512 bytes from ap1 eeprom
-at24_get_setup: found a match for eeprom at 52
-at24 1-0052: 512 byte 24c04 EEPROM, writable, 16 bytes/write
-sam9x5: ap2 eeprom read failed: -110
-atmel_nand 40000000.nand: Using dma0chan0 for DMA transfers.
-ONFI param page 0 valid
-ONFI flash detected
-NAND device: Manufacturer ID: 0x2c, Chip ID: 0xaa (Micron MT29F2G08ABBEAHC), 256MiB, page size: 2048, OOB size: 64
-atmel_nand 40000000.nand: ONFI params, minimum required ECC: 4 bits in 512 bytes
-atmel_nand 40000000.nand: Initialize PMECC params, cap: 4, sector: 512
-Scanning device for bad blocks
-9 ofpart partitions found on MTD device atmel_nand
-Creating 9 MTD partitions on "atmel_nand":
-0x000000000000-0x000010000000 : "NANDFlash"
-0x000000000000-0x000000040000 : "at91bootstrap"
-0x000000040000-0x0000000c0000 : "u-Boot"
-0x0000000c0000-0x000000160000 : "u-Boot Config"
-0x000000160000-0x000000200000 : "u-Boot Redundant Config"
-0x000000200000-0x000000800000 : "uImage"
-0x000000800000-0x000001000000 : "Config"
-0x000001000000-0x000001800000 : "OEM Config"
-0x000001800000-0x000010000000 : "Rootfs"
-tun: Universal TUN/TAP device driver, 1.6
-tun: (C) 1999-2004 Max Krasnyansky <maxk@qualcomm.com>
-libphy: MACB_mii_bus: probed
-macb f802c000.ethernet eth0: Cadence MACB at 0xf802c000 irq 23 (00:08:00:10:00:00)
-macb f802c000.ethernet eth0: attached PHY driver [Generic PHY] (mii_bus:phy_addr=f802c000.etherne:00, irq=-1)
-PPP generic driver version 2.4.2
-PPP BSD Compression module registered
-PPP Deflate Compression module registered
-ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver
-ehci-atmel: EHCI Atmel driver
-atmel-ehci 700000.ehci: EHCI Host Controller
-atmel-ehci 700000.ehci: new USB bus registered, assigned bus number 1
-atmel-ehci 700000.ehci: irq 31, io mem 0x00700000
-atmel-ehci 700000.ehci: USB 2.0 started, EHCI 1.00
-usb usb1: New USB device found, idVendor=1d6b, idProduct=0002
-usb usb1: New USB device strings: Mfr=3, Product=2, SerialNumber=1
-usb usb1: Product: EHCI Host Controller
-usb usb1: Manufacturer: Linux 3.12.70 ehci_hcd
-usb usb1: SerialNumber: 700000.ehci
-hub 1-0:1.0: USB hub found
-hub 1-0:1.0: 3 ports detected
-ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver
-at91_ohci 600000.ohci: AT91 OHCI
-at91_ohci 600000.ohci: new USB bus registered, assigned bus number 2
-at91_ohci 600000.ohci: irq 31, io mem 0x00600000
-usb usb2: New USB device found, idVendor=1d6b, idProduct=0001
-usb usb2: New USB device strings: Mfr=3, Product=2, SerialNumber=1
-usb usb2: Product: AT91 OHCI
-usb usb2: Manufacturer: Linux 3.12.70 ohci_hcd
-usb usb2: SerialNumber: at91
-hub 2-0:1.0: USB hub found
-hub 2-0:1.0: 3 ports detected
-rtc (null): invalid alarm value: 1900-1-1 0:0:0
-at91_rtc fffffeb0.rtc: rtc core: registered fffffeb0.rtc as rtc0
-at91_rtc fffffeb0.rtc: AT91 Real Time Clock driver.
-i2c /dev entries driver
-at91sam9_wdt: enabled (heartbeat=15 sec, nowayout=0)
-Netfilter messages via NETLINK v0.30.
-nf_conntrack version 0.5.0 (3964 buckets, 15856 max)
-xt_time: kernel timezone is -0000
-ipip: IPv4 over IPv4 tunneling driver
-gre: GRE over IPv4 demultiplexor driver
-ip_gre: GRE over IPv4 tunneling driver
-IPv4 over IPSec tunneling driver
-ip_tables: (C) 2000-2006 Netfilter Core Team
-TCP: cubic registered
-Initializing XFRM netlink socket
-NET: Registered protocol family 10
-mip6: Mobile IPv6
-sit: IPv6 over IPv4 tunneling driver
-NET: Registered protocol family 17
-NET: Registered protocol family 15
-l2tp_core: L2TP core driver, V2.0
-Key type dns_resolver registered
-at91_rtc fffffeb0.rtc: setting system clock to 2018-06-20 20:34:34 UTC (1529526874)
-usb 2-3: new full-speed USB device number 2 using at91_ohci
-usb 2-3: New USB device found, idVendor=04e2, idProduct=1414
-usb 2-3: New USB device strings: Mfr=0, Product=0, SerialNumber=0
-jffs2: notice: (1) jffs2_build_xattr_subsystem: complete building xattr subsystem, 0 of xdatum (0 unchecked, 0 orphan) and 0 of xref (0 dead, 0 orphan) found.
-VFS: Mounted root (jffs2 filesystem) readonly on device 31:8.
-devtmpfs: mounted
-Freeing unused kernel memory: 168K (c057a000 - c05a4000)
-INIT: version 2.88 booting
-jffs2: notice: (76) jffs2_build_xattr_subsystem: complete building xattr subsystem, 0 of xdatum (0 unchecked, 0 orphan) and 0 of xref (0 dead, 0 orphan) found.
-jffs2: notice: (76) jffs2_build_xattr_subsystem: complete building xattr subsystem, 0 of xdatum (0 unchecked, 0 orphan) and 0 of xref (0 dead, 0 orphan) found.
-Starting udev
-udevd[86]: starting version 3.2
-udevd[87]: starting eudev-3.2
-atmel_spi f0000000.spi: version: 0x212
-atmel_spi f0000000.spi: Using dma0chan1 (tx) and dma0chan2 (rx) for DMA transfers
-atmel_spi f0000000.spi: Atmel SPI Controller at 0xf0000000 (irq 28)
-atmel_spi f0000000.spi: master is unqueued, this is deprecated
-usbcore: registered new interface driver cdc_acm
-cdc_acm: USB Abstract Control Model driver for USB modems and ISDN adapters
-vizzini 2-3:1.0: This device cannot do calls on its own. It is not a modem.
-vizzini 2-3:1.0: ttyXRUSB0: XR21v14x usb uart device
-vizzini 2-3:1.2: This device cannot do calls on its own. It is not a modem.
-vizzini 2-3:1.2: ttyXRUSB1: XR21v14x usb uart device
-vizzini 2-3:1.4: This device cannot do calls on its own. It is not a modem.
-vizzini 2-3:1.4: ttyXRUSB2: XR21v14x usb uart device
-vizzini 2-3:1.6: This device cannot do calls on its own. It is not a modem.
-vizzini 2-3:1.6: ttyXRUSB3: XR21v14x usb uart device
-usbcore: registered new interface driver vizzini
-vizzini: Exar USB UART Driver for XR21V141x 
-atmel_spi f0004000.spi: version: 0x212
-atmel_spi f0004000.spi: Using dma1chan0 (tx) and dma1chan1 (rx) for DMA transfers
-atmel_spi f0004000.spi: Atmel SPI Controller at 0xf0004000 (irq 29)
-atmel_spi f0004000.spi: master is unqueued, this is deprecated
-tmp102 0-0048: initialized
-pps_core: LinuxPPS API ver. 1 registered
-pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>
-pps pps0: new PPS source pps.7.-1
-pps pps0: Registered IRQ 32 as PPS source
-atmel_usba_udc 500000.gadget: MMIO registers at 0xf803c000 mapped at d0b5e000
-atmel_usba_udc 500000.gadget: FIFO at 0x00500000 mapped at e1100000
-atmel_mci f0008000.mmc: version: 0x504
-atmel_mci f0008000.mmc: using dma0chan3 for DMA transfers
-atmel_mci f0008000.mmc: Atmel MCI controller at 0xf0008000 irq 22, 1 slots
-/var/config already mounted
-/var/oem already mounted
-directory bluetooth operations
-directory dnsmasq.d operations
-directory modprobe.d operations
-mts-io: Loading mts-io module
-[INFO] mts-io:mts_io_init:1046: init: v2.1.0
-[INFO] mts-io:mts_id_eeprom_load:853: Pruning radio feature from mts-io
-[INFO] mts-io:mts_id_eeprom_load:872: Adding WiFi/BT to mts-io driver
-[INFO] mts-io:mts_id_eeprom_load:877: Adding GPS to mts-io driver
-[INFO] mts-io:mts_id_eeprom_load:889: detected board MTCDT-0.1
-[INFO] mts-io:mts_id_eeprom_load:960: sizeof: 512
-[INFO] mts-io:mts_id_eeprom_load:961: vendor-id: Multi-Tech Systems
-[INFO] mts-io:mts_id_eeprom_load:962: product-id: MTCDT-247L
-[INFO] mts-io:mts_id_eeprom_load:963: device-id: 12345678
-[INFO] mts-io:mts_id_eeprom_load:964: hw-version: MTCDT-0.1
-[INFO] mts-io:mts_id_eeprom_load:971: mac-addr: 00:08:00:10:00:00
-[INFO] mts-io:mts_id_eeprom_load:973: imei: 123456789123456789
-[INFO] mts-io:mts_id_eeprom_load:974: capa-gps: yes
-[INFO] mts-io:mts_id_eeprom_load:975: capa-din: no
-[INFO] mts-io:mts_id_eeprom_load:976: capa-dout: no
-[INFO] mts-io:mts_id_eeprom_load:977: capa-adc: no
-[INFO] mts-io:mts_id_eeprom_load:978: capa-wifi: yes
-[INFO] mts-io:mts_id_eeprom_load:979: capa-bluetooth: yes
-[INFO] mts-io:mts_id_eeprom_load:980: capa-lora: no
-[INFO] mts-io:mts_id_eeprom_load:989: mac-bluetooth: 00:00:00:00:00:00
-[INFO] mts-io:mts_id_eeprom_load:998: mac-wifi: 00:00:00:00:00:00
-[INFO] mts-io:mts_id_eeprom_load:1005: uuid: AAA00000000000000000000000000021
-[INFO] mts-io:load_port:663: accessory card 1 vendor-id: Multi-Tech Systems
-[INFO] mts-io:load_port:664: accessory card 1 product-id: MTAC-LORA-H-915
-[INFO] mts-io:load_port:665: accessory card 1 device-id: P87040004
-[INFO] mts-io:load_port:666: accessory card 1 hw-version: MTAC-LORA-1.5
-[INFO] mts-io:load_port:687: accessory card 1 eui: 00:80:00:00:00:00:00:A4
-[INFO] mts-io:lora_setup:60: loading LORA accessory card in port 1
-[INFO] mts-io:lora_setup:90: created link [lora] to [ap1], success:0
-[INFO] mts-io:lora_setup:126: Substitute pins
-[INFO] mts-io:lora_setup:131: LORA H: Replace name AP1_GPIO1 with name AP1_CDONE
-[INFO] mts-io:lora_setup:132: LORA H: Replace pin number 70 with number 70
-[INFO] mts-io:lora_setup:131: LORA H: Replace name AP1_GPIO2 with name AP1_CRESET
-[INFO] mts-io:lora_setup:132: LORA H: Replace pin number 71 with number 71
-[INFO] mts-io:lora_setup:189: ap_subdirs[port_index=0] = cf0ccca0 ap_subdirs[port_index=0]=bf0d521c
-[INFO] mts-io:load_port:622: no accessory card inserted in port 2
-mts-io: Resetting system modules
-usb 1-2: new high-speed USB device number 2 using atmel-ehci
-usb 1-2: New USB device found, idVendor=0424, idProduct=2534
-usb 1-2: New USB device strings: Mfr=0, Product=0, SerialNumber=0
-hub 1-2:1.0: USB hub found
-hub 1-2:1.0: 4 ports detected
-usb 1-2.1: new high-speed USB device number 3 using atmel-ehci
-usb 1-2.1: New USB device found, idVendor=0424, idProduct=2534
-usb 1-2.1: New USB device strings: Mfr=0, Product=0, SerialNumber=0
-hub 1-2.1:1.0: USB hub found
-hub 1-2.1:1.0: 4 ports detected
-usb 1-2.2: new high-speed USB device number 4 using atmel-ehci
-usb 1-2.2: New USB device found, idVendor=1618, idProduct=9113
-usb 1-2.2: New USB device strings: Mfr=1, Product=2, SerialNumber=6
-usb 1-2.2: Product: Wireless USB Network Module
-usb 1-2.2: Manufacturer: Redpine Signals, Inc.
-usb 1-2.2: SerialNumber: 000000000001
-usb 1-2: USB disconnect, device number 2
-usb 1-2.1: USB disconnect, device number 3
-usb 1-2.2: USB disconnect, device number 4
-usb 1-2: new high-speed USB device number 5 using atmel-ehci
-usb 1-2: New USB device found, idVendor=0424, idProduct=2534
-usb 1-2: New USB device strings: Mfr=0, Product=0, SerialNumber=0
-hub 1-2:1.0: USB hub found
-hub 1-2:1.0: 4 ports detected
-usb 1-2.1: new high-speed USB device number 6 using atmel-ehci
-usb 1-2.1: New USB device found, idVendor=0424, idProduct=2534
-usb 1-2.1: New USB device strings: Mfr=0, Product=0, SerialNumber=0
-hub 1-2.1:1.0: USB hub found
-hub 1-2.1:1.0: 4 ports detected
-usb 1-2.2: new high-speed USB device number 7 using atmel-ehci
-usb 1-2.2: New USB device found, idVendor=1618, idProduct=9113
-usb 1-2.2: New USB device strings: Mfr=1, Product=2, SerialNumber=6
-usb 1-2.2: Product: Wireless USB Network Module
-usb 1-2.2: Manufacturer: Redpine Signals, Inc.
-usb 1-2.2: SerialNumber: 000000000001
-OK
-[INFO] ../../git/src/eeprom_main.c:main:580: loaded id eeprom from /sys/bus/i2c/devices/i2c-0/0-0056/eeprom successfully
-[INFO] ../../git/src/eeprom_main.c:mts_id_eeprom_inspect:291: sizeof: 512
-[INFO] ../../git/src/eeprom_main.c:mts_id_eeprom_inspect:292: vendor-id: Multi-Tech Systems
-[INFO] ../../git/src/eeprom_main.c:mts_id_eeprom_inspect:293: product-id: MTCDT-247L
-[INFO] ../../git/src/eeprom_main.c:mts_id_eeprom_inspect:294: device-id: 12345678
-[INFO] ../../git/src/eeprom_main.c:mts_id_eeprom_inspect:295: hw-version: MTCDT-0.1
-[INFO] ../../git/src/eeprom_main.c:mts_id_eeprom_inspect:302: mac-addr: 00:08:00:10:00:00
-[INFO] ../../git/src/eeprom_main.c:mts_id_eeprom_inspect:303: imei: 123456789123456789
-[INFO] ../../git/src/eeprom_main.c:mts_id_eeprom_inspect:304: capa-gps: yes
-[INFO] ../../git/src/eeprom_main.c:mts_id_eeprom_inspect:305: capa-din: no
-[INFO] ../../git/src/eeprom_main.c:mts_id_eeprom_inspect:306: capa-dout: no
-[INFO] ../../git/src/eeprom_main.c:mts_id_eeprom_inspect:307: capa-adc: no
-[INFO] ../../git/src/eeprom_main.c:mts_id_eeprom_inspect:308: capa-wifi: yes
-[INFO] ../../git/src/eeprom_main.c:mts_id_eeprom_inspect:309: capa-bluetooth: yes
-[INFO] ../../git/src/eeprom_main.c:mts_id_eeprom_inspect:310: capa-lora: no
-[INFO] ../../git/src/eeprom_main.c:mts_id_eeprom_inspect:318: mac-bluetooth: 00:00:00:00:00:00
-[INFO] ../../git/src/eeprom_main.c:mts_id_eeprom_inspect:325: mac-wifi: 00:00:00:00:00:00
-[INFO] ../../git/src/eeprom_main.c:mts_id_eeprom_inspect:331: uuid: AAA00000000000000000000000000021
-[INFO] ../../git/src/eeprom_main.c:mts_id_eeprom_inspect:341: lora-eui: "00:00:00:00:00:00:00:00"
-[INFO] ../../git/src/eeprom_main.c:mts_id_eeprom_inspect:343: lora-product-id: 
-[INFO] ../../git/src/eeprom_main.c:mts_id_eeprom_inspect:344: lora-hw-version: 
-Reading accessory cards data
-Adding accessory cards data
-rs9113: Loading rs9113 modules with COEX=6 and Country=0
-usb 1-2.2: USB disconnect, device number 7
-cfg80211: Calling CRDA to update world regulatory domain
-usb 1-2.2: new high-speed USB device number 8 using atmel-ehci
-usb 1-2.2: New USB device found, idVendor=1618, idProduct=9113
-usb 1-2.2: New USB device strings: Mfr=1, Product=2, SerialNumber=6
-usb 1-2.2: Product: Wireless USB Network Module
-usb 1-2.2: Manufacturer: Redpine Signals, Inc.
-usb 1-2.2: SerialNumber: 000000000001
-Bluetooth: Core ver 2.16
-NET: Registered protocol family 31
-Bluetooth: HCI device and connection manager initialized
-Bluetooth: HCI socket layer initialized
-Bluetooth: L2CAP socket layer initialized
-Bluetooth: SCO socket layer initialized
-onebox_wlan_nongpl: module license 'unspecified' taints kernel.
-Disabling lock debugging due to kernel taint
-usbcore: registered new interface driver Onebox-USB
-WLAN protocol selected
-BT protocol selected
-Driver initialization is done
-OK
-INIT: Entering runlevel: 5
-Configuring network interfaces... IPv6: ADDRCONF(NETDEV_UP): eth0: link is not ready
-done.
-Starting system message bus: dbus.
-Starting ifplugd: Starting /usr/sbin/ifplugd...
-done
-macb f802c000.ethernet eth0: link up (100/Full)
-IPv6: ADDRCONF(NETDEV_CHANGE): eth0: link becomes ready
-Starting OpenBSD Secure Shell server: sshd
-done.
-Starting bluetooth
-Bluetooth: BNEP (Ethernet Emulation) ver 1.3
-Bluetooth: BNEP filters: protocol multicast
-Bluetooth: BNEP socket layer initialized
-bluetoothd
-Would start /usr/sbin/ntpd -u ntp:ntp -p /var/run/ntp.pid -g -c /etc/ntp.conf , and add -20 to the priority.
-gpsd_ubx_settime: GPS does not have a fix yet.  Try again later.
-Starting syslogd/klogd: done
-bt-pan: disabled in /etc/default
-Starting rfcomm
-/usr/sbin/start-stop-daemon -S -p /run/rfcomm.pid -x /usr/bin/python2.7 -b -- /usr/libexec/bluetooth/rfcomm --login
diff --git a/scripts/upgrade/model b/scripts/upgrade/model
deleted file mode 100644
index 04501b0..0000000
--- a/scripts/upgrade/model
+++ /dev/null
@@ -1 +0,0 @@
-mtcdt|mtcdtip|mtcdtiphp|mtcap
diff --git a/scripts/upgrade/upgrade-4.0.0-4.0.1/install_list.txt b/scripts/upgrade/upgrade-4.0.0-4.0.1/install_list.txt
deleted file mode 100644
index e69de29..0000000
--- a/scripts/upgrade/upgrade-4.0.0-4.0.1/install_list.txt
+++ /dev/null
diff --git a/scripts/upgrade/upgrade-4.0.0-4.0.1/local.conf b/scripts/upgrade/upgrade-4.0.0-4.0.1/local.conf
deleted file mode 100644
index 04caa02..0000000
--- a/scripts/upgrade/upgrade-4.0.0-4.0.1/local.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# Set mtcap instead of mtcdt for mtcap
-arch all 1
-arch any 6
-arch noarch 11
-arch arm 16
-arch armv4 21
-arch armv4t 26
-arch armv5 31
-arch armv5t 36
-arch armv5e 41
-arch armv5te 46
-arch arm926ejste 51
-arch arm926ejse 56
-arch mtcdt 61
-arch mtcap 61
-
-src/gz mlinux-mtcdt file://FLASHDIR/repo/mtcdt
-src/gz mlinux-mtcap file://FLASHDIR/repo/mtcap
-src/gz mlinux-arm926ejste file://FLASHDIR/repo/arm926ejste
diff --git a/scripts/upgrade/upgrade-4.0.0-4.0.1/repo/Packages b/scripts/upgrade/upgrade-4.0.0-4.0.1/repo/Packages
deleted file mode 100644
index e69de29..0000000
--- a/scripts/upgrade/upgrade-4.0.0-4.0.1/repo/Packages
+++ /dev/null
diff --git a/scripts/upgrade/upgrade-4.0.0-4.0.1/repo/arm926ejste/Packages b/scripts/upgrade/upgrade-4.0.0-4.0.1/repo/arm926ejste/Packages
deleted file mode 100644
index 6cc98bc..0000000
--- a/scripts/upgrade/upgrade-4.0.0-4.0.1/repo/arm926ejste/Packages
+++ /dev/null
@@ -1,179 +0,0 @@
-Package: bluez5-noinst-tools
-Version: 5.47-m3.0
-Depends: libc6 (>= 2.24), libdbus-1-3 (>= 1.10.10), libglib-2.0-0 (>= 2.48.2), libreadline6 (>= 6.3)
-Section: libs
-Architecture: arm926ejste
-Maintainer: MultiTech Systems <oe-devel@multitech.net>
-MD5Sum: 2a7b0332fe89390f0f3d805ef7796caa
-Size: 322974
-Filename: bluez5-noinst-tools_5.47-m3.0_arm926ejste.ipk
-Source: http://kernel.org/pub/linux/bluetooth/bluez-5.47.tar.xz file://out-of-tree.patch file://init file://run-ptest file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch file://0001-tests-add-a-target-for-building-tests-without-runnin.patch file://default file://main.conf file://bt-pan/init file://bt-pan/default file://bt-pan/bt-pan file://rfcomm/rfcomm.py file://rfcomm/init file://rfcomm/default
-Description:  Linux Bluetooth Stack Userland V5  Linux Bluetooth stack V5 userland
- components.  These include a system   configurations, daemons, tools and
- system libraries.
-OE: bluez5
-HomePage: http://www.bluez.org
-License: GPLv2+ & LGPLv2.1+
-Priority: optional
-
-Package: bluez5-obex
-Version: 5.47-m3.0
-Depends: libc6 (>= 2.24), libdbus-1-3 (>= 1.10.10), libglib-2.0-0 (>= 2.48.2), libical (>= 2.0.0)
-Section: libs
-Architecture: arm926ejste
-Maintainer: MultiTech Systems <oe-devel@multitech.net>
-MD5Sum: 928d09adf783379abfc9e9b0edb36e64
-Size: 166574
-Filename: bluez5-obex_5.47-m3.0_arm926ejste.ipk
-Source: http://kernel.org/pub/linux/bluetooth/bluez-5.47.tar.xz file://out-of-tree.patch file://init file://run-ptest file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch file://0001-tests-add-a-target-for-building-tests-without-runnin.patch file://default file://main.conf file://bt-pan/init file://bt-pan/default file://bt-pan/bt-pan file://rfcomm/rfcomm.py file://rfcomm/init file://rfcomm/default
-Description:  Linux Bluetooth Stack Userland V5  Linux Bluetooth stack V5 userland
- components.  These include a system   configurations, daemons, tools and
- system libraries.
-OE: bluez5
-HomePage: http://www.bluez.org
-License: GPLv2+ & LGPLv2.1+
-Priority: optional
-
-Package: bluez5-pand
-Version: 5.47-m3.0
-Depends: bash, python-dbus, python-logging, python-syslog
-Recommends: update-rc.d
-Section: libs
-Architecture: arm926ejste
-Maintainer: MultiTech Systems <oe-devel@multitech.net>
-MD5Sum: ce90e092bdba63e29afc17977bd5292d
-Size: 6602
-Filename: bluez5-pand_5.47-m3.0_arm926ejste.ipk
-Source: http://kernel.org/pub/linux/bluetooth/bluez-5.47.tar.xz file://out-of-tree.patch file://init file://run-ptest file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch file://0001-tests-add-a-target-for-building-tests-without-runnin.patch file://default file://main.conf file://bt-pan/init file://bt-pan/default file://bt-pan/bt-pan file://rfcomm/rfcomm.py file://rfcomm/init file://rfcomm/default
-Description:  Linux Bluetooth Stack Userland V5  Linux Bluetooth stack V5 userland
- components.  These include a system   configurations, daemons, tools and
- system libraries.
-OE: bluez5
-HomePage: http://www.bluez.org
-License: GPLv2+ & LGPLv2.1+
-Priority: optional
-
-Package: bluez5-rfcomm
-Version: 5.47-m3.0
-Depends: bash, python-dbus, python-logging, python-pybluez, python-pygobject, python-syslog
-Recommends: update-rc.d
-Section: libs
-Architecture: arm926ejste
-Maintainer: MultiTech Systems <oe-devel@multitech.net>
-MD5Sum: a58b19fd37eea490eceecb0f44fef25a
-Size: 8252
-Filename: bluez5-rfcomm_5.47-m3.0_arm926ejste.ipk
-Source: http://kernel.org/pub/linux/bluetooth/bluez-5.47.tar.xz file://out-of-tree.patch file://init file://run-ptest file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch file://0001-tests-add-a-target-for-building-tests-without-runnin.patch file://default file://main.conf file://bt-pan/init file://bt-pan/default file://bt-pan/bt-pan file://rfcomm/rfcomm.py file://rfcomm/init file://rfcomm/default
-Description:  Linux Bluetooth Stack Userland V5  Linux Bluetooth stack V5 userland
- components.  These include a system   configurations, daemons, tools and
- system libraries.
-OE: bluez5
-HomePage: http://www.bluez.org
-License: GPLv2+ & LGPLv2.1+
-Priority: optional
-
-Package: bluez5-testtools
-Version: 5.47-m3.0
-Depends: python3, python3-dbus, python3-pygobject
-Section: libs
-Architecture: arm926ejste
-Maintainer: MultiTech Systems <oe-devel@multitech.net>
-MD5Sum: e28b13ca304efc9664dad104a3873961
-Size: 30356
-Filename: bluez5-testtools_5.47-m3.0_arm926ejste.ipk
-Source: http://kernel.org/pub/linux/bluetooth/bluez-5.47.tar.xz file://out-of-tree.patch file://init file://run-ptest file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch file://0001-tests-add-a-target-for-building-tests-without-runnin.patch file://default file://main.conf file://bt-pan/init file://bt-pan/default file://bt-pan/bt-pan file://rfcomm/rfcomm.py file://rfcomm/init file://rfcomm/default
-Description:  Linux Bluetooth Stack Userland V5  Linux Bluetooth stack V5 userland
- components.  These include a system   configurations, daemons, tools and
- system libraries.
-OE: bluez5
-HomePage: http://www.bluez.org
-License: GPLv2+ & LGPLv2.1+
-Priority: optional
-
-Package: bluez5
-Version: 5.47-m3.0
-Depends: libc6 (>= 2.24), libdbus-1-3 (>= 1.10.10), libglib-2.0-0 (>= 2.48.2), libreadline6 (>= 6.3), libudev1 (>= 3.2)
-Provides: bluez-hcidump
-Conflicts: bluez4
-Recommends: update-rc.d
-Section: libs
-Architecture: arm926ejste
-Maintainer: MultiTech Systems <oe-devel@multitech.net>
-MD5Sum: f4fa7697d5c944362509c0836a3b94d8
-Size: 1363450
-Filename: bluez5_5.47-m3.0_arm926ejste.ipk
-Source: http://kernel.org/pub/linux/bluetooth/bluez-5.47.tar.xz file://out-of-tree.patch file://init file://run-ptest file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch file://0001-tests-add-a-target-for-building-tests-without-runnin.patch file://default file://main.conf file://bt-pan/init file://bt-pan/default file://bt-pan/bt-pan file://rfcomm/rfcomm.py file://rfcomm/init file://rfcomm/default
-Description:  Linux Bluetooth Stack Userland V5  Linux Bluetooth stack V5 userland
- components.  These include a system   configurations, daemons, tools and
- system libraries.
-OE: bluez5
-HomePage: http://www.bluez.org
-License: GPLv2+ & LGPLv2.1+
-Priority: optional
-
-Package: libasound-module-bluez
-Version: 5.47-m3.0
-Section: libs
-Architecture: arm926ejste
-Maintainer: MultiTech Systems <oe-devel@multitech.net>
-MD5Sum: fcd41d3eee2580c29f356168f41993fe
-Size: 906
-Filename: libasound-module-bluez_5.47-m3.0_arm926ejste.ipk
-Source: http://kernel.org/pub/linux/bluetooth/bluez-5.47.tar.xz file://out-of-tree.patch file://init file://run-ptest file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch file://0001-tests-add-a-target-for-building-tests-without-runnin.patch file://default file://main.conf file://bt-pan/init file://bt-pan/default file://bt-pan/bt-pan file://rfcomm/rfcomm.py file://rfcomm/init file://rfcomm/default
-Description:  Linux Bluetooth Stack Userland V5  Linux Bluetooth stack V5 userland
- components.  These include a system   configurations, daemons, tools and
- system libraries.
-OE: bluez5
-HomePage: http://www.bluez.org
-License: GPLv2+ & LGPLv2.1+
-Priority: optional
-
-Package: libmts-io0
-Version: 1.0.8-r0.0
-Depends: libc6 (>= 2.24), libgcc1 (>= 6.2.0), libstdc++6 (>= 6.2.0)
-Provides: libmts-io
-Section: base
-Architecture: arm926ejste
-Maintainer: MultiTech Systems <oe-devel@multitech.net>
-MD5Sum: a96eac97bbc045acdfe56a7cf8668f7d
-Size: 138088
-Filename: libmts-io0_1.0.8-r0.0_arm926ejste.ipk
-Source: git://git.multitech.net/libmts-io;branch=master
-Description:  libmts-io version 1.0.8-r0  MultiTech IO C++ Library
-OE: libmts-io
-HomePage: http://www.multitech.net/
-License: LGPL-2.1
-Priority: optional
-
-Package: lora-network-server
-Version: 2.0.19-r4.0
-Depends: bash, libc6 (>= 2.24), libcurl4 (>= 7.50.1), libgcc1 (>= 6.2.0), libmosquittopp1 (>= 1.4.9), libmts0 (>= 0.5), libsqlite3-0 (>= 3.14.1), libstdc++6 (>= 6.2.0), logrotate, lora-packet-forwarder
-Recommends: update-rc.d
-Section: console/utils
-Architecture: arm926ejste
-Maintainer: MultiTech Systems <oe-devel@multitech.net>
-MD5Sum: d03a28ffacb7c283608513e9353b142a
-Size: 410814
-Filename: lora-network-server_2.0.19-r4.0_arm926ejste.ipk
-Source: http://multitech.net/downloads/lora-network-server_arm926ejste_2.0.19.tar.gz file://lora-network-server.init file://lora-network-server.default file://lora-network-server.logrotate.conf
-Description:  lora-network-server version 2.0.19-r4  MultiTech LoRa Network Server
-OE: lora-network-server
-License: Proprietary
-Priority: optional
-
-Package: python-pybluez
-Version: 0.22-r0.0
-Depends: bluez5 (>= 5.47), libc6 (>= 2.24), libpython2.7-1.0 (>= 2.7.12), python-core, python-fcntl
-Section: devel/python
-Architecture: arm926ejste
-Maintainer: MultiTech Systems <oe-devel@multitech.net>
-MD5Sum: 6b7b742642a4920b21866c3ac7b79a35
-Size: 72028
-Filename: python-pybluez_0.22-r0.0_arm926ejste.ipk
-Source: https://pypi.python.org/packages/c1/98/3149481d508bee174335be6725880f00d297afebe75c15e917af8f6fe169/PyBluez-0.22.zip
-Description:  python-pybluez version 0.22-r0  Bluetooth Python extension module
-OE: python-pybluez
-HomePage: http://karulis.github.io/pybluez/
-License: GPL-2.0
-Priority: optional
-
diff --git a/scripts/upgrade/upgrade-4.0.0-4.0.1/repo/mtcap/Packages b/scripts/upgrade/upgrade-4.0.0-4.0.1/repo/mtcap/Packages
deleted file mode 100644
index f908f97..0000000
--- a/scripts/upgrade/upgrade-4.0.0-4.0.1/repo/mtcap/Packages
+++ /dev/null
@@ -1,31 +0,0 @@
-Package: mlinux-version
-Version: 1:4.0.1_ea6ba1e5fb287003fea33522af39a771102713b2-r2.0
-Section: base
-Architecture: mtcap
-Maintainer: MultiTech Systems <oe-devel@multitech.net>
-MD5Sum: ef87d9e1188b15a38c7faa30055f597f
-Size: 1136
-Filename: mlinux-version_4.0.1_ea6ba1e5fb287003fea33522af39a771102713b2-r2.0_mtcap.ipk
-Source: None
-Description:  mlinux-version version 4.0.1_ea6ba1e5fb287003fea33522af39a771102713b2-r2
- mlinux-version version 4.0.1_ea6ba1e5fb287003fea33522af39a771102713b2-r2.
-OE: mlinux-version
-License: MIT
-Priority: optional
-
-Package: mts-id-eeprom
-Version: 0.3.8-r1.0.0
-Depends: bash, libc6 (>= 2.24), libcrypto1.0.0 (>= 1.0.2k), libgcc1 (>= 6.2.0), libstdc++6 (>= 6.2.0)
-Section: console/utils
-Architecture: mtcap
-Maintainer: MultiTech Systems <oe-devel@multitech.net>
-MD5Sum: 5062858f2201b30097078716a6ae863f
-Size: 69976
-Filename: mts-id-eeprom_0.3.8-r1.0.0_mtcap.ipk
-Source: git://git.multitech.net/mts-id-eeprom.git;protocol=git file://mtcap-fpga-v31.hex file://mtcap-fpga-v33.hex
-Description:  mts-id-eeprom version 0.3.8-r1.0  ID EEPROM tool for MTCDP
-OE: mts-id-eeprom
-HomePage: http://www.multitech.net/
-License: GPLv2+
-Priority: optional
-
diff --git a/scripts/upgrade/upgrade-4.0.0-4.0.1/repo/mtcdt/Packages b/scripts/upgrade/upgrade-4.0.0-4.0.1/repo/mtcdt/Packages
deleted file mode 100644
index 8cfe25e..0000000
--- a/scripts/upgrade/upgrade-4.0.0-4.0.1/repo/mtcdt/Packages
+++ /dev/null
@@ -1,31 +0,0 @@
-Package: mlinux-version
-Version: 1:4.0.1_ea6ba1e5fb287003fea33522af39a771102713b2-r2.0
-Section: base
-Architecture: mtcdt
-Maintainer: MultiTech Systems <oe-devel@multitech.net>
-MD5Sum: d0cb3ceee3c7f45404cf98ff549b8d7f
-Size: 1134
-Filename: mlinux-version_4.0.1_ea6ba1e5fb287003fea33522af39a771102713b2-r2.0_mtcdt.ipk
-Source: None
-Description:  mlinux-version version 4.0.1_ea6ba1e5fb287003fea33522af39a771102713b2-r2
- mlinux-version version 4.0.1_ea6ba1e5fb287003fea33522af39a771102713b2-r2.
-OE: mlinux-version
-License: MIT
-Priority: optional
-
-Package: mts-id-eeprom
-Version: 0.3.8-r1.0.0
-Depends: bash, libc6 (>= 2.24), libcrypto1.0.0 (>= 1.0.2k), libgcc1 (>= 6.2.0), libstdc++6 (>= 6.2.0)
-Section: console/utils
-Architecture: mtcdt
-Maintainer: MultiTech Systems <oe-devel@multitech.net>
-MD5Sum: 2eb166320621d16b4d96277618bf062b
-Size: 74644
-Filename: mts-id-eeprom_0.3.8-r1.0.0_mtcdt.ipk
-Source: git://git.multitech.net/mts-id-eeprom.git;protocol=git file://mtcdt-fpga-v31.hex file://mtcdt-fpga-v33.hex
-Description:  mts-id-eeprom version 0.3.8-r1.0  ID EEPROM tool for MTCDP
-OE: mts-id-eeprom
-HomePage: http://www.multitech.net/
-License: GPLv2+
-Priority: optional
-