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 ---------
.../open62541/files/open62541-1.1.3-headers.patch | 36 -------
.../open62541/files/open62541-1.1.3-tests.patch | 104 ---------------------
dev-libs/open62541/open62541-1.1.3.ebuild | 98 -------------------
5 files changed, 282 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 <k...@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 <k...@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 <k...@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 <k...@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 <k...@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 <k...@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
-}
