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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/
@ 2020-04-04 11:13 Haelwenn Monnier
  0 siblings, 0 replies; 21+ messages in thread
From: Haelwenn Monnier @ 2020-04-04 11:13 UTC (permalink / raw
  To: gentoo-commits

commit:     a4bf2eca95e0ed5049f20f25f3723187357ec3ed
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sat Apr  4 10:05:28 2020 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Sat Apr  4 10:35:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a4bf2eca

dev-libs/open62541: Open source C implementation of OPC UA (new package)

open62541 (http://open62541.org) is an open source and free implementation of
OPC UA (OPC Unified Architecture) written in the common subset of the C99 and
C++98 languages. The library is usable with all major compilers and provides the
necessary tools to implement dedicated OPC UA clients and servers, or to
integrate OPC UA-based communication into existing applications. open62541
library is platform independent. All platform-specific functionality is
implemented via exchangeable plugins. Plugin implementations are provided for
the major operating systems.

Closes: https://bugs.gentoo.org/716152
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>

 dev-libs/open62541/Manifest                        |  1 +
 .../open62541/files/open62541-1.0.1-tests.patch    | 60 ++++++++++++++++
 dev-libs/open62541/metadata.xml                    | 30 ++++++++
 dev-libs/open62541/open62541-1.0.1.ebuild          | 82 ++++++++++++++++++++++
 4 files changed, 173 insertions(+)

diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
new file mode 100644
index 0000000..1805c90
--- /dev/null
+++ b/dev-libs/open62541/Manifest
@@ -0,0 +1 @@
+DIST open62541-1.0.1.tar.gz 2689199 BLAKE2B ad2932a9e42cda5a5ef29904e740ff1cfb0d3e3d481f1d15ba0b1e67c8b42fae11774f28f9b8d8abf8b78400d1c3aea5dfe75a32fb70a303f5378ab5915bc337 SHA512 9fb0af8befba4d7c376ecd98dfab9033439e0a0594e7e3f48b6df54749af482a4e70a7aa077c49202fd704520bb433a7598fc9f9297a5ff12cb7a019176c4031

diff --git a/dev-libs/open62541/files/open62541-1.0.1-tests.patch b/dev-libs/open62541/files/open62541-1.0.1-tests.patch
new file mode 100644
index 0000000..6f8f294
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.0.1-tests.patch
@@ -0,0 +1,60 @@
+From f1f120389c345c3f45a6da5b6793cdfb78a0ce61 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Sat, 4 Apr 2020 11:59:16 +0200
+Subject: [PATCH] tests: Disable failing tests
+
+Disable failing tests:
+
+|95% tests passed, 2 tests failed out of 41
+|
+|Total Test time (real) =  78.09 sec
+|
+|The following tests FAILED:
+|         29 - pubsub_publish (Failed)
+|         30 - check_pubsub_subscribe (SEGFAULT)
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ tests/CMakeLists.txt | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 8f498e7911fa..853e535eeaa7 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -255,20 +255,20 @@ if(UA_ENABLE_PUBSUB)
+     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_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_test_valgrind(check_pubsub_subscribe ${TESTS_BINARY_DIR}/check_pubsub_subscribe)
+-    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_subscribe pubsub/check_pubsub_subscribe.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
++    # target_link_libraries(check_pubsub_subscribe ${LIBS})
++    # add_test_valgrind(check_pubsub_subscribe ${TESTS_BINARY_DIR}/check_pubsub_subscribe)
++    # 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_multiple_layer pubsub/check_pubsub_multiple_layer.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+     target_link_libraries(check_pubsub_multiple_layer ${LIBS})
+-- 
+2.24.1
+

diff --git a/dev-libs/open62541/metadata.xml b/dev-libs/open62541/metadata.xml
new file mode 100644
index 0000000..9ef64b2
--- /dev/null
+++ b/dev-libs/open62541/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>kurt@kmk-computers.de</email>
+    <name>Kurt Kanzenbach</name>
+  </maintainer>
+  <longdescription>
+    open62541 (http://open62541.org) is an open source and free implementation
+    of OPC UA (OPC Unified Architecture) written in the common subset of the C99
+    and C++98 languages. The library is usable with all major compilers and
+    provides the necessary tools to implement dedicated OPC UA clients and
+    servers, or to integrate OPC UA-based communication into existing
+    applications. open62541 library is platform independent. All
+    platform-specific functionality is implemented via exchangeable
+    plugins. Plugin implementations are provided for the major operating
+    systems.
+  </longdescription>
+  <use>
+    <flag name="mbedtls">
+      Enable encryption support
+    </flag>
+    <flag name="pubsub">
+      Enable OPC/UA Pub/Sub extensions
+    </flag>
+    <flag name="tools">
+      Build additional shell tools
+    </flag>
+  </use>
+</pkgmetadata>

diff --git a/dev-libs/open62541/open62541-1.0.1.ebuild b/dev-libs/open62541/open62541-1.0.1.ebuild
new file mode 100644
index 0000000..d11f16a
--- /dev/null
+++ b/dev-libs/open62541/open62541-1.0.1.ebuild
@@ -0,0 +1,82 @@
+# 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
+
+DESCRIPTION="Open source C implementation of OPC UA"
+HOMEPAGE="https://open62541.org/"
+SRC_URI="https://github.com/open62541/open62541/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples mbedtls pubsub test tools"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+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
+		$(python_gen_cond_dep '
+			dev-python/subunit[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+DEPEND="
+	mbedtls? ( net-libs/mbedtls:= )
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	${DEPEND}
+"
+
+PATCHES=( "${FILESDIR}/${P}-tests.patch" )
+
+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)
+		-UUA_ENABLE_ENCRYPTION=$(usex mbedtls)
+		-DUA_ENABLE_PUBSUB=$(usex pubsub)
+	)
+
+	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
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/
@ 2020-06-06  9:32 Andrew Ammerlaan
  0 siblings, 0 replies; 21+ messages in thread
From: Andrew Ammerlaan @ 2020-06-06  9:32 UTC (permalink / raw
  To: gentoo-commits

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 <kurt@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 <kurt@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
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/
@ 2020-07-17  9:46 Andrew Ammerlaan
  0 siblings, 0 replies; 21+ messages in thread
From: Andrew Ammerlaan @ 2020-07-17  9:46 UTC (permalink / raw
  To: gentoo-commits

commit:     4e77177d9990f6598d2d3471139100ba9898cb31
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Thu Jul 16 17:12:29 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Thu Jul 16 17:12:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4e77177d

dev-libs/open62541: Add version v1.1.1

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

 dev-libs/open62541/Manifest                        |   1 +
 dev-libs/open62541/files/open62541-1.1.1-etf.patch |  43 +++++++++
 .../open62541/files/open62541-1.1.1-headers.patch  |  36 +++++++
 .../open62541/files/open62541-1.1.1-tests.patch    | 104 +++++++++++++++++++++
 dev-libs/open62541/open62541-1.1.1.ebuild          |  98 +++++++++++++++++++
 5 files changed, 282 insertions(+)

diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index 1291050..4415d55 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1,2 +1,3 @@
 DIST open62541-1.0.1.tar.gz 2689199 BLAKE2B ad2932a9e42cda5a5ef29904e740ff1cfb0d3e3d481f1d15ba0b1e67c8b42fae11774f28f9b8d8abf8b78400d1c3aea5dfe75a32fb70a303f5378ab5915bc337 SHA512 9fb0af8befba4d7c376ecd98dfab9033439e0a0594e7e3f48b6df54749af482a4e70a7aa077c49202fd704520bb433a7598fc9f9297a5ff12cb7a019176c4031
+DIST open62541-1.1.1.tar.gz 2916122 BLAKE2B a3230911bfeaf54282b687293afc82e9d66f93250707cbdf2e2fc2141b8737153d182a7199a7fc677e5e625c17454d16f434923837554a4f79ba7c4d5013312d SHA512 5b4dacf25de6c20311de52feb0ea791779b8a9ccb894341786e63e740367ec1e8d91b984b670b1a58d62ea160d7384fedb3ff50cabbc93d76c95c330507afc57
 DIST open62541-1.1.tar.gz 2931184 BLAKE2B 817caad357e25bb70c548e7367ee75c358f40c27e5fde6b2edf6fe935289f58c40aa232565f0da5ba8ba6bcaf7138ce835232b649f10c2c9dee9618421eca6d8 SHA512 cf4d28de9534069600cdd3b20e837cdfbdeb46d4da59ad70fa8ad60fa1cd7fd02216cd0b818e8ece8dedb77de1986608817ab5f015e2ac0a806d5d8ba20a1765

diff --git a/dev-libs/open62541/files/open62541-1.1.1-etf.patch b/dev-libs/open62541/files/open62541-1.1.1-etf.patch
new file mode 100644
index 0000000..cce618e
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.1.1-etf.patch
@@ -0,0 +1,43 @@
+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
+

diff --git a/dev-libs/open62541/files/open62541-1.1.1-headers.patch b/dev-libs/open62541/files/open62541-1.1.1-headers.patch
new file mode 100644
index 0000000..97e225b
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.1.1-headers.patch
@@ -0,0 +1,36 @@
+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
+

diff --git a/dev-libs/open62541/files/open62541-1.1.1-tests.patch b/dev-libs/open62541/files/open62541-1.1.1-tests.patch
new file mode 100644
index 0000000..ad96717
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.1.1-tests.patch
@@ -0,0 +1,104 @@
+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
+

diff --git a/dev-libs/open62541/open62541-1.1.1.ebuild b/dev-libs/open62541/open62541-1.1.1.ebuild
new file mode 100644
index 0000000..b6b0d45
--- /dev/null
+++ b/dev-libs/open62541/open62541-1.1.1.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
+
+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_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
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/
@ 2020-07-20 11:40 Andrew Ammerlaan
  0 siblings, 0 replies; 21+ messages in thread
From: Andrew Ammerlaan @ 2020-07-20 11:40 UTC (permalink / raw
  To: gentoo-commits

commit:     5cf22a895d7262df9c112a1a86c71696f1b26a02
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sun Jul 19 13:51:02 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Jul 19 13:51:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5cf22a89

dev-libs/open62541: Drop old

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

 dev-libs/open62541/Manifest                        |   1 -
 dev-libs/open62541/files/open62541-1.1-etf.patch   |  43 --------
 .../open62541/files/open62541-1.1-headers.patch    |  36 -------
 dev-libs/open62541/files/open62541-1.1-tests.patch | 110 ---------------------
 dev-libs/open62541/open62541-1.1.ebuild            |  98 ------------------
 5 files changed, 288 deletions(-)

diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index 4415d55..7a17dfe 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1,3 +1,2 @@
 DIST open62541-1.0.1.tar.gz 2689199 BLAKE2B ad2932a9e42cda5a5ef29904e740ff1cfb0d3e3d481f1d15ba0b1e67c8b42fae11774f28f9b8d8abf8b78400d1c3aea5dfe75a32fb70a303f5378ab5915bc337 SHA512 9fb0af8befba4d7c376ecd98dfab9033439e0a0594e7e3f48b6df54749af482a4e70a7aa077c49202fd704520bb433a7598fc9f9297a5ff12cb7a019176c4031
 DIST open62541-1.1.1.tar.gz 2916122 BLAKE2B a3230911bfeaf54282b687293afc82e9d66f93250707cbdf2e2fc2141b8737153d182a7199a7fc677e5e625c17454d16f434923837554a4f79ba7c4d5013312d SHA512 5b4dacf25de6c20311de52feb0ea791779b8a9ccb894341786e63e740367ec1e8d91b984b670b1a58d62ea160d7384fedb3ff50cabbc93d76c95c330507afc57
-DIST open62541-1.1.tar.gz 2931184 BLAKE2B 817caad357e25bb70c548e7367ee75c358f40c27e5fde6b2edf6fe935289f58c40aa232565f0da5ba8ba6bcaf7138ce835232b649f10c2c9dee9618421eca6d8 SHA512 cf4d28de9534069600cdd3b20e837cdfbdeb46d4da59ad70fa8ad60fa1cd7fd02216cd0b818e8ece8dedb77de1986608817ab5f015e2ac0a806d5d8ba20a1765

diff --git a/dev-libs/open62541/files/open62541-1.1-etf.patch b/dev-libs/open62541/files/open62541-1.1-etf.patch
deleted file mode 100644
index a5edee6..0000000
--- a/dev-libs/open62541/files/open62541-1.1-etf.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From aa6581a7053dd43247d65daa5511fbcc2977731f 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] 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
-

diff --git a/dev-libs/open62541/files/open62541-1.1-headers.patch b/dev-libs/open62541/files/open62541-1.1-headers.patch
deleted file mode 100644
index 29d2ed3..0000000
--- a/dev-libs/open62541/files/open62541-1.1-headers.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From fef10a1f02ae5863e6670802ce162b6e102e3df8 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] 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 ee40c19af21f..3401ce3d2bd1 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -858,6 +858,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)
-@@ -867,6 +868,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
-

diff --git a/dev-libs/open62541/files/open62541-1.1-tests.patch b/dev-libs/open62541/files/open62541-1.1-tests.patch
deleted file mode 100644
index 68c0ef6..0000000
--- a/dev-libs/open62541/files/open62541-1.1-tests.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 3155e729c5a20cacfb84472e442c94b05bba8dd4 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] 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 | 84 --------------------------------------------
- 1 file changed, 84 deletions(-)
-
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 3e839534bf83..af644422bba6 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -331,90 +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_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_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
-

diff --git a/dev-libs/open62541/open62541-1.1.ebuild b/dev-libs/open62541/open62541-1.1.ebuild
deleted file mode 100644
index b6b0d45..0000000
--- a/dev-libs/open62541/open62541-1.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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
-
-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_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
-}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/
@ 2020-08-02  7:21 Andrew Ammerlaan
  0 siblings, 0 replies; 21+ messages in thread
From: Andrew Ammerlaan @ 2020-08-02  7:21 UTC (permalink / raw
  To: gentoo-commits

commit:     558391f81e8000b3f142055719e5a979b574b9ac
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sat Aug  1 17:16:13 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Aug  1 17:16:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=558391f8

dev-libs/open62541: Bump version to v1.1.2

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

 dev-libs/open62541/Manifest                        |   1 +
 dev-libs/open62541/files/open62541-1.1.2-etf.patch |  43 +++++++++
 .../open62541/files/open62541-1.1.2-headers.patch  |  36 +++++++
 .../open62541/files/open62541-1.1.2-tests.patch    | 104 +++++++++++++++++++++
 dev-libs/open62541/open62541-1.1.2.ebuild          |  98 +++++++++++++++++++
 5 files changed, 282 insertions(+)

diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index 7a17dfe..25329c9 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1,2 +1,3 @@
 DIST open62541-1.0.1.tar.gz 2689199 BLAKE2B ad2932a9e42cda5a5ef29904e740ff1cfb0d3e3d481f1d15ba0b1e67c8b42fae11774f28f9b8d8abf8b78400d1c3aea5dfe75a32fb70a303f5378ab5915bc337 SHA512 9fb0af8befba4d7c376ecd98dfab9033439e0a0594e7e3f48b6df54749af482a4e70a7aa077c49202fd704520bb433a7598fc9f9297a5ff12cb7a019176c4031
 DIST open62541-1.1.1.tar.gz 2916122 BLAKE2B a3230911bfeaf54282b687293afc82e9d66f93250707cbdf2e2fc2141b8737153d182a7199a7fc677e5e625c17454d16f434923837554a4f79ba7c4d5013312d SHA512 5b4dacf25de6c20311de52feb0ea791779b8a9ccb894341786e63e740367ec1e8d91b984b670b1a58d62ea160d7384fedb3ff50cabbc93d76c95c330507afc57
+DIST open62541-1.1.2.tar.gz 2916517 BLAKE2B 60ee78630ee74fbe9d2dee894f3b5f6b5209b823f8e24236e2f6ceb13ddc68df9c0065d57fe14096cdf822755979053201b6901540082aac3d69135c3dc54b67 SHA512 090f24b77211ef8e0a45c7b74de948db6ea64290fc591ae0131871119d826c8b385769ab4c1dad0f8ba663acafd7df3b4b288759623eb6f4a3fbd00ab65abedc

diff --git a/dev-libs/open62541/files/open62541-1.1.2-etf.patch b/dev-libs/open62541/files/open62541-1.1.2-etf.patch
new file mode 100644
index 0000000..cce618e
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.1.2-etf.patch
@@ -0,0 +1,43 @@
+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
+

diff --git a/dev-libs/open62541/files/open62541-1.1.2-headers.patch b/dev-libs/open62541/files/open62541-1.1.2-headers.patch
new file mode 100644
index 0000000..97e225b
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.1.2-headers.patch
@@ -0,0 +1,36 @@
+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
+

diff --git a/dev-libs/open62541/files/open62541-1.1.2-tests.patch b/dev-libs/open62541/files/open62541-1.1.2-tests.patch
new file mode 100644
index 0000000..ad96717
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.1.2-tests.patch
@@ -0,0 +1,104 @@
+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
+

diff --git a/dev-libs/open62541/open62541-1.1.2.ebuild b/dev-libs/open62541/open62541-1.1.2.ebuild
new file mode 100644
index 0000000..b6b0d45
--- /dev/null
+++ b/dev-libs/open62541/open62541-1.1.2.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
+
+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_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
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/
@ 2020-08-02  7:21 Andrew Ammerlaan
  0 siblings, 0 replies; 21+ messages in thread
From: Andrew Ammerlaan @ 2020-08-02  7:21 UTC (permalink / raw
  To: gentoo-commits

commit:     c24ed6999f51e39bad4fb960fa2e265e34f0e634
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sat Aug  1 17:18:12 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Aug  1 17:18:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c24ed699

dev-libs/open62541: Drop old

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

 dev-libs/open62541/Manifest                        |   1 -
 dev-libs/open62541/files/open62541-1.1.1-etf.patch |  43 ---------
 .../open62541/files/open62541-1.1.1-headers.patch  |  36 -------
 .../open62541/files/open62541-1.1.1-tests.patch    | 104 ---------------------
 dev-libs/open62541/open62541-1.1.1.ebuild          |  98 -------------------
 5 files changed, 282 deletions(-)

diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index 25329c9..c2d5794 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1,3 +1,2 @@
 DIST open62541-1.0.1.tar.gz 2689199 BLAKE2B ad2932a9e42cda5a5ef29904e740ff1cfb0d3e3d481f1d15ba0b1e67c8b42fae11774f28f9b8d8abf8b78400d1c3aea5dfe75a32fb70a303f5378ab5915bc337 SHA512 9fb0af8befba4d7c376ecd98dfab9033439e0a0594e7e3f48b6df54749af482a4e70a7aa077c49202fd704520bb433a7598fc9f9297a5ff12cb7a019176c4031
-DIST open62541-1.1.1.tar.gz 2916122 BLAKE2B a3230911bfeaf54282b687293afc82e9d66f93250707cbdf2e2fc2141b8737153d182a7199a7fc677e5e625c17454d16f434923837554a4f79ba7c4d5013312d SHA512 5b4dacf25de6c20311de52feb0ea791779b8a9ccb894341786e63e740367ec1e8d91b984b670b1a58d62ea160d7384fedb3ff50cabbc93d76c95c330507afc57
 DIST open62541-1.1.2.tar.gz 2916517 BLAKE2B 60ee78630ee74fbe9d2dee894f3b5f6b5209b823f8e24236e2f6ceb13ddc68df9c0065d57fe14096cdf822755979053201b6901540082aac3d69135c3dc54b67 SHA512 090f24b77211ef8e0a45c7b74de948db6ea64290fc591ae0131871119d826c8b385769ab4c1dad0f8ba663acafd7df3b4b288759623eb6f4a3fbd00ab65abedc

diff --git a/dev-libs/open62541/files/open62541-1.1.1-etf.patch b/dev-libs/open62541/files/open62541-1.1.1-etf.patch
deleted file mode 100644
index cce618e..0000000
--- a/dev-libs/open62541/files/open62541-1.1.1-etf.patch
+++ /dev/null
@@ -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
-

diff --git a/dev-libs/open62541/files/open62541-1.1.1-headers.patch b/dev-libs/open62541/files/open62541-1.1.1-headers.patch
deleted file mode 100644
index 97e225b..0000000
--- a/dev-libs/open62541/files/open62541-1.1.1-headers.patch
+++ /dev/null
@@ -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
-

diff --git a/dev-libs/open62541/files/open62541-1.1.1-tests.patch b/dev-libs/open62541/files/open62541-1.1.1-tests.patch
deleted file mode 100644
index ad96717..0000000
--- a/dev-libs/open62541/files/open62541-1.1.1-tests.patch
+++ /dev/null
@@ -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
-

diff --git a/dev-libs/open62541/open62541-1.1.1.ebuild b/dev-libs/open62541/open62541-1.1.1.ebuild
deleted file mode 100644
index b6b0d45..0000000
--- a/dev-libs/open62541/open62541-1.1.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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
-
-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_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
-}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/
@ 2020-12-11  8:36 Andrew Ammerlaan
  0 siblings, 0 replies; 21+ messages in thread
From: Andrew Ammerlaan @ 2020-12-11  8:36 UTC (permalink / raw
  To: gentoo-commits

commit:     3707641523662de28c4422e59e8aa8223a6790cd
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Thu Dec 10 16:52:38 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Thu Dec 10 16:52:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=37076415

dev-libs/open62541: Bump version to v1.0.3

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

 dev-libs/open62541/Manifest                        |  1 +
 .../open62541/files/open62541-1.0.3-tests.patch    | 60 ++++++++++++++++
 dev-libs/open62541/open62541-1.0.3.ebuild          | 83 ++++++++++++++++++++++
 3 files changed, 144 insertions(+)

diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index da0e050f..9cf13f4e 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1,2 +1,3 @@
 DIST open62541-1.0.2.tar.gz 2689341 BLAKE2B 68d7eda848e980156c18706706b99a30b70bafacc27b57aba99f8e1b6ae202cf719b94ec09417c10ad86df00c7adf1f5f03f74fa84071fa83c141236e65c00bd SHA512 39da1556a9155a461c2d0f351ada78ef878a3688e4ab570d41decdf8a3213c8fd160618f81ca80fb467ec41d5de0d61743d2289473f60ae1547785acf738945f
+DIST open62541-1.0.3.tar.gz 2691597 BLAKE2B 0ad9f71f97dfe550068d239cc97f59afd1f528a1b912d44734103a962fd3407ac9b3d753cc1499dbf5b7ad0f56a93378b5c833ac24262b1f9eb26916de296904 SHA512 5dfff3d784b1659a5c819b7666101e60af186e7604ca73e6c3ec15d20e8ceff26f1c9139bb78bf0c0fbc9ab10a1a3cd031252e1e6bf1f56c5403797257a318cf
 DIST open62541-1.1.2.tar.gz 2916517 BLAKE2B 60ee78630ee74fbe9d2dee894f3b5f6b5209b823f8e24236e2f6ceb13ddc68df9c0065d57fe14096cdf822755979053201b6901540082aac3d69135c3dc54b67 SHA512 090f24b77211ef8e0a45c7b74de948db6ea64290fc591ae0131871119d826c8b385769ab4c1dad0f8ba663acafd7df3b4b288759623eb6f4a3fbd00ab65abedc

diff --git a/dev-libs/open62541/files/open62541-1.0.3-tests.patch b/dev-libs/open62541/files/open62541-1.0.3-tests.patch
new file mode 100644
index 00000000..6f8f2942
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.0.3-tests.patch
@@ -0,0 +1,60 @@
+From f1f120389c345c3f45a6da5b6793cdfb78a0ce61 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Sat, 4 Apr 2020 11:59:16 +0200
+Subject: [PATCH] tests: Disable failing tests
+
+Disable failing tests:
+
+|95% tests passed, 2 tests failed out of 41
+|
+|Total Test time (real) =  78.09 sec
+|
+|The following tests FAILED:
+|         29 - pubsub_publish (Failed)
+|         30 - check_pubsub_subscribe (SEGFAULT)
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ tests/CMakeLists.txt | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 8f498e7911fa..853e535eeaa7 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -255,20 +255,20 @@ if(UA_ENABLE_PUBSUB)
+     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_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_test_valgrind(check_pubsub_subscribe ${TESTS_BINARY_DIR}/check_pubsub_subscribe)
+-    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_subscribe pubsub/check_pubsub_subscribe.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
++    # target_link_libraries(check_pubsub_subscribe ${LIBS})
++    # add_test_valgrind(check_pubsub_subscribe ${TESTS_BINARY_DIR}/check_pubsub_subscribe)
++    # 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_multiple_layer pubsub/check_pubsub_multiple_layer.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+     target_link_libraries(check_pubsub_multiple_layer ${LIBS})
+-- 
+2.24.1
+

diff --git a/dev-libs/open62541/open62541-1.0.3.ebuild b/dev-libs/open62541/open62541-1.0.3.ebuild
new file mode 100644
index 00000000..8c378e82
--- /dev/null
+++ b/dev-libs/open62541/open62541-1.0.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..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 examples mbedtls pubsub test tools"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+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:= )
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	${DEPEND}
+"
+
+PATCHES=( "${FILESDIR}/${P}-tests.patch" )
+
+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 mbedtls)
+		-DUA_ENABLE_PUBSUB=$(usex pubsub)
+	)
+
+	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
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/
@ 2020-12-11  8:36 Andrew Ammerlaan
  0 siblings, 0 replies; 21+ messages in thread
From: Andrew Ammerlaan @ 2020-12-11  8:36 UTC (permalink / raw
  To: gentoo-commits

commit:     a167e05c21b10361a0376dfe95a12911752d9951
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Thu Dec 10 17:01:09 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Thu Dec 10 17:01:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a167e05c

dev-libs/open62541: Bump version to v1.1.3

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

 dev-libs/open62541/Manifest                        |   1 +
 dev-libs/open62541/files/open62541-1.1.3-etf.patch |  43 +++++++++
 .../open62541/files/open62541-1.1.3-headers.patch  |  36 +++++++
 .../open62541/files/open62541-1.1.3-tests.patch    | 104 +++++++++++++++++++++
 dev-libs/open62541/open62541-1.1.3.ebuild          |  98 +++++++++++++++++++
 5 files changed, 282 insertions(+)

diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index 5e4ac33e..4091fb20 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1,2 +1,3 @@
 DIST open62541-1.0.3.tar.gz 2691597 BLAKE2B 0ad9f71f97dfe550068d239cc97f59afd1f528a1b912d44734103a962fd3407ac9b3d753cc1499dbf5b7ad0f56a93378b5c833ac24262b1f9eb26916de296904 SHA512 5dfff3d784b1659a5c819b7666101e60af186e7604ca73e6c3ec15d20e8ceff26f1c9139bb78bf0c0fbc9ab10a1a3cd031252e1e6bf1f56c5403797257a318cf
 DIST open62541-1.1.2.tar.gz 2916517 BLAKE2B 60ee78630ee74fbe9d2dee894f3b5f6b5209b823f8e24236e2f6ceb13ddc68df9c0065d57fe14096cdf822755979053201b6901540082aac3d69135c3dc54b67 SHA512 090f24b77211ef8e0a45c7b74de948db6ea64290fc591ae0131871119d826c8b385769ab4c1dad0f8ba663acafd7df3b4b288759623eb6f4a3fbd00ab65abedc
+DIST open62541-1.1.3.tar.gz 2925631 BLAKE2B 1314d51c1153a2e2785e8eccf363ef8285142b0e2af1890047eae079bd6d36583c0fa91661da4bf68c1dfa980c6b708fa7c6f7192bea06b234b98428074fd1c8 SHA512 e0574b9273002b22c042534dc8e177800bee87f8b48d3de4a627dc255211e67489531905cac41a8a15d337e2a958815b59be23c96163d3305cd43a8da18c390f

diff --git a/dev-libs/open62541/files/open62541-1.1.3-etf.patch b/dev-libs/open62541/files/open62541-1.1.3-etf.patch
new file mode 100644
index 00000000..cce618e6
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.1.3-etf.patch
@@ -0,0 +1,43 @@
+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
+

diff --git a/dev-libs/open62541/files/open62541-1.1.3-headers.patch b/dev-libs/open62541/files/open62541-1.1.3-headers.patch
new file mode 100644
index 00000000..97e225b0
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.1.3-headers.patch
@@ -0,0 +1,36 @@
+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
+

diff --git a/dev-libs/open62541/files/open62541-1.1.3-tests.patch b/dev-libs/open62541/files/open62541-1.1.3-tests.patch
new file mode 100644
index 00000000..ad96717f
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.1.3-tests.patch
@@ -0,0 +1,104 @@
+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
+

diff --git a/dev-libs/open62541/open62541-1.1.3.ebuild b/dev-libs/open62541/open62541-1.1.3.ebuild
new file mode 100644
index 00000000..87a8634f
--- /dev/null
+++ b/dev-libs/open62541/open62541-1.1.3.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..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_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
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/
@ 2020-12-11  8:36 Andrew Ammerlaan
  0 siblings, 0 replies; 21+ messages in thread
From: Andrew Ammerlaan @ 2020-12-11  8:36 UTC (permalink / raw
  To: gentoo-commits

commit:     56846b488209fe90af47b3e93072c35551deaf2c
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Thu Dec 10 16:54:23 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Thu Dec 10 16:54:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=56846b48

dev-libs/open62541: Drop old

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

 dev-libs/open62541/Manifest                        |  1 -
 .../open62541/files/open62541-1.0.2-tests.patch    | 60 ----------------
 dev-libs/open62541/open62541-1.0.2.ebuild          | 83 ----------------------
 3 files changed, 144 deletions(-)

diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index 9cf13f4e..5e4ac33e 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1,3 +1,2 @@
-DIST open62541-1.0.2.tar.gz 2689341 BLAKE2B 68d7eda848e980156c18706706b99a30b70bafacc27b57aba99f8e1b6ae202cf719b94ec09417c10ad86df00c7adf1f5f03f74fa84071fa83c141236e65c00bd SHA512 39da1556a9155a461c2d0f351ada78ef878a3688e4ab570d41decdf8a3213c8fd160618f81ca80fb467ec41d5de0d61743d2289473f60ae1547785acf738945f
 DIST open62541-1.0.3.tar.gz 2691597 BLAKE2B 0ad9f71f97dfe550068d239cc97f59afd1f528a1b912d44734103a962fd3407ac9b3d753cc1499dbf5b7ad0f56a93378b5c833ac24262b1f9eb26916de296904 SHA512 5dfff3d784b1659a5c819b7666101e60af186e7604ca73e6c3ec15d20e8ceff26f1c9139bb78bf0c0fbc9ab10a1a3cd031252e1e6bf1f56c5403797257a318cf
 DIST open62541-1.1.2.tar.gz 2916517 BLAKE2B 60ee78630ee74fbe9d2dee894f3b5f6b5209b823f8e24236e2f6ceb13ddc68df9c0065d57fe14096cdf822755979053201b6901540082aac3d69135c3dc54b67 SHA512 090f24b77211ef8e0a45c7b74de948db6ea64290fc591ae0131871119d826c8b385769ab4c1dad0f8ba663acafd7df3b4b288759623eb6f4a3fbd00ab65abedc

diff --git a/dev-libs/open62541/files/open62541-1.0.2-tests.patch b/dev-libs/open62541/files/open62541-1.0.2-tests.patch
deleted file mode 100644
index 6f8f2942..00000000
--- a/dev-libs/open62541/files/open62541-1.0.2-tests.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From f1f120389c345c3f45a6da5b6793cdfb78a0ce61 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Sat, 4 Apr 2020 11:59:16 +0200
-Subject: [PATCH] tests: Disable failing tests
-
-Disable failing tests:
-
-|95% tests passed, 2 tests failed out of 41
-|
-|Total Test time (real) =  78.09 sec
-|
-|The following tests FAILED:
-|         29 - pubsub_publish (Failed)
-|         30 - check_pubsub_subscribe (SEGFAULT)
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- tests/CMakeLists.txt | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 8f498e7911fa..853e535eeaa7 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -255,20 +255,20 @@ if(UA_ENABLE_PUBSUB)
-     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_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_test_valgrind(check_pubsub_subscribe ${TESTS_BINARY_DIR}/check_pubsub_subscribe)
--    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_subscribe pubsub/check_pubsub_subscribe.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
-+    # target_link_libraries(check_pubsub_subscribe ${LIBS})
-+    # add_test_valgrind(check_pubsub_subscribe ${TESTS_BINARY_DIR}/check_pubsub_subscribe)
-+    # 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_multiple_layer pubsub/check_pubsub_multiple_layer.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
-     target_link_libraries(check_pubsub_multiple_layer ${LIBS})
--- 
-2.24.1
-

diff --git a/dev-libs/open62541/open62541-1.0.2.ebuild b/dev-libs/open62541/open62541-1.0.2.ebuild
deleted file mode 100644
index b3424bf6..00000000
--- a/dev-libs/open62541/open62541-1.0.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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
-
-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 examples mbedtls pubsub test tools"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-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:= )
-"
-RDEPEND="
-	${PYTHON_DEPS}
-	${DEPEND}
-"
-
-PATCHES=( "${FILESDIR}/${P}-tests.patch" )
-
-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 mbedtls)
-		-DUA_ENABLE_PUBSUB=$(usex pubsub)
-	)
-
-	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
-}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/
@ 2021-01-23 11:49 Michał Górny
  0 siblings, 0 replies; 21+ messages in thread
