diff --git a/recipes-iot/aws-iot-securetunneling-localproxy/aws-iot-securetunneling-localproxy_git.bb b/recipes-iot/aws-iot-securetunneling-localproxy/aws-iot-securetunneling-localproxy_git.bb index 66a222e51..3fdc30b96 100644 --- a/recipes-iot/aws-iot-securetunneling-localproxy/aws-iot-securetunneling-localproxy_git.bb +++ b/recipes-iot/aws-iot-securetunneling-localproxy/aws-iot-securetunneling-localproxy_git.bb @@ -17,16 +17,14 @@ DEPENDS += "\ BRANCH ?= "main" # nooelint: oelint.file.patchsignedoff -SRC_URI = "\ - git://git@github.com/aws-samples/aws-iot-securetunneling-localproxy.git;branch=${BRANCH};protocol=https \ - file://boost-support-any.patch \ - file://gcc13.patch \ - file://gcc13_2.patch \ - file://remove-cxx-standard.patch \ - file://boost-include-format.patch \ - file://run-ptest \ - " -SRCREV = "9eace7470fbbee00473074f6dc763afdc9e11a4c" +SRC_URI = "git://git@github.com/aws-samples/aws-iot-securetunneling-localproxy.git;branch=${BRANCH};protocol=https \ + file://boost-support-any.patch \ + file://gcc13_2.patch \ + file://remove-cxx-standard.patch \ + file://boost-include-format.patch \ + file://run-ptest \ + " +SRCREV = "b9d706f92b64dc003514fa31ae804564fb0af429" UPSTREAM_CHECK_COMMITS = "1" diff --git a/recipes-iot/aws-iot-securetunneling-localproxy/files/boost-include-format.patch b/recipes-iot/aws-iot-securetunneling-localproxy/files/boost-include-format.patch index 46af22f4c..236786725 100644 --- a/recipes-iot/aws-iot-securetunneling-localproxy/files/boost-include-format.patch +++ b/recipes-iot/aws-iot-securetunneling-localproxy/files/boost-include-format.patch @@ -1,16 +1,15 @@ -From 0ac519e1cf096c70aa5deceff51c7f533a95eaf7 Mon Sep 17 00:00:00 2001 +From 6ea963cfb223cafcf83092054e1590f5e95e9eb5 Mon Sep 17 00:00:00 2001 From: Thomas Roos Date: Mon, 11 Mar 2024 10:35:55 +0000 Subject: [PATCH] aws-iot-securetunneling-localproxy: boost 1.84 format include Upstream-Status: Submitted [author] - --- src/config/ConfigFile.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/ConfigFile.cpp b/src/config/ConfigFile.cpp -index 105ca10..ce9f17b 100644 +index 2a3205c..6e25a2f 100644 --- a/src/config/ConfigFile.cpp +++ b/src/config/ConfigFile.cpp @@ -19,6 +19,7 @@ @@ -21,7 +20,7 @@ index 105ca10..ce9f17b 100644 #include #include #include -@@ -212,4 +213,4 @@ namespace aws { namespace iot { namespace securedtunneling { namespace config_fi +@@ -219,4 +220,4 @@ namespace aws { namespace iot { namespace securedtunneling { namespace config_fi boost::filesystem::path full_path(boost::filesystem::current_path()); return (boost::format("%1%/config") % full_path.string()).str(); } diff --git a/recipes-iot/aws-iot-securetunneling-localproxy/files/boost-support-any.patch b/recipes-iot/aws-iot-securetunneling-localproxy/files/boost-support-any.patch index ae81eb1ce..2277559e0 100644 --- a/recipes-iot/aws-iot-securetunneling-localproxy/files/boost-support-any.patch +++ b/recipes-iot/aws-iot-securetunneling-localproxy/files/boost-support-any.patch @@ -1,4 +1,4 @@ -From 55a765ca7c0fdc46a0cfac8f7cbf10a89d42ded3 Mon Sep 17 00:00:00 2001 +From ad3ae0ebf4954fd2389870857f27d3d60f822bfd Mon Sep 17 00:00:00 2001 From: Thomas Roos Date: Fri, 10 Mar 2023 12:46:05 +0000 Subject: [PATCH] aws-iot-securetunneling-localproxy: support any boost version @@ -9,10 +9,10 @@ Upstream-Status: Denied [Any version that compile should be good, team does only 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index d54b8eb..34c897a 100644 +index aa4e90b..02ac23c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -76,8 +76,7 @@ endif(BUILD_TESTS) +@@ -92,8 +92,7 @@ endif(BUILD_TESTS) set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_DEBUG_RUNTIME OFF) #set_property(GLOBAL PROPERTY Boost_USE_MULTITHREADED ON) diff --git a/recipes-iot/aws-iot-securetunneling-localproxy/files/gcc13.patch b/recipes-iot/aws-iot-securetunneling-localproxy/files/gcc13.patch deleted file mode 100644 index 13c66ad29..000000000 --- a/recipes-iot/aws-iot-securetunneling-localproxy/files/gcc13.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 2e1f47ca467a3a5a1e1a56879b784bc33599eb76 Mon Sep 17 00:00:00 2001 -From: tro -Date: Tue, 30 May 2023 12:10:36 +0200 -Subject: [PATCH] ProxySettings.h: add #include - -Upstream-Status: Pending -> https://github.com/aws-samples/aws-iot-securetunneling-localproxy/pull/136 ---- - src/ProxySettings.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/ProxySettings.h b/src/ProxySettings.h -index 9dc4e10..de3098a 100644 ---- a/src/ProxySettings.h -+++ b/src/ProxySettings.h -@@ -2,6 +2,7 @@ - // SPDX-License-Identifier: Apache-2.0 - #pragma once - -+#include - #include - namespace aws { namespace iot { namespace securedtunneling { namespace settings { - using boost::property_tree::ptree; diff --git a/recipes-iot/aws-iot-securetunneling-localproxy/files/gcc13_2.patch b/recipes-iot/aws-iot-securetunneling-localproxy/files/gcc13_2.patch index 9e910ed96..cf6259188 100644 --- a/recipes-iot/aws-iot-securetunneling-localproxy/files/gcc13_2.patch +++ b/recipes-iot/aws-iot-securetunneling-localproxy/files/gcc13_2.patch @@ -1,4 +1,4 @@ -From 36fa8d748cf149a5db554cf18b4485b601d9dcc0 Mon Sep 17 00:00:00 2001 +From ed1d14ea59b5dffc8107c9bddfa1d10939fa7f73 Mon Sep 17 00:00:00 2001 From: Thomas Roos Date: Mon, 8 Jan 2024 15:07:56 +0000 Subject: [PATCH] aws-iot-securetunneling-localproxy: fix GCC 13 build diff --git a/recipes-iot/aws-iot-securetunneling-localproxy/files/remove-cxx-standard.patch b/recipes-iot/aws-iot-securetunneling-localproxy/files/remove-cxx-standard.patch index 2df30ee34..597bf5bd8 100644 --- a/recipes-iot/aws-iot-securetunneling-localproxy/files/remove-cxx-standard.patch +++ b/recipes-iot/aws-iot-securetunneling-localproxy/files/remove-cxx-standard.patch @@ -1,16 +1,15 @@ -From be61db954f8819dd7252b86f8aa5716da0d4d0b2 Mon Sep 17 00:00:00 2001 +From e239941555cf9656e3b41a0bb130b5e258c970dd Mon Sep 17 00:00:00 2001 From: Thomas Roos Date: Tue, 9 Jan 2024 14:34:32 +0000 Subject: [PATCH] aws-iot-securetunneling-localproxy: remove setting of Upstream-Status: Submitted [author] - --- CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 34c897a..972e5a8 100644 +index 02ac23c..fe71762 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,3 @@ @@ -19,7 +18,7 @@ index 34c897a..972e5a8 100644 set(AWS_TUNNEL_LOCAL_PROXY_TARGET_NAME localproxy) set(AWS_TUNNEL_LOCAL_PROXY_LIB_NAME lproxy) project(${AWS_TUNNEL_LOCAL_PROXY_TARGET_NAME} CXX) -@@ -21,9 +19,7 @@ endif () +@@ -31,9 +29,7 @@ endif () ######################################## # Section : Common Build setttings # ######################################## @@ -28,5 +27,5 @@ index 34c897a..972e5a8 100644 -set(CMAKE_CXX_STANDARD_REQUIRED ON) #...is required... +# Disable extensions. set(CMAKE_CXX_EXTENSIONS OFF) #...without compiler extensions like gnu++11 - + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)