[gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/

["Florian Schmaus" <flow@gentoo.org>]

commit:     b034a39af4bd344630df7f27dbfa0d6005955e97
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Tue Dec 28 15:58:36 2021 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Dec 28 15:58:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b034a39a

dev-libs/open62541: Bump to v1.2.3

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>

 dev-libs/open62541/Manifest                        |   1 +
 .../open62541/files/open62541-1.2.3-headers.patch  |  31 ++++++
 .../open62541/files/open62541-1.2.3-tests.patch    | 124 +++++++++++++++++++++
 dev-libs/open62541/open62541-1.2.3.ebuild          | 104 +++++++++++++++++
 4 files changed, 260 insertions(+)

diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index f17920a09..f8e758cf2 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1 +1,2 @@
 DIST open62541-1.2.2.tar.gz 3644878 BLAKE2B e95cada67461be699d0cc8038c479f955df92117626a2e35764df98191a0836a8e59db74c38f2f60d8acc06cfe5dd89d31c806ceb32de5c92ea9c104678a60ed SHA512 e6a1ec2208ec29d8685d2a957fae6f3fedc0e847d6ab1bb8ac5c7980223bc377692334c87575956b53bb37a9b71c5dedd1b5c4f19f122561543d04661fefe1d5
+DIST open62541-1.2.3.tar.gz 3645511 BLAKE2B 3cebe1a4200cb026916cd801303937509d8e59c10af5400f5a212c16006c1744bc403fad25b40fb7bcf9043982649f1661c13aa16df8a07db6334f7e2fc55872 SHA512 ffcc697901ec978fb9d1f8996f8a4c5114c98a0ec19206cac95d1a84f8d0fcbe38bf73e88f1df59d53bc6be481102aa2f2a6a0efa29797e7ce11123bd23131c2

diff --git a/dev-libs/open62541/files/open62541-1.2.3-headers.patch b/dev-libs/open62541/files/open62541-1.2.3-headers.patch
new file mode 100644
index 000000000..75d79ec46
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.2.3-headers.patch
@@ -0,0 +1,31 @@
+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(+)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -907,6 +907,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)
+@@ -916,6 +917,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")

diff --git a/dev-libs/open62541/files/open62541-1.2.3-tests.patch b/dev-libs/open62541/files/open62541-1.2.3-tests.patch
new file mode 100644
index 000000000..e8b83fe08
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.2.3-tests.patch
@@ -0,0 +1,124 @@
+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 |  103 ---------------------------------------------------
+ 1 file changed, 103 deletions(-)
+
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -341,109 +341,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)
+-    add_executable(check_pubsub_get_state pubsub/check_pubsub_get_state.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+-    target_link_libraries(check_pubsub_get_state ${LIBS})
+-    add_test_valgrind(check_pubsub_get_state ${TESTS_BINARY_DIR}/check_pubsub_get_state)
+-
+-    #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_subscribe_config_freeze pubsub/check_pubsub_subscribe_config_freeze.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+-    target_link_libraries(check_pubsub_subscribe_config_freeze ${LIBS})
+-    add_test_valgrind(check_pubsub_subscribe_config_freeze ${TESTS_BINARY_DIR}/check_pubsub_subscribe_config_freeze)
+-    add_executable(check_pubsub_subscribe_rt_levels pubsub/check_pubsub_subscribe_rt_levels.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+-    target_link_libraries(check_pubsub_subscribe_rt_levels ${LIBS})
+-    add_test_valgrind(check_pubsub_subscribe_rt_levels ${TESTS_BINARY_DIR}/check_pubsub_subscribe_rt_levels)
+-    add_executable(check_pubsub_multiple_subscribe_rt_levels pubsub/check_pubsub_multiple_subscribe_rt_levels.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+-    target_link_libraries(check_pubsub_multiple_subscribe_rt_levels ${LIBS})
+-    add_test_valgrind(check_pubsub_multiple_subscribe_rt_levels ${TESTS_BINARY_DIR}/check_pubsub_multiple_subscribe_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_MONITORING)
+-        add_executable(check_pubsub_subscribe_msgrcvtimeout pubsub/check_pubsub_subscribe_msgrcvtimeout.c 
+-            $<TARGET_OBJECTS:open62541-object>
+-            $<TARGET_OBJECTS:open62541-testplugins>)
+-        target_link_libraries(check_pubsub_subscribe_msgrcvtimeout ${LIBS})
+-        add_test_valgrind(check_pubsub_subscribe_msgrcvtimeout ${TESTS_BINARY_DIR}/check_pubsub_subscribe_msgrcvtimeout)
+-    endif()
+-
+-    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()
+-    if(UA_ENABLE_PUBSUB_FILE_CONFIG)
+-        add_executable(check_pubsub_configuration pubsub/check_pubsub_configuration.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+-        target_link_libraries(check_pubsub_configuration ${LIBS})
+-        add_test_valgrind(pubsub_configuration ${TESTS_BINARY_DIR}/check_pubsub_configuration)
+-    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)

diff --git a/dev-libs/open62541/open62541-1.2.3.ebuild b/dev-libs/open62541/open62541-1.2.3.ebuild
new file mode 100644
index 000000000..ca53b7b75
--- /dev/null
+++ b/dev-libs/open62541/open62541-1.2.3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		dev-libs/check
+		dev-util/valgrind
+		$(python_gen_cond_dep '
+			dev-python/subunit[${PYTHON_USEDEP}]
+		')
+	)
+"
+DEPEND="
+	mbedtls? ( net-libs/mbedtls:= )
+	openssl? ( dev-libs/openssl:0= )
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	${DEPEND}
+"
+
+PATCHES=(
+	"${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
+}