From: Michał Górny @ 2021-01-23 11:49 UTC (permalink / raw
  To: gentoo-commits

commit:     af91922c98484db342381398491ac302205ad273
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Fri Jan 22 17:04:23 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 17:04:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=af91922c

dev-libs/open62541: Drop old

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

 dev-libs/open62541/Manifest                        |  1 -
 .../open62541/files/open62541-1.0.3-tests.patch    | 60 ----------------
 dev-libs/open62541/open62541-1.0.3.ebuild          | 83 ----------------------
 3 files changed, 144 deletions(-)

diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index 14372099..5aa6908b 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1,3 +1,2 @@
-DIST open62541-1.0.3.tar.gz 2691597 BLAKE2B 0ad9f71f97dfe550068d239cc97f59afd1f528a1b912d44734103a962fd3407ac9b3d753cc1499dbf5b7ad0f56a93378b5c833ac24262b1f9eb26916de296904 SHA512 5dfff3d784b1659a5c819b7666101e60af186e7604ca73e6c3ec15d20e8ceff26f1c9139bb78bf0c0fbc9ab10a1a3cd031252e1e6bf1f56c5403797257a318cf
 DIST open62541-1.0.6.tar.gz 2691627 BLAKE2B 72a0eb5870bf4233ac6f3911c1a7ad95d4cfa1c26be581815e99189206e188beedc1c2c81ea4cbd038ef545b9548949735353a550bb54ca6a7fb6a6fd60ffa65 SHA512 f317476e19fd2cc1cbd9155e2fe8bcac6499758f35a2f4eb59403add7d66ef94d45bae06bc8ece79eedceef1d0a364565d567b97e94da6b333591f4347961955
 DIST open62541-1.1.5.tar.gz 2925670 BLAKE2B 5da0795801f2fd92fd3d922fbda83d8ef6f22f19a9e17d585fd2f9dddf37e3fc95290ac3d49774ebad0bee8114f5bec4af11d01998ba765b93311062681c7114 SHA512 46379047c83bd728343c4d5b78bf5ade02bd9af4c430350d54366aeab66dadfaee2bded317e990b2456d98dd7277877824e6ad3c632d62c94ba50b14433ea880

diff --git a/dev-libs/open62541/files/open62541-1.0.3-tests.patch b/dev-libs/open62541/files/open62541-1.0.3-tests.patch
deleted file mode 100644
index 6f8f2942..00000000
--- a/dev-libs/open62541/files/open62541-1.0.3-tests.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From f1f120389c345c3f45a6da5b6793cdfb78a0ce61 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Sat, 4 Apr 2020 11:59:16 +0200
-Subject: [PATCH] tests: Disable failing tests
-
-Disable failing tests:
-
-|95% tests passed, 2 tests failed out of 41
-|
-|Total Test time (real) =  78.09 sec
-|
-|The following tests FAILED:
-|         29 - pubsub_publish (Failed)
-|         30 - check_pubsub_subscribe (SEGFAULT)
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- tests/CMakeLists.txt | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 8f498e7911fa..853e535eeaa7 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -255,20 +255,20 @@ if(UA_ENABLE_PUBSUB)
-     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_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_test_valgrind(check_pubsub_subscribe ${TESTS_BINARY_DIR}/check_pubsub_subscribe)
--    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_subscribe pubsub/check_pubsub_subscribe.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
-+    # target_link_libraries(check_pubsub_subscribe ${LIBS})
-+    # add_test_valgrind(check_pubsub_subscribe ${TESTS_BINARY_DIR}/check_pubsub_subscribe)
-+    # 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_multiple_layer pubsub/check_pubsub_multiple_layer.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
-     target_link_libraries(check_pubsub_multiple_layer ${LIBS})
--- 
-2.24.1
-

diff --git a/dev-libs/open62541/open62541-1.0.3.ebuild b/dev-libs/open62541/open62541-1.0.3.ebuild
deleted file mode 100644
index 64dbdec9..00000000
--- a/dev-libs/open62541/open62541-1.0.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 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 examples mbedtls pubsub test tools"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-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:= )
-"
-RDEPEND="
-	${PYTHON_DEPS}
-	${DEPEND}
-"
-
-PATCHES=( "${FILESDIR}/${P}-tests.patch" )
-
-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 mbedtls)
-		-DUA_ENABLE_PUBSUB=$(usex pubsub)
-	)
-
-	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
-}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/
@ 2021-04-10 10:07 Andrew Ammerlaan
  0 siblings, 0 replies; 21+ messages in thread
