Merge pull request #88 from JacobBarthelmeh/socat

update socat version supported

conf/layer.conf

@@ -93,8 +93,11 @@ BBFILES += "${@bb.utils.contains('IMAGE_INSTALL', \
 # Uncomment if building rsyslog with wolfSSL.
 #BBFILES += "${LAYERDIR}/recipes-extended/rsyslog/*.bbappend"
 
-# Uncomment if building socat with wolfSSL.
-#BBFILES += "${LAYERDIR}/recipes-connectivity/socat/*.bbappend"
+# Uncomment if building socat 1.7.3.4 with wolfSSL.
+#BBFILES += "${LAYERDIR}/recipes-connectivity/socat/1.7.3.4/*.bbappend"
+
+# Uncomment if building socat 1.8.0.0 with wolfSSL.
+#BBFILES += "${LAYERDIR}/recipes-connectivity/socat/1.8.0.0/*.bbappend"
 
 # Uncomment if building strongSwan with wolfSSL.
 #BBFILES += "${LAYERDIR}/recipes-support/strongswan/*.bbappend"

recipes-connectivity/README.md

@@ -49,6 +49,7 @@ Socat
 -----
 
 This supports using `Socat` version: 1.7.3.4, which was shipped with Yocto Dunfell
+And supports version 1.8.0.0 if updating the version of `Socat` in Yocto Dunfell
 
 - Usage:
     Change the line in the `meta-wolfssl/conf/layer.conf` from:

recipes-connectivity/socat/1.7.3.4/wolfssl_%.bbappend

@@ -0,0 +1,2 @@
+EXTRA_OECONF += "--enable-maxfragment --enable-opensslall --enable-opensslextra --enable-dtls"
+

recipes-connectivity/socat/1.8.0.0/socat_1.8.0.0.bbappend

@@ -0,0 +1,6 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+SRC_URI += " file://socat-1.8.0.0.patch"
+DEPENDS_remove = "openssl"
+EXTRA_AUTORECONF_remove = "--exclude=autoheader"
+DEPENDS += "wolfssl"
+EXTRA_OECONF += "--with-wolfssl=${STAGING_EXECPREFIXDIR}"

recipes-connectivity/socat/1.8.0.0/wolfssl_%.bbappend

@@ -0,0 +1,2 @@
+EXTRA_OECONF += "--enable-maxfragment --enable-opensslall --enable-opensslextra --enable-dtls"
+

recipes-connectivity/socat/wolfssl_%.bbappend

@@ -1 +0,0 @@
-EXTRA_OECONF += "--enable-opensslextra --enable-opensslall"