From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 41068158020 for ; Wed, 16 Nov 2022 10:19:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 09525E08AD; Wed, 16 Nov 2022 10:19:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 799E9E089A for ; Wed, 16 Nov 2022 10:19:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BA4B5340F4A for ; Wed, 16 Nov 2022 10:19:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 587CA771 for ; Wed, 16 Nov 2022 10:19:14 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1668546571.04beb9ff160c34bf7fa74ea03a46eefa85888293.flow@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/files/, dev-libs/open62541/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-libs/open62541/Manifest dev-libs/open62541/files/open62541-1.3.3-disable-xdp.patch dev-libs/open62541/files/open62541-1.3.3-tests.patch dev-libs/open62541/open62541-1.3.3.ebuild X-VCS-Directories: dev-libs/open62541/files/ dev-libs/open62541/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 04beb9ff160c34bf7fa74ea03a46eefa85888293 X-VCS-Branch: master Date: Wed, 16 Nov 2022 10:19:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2eae691d-9a6f-4367-9c09-0bb15286cabb X-Archives-Hash: 9f8fa113fbd9a4a1b04a8d817fba806d commit: 04beb9ff160c34bf7fa74ea03a46eefa85888293 Author: Kurt Kanzenbach kmk-computers de> AuthorDate: Tue Nov 15 21:04:18 2022 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Tue Nov 15 21:09:31 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=04beb9ff dev-libs/open62541: drop 1.3.3 Closes: https://bugs.gentoo.org/839153 Signed-off-by: Kurt Kanzenbach kmk-computers.de> dev-libs/open62541/Manifest | 1 - .../files/open62541-1.3.3-disable-xdp.patch | 21 --- .../open62541/files/open62541-1.3.3-tests.patch | 144 --------------------- dev-libs/open62541/open62541-1.3.3.ebuild | 96 -------------- 4 files changed, 262 deletions(-) diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest index 498a9b46d..93f71afd2 100644 --- a/dev-libs/open62541/Manifest +++ b/dev-libs/open62541/Manifest @@ -1,2 +1 @@ -DIST open62541-1.3.3.tar.gz 3866193 BLAKE2B 543c027ceffade9a5bee3dd99a634e694fc92116ab6d5d39844243325bb48ae46108dfc50bc9350099d942ab1a81614cee9f9477436b1b831a592230ceb884cc SHA512 409c60b84791165d07a69077b51c5783dc9aef1a593b491da1807c44b51542a59b6bea8718a66c256e953aa5d0ad1c38cd08a615ed55f453df50c719a291d018 DIST open62541-1.3.4.tar.gz 3867546 BLAKE2B d356f065d8565b5d7a0964116afb8e1dacb1a1c85c212baa6432830dca0a94232c24eed3d0aa0bd6f0a106ec137f038e5957dc383f4511d1fa8b49d5f2e0633a SHA512 3230355237a3c88351ddd1d291057ab0b1e4ab0a3a1218c90a0201d4d77769098e6fbced26efef7c8635020b6d64748d065fc707615c45487aa3502aa19b6687 diff --git a/dev-libs/open62541/files/open62541-1.3.3-disable-xdp.patch b/dev-libs/open62541/files/open62541-1.3.3-disable-xdp.patch deleted file mode 100644 index cb5cb6e8f..000000000 --- a/dev-libs/open62541/files/open62541-1.3.3-disable-xdp.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Kurt Kanzenbach -Subject: pubsub: Disable XDP code - -The XDP code assumes < dev-libs/libbpf-0.0.7. Disable it. - -Signed-off-by: Kurt Kanzenbach ---- - 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 - - #if defined __has_include --# if __has_include() && __has_include() && __has_include() -+# if 0 - # define LIBBPF_EBPF - /* Libbpf headers */ - # include diff --git a/dev-libs/open62541/files/open62541-1.3.3-tests.patch b/dev-libs/open62541/files/open62541-1.3.3-tests.patch deleted file mode 100644 index 292cd73fc..000000000 --- a/dev-libs/open62541/files/open62541-1.3.3-tests.patch +++ /dev/null @@ -1,144 +0,0 @@ -From: Kurt Kanzenbach -Subject: test: Remove PubSub tests - -Remove PubSub tests. They don't run within portage. - -Signed-off-by: Kurt Kanzenbach ---- - tests/CMakeLists.txt | 125 --------------------------------------------------- - 1 file changed, 125 deletions(-) - ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -381,131 +381,6 @@ if(UA_ENABLE_DISCOVERY) - add_test_valgrind(discovery ${TESTS_BINARY_DIR}/check_discovery) - endif() - --if(UA_ENABLE_PUBSUB) -- add_executable(check_pubsub_encoding pubsub/check_pubsub_encoding.c $ $) -- target_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_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_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_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_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_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_link_libraries(check_pubsub_subscribe ${LIBS}) -- add_executable(check_pubsub_publishspeed pubsub/check_pubsub_publishspeed.c $ $) -- 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_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_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_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_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_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_link_libraries(check_pubsub_multiple_layer ${LIBS}) -- add_test_valgrind(pubsub_multiple_layer ${TESTS_BINARY_DIR}/check_pubsub_multiple_layer) -- -- if(UA_ENABLE_PUBSUB_ENCRYPTION) -- add_executable(check_pubsub_encryption pubsub/check_pubsub_encryption.c -- $ -- $) -- target_link_libraries(check_pubsub_encryption ${LIBS}) -- add_test_valgrind(check_pubsub_encryption ${TESTS_BINARY_DIR}/check_pubsub_encryption) -- -- add_executable(check_pubsub_encryption_aes256 pubsub/check_pubsub_encryption_aes256.c -- $ -- $) -- target_link_libraries(check_pubsub_encryption_aes256 ${LIBS}) -- add_test_valgrind(check_pubsub_encryption_aes256 ${TESTS_BINARY_DIR}/check_pubsub_encryption_aes256) -- -- add_executable(check_pubsub_decryption pubsub/check_pubsub_decryption.c -- $ -- $) -- target_link_libraries(check_pubsub_decryption ${LIBS}) -- add_test_valgrind(check_pubsub_decryption ${TESTS_BINARY_DIR}/check_pubsub_decryption) -- -- add_executable(check_pubsub_subscribe_encrypted pubsub/check_pubsub_subscribe_encrypted.c -- $ -- $) -- target_link_libraries(check_pubsub_subscribe_encrypted ${LIBS}) -- add_test_valgrind(check_pubsub_subscribe_encrypted ${TESTS_BINARY_DIR}/check_pubsub_subscribe_encrypted) -- endif() -- -- if (UA_ENABLE_PUBSUB_MONITORING) -- add_executable(check_pubsub_subscribe_msgrcvtimeout pubsub/check_pubsub_subscribe_msgrcvtimeout.c -- $ -- $) -- target_link_libraries(check_pubsub_subscribe_msgrcvtimeout ${LIBS}) -- add_test_valgrind(check_pubsub_subscribe_msgrcvtimeout ${TESTS_BINARY_DIR}/check_pubsub_subscribe_msgrcvtimeout) -- endif() -- -- if(UA_ENABLE_PUBSUB_ETH_UADP) -- add_executable(check_pubsub_connection_ethernet pubsub/check_pubsub_connection_ethernet.c $ $) -- target_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_link_libraries(check_pubsub_publish_ethernet ${LIBS}) -- add_test_valgrind(pubsub_publish_ethernet ${TESTS_BINARY_DIR}/check_pubsub_publish_ethernet) -- add_executable(check_pubsub_connection_ethernet_etf pubsub/check_pubsub_connection_ethernet_etf.c $ $) -- target_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_link_libraries(check_pubsub_publish_ethernet_etf ${LIBS}) -- add_test_valgrind(pubsub_publish_ethernet_etf ${TESTS_BINARY_DIR}/check_pubsub_publish_ethernet_etf) -- if(LIB_BPF) -- add_executable(check_pubsub_connection_xdp pubsub/check_pubsub_connection_xdp.c $ $) -- target_link_libraries(check_pubsub_connection_xdp ${LIBS}) -- add_test_valgrind(pubsub_connection_xdp ${TESTS_BINARY_DIR}/check_pubsub_connection_xdp) -- endif() -- endif() -- -- if(UA_ENABLE_PUBSUB_INFORMATIONMODEL) -- add_executable(check_pubsub_informationmodel pubsub/check_pubsub_informationmodel.c $ $) -- target_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_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_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_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_link_libraries(check_server_readspeed ${LIBS}) - add_test_no_valgrind(server_readspeed ${TESTS_BINARY_DIR}/check_server_readspeed) diff --git a/dev-libs/open62541/open62541-1.3.3.ebuild b/dev-libs/open62541/open62541-1.3.3.ebuild deleted file mode 100644 index be8f20c47..000000000 --- a/dev-libs/open62541/open62541-1.3.3.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..11} ) - -inherit cmake python-single-r1 - -DESCRIPTION="Open source C implementation of OPC UA" -HOMEPAGE="https://www.open62541.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc encryption examples mbedtls pubsub openssl test tools" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - encryption? ( || ( mbedtls openssl ) ) -" - -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig - doc? ( - media-gfx/graphviz - $(python_gen_cond_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - ') - ) - test? ( - dev-libs/check - dev-util/valgrind - $(python_gen_cond_dep ' - dev-python/subunit[${PYTHON_USEDEP}] - ') - ) -" -DEPEND=" - mbedtls? ( net-libs/mbedtls:= ) - openssl? ( dev-libs/openssl:0= ) -" -RDEPEND=" - ${PYTHON_DEPS} - ${DEPEND} -" - -PATCHES=( - "${FILESDIR}/${P}-disable-xdp.patch" - "${FILESDIR}/${P}-tests.patch" -) - -src_configure() { - local mycmakeargs=( - -DBUILD_SHARED_LIBS=ON - -DOPEN62541_VERSION=v${PV} - -DUA_BUILD_EXAMPLES=OFF - -DUA_BUILD_TOOLS=$(usex tools) - -DUA_BUILD_UNIT_TESTS=$(usex test) - -DUA_ENABLE_PUBSUB=$(usex pubsub) - -DUA_ENABLE_PUBSUB_ETH_UADP=$(usex pubsub) - -DUA_FORCE_WERROR=OFF - ) - - if use encryption; then - use mbedtls && mycmakeargs+=(-DUA_ENABLE_ENCRYPTION=MBEDTLS) - use openssl && mycmakeargs+=(-DUA_ENABLE_ENCRYPTION=OPENSSL) - fi - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - use doc && cmake_build doc -} - -src_install() { - use doc && local HTML_DOCS=( "${WORKDIR}"/${P}_build/doc/. ) - cmake_src_install - - if use examples; then - docompress -x /usr/share/doc/${PF}/examples - dodoc -r examples/ - fi - - python_fix_shebang "${ED}" -} - -src_test() { - cmake_src_test -j1 -}