From: Andrew Ammerlaan @ 2021-04-10 10:07 UTC (permalink / raw
  To: gentoo-commits

commit:     15931f3a10a54646ae43dceef3912bb8888a0814
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Fri Apr  9 18:06:00 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Apr  9 18:06:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=15931f3a

dev-libs/open62541: Drop old

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

 dev-libs/open62541/Manifest                        |   1 -
 dev-libs/open62541/files/open62541-1.1.5-etf.patch |  40 --------
 .../open62541/files/open62541-1.1.5-headers.patch  |  33 -------
 .../open62541/files/open62541-1.1.5-tests.patch    | 101 --------------------
 dev-libs/open62541/open62541-1.1.5.ebuild          | 105 ---------------------
 5 files changed, 280 deletions(-)

diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index 229988584..43c70fd57 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -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

diff --git a/dev-libs/open62541/files/open62541-1.1.5-etf.patch b/dev-libs/open62541/files/open62541-1.1.5-etf.patch
deleted file mode 100644
index 09f47ed87..000000000
--- a/dev-libs/open62541/files/open62541-1.1.5-etf.patch
+++ /dev/null
@@ -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);
- 

diff --git a/dev-libs/open62541/files/open62541-1.1.5-headers.patch b/dev-libs/open62541/files/open62541-1.1.5-headers.patch
deleted file mode 100644
index 8cedc3f06..000000000
--- a/dev-libs/open62541/files/open62541-1.1.5-headers.patch
+++ /dev/null
@@ -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")

