mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-10 23:52:59 -04:00
dev-libs/open62541: Drop old
Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
This commit is contained in:
Kurt Kanzenbach
@@ -1,3 +1,2 @@
|
||||
DIST open62541-1.0.6.tar.gz 2691627 BLAKE2B 72a0eb5870bf4233ac6f3911c1a7ad95d4cfa1c26be581815e99189206e188beedc1c2c81ea4cbd038ef545b9548949735353a550bb54ca6a7fb6a6fd60ffa65 SHA512 f317476e19fd2cc1cbd9155e2fe8bcac6499758f35a2f4eb59403add7d66ef94d45bae06bc8ece79eedceef1d0a364565d567b97e94da6b333591f4347961955
|
||||
DIST open62541-1.1.5.tar.gz 2925670 BLAKE2B 5da0795801f2fd92fd3d922fbda83d8ef6f22f19a9e17d585fd2f9dddf37e3fc95290ac3d49774ebad0bee8114f5bec4af11d01998ba765b93311062681c7114 SHA512 46379047c83bd728343c4d5b78bf5ade02bd9af4c430350d54366aeab66dadfaee2bded317e990b2456d98dd7277877824e6ad3c632d62c94ba50b14433ea880
|
||||
DIST open62541-1.2.tar.gz 3640972 BLAKE2B 0b27837ba953338923651919accfb30356d1ecd83c911586720c803bb5cfce193361111e962c79b0e1739e804bb2de25a74e6b105b80eb58b497d7f5fa7ed469 SHA512 f492db2fe1569cf831f67e55d633af13bac1026e4ab8a30c2e1c36ada9b635e0086f176cb8f53665b2254ca9ba8c8f46ea850b1a0430045b71502f166645613a
|
||||
|
||||
@@ -1,40 +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(-)
|
||||
|
||||
Index: open62541/plugins/ua_pubsub_ethernet_etf.c
|
||||
===================================================================
|
||||
--- open62541.orig/plugins/ua_pubsub_ethernet_etf.c
|
||||
+++ open62541/plugins/ua_pubsub_ethernet_etf.c
|
||||
@@ -186,7 +186,7 @@ UA_PubSubChannelEthernetETF_open(const U
|
||||
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);
|
||||
|
||||
@@ -1,33 +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(+)
|
||||
|
||||
Index: open62541/CMakeLists.txt
|
||||
===================================================================
|
||||
--- open62541.orig/CMakeLists.txt
|
||||
+++ open62541/CMakeLists.txt
|
||||
@@ -877,6 +877,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)
|
||||
@@ -886,6 +887,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")
|
||||
@@ -1,101 +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(-)
|
||||
|
||||
Index: open62541/tests/CMakeLists.txt
|
||||
===================================================================
|
||||
--- open62541.orig/tests/CMakeLists.txt
|
||||
+++ open62541/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)
|
||||
@@ -1,105 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{7..9} )
|
||||
|
||||
inherit cmake python-single-r1
|
||||
|
||||
DESCRIPTION="Open source C implementation of OPC UA"
|
||||
HOMEPAGE="https://open62541.org/"
|
||||
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="MPL-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm64 ~x86"
|
||||
IUSE="doc encryption examples etf mbedtls pubsub openssl test tools xdp"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
REQUIRED_USE="
|
||||
${PYTHON_REQUIRED_USE}
|
||||
encryption? ( || ( mbedtls openssl ) )
|
||||
etf? ( pubsub )
|
||||
xdp? ( pubsub )
|
||||
"
|
||||
|
||||
BDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
virtual/pkgconfig
|
||||
doc? (
|
||||
media-gfx/graphviz
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
|
||||
dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
|
||||
')
|
||||
)
|
||||
test? (
|
||||
dev-libs/check
|
||||
dev-util/valgrind
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/subunit[${PYTHON_MULTI_USEDEP}]
|
||||
')
|
||||
)
|
||||
"
|
||||
DEPEND="
|
||||
mbedtls? ( net-libs/mbedtls:= )
|
||||
openssl? ( dev-libs/openssl:0= )
|
||||
"
|
||||
RDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
${DEPEND}
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-etf.patch"
|
||||
"${FILESDIR}/${P}-headers.patch"
|
||||
"${FILESDIR}/${P}-tests.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
# bug 780912
|
||||
sed -i -e 's/check_add_cc_flag("-Werror")//g' CMakeLists.txt || die
|
||||
|
||||
cmake_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DBUILD_SHARED_LIBS=ON
|
||||
-DOPEN62541_VERSION=v${PV}
|
||||
-DUA_BUILD_EXAMPLES=OFF
|
||||
-DUA_BUILD_TOOLS=$(usex tools)
|
||||
-DUA_BUILD_UNIT_TESTS=$(usex test)
|
||||
-DUA_ENABLE_ENCRYPTION=$(usex encryption)
|
||||
-DUA_ENABLE_ENCRYPTION_MBEDTLS=$(usex mbedtls)
|
||||
-DUA_ENABLE_ENCRYPTION_OPENSSL=$(usex openssl)
|
||||
-DUA_ENABLE_PUBSUB=$(usex pubsub)
|
||||
-DUA_ENABLE_PUBSUB_ETH_UADP=$(usex pubsub)
|
||||
-DUA_ENABLE_PUBSUB_ETH_UADP_ETF=$(usex etf)
|
||||
-DUA_ENABLE_PUBSUB_ETH_UADP_XDP=$(usex xdp)
|
||||
)
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cmake_src_compile
|
||||
use doc && cmake_build doc
|
||||
}
|
||||
|
||||
src_install() {
|
||||
use doc && local HTML_DOCS=( "${WORKDIR}"/${P}_build/doc/. )
|
||||
cmake_src_install
|
||||
|
||||
if use examples; then
|
||||
docompress -x /usr/share/doc/${PF}/examples
|
||||
dodoc -r examples/
|
||||
fi
|
||||
|
||||
python_fix_shebang "${ED}"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cmake_src_test -j1
|
||||
}
|
||||
Reference in New Issue
Block a user