mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-19 12:03:02 -04:00
dev-libs/open62541: Drop old
Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
This commit is contained in:
Kurt Kanzenbach
@@ -1,43 +0,0 @@
|
||||
From 8cac173827297e936a24b4bdfe73f2498dfe483a Mon Sep 17 00:00:00 2001
|
||||
From: Kurt Kanzenbach <kurt@kmk-computers.de>
|
||||
Date: Sun, 12 Jul 2020 10:57:08 +0200
|
||||
Subject: [PATCH 3/3] etf: Fix compiler warning/build error in etf plugin
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Fix the following warning/error:
|
||||
|
||||
|In function ‘snprintf’,
|
||||
| inlined from ‘UA_PubSubChannelEthernetETF_open’ at /var/tmp/portage/dev-libs/open62541-1.1/work/open62541-1.1/plugins/ua_pubsub_ethernet_etf.c:189:5,
|
||||
| inlined from ‘TransportLayerEthernetETF_addChannel’ at /var/tmp/portage/dev-libs/open62541-1.1/work/open62541-1.1/plugins/ua_pubsub_ethernet_etf.c:563:40:
|
||||
|/usr/include/bits/stdio2.h:67:10: error: ‘__builtin___snprintf_chk’ specified bound 40 exceeds destination size 16 [-Werror=stringop-overflow=]
|
||||
| 67 | return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
|
||||
| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
| 68 | __bos (__s), __fmt, __va_arg_pack ());
|
||||
| | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
|
||||
|
||||
By using the correct size.
|
||||
|
||||
Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
|
||||
---
|
||||
plugins/ua_pubsub_ethernet_etf.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/plugins/ua_pubsub_ethernet_etf.c b/plugins/ua_pubsub_ethernet_etf.c
|
||||
index 416b5857945a..d55eb363e3b5 100644
|
||||
--- a/plugins/ua_pubsub_ethernet_etf.c
|
||||
+++ b/plugins/ua_pubsub_ethernet_etf.c
|
||||
@@ -186,7 +186,7 @@ UA_PubSubChannelEthernetETF_open(const UA_PubSubConnectionConfig *connectionConf
|
||||
struct ifreq ifreq;
|
||||
memset(&ifreq, 0, sizeof(struct ifreq));
|
||||
UA_UInt64 len = UA_MIN(address->networkInterface.length, sizeof(ifreq.ifr_name)-1);
|
||||
- UA_snprintf(ifreq.ifr_name, sizeof(struct ifreq),
|
||||
+ UA_snprintf(ifreq.ifr_name, sizeof(ifreq.ifr_name),
|
||||
"%.*s", (int)len,
|
||||
(char*)address->networkInterface.data);
|
||||
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
From a5697f1eb69822e172bc31d1549222c8ca718844 Mon Sep 17 00:00:00 2001
|
||||
From: Kurt Kanzenbach <kurt@kmk-computers.de>
|
||||
Date: Sun, 12 Jul 2020 10:39:31 +0200
|
||||
Subject: [PATCH 2/3] cmake: Install ETF and XDP plugin headers
|
||||
|
||||
When the corresponding features are enabled, the headers should be installed as
|
||||
well.
|
||||
|
||||
Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
|
||||
---
|
||||
CMakeLists.txt | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index d7417c88088b..8f87c5d998c6 100755
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -861,6 +861,7 @@ if(UA_ENABLE_PUBSUB)
|
||||
list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_udp.h)
|
||||
list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_udp.c)
|
||||
if(UA_ENABLE_PUBSUB_ETH_UADP_ETF)
|
||||
+ list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_ethernet_etf.h)
|
||||
list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet_etf.c)
|
||||
endif()
|
||||
if(UA_ENABLE_PUBSUB_ETH_UADP)
|
||||
@@ -870,6 +871,7 @@ if(UA_ENABLE_PUBSUB)
|
||||
if(UA_ENABLE_PUBSUB_ETH_UADP_XDP)
|
||||
if(EXISTS "${XDP_LIBRARY}")
|
||||
list(APPEND open62541_LIBRARIES ${XDP_LIBRARY})
|
||||
+ list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_ethernet_xdp.h)
|
||||
list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet_xdp.c)
|
||||
else()
|
||||
MESSAGE(WARNING "samples in bpf-next directory were not built. Build the bpf-next to use XDP")
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@@ -1,104 +0,0 @@
|
||||
From ab9a4a1c826bb662816f71020054ba2558afefc7 Mon Sep 17 00:00:00 2001
|
||||
From: Kurt Kanzenbach <kurt@kmk-computers.de>
|
||||
Date: Sat, 20 Jun 2020 14:28:57 +0200
|
||||
Subject: [PATCH 1/3] cmake: pubsub: Disable failing tests within portage
|
||||
|
||||
The Pub/Sub tests won't work within portage. Disable them.
|
||||
|
||||
Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
|
||||
---
|
||||
tests/CMakeLists.txt | 78 --------------------------------------------
|
||||
1 file changed, 78 deletions(-)
|
||||
|
||||
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
||||
index c73b2b04520b..fb21fb856ba4 100644
|
||||
--- a/tests/CMakeLists.txt
|
||||
+++ b/tests/CMakeLists.txt
|
||||
@@ -331,84 +331,6 @@ if(UA_ENABLE_DISCOVERY)
|
||||
add_test_valgrind(discovery ${TESTS_BINARY_DIR}/check_discovery)
|
||||
endif()
|
||||
|
||||
-if(UA_ENABLE_PUBSUB)
|
||||
- add_executable(check_pubsub_encoding pubsub/check_pubsub_encoding.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
|
||||
- target_link_libraries(check_pubsub_encoding ${LIBS})
|
||||
- add_test_valgrind(pubsub_encoding ${TESTS_BINARY_DIR}/check_pubsub_encoding)
|
||||
- add_executable(check_pubsub_pds pubsub/check_pubsub_pds.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
|
||||
- target_link_libraries(check_pubsub_pds ${LIBS})
|
||||
- add_test_valgrind(pubsub_pds ${TESTS_BINARY_DIR}/check_pubsub_pds)
|
||||
- add_executable(check_pubsub_connection_udp pubsub/check_pubsub_connection_udp.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
|
||||
- target_link_libraries(check_pubsub_connection_udp ${LIBS})
|
||||
- add_test_valgrind(pubsub_connection_udp ${TESTS_BINARY_DIR}/check_pubsub_connection_udp)
|
||||
- add_executable(check_pubsub_publish pubsub/check_pubsub_publish.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
|
||||
- target_link_libraries(check_pubsub_publish ${LIBS})
|
||||
- add_test_valgrind(pubsub_publish ${TESTS_BINARY_DIR}/check_pubsub_publish)
|
||||
- add_executable(check_pubsub_publish_uadp pubsub/check_pubsub_publish_uadp.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
|
||||
- target_link_libraries(check_pubsub_publish_uadp ${LIBS})
|
||||
- add_test_valgrind(pubsub_publish ${TESTS_BINARY_DIR}/check_pubsub_publish_uadp)
|
||||
-
|
||||
- #Link libraries for executing subscriber unit test
|
||||
- add_executable(check_pubsub_subscribe pubsub/check_pubsub_subscribe.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
|
||||
- target_link_libraries(check_pubsub_subscribe ${LIBS})
|
||||
- add_executable(check_pubsub_publishspeed pubsub/check_pubsub_publishspeed.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
|
||||
- target_link_libraries(check_pubsub_publishspeed ${LIBS})
|
||||
- add_test_valgrind(pubsub_publishspeed ${TESTS_BINARY_DIR}/check_pubsub_publish)
|
||||
- add_executable(check_pubsub_config_freeze pubsub/check_pubsub_config_freeze.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
|
||||
- target_link_libraries(check_pubsub_config_freeze ${LIBS})
|
||||
- add_test_valgrind(check_pubsub_config_freeze ${TESTS_BINARY_DIR}/check_pubsub_config_freeze)
|
||||
- add_executable(check_pubsub_publish_rt_levels pubsub/check_pubsub_publish_rt_levels.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
|
||||
- target_link_libraries(check_pubsub_publish_rt_levels ${LIBS})
|
||||
- add_test_valgrind(check_pubsub_publish_rt_levels ${TESTS_BINARY_DIR}/check_pubsub_publish_rt_levels)
|
||||
-
|
||||
- add_executable(check_pubsub_multiple_layer pubsub/check_pubsub_multiple_layer.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
|
||||
- target_link_libraries(check_pubsub_multiple_layer ${LIBS})
|
||||
- add_test_valgrind(pubsub_multiple_layer ${TESTS_BINARY_DIR}/check_pubsub_multiple_layer)
|
||||
-
|
||||
- if(UA_ENABLE_PUBSUB_ETH_UADP)
|
||||
- if(NOT UA_ENABLE_PUBSUB_ETH_UADP_ETF)
|
||||
- add_executable(check_pubsub_connection_ethernet pubsub/check_pubsub_connection_ethernet.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
|
||||
- target_link_libraries(check_pubsub_connection_ethernet ${LIBS})
|
||||
- add_test_valgrind(pubsub_connection_ethernet ${TESTS_BINARY_DIR}/check_pubsub_connection_ethernet)
|
||||
- add_executable(check_pubsub_publish_ethernet pubsub/check_pubsub_publish_ethernet.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
|
||||
- target_link_libraries(check_pubsub_publish_ethernet ${LIBS})
|
||||
- add_test_valgrind(pubsub_publish_ethernet ${TESTS_BINARY_DIR}/check_pubsub_publish_ethernet)
|
||||
- endif()
|
||||
- if(UA_ENABLE_PUBSUB_ETH_UADP_XDP)
|
||||
- add_executable(check_pubsub_connection_xdp pubsub/check_pubsub_connection_xdp.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
|
||||
- target_link_libraries(check_pubsub_connection_xdp ${LIBS})
|
||||
- add_test_valgrind(pubsub_connection_xdp ${TESTS_BINARY_DIR}/check_pubsub_connection_xdp)
|
||||
- endif()
|
||||
- endif()
|
||||
- if(UA_ENABLE_PUBSUB_ETH_UADP_ETF)
|
||||
- add_executable(check_pubsub_connection_ethernet_etf pubsub/check_pubsub_connection_ethernet_etf.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
|
||||
- target_link_libraries(check_pubsub_connection_ethernet_etf ${LIBS})
|
||||
- add_test_valgrind(pubsub_connection_ethernet_etf ${TESTS_BINARY_DIR}/check_pubsub_connection_ethernet_etf)
|
||||
- add_executable(check_pubsub_publish_ethernet_etf pubsub/check_pubsub_publish_ethernet_etf.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
|
||||
- target_link_libraries(check_pubsub_publish_ethernet_etf ${LIBS})
|
||||
- add_test_valgrind(pubsub_publish_ethernet_etf ${TESTS_BINARY_DIR}/check_pubsub_publish_ethernet_etf)
|
||||
- endif()
|
||||
-
|
||||
- if(UA_ENABLE_PUBSUB_INFORMATIONMODEL)
|
||||
- add_executable(check_pubsub_informationmodel pubsub/check_pubsub_informationmodel.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
|
||||
- target_link_libraries(check_pubsub_informationmodel ${LIBS})
|
||||
- add_test_valgrind(check_pubsub_informationmodel ${TESTS_BINARY_DIR}/check_pubsub_informationmodel)
|
||||
- if(UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS)
|
||||
- add_executable(check_pubsub_informationmodel_methods pubsub/check_pubsub_informationmodel_methods.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
|
||||
- target_link_libraries(check_pubsub_informationmodel_methods ${LIBS})
|
||||
- add_test_valgrind(check_pubsub_informationmodel_methods ${TESTS_BINARY_DIR}/check_pubsub_informationmodel_methods)
|
||||
-
|
||||
- endif()
|
||||
- endif()
|
||||
- if(UA_ENABLE_PUBSUB_MQTT)
|
||||
- if(NOT WIN32)
|
||||
- add_executable(check_pubsub_connection_mqtt pubsub/check_pubsub_connection_mqtt.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
|
||||
- target_link_libraries(check_pubsub_connection_mqtt ${LIBS})
|
||||
- add_test_valgrind(pubsub_connection_mqtt ${TESTS_BINARY_DIR}/check_pubsub_connection_mqtt)
|
||||
- endif()
|
||||
- endif()
|
||||
-endif()
|
||||
-
|
||||
add_executable(check_server_readspeed server/check_server_readspeed.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
|
||||
target_link_libraries(check_server_readspeed ${LIBS})
|
||||
add_test_no_valgrind(server_readspeed ${TESTS_BINARY_DIR}/check_server_readspeed)
|
||||
--
|
||||
2.26.2
|
||||
|
||||
Reference in New Issue
Block a user