diff --git a/dev-libs/open62541/files/open62541-1.1.5-tests.patch b/dev-libs/open62541/files/open62541-1.1.5-tests.patch
deleted file mode 100644
index 03a1bf081..000000000
--- a/dev-libs/open62541/files/open62541-1.1.5-tests.patch
+++ /dev/null
@@ -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)

diff --git a/dev-libs/open62541/open62541-1.1.5.ebuild b/dev-libs/open62541/open62541-1.1.5.ebuild
deleted file mode 100644
index f8658a835..000000000
--- a/dev-libs/open62541/open62541-1.1.5.ebuild
+++ /dev/null
@@ -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
-}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/
@ 2021-04-10 10:07 Andrew Ammerlaan
  0 siblings, 0 replies; 21+ messages in thread
From: Andrew Ammerlaan @ 2021-04-10 10:07 UTC (permalink / raw
  To: gentoo-commits

commit:     5a4205c0a017a2e256b45b429dbc4791a3242c70
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Fri Apr  9 18:03:13 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Apr  9 18:04:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5a4205c0

dev-libs/open62541: Bump version to v1.2

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

 dev-libs/open62541/Manifest                        |   1 +
 .../open62541/files/open62541-1.2-headers.patch    |  33 ++++++
 dev-libs/open62541/files/open62541-1.2-tests.patch | 126 +++++++++++++++++++++
 dev-libs/open62541/open62541-1.2.ebuild            | 104 +++++++++++++++++
 4 files changed, 264 insertions(+)

diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index 5aa6908b2..229988584 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/dev-libs/open62541/files/open62541-1.2-headers.patch b/dev-libs/open62541/files/open62541-1.2-headers.patch
new file mode 100644
index 000000000..4a33c03b6
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.2-headers.patch
@@ -0,0 +1,33 @@
+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
+@@ -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-tests.patch b/dev-libs/open62541/files/open62541-1.2-tests.patch
new file mode 100644
index 000000000..d5cf4d404
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.2-tests.patch
@@ -0,0 +1,126 @@
+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
+@@ -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.ebuild b/dev-libs/open62541/open62541-1.2.ebuild
new file mode 100644
index 000000000..7665253c8
--- /dev/null
+++ b/dev-libs/open62541/open62541-1.2.ebuild
@@ -0,0 +1,104 @@
+# 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}-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
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/
@ 2021-05-24  7:31 Andrew Ammerlaan
  0 siblings, 0 replies; 21+ messages in thread
From: Andrew Ammerlaan @ 2021-05-24  7:31 UTC (permalink / raw
  To: gentoo-commits

commit:     0606fd594002a237526aa5f58c2c056d1602b7c6
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sun May 23 10:36:23 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun May 23 10:36:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0606fd59

dev-libs/open62541: Bump version to v1.2.2

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

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

diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index 148c8fa9d..9a40abafc 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1 +1,2 @@
 DIST open62541-1.2.1.tar.gz 3643976 BLAKE2B e075231bf8220bc7d597cd02fe754cc30dd4dbb47c2be440487abfd63a84f251ad5a565b340e2c342d42fcf45ad2104ca708e89f87945dc8a5746e9601e1c422 SHA512 2b260a06455aa963c3c7ec3b39df43d5df63f022f664bf70b38481239bf6f9b48ef853398eb9621875b862b8536c79c9cf05d7d92cc9fb0668009ddea96bf8d9
+DIST open62541-1.2.2.tar.gz 3644878 BLAKE2B e95cada67461be699d0cc8038c479f955df92117626a2e35764df98191a0836a8e59db74c38f2f60d8acc06cfe5dd89d31c806ceb32de5c92ea9c104678a60ed SHA512 e6a1ec2208ec29d8685d2a957fae6f3fedc0e847d6ab1bb8ac5c7980223bc377692334c87575956b53bb37a9b71c5dedd1b5c4f19f122561543d04661fefe1d5

diff --git a/dev-libs/open62541/files/open62541-1.2.2-headers.patch b/dev-libs/open62541/files/open62541-1.2.2-headers.patch
new file mode 100644
index 000000000..75d79ec46
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.2.2-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.2-tests.patch b/dev-libs/open62541/files/open62541-1.2.2-tests.patch
new file mode 100644
index 000000000..e8b83fe08
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.2.2-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.2.ebuild b/dev-libs/open62541/open62541-1.2.2.ebuild
new file mode 100644
index 000000000..7665253c8
--- /dev/null
+++ b/dev-libs/open62541/open62541-1.2.2.ebuild
@@ -0,0 +1,104 @@
+# 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}-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
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/
@ 2021-05-24  7:31 Andrew Ammerlaan
  0 siblings, 0 replies; 21+ messages in thread
From: Andrew Ammerlaan @ 2021-05-24  7:31 UTC (permalink / raw
  To: gentoo-commits

commit:     62d0063e2c18a71daaeb6b041b2af1a7afd8dc44
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sun May 23 10:37:22 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun May 23 10:37:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=62d0063e

dev-libs/open62541: Drop old

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

 dev-libs/open62541/Manifest                        |   1 -
 .../open62541/files/open62541-1.2.1-headers.patch  |  33 ------
 .../open62541/files/open62541-1.2.1-tests.patch    | 126 ---------------------
 dev-libs/open62541/open62541-1.2.1.ebuild          | 104 -----------------
 4 files changed, 264 deletions(-)

diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index 9a40abafc..f17920a09 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1,2 +1 @@
-DIST open62541-1.2.1.tar.gz 3643976 BLAKE2B e075231bf8220bc7d597cd02fe754cc30dd4dbb47c2be440487abfd63a84f251ad5a565b340e2c342d42fcf45ad2104ca708e89f87945dc8a5746e9601e1c422 SHA512 2b260a06455aa963c3c7ec3b39df43d5df63f022f664bf70b38481239bf6f9b48ef853398eb9621875b862b8536c79c9cf05d7d92cc9fb0668009ddea96bf8d9
 DIST open62541-1.2.2.tar.gz 3644878 BLAKE2B e95cada67461be699d0cc8038c479f955df92117626a2e35764df98191a0836a8e59db74c38f2f60d8acc06cfe5dd89d31c806ceb32de5c92ea9c104678a60ed SHA512 e6a1ec2208ec29d8685d2a957fae6f3fedc0e847d6ab1bb8ac5c7980223bc377692334c87575956b53bb37a9b71c5dedd1b5c4f19f122561543d04661fefe1d5

diff --git a/dev-libs/open62541/files/open62541-1.2.1-headers.patch b/dev-libs/open62541/files/open62541-1.2.1-headers.patch
deleted file mode 100644
index 4a33c03b6..000000000
--- a/dev-libs/open62541/files/open62541-1.2.1-headers.patch
+++ /dev/null
@@ -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
-@@ -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.1-tests.patch b/dev-libs/open62541/files/open62541-1.2.1-tests.patch
deleted file mode 100644
index d5cf4d404..000000000
--- a/dev-libs/open62541/files/open62541-1.2.1-tests.patch
+++ /dev/null
@@ -1,126 +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
-@@ -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.1.ebuild b/dev-libs/open62541/open62541-1.2.1.ebuild
deleted file mode 100644
index 7665253c8..000000000
--- a/dev-libs/open62541/open62541-1.2.1.ebuild
+++ /dev/null
@@ -1,104 +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}-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
-}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/
@ 2021-12-30 14:34 Florian Schmaus
  0 siblings, 0 replies; 21+ messages in thread
From: Florian Schmaus @ 2021-12-30 14:34 UTC (permalink / raw
  To: gentoo-commits

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

dev-libs/open62541: Drop old

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.2-headers.patch  |  31 ------
 .../open62541/files/open62541-1.2.2-tests.patch    | 124 ---------------------
 dev-libs/open62541/open62541-1.2.2.ebuild          | 104 -----------------
 4 files changed, 260 deletions(-)

diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index f8e758cf2..d59ef7daa 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1,2 +1 @@
-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.2-headers.patch b/dev-libs/open62541/files/open62541-1.2.2-headers.patch
deleted file mode 100644
index 75d79ec46..000000000
--- a/dev-libs/open62541/files/open62541-1.2.2-headers.patch
+++ /dev/null
@@ -1,31 +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(+)
-
---- 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.2-tests.patch b/dev-libs/open62541/files/open62541-1.2.2-tests.patch
deleted file mode 100644
index e8b83fe08..000000000
--- a/dev-libs/open62541/files/open62541-1.2.2-tests.patch
+++ /dev/null
@@ -1,124 +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 |  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.2.ebuild b/dev-libs/open62541/open62541-1.2.2.ebuild
deleted file mode 100644
index b2d56bf4f..000000000
--- a/dev-libs/open62541/open62541-1.2.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/
@ 2021-12-30 14:34 Florian Schmaus
  0 siblings, 0 replies; 21+ messages in thread
From: Florian Schmaus @ 2021-12-30 14:34 UTC (permalink / raw
  To: gentoo-commits

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
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/
@ 2022-02-26 18:16 Florian Schmaus
  0 siblings, 0 replies; 21+ messages in thread
From: Florian Schmaus @ 2022-02-26 18:16 UTC (permalink / raw
  To: gentoo-commits

commit:     f870bb39cedb5025094db44a3d9fca4d9ee4fd5a
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Fri Feb 25 20:48:49 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Feb 25 20:48:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f870bb39

dev-libs/open62541: Drop old

Package-Manager: Portage-3.0.30, 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 deletions(-)

diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index aa9a52758..c6d3c1ab9 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1,2 +1 @@
-DIST open62541-1.2.3.tar.gz 3645511 BLAKE2B 3cebe1a4200cb026916cd801303937509d8e59c10af5400f5a212c16006c1744bc403fad25b40fb7bcf9043982649f1661c13aa16df8a07db6334f7e2fc55872 SHA512 ffcc697901ec978fb9d1f8996f8a4c5114c98a0ec19206cac95d1a84f8d0fcbe38bf73e88f1df59d53bc6be481102aa2f2a6a0efa29797e7ce11123bd23131c2
 DIST open62541-1.2.4.tar.gz 3646665 BLAKE2B 83441f05d4f846e83d441a84d46e6bff4459a239d02eee7a78f846a26cb433ecb67a2b178c8a5bcbc748b10ac49f055f5c9063b02dd72d2e574f1b1e0ea3fe97 SHA512 4fb4c01c0573dd5e06c4f3a0caa6b7b5ef3bafbbf3d4d7a0770e9e448e111b5f4906d6911271f28c27a2b1f07710a6bc0b3204ca39e043c350f5051c3ee8e821

diff --git a/dev-libs/open62541/files/open62541-1.2.3-headers.patch b/dev-libs/open62541/files/open62541-1.2.3-headers.patch
deleted file mode 100644
index 75d79ec46..000000000
--- a/dev-libs/open62541/files/open62541-1.2.3-headers.patch
+++ /dev/null
@@ -1,31 +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(+)
-
---- 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
deleted file mode 100644
index e8b83fe08..000000000
--- a/dev-libs/open62541/files/open62541-1.2.3-tests.patch
+++ /dev/null
@@ -1,124 +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 |  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
deleted file mode 100644
index ca53b7b75..000000000
--- a/dev-libs/open62541/open62541-1.2.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# 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
-}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/
@ 2022-11-16 10:19 Florian Schmaus
  0 siblings, 0 replies; 21+ messages in thread
From: Florian Schmaus @ 2022-11-16 10:19 UTC (permalink / raw
  To: gentoo-commits

commit:     04beb9ff160c34bf7fa74ea03a46eefa85888293
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Tue Nov 15 21:04:18 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 21:09:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=04beb9ff

dev-libs/open62541: drop 1.3.3

Closes: https://bugs.gentoo.org/839153
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>

 dev-libs/open62541/Manifest                        |   1 -
 .../files/open62541-1.3.3-disable-xdp.patch        |  21 ---
 .../open62541/files/open62541-1.3.3-tests.patch    | 144 ---------------------
 dev-libs/open62541/open62541-1.3.3.ebuild          |  96 --------------
 4 files changed, 262 deletions(-)

diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index 498a9b46d..93f71afd2 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1,2 +1 @@
-DIST open62541-1.3.3.tar.gz 3866193 BLAKE2B 543c027ceffade9a5bee3dd99a634e694fc92116ab6d5d39844243325bb48ae46108dfc50bc9350099d942ab1a81614cee9f9477436b1b831a592230ceb884cc SHA512 409c60b84791165d07a69077b51c5783dc9aef1a593b491da1807c44b51542a59b6bea8718a66c256e953aa5d0ad1c38cd08a615ed55f453df50c719a291d018
 DIST open62541-1.3.4.tar.gz 3867546 BLAKE2B d356f065d8565b5d7a0964116afb8e1dacb1a1c85c212baa6432830dca0a94232c24eed3d0aa0bd6f0a106ec137f038e5957dc383f4511d1fa8b49d5f2e0633a SHA512 3230355237a3c88351ddd1d291057ab0b1e4ab0a3a1218c90a0201d4d77769098e6fbced26efef7c8635020b6d64748d065fc707615c45487aa3502aa19b6687

diff --git a/dev-libs/open62541/files/open62541-1.3.3-disable-xdp.patch b/dev-libs/open62541/files/open62541-1.3.3-disable-xdp.patch
deleted file mode 100644
index cb5cb6e8f..000000000
--- a/dev-libs/open62541/files/open62541-1.3.3-disable-xdp.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Subject: pubsub: Disable XDP code
-
-The XDP code assumes < dev-libs/libbpf-0.0.7. Disable it.
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- plugins/ua_pubsub_ethernet.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/plugins/ua_pubsub_ethernet.c
-+++ b/plugins/ua_pubsub_ethernet.c
-@@ -43,7 +43,7 @@ static UA_THREAD_LOCAL UA_Byte ReceiveMs
- #include <linux/if_link.h>
- 
- #if defined __has_include
--#   if __has_include(<bpf/bpf.h>) && __has_include(<bpf/libbpf.h>) && __has_include(<bpf/xsk.h>)
-+#   if 0
- #       define LIBBPF_EBPF
-         /* Libbpf headers */
- #       include <bpf/bpf.h>

diff --git a/dev-libs/open62541/files/open62541-1.3.3-tests.patch b/dev-libs/open62541/files/open62541-1.3.3-tests.patch
deleted file mode 100644
index 292cd73fc..000000000
--- a/dev-libs/open62541/files/open62541-1.3.3-tests.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Subject: test: Remove PubSub tests
-
-Remove PubSub tests. They don't run within portage.
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- tests/CMakeLists.txt |  125 ---------------------------------------------------
- 1 file changed, 125 deletions(-)
-
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -381,131 +381,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-testplugins>)
--    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-testplugins>)
--    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-testplugins>)
--    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-testplugins>)
--    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-testplugins>)
--    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-testplugins>)
--    target_link_libraries(check_pubsub_subscribe ${LIBS})
--    add_executable(check_pubsub_publishspeed pubsub/check_pubsub_publishspeed.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
--    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-testplugins>)
--    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-testplugins>)
--    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-testplugins>)
--    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-testplugins>)
--    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-testplugins>)
--    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-testplugins>)
--    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_ENCRYPTION)
--        add_executable(check_pubsub_encryption pubsub/check_pubsub_encryption.c
--            $<TARGET_OBJECTS:open62541-object>
--            $<TARGET_OBJECTS:open62541-testplugins>)
--        target_link_libraries(check_pubsub_encryption ${LIBS})
--        add_test_valgrind(check_pubsub_encryption ${TESTS_BINARY_DIR}/check_pubsub_encryption)
--
--        add_executable(check_pubsub_encryption_aes256 pubsub/check_pubsub_encryption_aes256.c
--            $<TARGET_OBJECTS:open62541-object>
--            $<TARGET_OBJECTS:open62541-testplugins>)
--        target_link_libraries(check_pubsub_encryption_aes256 ${LIBS})
--        add_test_valgrind(check_pubsub_encryption_aes256 ${TESTS_BINARY_DIR}/check_pubsub_encryption_aes256)
--    
--        add_executable(check_pubsub_decryption pubsub/check_pubsub_decryption.c
--                $<TARGET_OBJECTS:open62541-object>
--                $<TARGET_OBJECTS:open62541-testplugins>)
--        target_link_libraries(check_pubsub_decryption ${LIBS})
--        add_test_valgrind(check_pubsub_decryption ${TESTS_BINARY_DIR}/check_pubsub_decryption)
--
--        add_executable(check_pubsub_subscribe_encrypted pubsub/check_pubsub_subscribe_encrypted.c
--                $<TARGET_OBJECTS:open62541-object>
--                $<TARGET_OBJECTS:open62541-testplugins>)
--        target_link_libraries(check_pubsub_subscribe_encrypted ${LIBS})
--        add_test_valgrind(check_pubsub_subscribe_encrypted ${TESTS_BINARY_DIR}/check_pubsub_subscribe_encrypted)
--    endif()
--
--    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)
--        add_executable(check_pubsub_connection_ethernet pubsub/check_pubsub_connection_ethernet.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
--        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-testplugins>)
--        target_link_libraries(check_pubsub_publish_ethernet ${LIBS})
--        add_test_valgrind(pubsub_publish_ethernet ${TESTS_BINARY_DIR}/check_pubsub_publish_ethernet)
--        add_executable(check_pubsub_connection_ethernet_etf pubsub/check_pubsub_connection_ethernet_etf.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
--        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-testplugins>)
--        target_link_libraries(check_pubsub_publish_ethernet_etf ${LIBS})
--        add_test_valgrind(pubsub_publish_ethernet_etf ${TESTS_BINARY_DIR}/check_pubsub_publish_ethernet_etf)
--        if(LIB_BPF)
--            add_executable(check_pubsub_connection_xdp pubsub/check_pubsub_connection_xdp.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
--            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_INFORMATIONMODEL)
--        add_executable(check_pubsub_informationmodel pubsub/check_pubsub_informationmodel.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
--        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-testplugins>)
--            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-testplugins>)
--            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-testplugins>)
--        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.3.3.ebuild b/dev-libs/open62541/open62541-1.3.3.ebuild
deleted file mode 100644
index be8f20c47..000000000
--- a/dev-libs/open62541/open62541-1.3.3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="Open source C implementation of OPC UA"
-HOMEPAGE="https://www.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 mbedtls pubsub openssl test tools"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	encryption? ( || ( mbedtls openssl ) )
-"
-
-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}-disable-xdp.patch"
-	"${FILESDIR}/${P}-tests.patch"
-)
-
-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_PUBSUB=$(usex pubsub)
-		-DUA_ENABLE_PUBSUB_ETH_UADP=$(usex pubsub)
-		-DUA_FORCE_WERROR=OFF
-	)
-
-	if use encryption; then
-		use mbedtls && mycmakeargs+=(-DUA_ENABLE_ENCRYPTION=MBEDTLS)
-		use openssl && mycmakeargs+=(-DUA_ENABLE_ENCRYPTION=OPENSSL)
-	fi
-
-	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
-}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/
@ 2023-02-24  7:41 Viorel Munteanu
  0 siblings, 0 replies; 21+ messages in thread
