* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/, dev-libs/open62541/files/
@ 2021-01-23 11:49 Michał Górny
0 siblings, 0 replies; 11+ messages in thread
From: Michał Górny @ 2021-01-23 11:49 UTC (permalink / raw
To: gentoo-commits
commit: 7c340abc7c15dacd6ac99ed83dbcc0ee163be2b0
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Fri Jan 22 16:50:46 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 16:50:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7c340abc
dev-libs/open62541: Bump version to v1.1.5
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 +
dev-libs/open62541/files/open62541-1.1.5-etf.patch | 40 ++++++++
| 33 +++++++
.../open62541/files/open62541-1.1.5-tests.patch | 101 +++++++++++++++++++++
dev-libs/open62541/open62541-1.1.5.ebuild | 98 ++++++++++++++++++++
5 files changed, 273 insertions(+)
diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index 0520d956..fc6cef34 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.3.tar.gz 2925631 BLAKE2B 1314d51c1153a2e2785e8eccf363ef8285142b0e2af1890047eae079bd6d36583c0fa91661da4bf68c1dfa980c6b708fa7c6f7192bea06b234b98428074fd1c8 SHA512 e0574b9273002b22c042534dc8e177800bee87f8b48d3de4a627dc255211e67489531905cac41a8a15d337e2a958815b59be23c96163d3305cd43a8da18c390f
+DIST open62541-1.1.5.tar.gz 2925670 BLAKE2B 5da0795801f2fd92fd3d922fbda83d8ef6f22f19a9e17d585fd2f9dddf37e3fc95290ac3d49774ebad0bee8114f5bec4af11d01998ba765b93311062681c7114 SHA512 46379047c83bd728343c4d5b78bf5ade02bd9af4c430350d54366aeab66dadfaee2bded317e990b2456d98dd7277877824e6ad3c632d62c94ba50b14433ea880
diff --git a/dev-libs/open62541/files/open62541-1.1.5-etf.patch b/dev-libs/open62541/files/open62541-1.1.5-etf.patch
new file mode 100644
index 00000000..09f47ed8
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.1.5-etf.patch
@@ -0,0 +1,40 @@
+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);
+
--git a/dev-libs/open62541/files/open62541-1.1.5-headers.patch b/dev-libs/open62541/files/open62541-1.1.5-headers.patch
new file mode 100644
index 00000000..8cedc3f0
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.1.5-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
+@@ -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
new file mode 100644
index 00000000..03a1bf08
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.1.5-tests.patch
@@ -0,0 +1,101 @@
+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
new file mode 100644
index 00000000..bcc47e3c
--- /dev/null
+++ b/dev-libs/open62541/open62541-1.1.5.ebuild
@@ -0,0 +1,98 @@
+# 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_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] 11+ messages in thread* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/, dev-libs/open62541/files/
@ 2022-11-16 10:19 Florian Schmaus
0 siblings, 0 replies; 11+ messages in thread
From: Florian Schmaus @ 2022-11-16 10:19 UTC (permalink / raw
To: gentoo-commits
commit: 4cf36065e742d300fab3fce6e9ccccae9c2a736a
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Tue Nov 15 21:03:57 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=4cf36065
dev-libs/open62541: add 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 insertions(+)
diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index 7d68b6049..498a9b46d 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1 +1,2 @@
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.4-disable-xdp.patch b/dev-libs/open62541/files/open62541-1.3.4-disable-xdp.patch
new file mode 100644
index 000000000..cb5cb6e8f
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.3.4-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.4.ebuild b/dev-libs/open62541/open62541-1.3.4.ebuild
new file mode 100644
index 000000000..76fd3ebe3
--- /dev/null
+++ b/dev-libs/open62541/open62541-1.3.4.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] 11+ messages in thread* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/, dev-libs/open62541/files/
@ 2022-02-26 18:16 Florian Schmaus
0 siblings, 0 replies; 11+ messages in thread
From: Florian Schmaus @ 2022-02-26 18:16 UTC (permalink / raw
To: gentoo-commits
commit: 36e42377c96008cd4bc4b200f98ec2348ba4b2a9
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Fri Feb 25 20:47:31 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Feb 25 20:47:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=36e42377
dev-libs/open62541: Bump version to v1.2.4
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 +
| 31 ++++++
.../open62541/files/open62541-1.2.4-tests.patch | 124 +++++++++++++++++++++
dev-libs/open62541/open62541-1.2.4.ebuild | 104 +++++++++++++++++
4 files changed, 260 insertions(+)
diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index d59ef7daa..aa9a52758 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1 +1,2 @@
DIST open62541-1.2.3.tar.gz 3645511 BLAKE2B 3cebe1a4200cb026916cd801303937509d8e59c10af5400f5a212c16006c1744bc403fad25b40fb7bcf9043982649f1661c13aa16df8a07db6334f7e2fc55872 SHA512 ffcc697901ec978fb9d1f8996f8a4c5114c98a0ec19206cac95d1a84f8d0fcbe38bf73e88f1df59d53bc6be481102aa2f2a6a0efa29797e7ce11123bd23131c2
+DIST open62541-1.2.4.tar.gz 3646665 BLAKE2B 83441f05d4f846e83d441a84d46e6bff4459a239d02eee7a78f846a26cb433ecb67a2b178c8a5bcbc748b10ac49f055f5c9063b02dd72d2e574f1b1e0ea3fe97 SHA512 4fb4c01c0573dd5e06c4f3a0caa6b7b5ef3bafbbf3d4d7a0770e9e448e111b5f4906d6911271f28c27a2b1f07710a6bc0b3204ca39e043c350f5051c3ee8e821
--git a/dev-libs/open62541/files/open62541-1.2.4-headers.patch b/dev-libs/open62541/files/open62541-1.2.4-headers.patch
new file mode 100644
index 000000000..75d79ec46
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.2.4-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.4-tests.patch b/dev-libs/open62541/files/open62541-1.2.4-tests.patch
new file mode 100644
index 000000000..e8b83fe08
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.2.4-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.4.ebuild b/dev-libs/open62541/open62541-1.2.4.ebuild
new file mode 100644
index 000000000..971777330
--- /dev/null
+++ b/dev-libs/open62541/open62541-1.2.4.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+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] 11+ messages in thread* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/, dev-libs/open62541/files/
@ 2021-01-23 11:49 Michał Górny
0 siblings, 0 replies; 11+ messages in thread
From: Michał Górny @ 2021-01-23 11:49 UTC (permalink / raw
To: gentoo-commits
commit: f38694b9385277c7862d7901aabae703e60d4a09
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Fri Jan 22 16:57:06 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 16:57:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f38694b9
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 -
dev-libs/open62541/files/open62541-1.1.3-etf.patch | 43 ---------
| 36 -------
.../open62541/files/open62541-1.1.3-tests.patch | 104 ---------------------
dev-libs/open62541/open62541-1.1.3.ebuild | 98 -------------------
5 files changed, 282 deletions(-)
diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index fc6cef34..c7a1c386 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.1.3.tar.gz 2925631 BLAKE2B 1314d51c1153a2e2785e8eccf363ef8285142b0e2af1890047eae079bd6d36583c0fa91661da4bf68c1dfa980c6b708fa7c6f7192bea06b234b98428074fd1c8 SHA512 e0574b9273002b22c042534dc8e177800bee87f8b48d3de4a627dc255211e67489531905cac41a8a15d337e2a958815b59be23c96163d3305cd43a8da18c390f
DIST open62541-1.1.5.tar.gz 2925670 BLAKE2B 5da0795801f2fd92fd3d922fbda83d8ef6f22f19a9e17d585fd2f9dddf37e3fc95290ac3d49774ebad0bee8114f5bec4af11d01998ba765b93311062681c7114 SHA512 46379047c83bd728343c4d5b78bf5ade02bd9af4c430350d54366aeab66dadfaee2bded317e990b2456d98dd7277877824e6ad3c632d62c94ba50b14433ea880
diff --git a/dev-libs/open62541/files/open62541-1.1.3-etf.patch b/dev-libs/open62541/files/open62541-1.1.3-etf.patch
deleted file mode 100644
index cce618e6..00000000
--- a/dev-libs/open62541/files/open62541-1.1.3-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.3-headers.patch b/dev-libs/open62541/files/open62541-1.1.3-headers.patch
deleted file mode 100644
index 97e225b0..00000000
--- a/dev-libs/open62541/files/open62541-1.1.3-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.3-tests.patch b/dev-libs/open62541/files/open62541-1.1.3-tests.patch
deleted file mode 100644
index ad96717f..00000000
--- a/dev-libs/open62541/files/open62541-1.1.3-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.3.ebuild b/dev-libs/open62541/open62541-1.1.3.ebuild
deleted file mode 100644
index 79cccd83..00000000
--- a/dev-libs/open62541/open62541-1.1.3.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_{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_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] 11+ messages in thread* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/, dev-libs/open62541/files/
@ 2021-01-23 11:49 Michał Górny
0 siblings, 0 replies; 11+ messages in thread
From: Michał Górny @ 2021-01-23 11:49 UTC (permalink / raw
To: gentoo-commits
commit: 4f5f5d320dcce5a228866e0a9a27828c5908b49a
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Fri Jan 22 17:03:16 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 17:03:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4f5f5d32
dev-libs/open62541: Bump version to v1.0.6
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.6-tests.patch | 57 +++++++++++++++
dev-libs/open62541/open62541-1.0.6.ebuild | 83 ++++++++++++++++++++++
3 files changed, 141 insertions(+)
diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index c7a1c386..14372099 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.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.6-tests.patch b/dev-libs/open62541/files/open62541-1.0.6-tests.patch
new file mode 100644
index 00000000..774b6ade
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.0.6-tests.patch
@@ -0,0 +1,57 @@
+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(-)
+
+Index: open62541/tests/CMakeLists.txt
+===================================================================
+--- open62541.orig/tests/CMakeLists.txt
++++ open62541/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})
diff --git a/dev-libs/open62541/open62541-1.0.6.ebuild b/dev-libs/open62541/open62541-1.0.6.ebuild
new file mode 100644
index 00000000..8885df92
--- /dev/null
+++ b/dev-libs/open62541/open62541-1.0.6.ebuild
@@ -0,0 +1,83 @@
+# 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 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] 11+ messages in thread* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/, dev-libs/open62541/files/
@ 2020-12-11 8:36 Andrew Ammerlaan
0 siblings, 0 replies; 11+ messages in thread
From: Andrew Ammerlaan @ 2020-12-11 8:36 UTC (permalink / raw
To: gentoo-commits
commit: ea4e95332746707f242f7fd3d28aecb771a1a693
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Thu Dec 10 17:07:27 2020 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Thu Dec 10 17:07:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ea4e9533
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 -
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 deletions(-)
diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index 4091fb20..0520d956 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.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.2-etf.patch b/dev-libs/open62541/files/open62541-1.1.2-etf.patch
deleted file mode 100644
index cce618e6..00000000
--- a/dev-libs/open62541/files/open62541-1.1.2-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.2-headers.patch b/dev-libs/open62541/files/open62541-1.1.2-headers.patch
deleted file mode 100644
index 97e225b0..00000000
--- a/dev-libs/open62541/files/open62541-1.1.2-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.2-tests.patch b/dev-libs/open62541/files/open62541-1.1.2-tests.patch
deleted file mode 100644
index ad96717f..00000000
--- a/dev-libs/open62541/files/open62541-1.1.2-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.2.ebuild b/dev-libs/open62541/open62541-1.1.2.ebuild
deleted file mode 100644
index b6b0d455..00000000
--- a/dev-libs/open62541/open62541-1.1.2.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] 11+ messages in thread* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/, dev-libs/open62541/files/
@ 2020-08-17 10:17 Andrew Ammerlaan
0 siblings, 0 replies; 11+ messages in thread
From: Andrew Ammerlaan @ 2020-08-17 10:17 UTC (permalink / raw
To: gentoo-commits
commit: ce7c605a8dfa21fe26dfcaf7fb43da2056bbddf0
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sun Aug 16 07:33:34 2020 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Aug 16 07:33:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ce7c605a
dev-libs/open62541: Add version v1.0.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 +
.../open62541/files/open62541-1.0.2-tests.patch | 60 ++++++++++++++++
dev-libs/open62541/open62541-1.0.2.ebuild | 83 ++++++++++++++++++++++
3 files changed, 144 insertions(+)
diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index c2d5794..d26c310 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.0.2.tar.gz 2689341 BLAKE2B 68d7eda848e980156c18706706b99a30b70bafacc27b57aba99f8e1b6ae202cf719b94ec09417c10ad86df00c7adf1f5f03f74fa84071fa83c141236e65c00bd SHA512 39da1556a9155a461c2d0f351ada78ef878a3688e4ab570d41decdf8a3213c8fd160618f81ca80fb467ec41d5de0d61743d2289473f60ae1547785acf738945f
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
new file mode 100644
index 0000000..6f8f294
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.0.2-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.2.ebuild b/dev-libs/open62541/open62541-1.0.2.ebuild
new file mode 100644
index 0000000..b3424bf
--- /dev/null
+++ b/dev-libs/open62541/open62541-1.0.2.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..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] 11+ messages in thread* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/, dev-libs/open62541/files/
@ 2020-08-17 10:17 Andrew Ammerlaan
0 siblings, 0 replies; 11+ messages in thread
From: Andrew Ammerlaan @ 2020-08-17 10:17 UTC (permalink / raw
To: gentoo-commits
commit: c82c9d0cb6903f6b629389dc346601d7aed1eb6b
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sun Aug 16 07:34:20 2020 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Aug 16 07:34:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c82c9d0c
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 -
.../open62541/files/open62541-1.0.1-tests.patch | 60 ----------------
dev-libs/open62541/open62541-1.0.1.ebuild | 83 ----------------------
3 files changed, 144 deletions(-)
diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index d26c310..da0e050 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.0.2.tar.gz 2689341 BLAKE2B 68d7eda848e980156c18706706b99a30b70bafacc27b57aba99f8e1b6ae202cf719b94ec09417c10ad86df00c7adf1f5f03f74fa84071fa83c141236e65c00bd SHA512 39da1556a9155a461c2d0f351ada78ef878a3688e4ab570d41decdf8a3213c8fd160618f81ca80fb467ec41d5de0d61743d2289473f60ae1547785acf738945f
DIST open62541-1.1.2.tar.gz 2916517 BLAKE2B 60ee78630ee74fbe9d2dee894f3b5f6b5209b823f8e24236e2f6ceb13ddc68df9c0065d57fe14096cdf822755979053201b6901540082aac3d69135c3dc54b67 SHA512 090f24b77211ef8e0a45c7b74de948db6ea64290fc591ae0131871119d826c8b385769ab4c1dad0f8ba663acafd7df3b4b288759623eb6f4a3fbd00ab65abedc
diff --git a/dev-libs/open62541/files/open62541-1.0.1-tests.patch b/dev-libs/open62541/files/open62541-1.0.1-tests.patch
deleted file mode 100644
index 6f8f294..0000000
--- a/dev-libs/open62541/files/open62541-1.0.1-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.1.ebuild b/dev-libs/open62541/open62541-1.0.1.ebuild
deleted file mode 100644
index b3424bf..0000000
--- a/dev-libs/open62541/open62541-1.0.1.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] 11+ messages in thread* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/, dev-libs/open62541/files/
@ 2020-07-12 11:57 Andrew Ammerlaan
0 siblings, 0 replies; 11+ messages in thread
From: Andrew Ammerlaan @ 2020-07-12 11:57 UTC (permalink / raw
To: gentoo-commits
commit: 4e1bbb9cb5cd617c9fc97ae3ec5f342f61030c17
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sun Jul 12 09:14:36 2020 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Jul 12 09:14:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4e1bbb9c
dev-libs/open62541: Fix issues
This fixes two problems:
* Build fix when ETF is enabled
* Install XDP and ETF plugin header
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
dev-libs/open62541/files/open62541-1.1-etf.patch | 43 ++++++++++++++++++++++
.../open62541/files/open62541-1.1-headers.patch | 36 ++++++++++++++++++
dev-libs/open62541/open62541-1.1.ebuild | 7 +++-
3 files changed, 85 insertions(+), 1 deletion(-)
diff --git a/dev-libs/open62541/files/open62541-1.1-etf.patch b/dev-libs/open62541/files/open62541-1.1-etf.patch
new file mode 100644
index 0000000..a5edee6
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.1-etf.patch
@@ -0,0 +1,43 @@
+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
new file mode 100644
index 0000000..29d2ed3
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.1-headers.patch
@@ -0,0 +1,36 @@
+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/open62541-1.1.ebuild b/dev-libs/open62541/open62541-1.1.ebuild
index 5fe1065..b6b0d45 100644
--- a/dev-libs/open62541/open62541-1.1.ebuild
+++ b/dev-libs/open62541/open62541-1.1.ebuild
@@ -51,7 +51,11 @@ RDEPEND="
${DEPEND}
"
-PATCHES=( "${FILESDIR}/${P}-tests.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-etf.patch"
+ "${FILESDIR}/${P}-headers.patch"
+ "${FILESDIR}/${P}-tests.patch"
+)
src_configure() {
local mycmakeargs=(
@@ -64,6 +68,7 @@ src_configure() {
-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)
)
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/, dev-libs/open62541/files/
@ 2020-06-21 19:11 Andrew Ammerlaan
0 siblings, 0 replies; 11+ messages in thread
From: Andrew Ammerlaan @ 2020-06-21 19:11 UTC (permalink / raw
To: gentoo-commits
commit: 32e130b572c062997e3337b6b7365d1fb9913a45
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sat Jun 20 12:33:54 2020 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Jun 20 12:33:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=32e130b5
dev-libs/open62541: Drop 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/open62541-1.1_rc1.ebuild | 98 -------------------
3 files changed, 203 deletions(-)
diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index 1899447..1291050 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-rc1.tar.gz 2913287 BLAKE2B c4b46f2dc040549f64befa7b0717cebb6048d28c167c89291301b774c78c9d0b7a1520f0b81319e3837da0f4ca21ec999ca02be20ca92a2f271984773112b8f8 SHA512 fd700b2ccb878f01775aad18b2549f3bb138bb769a1b1c608194294a1dbb806c6902caded42b7a21416d97ee4d59917ff4e114e34bcab3a3cf8c829b866227cb
DIST open62541-1.1.tar.gz 2931184 BLAKE2B 817caad357e25bb70c548e7367ee75c358f40c27e5fde6b2edf6fe935289f58c40aa232565f0da5ba8ba6bcaf7138ce835232b649f10c2c9dee9618421eca6d8 SHA512 cf4d28de9534069600cdd3b20e837cdfbdeb46d4da59ad70fa8ad60fa1cd7fd02216cd0b818e8ece8dedb77de1986608817ab5f015e2ac0a806d5d8ba20a1765
diff --git a/dev-libs/open62541/files/open62541-1.1_rc1-tests.patch b/dev-libs/open62541/files/open62541-1.1_rc1-tests.patch
deleted file mode 100644
index 1b14eb2..0000000
--- a/dev-libs/open62541/files/open62541-1.1_rc1-tests.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-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/open62541-1.1_rc1.ebuild b/dev-libs/open62541/open62541-1.1_rc1.ebuild
deleted file mode 100644
index 48b25d9..0000000
--- a/dev-libs/open62541/open62541-1.1_rc1.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
-
-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] 11+ messages in thread* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/, dev-libs/open62541/files/
@ 2020-06-21 19:11 Andrew Ammerlaan
0 siblings, 0 replies; 11+ messages in thread
From: Andrew Ammerlaan @ 2020-06-21 19:11 UTC (permalink / raw
To: gentoo-commits
commit: f87f719ab6235a4af4e00021f2ca8ffbb4acc9ce
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sat Jun 20 12:33:24 2020 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Jun 20 12:33:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f87f719a
dev-libs/open62541: Bump version to v1.1
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 +
dev-libs/open62541/files/open62541-1.1-tests.patch | 110 +++++++++++++++++++++
dev-libs/open62541/open62541-1.1.ebuild | 93 +++++++++++++++++
3 files changed, 204 insertions(+)
diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index c631ff4..1899447 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-rc1.tar.gz 2913287 BLAKE2B c4b46f2dc040549f64befa7b0717cebb6048d28c167c89291301b774c78c9d0b7a1520f0b81319e3837da0f4ca21ec999ca02be20ca92a2f271984773112b8f8 SHA512 fd700b2ccb878f01775aad18b2549f3bb138bb769a1b1c608194294a1dbb806c6902caded42b7a21416d97ee4d59917ff4e114e34bcab3a3cf8c829b866227cb
+DIST open62541-1.1.tar.gz 2931184 BLAKE2B 817caad357e25bb70c548e7367ee75c358f40c27e5fde6b2edf6fe935289f58c40aa232565f0da5ba8ba6bcaf7138ce835232b649f10c2c9dee9618421eca6d8 SHA512 cf4d28de9534069600cdd3b20e837cdfbdeb46d4da59ad70fa8ad60fa1cd7fd02216cd0b818e8ece8dedb77de1986608817ab5f015e2ac0a806d5d8ba20a1765
diff --git a/dev-libs/open62541/files/open62541-1.1-tests.patch b/dev-libs/open62541/files/open62541-1.1-tests.patch
new file mode 100644
index 0000000..68c0ef6
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.1-tests.patch
@@ -0,0 +1,110 @@
+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
new file mode 100644
index 0000000..5fe1065
--- /dev/null
+++ b/dev-libs/open62541/open62541-1.1.ebuild
@@ -0,0 +1,93 @@
+# 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}-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_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] 11+ messages in thread
end of thread, other threads:[~2022-11-16 10:19 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-23 11:49 [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/, dev-libs/open62541/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2022-11-16 10:19 Florian Schmaus
2022-02-26 18:16 Florian Schmaus
2021-01-23 11:49 Michał Górny
2021-01-23 11:49 Michał Górny
2020-12-11 8:36 Andrew Ammerlaan
2020-08-17 10:17 Andrew Ammerlaan
2020-08-17 10:17 Andrew Ammerlaan
2020-07-12 11:57 Andrew Ammerlaan
2020-06-21 19:11 Andrew Ammerlaan
2020-06-21 19:11 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox