commit: e37b712f6876fa04379c0cb5c88d76b816e379f7
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Fri Jun 5 17:32:12 2020 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Jun 5 17:34:22 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e37b712f
dev-libs/open62541: Bump version to v1.1-rc1
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
dev-libs/open62541/Manifest | 1 +
.../open62541/files/open62541-1.1_rc1-tests.patch | 104 +++++++++++++++++++++
dev-libs/open62541/metadata.xml | 14 ++-
dev-libs/open62541/open62541-1.1_rc1.ebuild | 98 +++++++++++++++++++
4 files changed, 216 insertions(+), 1 deletion(-)
diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index 1805c90..c631ff4 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1 +1,2 @@
DIST open62541-1.0.1.tar.gz 2689199 BLAKE2B
ad2932a9e42cda5a5ef29904e740ff1cfb0d3e3d481f1d15ba0b1e67c8b42fae11774f28f9b8d8abf8b78400d1c3aea5dfe75a32fb70a303f5378ab5915bc337
SHA512
9fb0af8befba4d7c376ecd98dfab9033439e0a0594e7e3f48b6df54749af482a4e70a7aa077c49202fd704520bb433a7598fc9f9297a5ff12cb7a019176c4031
+DIST open62541-1.1-rc1.tar.gz 2913287 BLAKE2B
c4b46f2dc040549f64befa7b0717cebb6048d28c167c89291301b774c78c9d0b7a1520f0b81319e3837da0f4ca21ec999ca02be20ca92a2f271984773112b8f8
SHA512
fd700b2ccb878f01775aad18b2549f3bb138bb769a1b1c608194294a1dbb806c6902caded42b7a21416d97ee4d59917ff4e114e34bcab3a3cf8c829b866227cb
diff --git a/dev-libs/open62541/files/open62541-1.1_rc1-tests.patch
b/dev-libs/open62541/files/open62541-1.1_rc1-tests.patch
new file mode 100644
index 0000000..1b14eb2
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.1_rc1-tests.patch
@@ -0,0 +1,104 @@
+From 42c70a47ac3a2acfbc9ef0ab153192f132d905ed Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <k...@kmk-computers.de>
+Date: Fri, 5 Jun 2020 19:22:15 +0200
+Subject: [PATCH] cmake: pubsub: Disable failing tests within portage
+
+The Pub/Sub tests won't work within portage. Disable them.
+
+Signed-off-by: Kurt Kanzenbach <k...@kmk-computers.de>
+---
+ tests/CMakeLists.txt | 78 --------------------------------------------
+ 1 file changed, 78 deletions(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 19ec2d8c44f9..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(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(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
+
diff --git a/dev-libs/open62541/metadata.xml b/dev-libs/open62541/metadata.xml
index eda9854..67d1ce5 100644
--- a/dev-libs/open62541/metadata.xml
+++ b/dev-libs/open62541/metadata.xml
@@ -17,15 +17,27 @@
systems.
</longdescription>
<use>
- <flag name="mbedtls">
+ <flag name="encryption">
Enable encryption support
</flag>
+ <flag name="etf">
+ Enable pub/sub using Earliest TxTime First Qdisc
+ </flag>
+ <flag name="mbedtls">
+ Use mbedtls for encryption
+ </flag>
<flag name="pubsub">
Enable OPC/UA Pub/Sub extensions
</flag>
+ <flag name="openssl">
+ Use openssl for encryption
+ </flag>
<flag name="tools">
Build additional shell tools
</flag>
+ <flag name="xdp">
+ Enable pub/sub with eXpress Data Path (XDP)
+ </flag>
</use>
<upstream>
<remote-id type="github">open62541/open62541</remote-id>
diff --git a/dev-libs/open62541/open62541-1.1_rc1.ebuild
b/dev-libs/open62541/open62541-1.1_rc1.ebuild
new file mode 100644
index 0000000..48b25d9
--- /dev/null
+++ b/dev-libs/open62541/open62541-1.1_rc1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+
+inherit cmake python-single-r1
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Open source C implementation of OPC UA"
+HOMEPAGE="https://open62541.org/";
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz ->
${MY_P}.tar.gz"
+
+S=${WORKDIR}/${MY_P}
+
+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}-tests.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ -DOPEN62541_VERSION=v${MY_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_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
+}