From: Viorel Munteanu @ 2023-02-24  7:41 UTC (permalink / raw
  To: gentoo-commits

commit:     e264c8c72e20077c204c2cfe34e0240e53ebfb2e
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Thu Feb 23 18:55:40 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 20:41:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e264c8c7

dev-libs/open62541: drop 1.3.4

Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>

 dev-libs/open62541/Manifest                        |  1 -
 .../files/open62541-1.3.4-disable-xdp.patch        | 21 -----
 dev-libs/open62541/open62541-1.3.4.ebuild          | 89 ----------------------
 3 files changed, 111 deletions(-)

diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index 08cec5db7..5a6bd34e2 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1,2 +1 @@
-DIST open62541-1.3.4.tar.gz 3867546 BLAKE2B d356f065d8565b5d7a0964116afb8e1dacb1a1c85c212baa6432830dca0a94232c24eed3d0aa0bd6f0a106ec137f038e5957dc383f4511d1fa8b49d5f2e0633a SHA512 3230355237a3c88351ddd1d291057ab0b1e4ab0a3a1218c90a0201d4d77769098e6fbced26efef7c8635020b6d64748d065fc707615c45487aa3502aa19b6687
 DIST open62541-1.3.5.tar.gz 3870493 BLAKE2B ee30e3b2f37f3fbf9b9e8c87317575336807eeaaf7a0bc35ca5f9e59cf9997126752424b8b971a4ed8eb457106a25cabc744389d1ef8c8d7a6c912cf34077c21 SHA512 bb45d288a097b461d2a7106153c7f4b4c38c73cf767fe15c6c9c2213a6e3fcaf9b436fb70c1e7c6dcbc8ef45f232a5bd2f140285fab486358cb5a3a17da96d6e

diff --git a/dev-libs/open62541/files/open62541-1.3.4-disable-xdp.patch b/dev-libs/open62541/files/open62541-1.3.4-disable-xdp.patch
deleted file mode 100644
index cb5cb6e8f..000000000
--- a/dev-libs/open62541/files/open62541-1.3.4-disable-xdp.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Subject: pubsub: Disable XDP code
-
-The XDP code assumes < dev-libs/libbpf-0.0.7. Disable it.
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- plugins/ua_pubsub_ethernet.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/plugins/ua_pubsub_ethernet.c
-+++ b/plugins/ua_pubsub_ethernet.c
-@@ -43,7 +43,7 @@ static UA_THREAD_LOCAL UA_Byte ReceiveMs
- #include <linux/if_link.h>
- 
- #if defined __has_include
--#   if __has_include(<bpf/bpf.h>) && __has_include(<bpf/libbpf.h>) && __has_include(<bpf/xsk.h>)
-+#   if 0
- #       define LIBBPF_EBPF
-         /* Libbpf headers */
- #       include <bpf/bpf.h>

diff --git a/dev-libs/open62541/open62541-1.3.4.ebuild b/dev-libs/open62541/open62541-1.3.4.ebuild
deleted file mode 100644
index f18e14222..000000000
--- a/dev-libs/open62541/open62541-1.3.4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="Open source C implementation of OPC UA"
-HOMEPAGE="https://www.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 mbedtls pubsub openssl tools"
-# Requires network access
-RESTRICT="test"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	encryption? ( || ( mbedtls openssl ) )
-"
-
-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}]
-		')
-	)
-"
-DEPEND="
-	mbedtls? ( net-libs/mbedtls:= )
-	openssl? ( dev-libs/openssl:0= )
-"
-RDEPEND="
-	${PYTHON_DEPS}
-	${DEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-disable-xdp.patch"
-)
-
-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=OFF
-		-DUA_ENABLE_PUBSUB=$(usex pubsub)
-		-DUA_ENABLE_PUBSUB_ETH_UADP=$(usex pubsub)
-		-DUA_FORCE_WERROR=OFF
-	)
-
-	if use encryption; then
-		use mbedtls && mycmakeargs+=(-DUA_ENABLE_ENCRYPTION=MBEDTLS)
-		use openssl && mycmakeargs+=(-DUA_ENABLE_ENCRYPTION=OPENSSL)
-	fi
-
-	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
-}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/
@ 2023-02-24  7:41 Viorel Munteanu
  0 siblings, 0 replies; 21+ messages in thread
From: Viorel Munteanu @ 2023-02-24  7:41 UTC (permalink / raw
  To: gentoo-commits

commit:     aa13bd535a4558b629b12b942aa2c4e67ae521f9
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Thu Feb 23 18:55:22 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 20:41:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=aa13bd53

dev-libs/open62541: add 1.3.5

Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>

 dev-libs/open62541/Manifest                        |  1 +
 .../files/open62541-1.3.5-disable-xdp.patch        | 21 +++++
 dev-libs/open62541/open62541-1.3.5.ebuild          | 89 ++++++++++++++++++++++
 3 files changed, 111 insertions(+)

diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index 93f71afd2..08cec5db7 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1 +1,2 @@
 DIST open62541-1.3.4.tar.gz 3867546 BLAKE2B d356f065d8565b5d7a0964116afb8e1dacb1a1c85c212baa6432830dca0a94232c24eed3d0aa0bd6f0a106ec137f038e5957dc383f4511d1fa8b49d5f2e0633a SHA512 3230355237a3c88351ddd1d291057ab0b1e4ab0a3a1218c90a0201d4d77769098e6fbced26efef7c8635020b6d64748d065fc707615c45487aa3502aa19b6687
+DIST open62541-1.3.5.tar.gz 3870493 BLAKE2B ee30e3b2f37f3fbf9b9e8c87317575336807eeaaf7a0bc35ca5f9e59cf9997126752424b8b971a4ed8eb457106a25cabc744389d1ef8c8d7a6c912cf34077c21 SHA512 bb45d288a097b461d2a7106153c7f4b4c38c73cf767fe15c6c9c2213a6e3fcaf9b436fb70c1e7c6dcbc8ef45f232a5bd2f140285fab486358cb5a3a17da96d6e

diff --git a/dev-libs/open62541/files/open62541-1.3.5-disable-xdp.patch b/dev-libs/open62541/files/open62541-1.3.5-disable-xdp.patch
new file mode 100644
index 000000000..cb5cb6e8f
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.3.5-disable-xdp.patch
@@ -0,0 +1,21 @@
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Subject: pubsub: Disable XDP code
+
+The XDP code assumes < dev-libs/libbpf-0.0.7. Disable it.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ plugins/ua_pubsub_ethernet.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/plugins/ua_pubsub_ethernet.c
++++ b/plugins/ua_pubsub_ethernet.c
+@@ -43,7 +43,7 @@ static UA_THREAD_LOCAL UA_Byte ReceiveMs
+ #include <linux/if_link.h>
+ 
+ #if defined __has_include
+-#   if __has_include(<bpf/bpf.h>) && __has_include(<bpf/libbpf.h>) && __has_include(<bpf/xsk.h>)
++#   if 0
+ #       define LIBBPF_EBPF
+         /* Libbpf headers */
+ #       include <bpf/bpf.h>

diff --git a/dev-libs/open62541/open62541-1.3.5.ebuild b/dev-libs/open62541/open62541-1.3.5.ebuild
new file mode 100644
index 000000000..f18e14222
--- /dev/null
+++ b/dev-libs/open62541/open62541-1.3.5.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Open source C implementation of OPC UA"
+HOMEPAGE="https://www.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 mbedtls pubsub openssl tools"
+# Requires network access
+RESTRICT="test"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	encryption? ( || ( mbedtls openssl ) )
+"
+
+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}]
+		')
+	)
+"
+DEPEND="
+	mbedtls? ( net-libs/mbedtls:= )
+	openssl? ( dev-libs/openssl:0= )
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	${DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-disable-xdp.patch"
+)
+
+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=OFF
+		-DUA_ENABLE_PUBSUB=$(usex pubsub)
+		-DUA_ENABLE_PUBSUB_ETH_UADP=$(usex pubsub)
+		-DUA_FORCE_WERROR=OFF
+	)
+
+	if use encryption; then
+		use mbedtls && mycmakeargs+=(-DUA_ENABLE_ENCRYPTION=MBEDTLS)
+		use openssl && mycmakeargs+=(-DUA_ENABLE_ENCRYPTION=OPENSSL)
+	fi
+
+	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
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/
@ 2024-04-14 15:13 Julien Roy
  0 siblings, 0 replies; 21+ messages in thread
From: Julien Roy @ 2024-04-14 15:13 UTC (permalink / raw
  To: gentoo-commits

commit:     2703f939d6fc1cb91c6b93b23c52f194a0ef7339
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sun Apr 14 15:03:18 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Sun Apr 14 15:06:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2703f939

dev-libs/open62541: drop 1.3.9

Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>

 dev-libs/open62541/Manifest                        |  1 -
 .../files/open62541-1.3.5-disable-xdp.patch        | 21 -----
 dev-libs/open62541/open62541-1.3.9.ebuild          | 89 ----------------------
 3 files changed, 111 deletions(-)

diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index 23b0acb338..b826df8490 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1,2 +1 @@
-DIST open62541-1.3.9.tar.gz 3874701 BLAKE2B 22fe64d02f900dfdb70013783727f0b6edf90e8637e57dce4b07f6b97d7fd33c36090f3d0be5af28d484e8654c3184d03df4c8438c27530d6e2be9c516b06b82 SHA512 8771a70d1f38f2a02f21281200d98fdd8d41d842cc82704155793529a1768beeb2583382f7547e6aaefdab4a17c3130779af792b2a59487889a3cdea4a2fa776
 DIST open62541-1.4.0.tar.gz 4193601 BLAKE2B 9285c2e8e7d59c306d575579b7935881536c3b2b4d1765a3fb2b6e342540dcae4b65662e2672641b446b0f4d737692af21f62efe497a83fbe42a400bd18f0048 SHA512 2c0a3caea48d4708f37cc084ee8d683a02190f4402fd51bbd5cba763bfab8afa92ecbfb129aa4cfa94930a785ab6037fc4b71de363a374b8952e483464c5e7d3

diff --git a/dev-libs/open62541/files/open62541-1.3.5-disable-xdp.patch b/dev-libs/open62541/files/open62541-1.3.5-disable-xdp.patch
deleted file mode 100644
index cb5cb6e8f4..0000000000
--- a/dev-libs/open62541/files/open62541-1.3.5-disable-xdp.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Subject: pubsub: Disable XDP code
-
-The XDP code assumes < dev-libs/libbpf-0.0.7. Disable it.
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- plugins/ua_pubsub_ethernet.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/plugins/ua_pubsub_ethernet.c
-+++ b/plugins/ua_pubsub_ethernet.c
-@@ -43,7 +43,7 @@ static UA_THREAD_LOCAL UA_Byte ReceiveMs
- #include <linux/if_link.h>
- 
- #if defined __has_include
--#   if __has_include(<bpf/bpf.h>) && __has_include(<bpf/libbpf.h>) && __has_include(<bpf/xsk.h>)
-+#   if 0
- #       define LIBBPF_EBPF
-         /* Libbpf headers */
- #       include <bpf/bpf.h>

diff --git a/dev-libs/open62541/open62541-1.3.9.ebuild b/dev-libs/open62541/open62541-1.3.9.ebuild
deleted file mode 100644
index 63eaa15128..0000000000
--- a/dev-libs/open62541/open62541-1.3.9.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="Open source C implementation of OPC UA"
-HOMEPAGE="https://www.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 mbedtls pubsub openssl tools"
-# Requires network access
-RESTRICT="test"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	encryption? ( || ( mbedtls openssl ) )
-"
-
-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}]
-		')
-	)
-"
-DEPEND="
-	mbedtls? ( net-libs/mbedtls:= )
-	openssl? ( dev-libs/openssl:0= )
-"
-RDEPEND="
-	${PYTHON_DEPS}
-	${DEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.5-disable-xdp.patch"
-)
-
-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=OFF
-		-DUA_ENABLE_PUBSUB=$(usex pubsub)
-		-DUA_ENABLE_PUBSUB_ETH_UADP=$(usex pubsub)
-		-DUA_FORCE_WERROR=OFF
-	)
-
-	if use encryption; then
-		use mbedtls && mycmakeargs+=(-DUA_ENABLE_ENCRYPTION=MBEDTLS)
-		use openssl && mycmakeargs+=(-DUA_ENABLE_ENCRYPTION=OPENSSL)
-	fi
-
-	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
-}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

end of thread, other threads:[~2024-04-14 15:13 UTC | newest]

Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-14 15:13 [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/ Julien Roy
  -- strict thread matches above, loose matches on Subject: below --
2023-02-24  7:41 Viorel Munteanu
2023-02-24  7:41 Viorel Munteanu
2022-11-16 10:19 Florian Schmaus
2022-02-26 18:16 Florian Schmaus
2021-12-30 14:34 Florian Schmaus
2021-12-30 14:34 Florian Schmaus
2021-05-24  7:31 Andrew Ammerlaan
2021-05-24  7:31 Andrew Ammerlaan
2021-04-10 10:07 Andrew Ammerlaan
2021-04-10 10:07 Andrew Ammerlaan
2021-01-23 11:49 Michał Górny
2020-12-11  8:36 Andrew Ammerlaan
2020-12-11  8:36 Andrew Ammerlaan
2020-12-11  8:36 Andrew Ammerlaan
2020-08-02  7:21 Andrew Ammerlaan
2020-08-02  7:21 Andrew Ammerlaan
2020-07-20 11:40 Andrew Ammerlaan
2020-07-17  9:46 Andrew Ammerlaan
2020-06-06  9:32 Andrew Ammerlaan
2020-04-04 11:13 Haelwenn Monnier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox