From 660fe158ec58a901cc42d6aea9b2cde89cb91755 Mon Sep 17 00:00:00 2001 From: Denis Reva Date: Thu, 10 Dec 2020 20:10:42 +0500 Subject: [PATCH 1/8] sys-fs/dwarfs: fixed a typo with installation I wrote default in src_install section instead of cmake_src_install accidently Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Denis Reva --- .../dwarfs/{dwarfs-0.2.3-r3.ebuild => dwarfs-0.2.3-r4.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename sys-fs/dwarfs/{dwarfs-0.2.3-r3.ebuild => dwarfs-0.2.3-r4.ebuild} (99%) diff --git a/sys-fs/dwarfs/dwarfs-0.2.3-r3.ebuild b/sys-fs/dwarfs/dwarfs-0.2.3-r4.ebuild similarity index 99% rename from sys-fs/dwarfs/dwarfs-0.2.3-r3.ebuild rename to sys-fs/dwarfs/dwarfs-0.2.3-r4.ebuild index 33378106cf..1b8ff79dcc 100644 --- a/sys-fs/dwarfs/dwarfs-0.2.3-r3.ebuild +++ b/sys-fs/dwarfs/dwarfs-0.2.3-r4.ebuild @@ -73,7 +73,7 @@ src_prepare(){ } src_install(){ - default + cmake_src_install dolib.so libmetadata_thrift.so libthrift_light.so dolib.so folly/libfolly.so.0.58.0-dev folly/libfolly.so } From 3707641523662de28c4422e59e8aa8223a6790cd Mon Sep 17 00:00:00 2001 From: Kurt Kanzenbach Date: Thu, 10 Dec 2020 17:52:38 +0100 Subject: [PATCH 2/8] dev-libs/open62541: Bump version to v1.0.3 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Kurt Kanzenbach --- dev-libs/open62541/Manifest | 1 + .../files/open62541-1.0.3-tests.patch | 60 ++++++++++++++ dev-libs/open62541/open62541-1.0.3.ebuild | 83 +++++++++++++++++++ 3 files changed, 144 insertions(+) create mode 100644 dev-libs/open62541/files/open62541-1.0.3-tests.patch create mode 100644 dev-libs/open62541/open62541-1.0.3.ebuild diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest index da0e050f2d..9cf13f4eaa 100644 --- a/dev-libs/open62541/Manifest +++ b/dev-libs/open62541/Manifest @@ -1,2 +1,3 @@ DIST open62541-1.0.2.tar.gz 2689341 BLAKE2B 68d7eda848e980156c18706706b99a30b70bafacc27b57aba99f8e1b6ae202cf719b94ec09417c10ad86df00c7adf1f5f03f74fa84071fa83c141236e65c00bd SHA512 39da1556a9155a461c2d0f351ada78ef878a3688e4ab570d41decdf8a3213c8fd160618f81ca80fb467ec41d5de0d61743d2289473f60ae1547785acf738945f +DIST open62541-1.0.3.tar.gz 2691597 BLAKE2B 0ad9f71f97dfe550068d239cc97f59afd1f528a1b912d44734103a962fd3407ac9b3d753cc1499dbf5b7ad0f56a93378b5c833ac24262b1f9eb26916de296904 SHA512 5dfff3d784b1659a5c819b7666101e60af186e7604ca73e6c3ec15d20e8ceff26f1c9139bb78bf0c0fbc9ab10a1a3cd031252e1e6bf1f56c5403797257a318cf DIST open62541-1.1.2.tar.gz 2916517 BLAKE2B 60ee78630ee74fbe9d2dee894f3b5f6b5209b823f8e24236e2f6ceb13ddc68df9c0065d57fe14096cdf822755979053201b6901540082aac3d69135c3dc54b67 SHA512 090f24b77211ef8e0a45c7b74de948db6ea64290fc591ae0131871119d826c8b385769ab4c1dad0f8ba663acafd7df3b4b288759623eb6f4a3fbd00ab65abedc diff --git a/dev-libs/open62541/files/open62541-1.0.3-tests.patch b/dev-libs/open62541/files/open62541-1.0.3-tests.patch new file mode 100644 index 0000000000..6f8f2942d4 --- /dev/null +++ b/dev-libs/open62541/files/open62541-1.0.3-tests.patch @@ -0,0 +1,60 @@ +From f1f120389c345c3f45a6da5b6793cdfb78a0ce61 Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach +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 +--- + 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_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_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) + + #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_test_valgrind(check_pubsub_subscribe ${TESTS_BINARY_DIR}/check_pubsub_subscribe) +- 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_subscribe pubsub/check_pubsub_subscribe.c $ $) ++ # 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_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_link_libraries(check_pubsub_multiple_layer ${LIBS}) +-- +2.24.1 + diff --git a/dev-libs/open62541/open62541-1.0.3.ebuild b/dev-libs/open62541/open62541-1.0.3.ebuild new file mode 100644 index 0000000000..8c378e8261 --- /dev/null +++ b/dev-libs/open62541/open62541-1.0.3.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) + +inherit cmake python-single-r1 + +DESCRIPTION="Open source C implementation of OPC UA" +HOMEPAGE="https://open62541.org/" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc examples mbedtls pubsub test tools" +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig + doc? ( + media-gfx/graphviz + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_MULTI_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}] + ') + ) + test? ( + dev-libs/check + dev-util/valgrind + $(python_gen_cond_dep ' + dev-python/subunit[${PYTHON_MULTI_USEDEP}] + ') + ) +" +DEPEND=" + mbedtls? ( net-libs/mbedtls:= ) +" +RDEPEND=" + ${PYTHON_DEPS} + ${DEPEND} +" + +PATCHES=( "${FILESDIR}/${P}-tests.patch" ) + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + -DOPEN62541_VERSION=v${PV} + -DUA_BUILD_EXAMPLES=OFF + -DUA_BUILD_TOOLS=$(usex tools) + -DUA_BUILD_UNIT_TESTS=$(usex test) + -DUA_ENABLE_ENCRYPTION=$(usex mbedtls) + -DUA_ENABLE_PUBSUB=$(usex pubsub) + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && cmake_build doc +} + +src_install() { + use doc && local HTML_DOCS=( "${WORKDIR}"/${P}_build/doc/. ) + cmake_src_install + + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + dodoc -r examples/ + fi + + python_fix_shebang "${ED}" +} + +src_test() { + cmake_src_test -j1 +} From 56846b488209fe90af47b3e93072c35551deaf2c Mon Sep 17 00:00:00 2001 From: Kurt Kanzenbach Date: Thu, 10 Dec 2020 17:54:23 +0100 Subject: [PATCH 3/8] dev-libs/open62541: Drop old Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Kurt Kanzenbach --- dev-libs/open62541/Manifest | 1 - .../files/open62541-1.0.2-tests.patch | 60 -------------- dev-libs/open62541/open62541-1.0.2.ebuild | 83 ------------------- 3 files changed, 144 deletions(-) delete mode 100644 dev-libs/open62541/files/open62541-1.0.2-tests.patch delete mode 100644 dev-libs/open62541/open62541-1.0.2.ebuild diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest index 9cf13f4eaa..5e4ac33e52 100644 --- a/dev-libs/open62541/Manifest +++ b/dev-libs/open62541/Manifest @@ -1,3 +1,2 @@ -DIST open62541-1.0.2.tar.gz 2689341 BLAKE2B 68d7eda848e980156c18706706b99a30b70bafacc27b57aba99f8e1b6ae202cf719b94ec09417c10ad86df00c7adf1f5f03f74fa84071fa83c141236e65c00bd SHA512 39da1556a9155a461c2d0f351ada78ef878a3688e4ab570d41decdf8a3213c8fd160618f81ca80fb467ec41d5de0d61743d2289473f60ae1547785acf738945f DIST open62541-1.0.3.tar.gz 2691597 BLAKE2B 0ad9f71f97dfe550068d239cc97f59afd1f528a1b912d44734103a962fd3407ac9b3d753cc1499dbf5b7ad0f56a93378b5c833ac24262b1f9eb26916de296904 SHA512 5dfff3d784b1659a5c819b7666101e60af186e7604ca73e6c3ec15d20e8ceff26f1c9139bb78bf0c0fbc9ab10a1a3cd031252e1e6bf1f56c5403797257a318cf DIST open62541-1.1.2.tar.gz 2916517 BLAKE2B 60ee78630ee74fbe9d2dee894f3b5f6b5209b823f8e24236e2f6ceb13ddc68df9c0065d57fe14096cdf822755979053201b6901540082aac3d69135c3dc54b67 SHA512 090f24b77211ef8e0a45c7b74de948db6ea64290fc591ae0131871119d826c8b385769ab4c1dad0f8ba663acafd7df3b4b288759623eb6f4a3fbd00ab65abedc diff --git a/dev-libs/open62541/files/open62541-1.0.2-tests.patch b/dev-libs/open62541/files/open62541-1.0.2-tests.patch deleted file mode 100644 index 6f8f2942d4..0000000000 --- a/dev-libs/open62541/files/open62541-1.0.2-tests.patch +++ /dev/null @@ -1,60 +0,0 @@ -From f1f120389c345c3f45a6da5b6793cdfb78a0ce61 Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach -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 ---- - 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_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_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) - - #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_test_valgrind(check_pubsub_subscribe ${TESTS_BINARY_DIR}/check_pubsub_subscribe) -- 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_subscribe pubsub/check_pubsub_subscribe.c $ $) -+ # 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_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_link_libraries(check_pubsub_multiple_layer ${LIBS}) --- -2.24.1 - diff --git a/dev-libs/open62541/open62541-1.0.2.ebuild b/dev-libs/open62541/open62541-1.0.2.ebuild deleted file mode 100644 index b3424bf6e4..0000000000 --- a/dev-libs/open62541/open62541-1.0.2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..8} ) - -inherit cmake python-single-r1 - -DESCRIPTION="Open source C implementation of OPC UA" -HOMEPAGE="https://open62541.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc examples mbedtls pubsub test tools" -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig - doc? ( - media-gfx/graphviz - $(python_gen_cond_dep ' - dev-python/sphinx[${PYTHON_MULTI_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}] - ') - ) - test? ( - dev-libs/check - dev-util/valgrind - $(python_gen_cond_dep ' - dev-python/subunit[${PYTHON_MULTI_USEDEP}] - ') - ) -" -DEPEND=" - mbedtls? ( net-libs/mbedtls:= ) -" -RDEPEND=" - ${PYTHON_DEPS} - ${DEPEND} -" - -PATCHES=( "${FILESDIR}/${P}-tests.patch" ) - -src_configure() { - local mycmakeargs=( - -DBUILD_SHARED_LIBS=ON - -DOPEN62541_VERSION=v${PV} - -DUA_BUILD_EXAMPLES=OFF - -DUA_BUILD_TOOLS=$(usex tools) - -DUA_BUILD_UNIT_TESTS=$(usex test) - -DUA_ENABLE_ENCRYPTION=$(usex mbedtls) - -DUA_ENABLE_PUBSUB=$(usex pubsub) - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - use doc && cmake_build doc -} - -src_install() { - use doc && local HTML_DOCS=( "${WORKDIR}"/${P}_build/doc/. ) - cmake_src_install - - if use examples; then - docompress -x /usr/share/doc/${PF}/examples - dodoc -r examples/ - fi - - python_fix_shebang "${ED}" -} - -src_test() { - cmake_src_test -j1 -} From a167e05c21b10361a0376dfe95a12911752d9951 Mon Sep 17 00:00:00 2001 From: Kurt Kanzenbach Date: Thu, 10 Dec 2020 18:01:09 +0100 Subject: [PATCH 4/8] dev-libs/open62541: Bump version to v1.1.3 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Kurt Kanzenbach --- dev-libs/open62541/Manifest | 1 + .../open62541/files/open62541-1.1.3-etf.patch | 43 ++++++++ .../files/open62541-1.1.3-headers.patch | 36 ++++++ .../files/open62541-1.1.3-tests.patch | 104 ++++++++++++++++++ dev-libs/open62541/open62541-1.1.3.ebuild | 98 +++++++++++++++++ 5 files changed, 282 insertions(+) create mode 100644 dev-libs/open62541/files/open62541-1.1.3-etf.patch create mode 100644 dev-libs/open62541/files/open62541-1.1.3-headers.patch create mode 100644 dev-libs/open62541/files/open62541-1.1.3-tests.patch create mode 100644 dev-libs/open62541/open62541-1.1.3.ebuild diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest index 5e4ac33e52..4091fb205d 100644 --- a/dev-libs/open62541/Manifest +++ b/dev-libs/open62541/Manifest @@ -1,2 +1,3 @@ DIST open62541-1.0.3.tar.gz 2691597 BLAKE2B 0ad9f71f97dfe550068d239cc97f59afd1f528a1b912d44734103a962fd3407ac9b3d753cc1499dbf5b7ad0f56a93378b5c833ac24262b1f9eb26916de296904 SHA512 5dfff3d784b1659a5c819b7666101e60af186e7604ca73e6c3ec15d20e8ceff26f1c9139bb78bf0c0fbc9ab10a1a3cd031252e1e6bf1f56c5403797257a318cf DIST open62541-1.1.2.tar.gz 2916517 BLAKE2B 60ee78630ee74fbe9d2dee894f3b5f6b5209b823f8e24236e2f6ceb13ddc68df9c0065d57fe14096cdf822755979053201b6901540082aac3d69135c3dc54b67 SHA512 090f24b77211ef8e0a45c7b74de948db6ea64290fc591ae0131871119d826c8b385769ab4c1dad0f8ba663acafd7df3b4b288759623eb6f4a3fbd00ab65abedc +DIST open62541-1.1.3.tar.gz 2925631 BLAKE2B 1314d51c1153a2e2785e8eccf363ef8285142b0e2af1890047eae079bd6d36583c0fa91661da4bf68c1dfa980c6b708fa7c6f7192bea06b234b98428074fd1c8 SHA512 e0574b9273002b22c042534dc8e177800bee87f8b48d3de4a627dc255211e67489531905cac41a8a15d337e2a958815b59be23c96163d3305cd43a8da18c390f diff --git a/dev-libs/open62541/files/open62541-1.1.3-etf.patch b/dev-libs/open62541/files/open62541-1.1.3-etf.patch new file mode 100644 index 0000000000..cce618e63d --- /dev/null +++ b/dev-libs/open62541/files/open62541-1.1.3-etf.patch @@ -0,0 +1,43 @@ +From 8cac173827297e936a24b4bdfe73f2498dfe483a Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach +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 +--- + plugins/ua_pubsub_ethernet_etf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/ua_pubsub_ethernet_etf.c b/plugins/ua_pubsub_ethernet_etf.c +index 416b5857945a..d55eb363e3b5 100644 +--- a/plugins/ua_pubsub_ethernet_etf.c ++++ b/plugins/ua_pubsub_ethernet_etf.c +@@ -186,7 +186,7 @@ UA_PubSubChannelEthernetETF_open(const UA_PubSubConnectionConfig *connectionConf + struct ifreq ifreq; + memset(&ifreq, 0, sizeof(struct ifreq)); + UA_UInt64 len = UA_MIN(address->networkInterface.length, sizeof(ifreq.ifr_name)-1); +- UA_snprintf(ifreq.ifr_name, sizeof(struct ifreq), ++ UA_snprintf(ifreq.ifr_name, sizeof(ifreq.ifr_name), + "%.*s", (int)len, + (char*)address->networkInterface.data); + +-- +2.26.2 + diff --git a/dev-libs/open62541/files/open62541-1.1.3-headers.patch b/dev-libs/open62541/files/open62541-1.1.3-headers.patch new file mode 100644 index 0000000000..97e225b013 --- /dev/null +++ b/dev-libs/open62541/files/open62541-1.1.3-headers.patch @@ -0,0 +1,36 @@ +From a5697f1eb69822e172bc31d1549222c8ca718844 Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach +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 +--- + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d7417c88088b..8f87c5d998c6 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -861,6 +861,7 @@ if(UA_ENABLE_PUBSUB) + list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_udp.h) + list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_udp.c) + if(UA_ENABLE_PUBSUB_ETH_UADP_ETF) ++ list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_ethernet_etf.h) + list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet_etf.c) + endif() + if(UA_ENABLE_PUBSUB_ETH_UADP) +@@ -870,6 +871,7 @@ if(UA_ENABLE_PUBSUB) + if(UA_ENABLE_PUBSUB_ETH_UADP_XDP) + if(EXISTS "${XDP_LIBRARY}") + list(APPEND open62541_LIBRARIES ${XDP_LIBRARY}) ++ list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_ethernet_xdp.h) + list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet_xdp.c) + else() + MESSAGE(WARNING "samples in bpf-next directory were not built. Build the bpf-next to use XDP") +-- +2.26.2 + diff --git a/dev-libs/open62541/files/open62541-1.1.3-tests.patch b/dev-libs/open62541/files/open62541-1.1.3-tests.patch new file mode 100644 index 0000000000..ad96717fc5 --- /dev/null +++ b/dev-libs/open62541/files/open62541-1.1.3-tests.patch @@ -0,0 +1,104 @@ +From ab9a4a1c826bb662816f71020054ba2558afefc7 Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach +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 +--- + 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_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) +- +- #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_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_ETH_UADP) +- if(NOT UA_ENABLE_PUBSUB_ETH_UADP_ETF) +- 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) +- endif() +- if(UA_ENABLE_PUBSUB_ETH_UADP_XDP) +- 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_ETH_UADP_ETF) +- 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) +- 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() +-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) +-- +2.26.2 + diff --git a/dev-libs/open62541/open62541-1.1.3.ebuild b/dev-libs/open62541/open62541-1.1.3.ebuild new file mode 100644 index 0000000000..87a8634f31 --- /dev/null +++ b/dev-libs/open62541/open62541-1.1.3.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) + +inherit cmake python-single-r1 + +DESCRIPTION="Open source C implementation of OPC UA" +HOMEPAGE="https://open62541.org/" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc encryption examples etf mbedtls pubsub openssl test tools xdp" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + encryption? ( || ( mbedtls openssl ) ) + etf? ( pubsub ) + xdp? ( pubsub ) +" + +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig + doc? ( + media-gfx/graphviz + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_MULTI_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}] + ') + ) + test? ( + dev-libs/check + dev-util/valgrind + $(python_gen_cond_dep ' + dev-python/subunit[${PYTHON_MULTI_USEDEP}] + ') + ) +" +DEPEND=" + mbedtls? ( net-libs/mbedtls:= ) + openssl? ( dev-libs/openssl:0= ) +" +RDEPEND=" + ${PYTHON_DEPS} + ${DEPEND} +" + +PATCHES=( + "${FILESDIR}/${P}-etf.patch" + "${FILESDIR}/${P}-headers.patch" + "${FILESDIR}/${P}-tests.patch" +) + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + -DOPEN62541_VERSION=v${PV} + -DUA_BUILD_EXAMPLES=OFF + -DUA_BUILD_TOOLS=$(usex tools) + -DUA_BUILD_UNIT_TESTS=$(usex test) + -DUA_ENABLE_ENCRYPTION=$(usex encryption) + -DUA_ENABLE_ENCRYPTION_MBEDTLS=$(usex mbedtls) + -DUA_ENABLE_ENCRYPTION_OPENSSL=$(usex openssl) + -DUA_ENABLE_PUBSUB=$(usex pubsub) + -DUA_ENABLE_PUBSUB_ETH_UADP=$(usex pubsub) + -DUA_ENABLE_PUBSUB_ETH_UADP_ETF=$(usex etf) + -DUA_ENABLE_PUBSUB_ETH_UADP_XDP=$(usex xdp) + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && cmake_build doc +} + +src_install() { + use doc && local HTML_DOCS=( "${WORKDIR}"/${P}_build/doc/. ) + cmake_src_install + + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + dodoc -r examples/ + fi + + python_fix_shebang "${ED}" +} + +src_test() { + cmake_src_test -j1 +} From ea4e95332746707f242f7fd3d28aecb771a1a693 Mon Sep 17 00:00:00 2001 From: Kurt Kanzenbach Date: Thu, 10 Dec 2020 18:07:27 +0100 Subject: [PATCH 5/8] dev-libs/open62541: Drop old Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Kurt Kanzenbach --- dev-libs/open62541/Manifest | 1 - .../open62541/files/open62541-1.1.2-etf.patch | 43 -------- .../files/open62541-1.1.2-headers.patch | 36 ------ .../files/open62541-1.1.2-tests.patch | 104 ------------------ dev-libs/open62541/open62541-1.1.2.ebuild | 98 ----------------- 5 files changed, 282 deletions(-) delete mode 100644 dev-libs/open62541/files/open62541-1.1.2-etf.patch delete mode 100644 dev-libs/open62541/files/open62541-1.1.2-headers.patch delete mode 100644 dev-libs/open62541/files/open62541-1.1.2-tests.patch delete mode 100644 dev-libs/open62541/open62541-1.1.2.ebuild diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest index 4091fb205d..0520d95664 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 cce618e63d..0000000000 --- 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 -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 ---- - 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 97e225b013..0000000000 --- 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 -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 ---- - 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 ad96717fc5..0000000000 --- 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 -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 ---- - 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_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) -- -- #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_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_ETH_UADP) -- if(NOT UA_ENABLE_PUBSUB_ETH_UADP_ETF) -- 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) -- endif() -- if(UA_ENABLE_PUBSUB_ETH_UADP_XDP) -- 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_ETH_UADP_ETF) -- 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) -- 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() --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) --- -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 b6b0d4555b..0000000000 --- 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 -} From 4f8fa2320d6fb0b8b66c28f70d9080f258179f82 Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Fri, 11 Dec 2020 10:47:24 +1300 Subject: [PATCH 6/8] net-misc/megasync: bump to 4.3.7; update live ebuild - uses tag archives instead of the git repo - removed multilib (was it even used?) - libressl support - general ebuild cleanup Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson --- net-misc/megasync/Manifest | 2 + net-misc/megasync/megasync-4.3.7.ebuild | 131 ++++++++++++++++++++++++ net-misc/megasync/megasync-9999.ebuild | 122 +++++++++++----------- 3 files changed, 191 insertions(+), 64 deletions(-) create mode 100644 net-misc/megasync/Manifest create mode 100644 net-misc/megasync/megasync-4.3.7.ebuild diff --git a/net-misc/megasync/Manifest b/net-misc/megasync/Manifest new file mode 100644 index 0000000000..2e3f944413 --- /dev/null +++ b/net-misc/megasync/Manifest @@ -0,0 +1,2 @@ +DIST megasync-4.3.7.tar.gz 16020207 BLAKE2B f38b40594c0cb1ed3e93715842f3c161e09ef66deb017d2e5fa03d9d0ac2863ba02b88d1fe779960c07664b19250fa29115a87d62d0934157370c1faa85345a5 SHA512 6852390e05da13effd059a5e0dc7fe400f3456668925fbed5e34bc5018b3664d72aebd78847dfdb4f6dda39fe615a79e5c0eb99e72a401fb833d4eba8216010c +DIST megasync-sdk-4.3.7.tar.gz 3362032 BLAKE2B 36ab643252d27475f34c7a5ee0e71a6470f2c830ea5c8331a094b79da5cd751699390c36e107cb0da06e6f46932e10e5fefbfc8eec3e8645ba84c365835088f3 SHA512 45dcc285c194cc347d9d562638658d2f0dd8099371e7408995cad68811e720905ad6f9810b24079c1112d16bfb87f7986cf3180520dc7edd611e703c251b182a diff --git a/net-misc/megasync/megasync-4.3.7.ebuild b/net-misc/megasync/megasync-4.3.7.ebuild new file mode 100644 index 0000000000..390ce3385a --- /dev/null +++ b/net-misc/megasync/megasync-4.3.7.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools cmake desktop qmake-utils + +MEGA_SDK_REV="ba4834cb6c22f4e996f328db3aa5b82ef20eed3e" # commit of src/MEGASync/mega submodule + +DESCRIPTION="The official Qt-based program for syncing your MEGA account in your PC" +HOMEPAGE="http://mega.co.nz" + +if [[ ${PV} == 9999 ]];then + inherit git-r3 + EGIT_REPO_URI="https://github.com/meganz/MEGAsync" +else + SRC_URI=" + https://github.com/meganz/MEGAsync/archive/v${PV}.0_Linux.tar.gz -> ${P}.tar.gz + https://github.com/meganz/sdk/archive/${MEGA_SDK_REV}.tar.gz -> ${PN}-sdk-${PV}.tar.gz + " + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}"/MEGAsync-${PV}.0_Linux +fi + +LICENSE="MEGA" +SLOT="0" +IUSE="+cryptopp +curl +sqlite +zlib dolphin examples freeimage java libressl nautilus php python readline threads thunar" + +RDEPEND=" + app-arch/xz-utils + dev-libs/libgcrypt + dev-libs/libsodium + dev-libs/libuv + media-libs/libpng + net-dns/c-ares + x11-themes/hicolor-icon-theme + cryptopp? ( dev-libs/crypto++ ) + curl? ( + !libressl? ( net-misc/curl[ssl,curl_ssl_openssl] ) + libressl? ( net-misc/curl[ssl,curl_ssl_libressl] ) + ) + dolphin? ( kde-apps/dolphin ) + freeimage? ( media-libs/freeimage ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + nautilus? ( >=gnome-base/nautilus-3 ) + readline? ( sys-libs/readline:0 ) + sqlite? ( dev-db/sqlite:3 ) + thunar? ( xfce-base/thunar ) + zlib? ( sys-libs/zlib ) +" +DEPEND=" + ${RDEPEND} + media-libs/libmediainfo + media-libs/libraw + dev-qt/qtcore:5 + dev-qt/qtwidgets:5 + dev-qt/qtgui:5 + dev-qt/qtconcurrent:5 + dev-qt/qtnetwork:5 + dev-qt/qtdbus:5 + dev-qt/qtimageformats:5 + dev-qt/qtsvg:5 +" +BDEPEND=" + app-doc/doxygen + dev-lang/swig + dev-qt/linguist-tools +" + +DOCS=( CREDITS.md README.md ) + +src_prepare() { + rmdir src/MEGASync/mega + mv "${WORKDIR}"/sdk-${MEGA_SDK_REV} src/MEGASync/mega + default + cd src/MEGASync/mega + eautoreconf +} + +src_configure() { + cd src/MEGASync/mega + econf \ + "--disable-silent-rules" \ + "--disable-curl-checks" \ + "--disable-megaapi" \ + $(use_with zlib) \ + $(use_with sqlite) \ + $(use_with cryptopp) \ + "--with-cares" \ + $(use_with curl) \ + "--without-termcap" \ + $(use_enable threads posix-threads) \ + "--with-sodium" \ + $(use_with freeimage) \ + $(use_with readline) \ + $(use_enable examples) \ + $(use_enable java) \ + $(use_enable php) \ + $(use_enable python) \ + "--enable-chat" \ + "--enable-gcc-hardening" + cd ../.. + + local myeqmakeargs=( + MEGA.pro + CONFIG+="release" + ) + + eqmake5 ${myeqmakeargs[@]} + use dolphin && cmake_src_configure + $(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro +} + +src_compile() { + emake -C src INSTALL_ROOT="${D}" || die + use dolphin && cmake_src_compile +} + +src_install() { + use dolphin && cmake_src_install + einstalldocs + dobin src/MEGASync/${PN} + insinto usr/share/licenses/${PN} + doins LICENCE.md installer/terms.txt + domenu src/MEGASync/platform/linux/data/${PN}.desktop + cd src/MEGASync/platform/linux/data/icons/hicolor + for size in 16x16 32x32 48x48 128x128 256x256;do + doicon -s $size $size/apps/mega.png + done +} diff --git a/net-misc/megasync/megasync-9999.ebuild b/net-misc/megasync/megasync-9999.ebuild index a1edfca127..5a8311e0b2 100644 --- a/net-misc/megasync/megasync-9999.ebuild +++ b/net-misc/megasync/megasync-9999.ebuild @@ -3,27 +3,54 @@ EAPI=7 -inherit eutils multilib qmake-utils autotools git-r3 desktop cmake-multilib +inherit autotools desktop qmake-utils xdg cmake + +MEGA_SDK_REV="ba4834cb6c22f4e996f328db3aa5b82ef20eed3e" # commit of src/MEGASync/mega submodule DESCRIPTION="The official Qt-based program for syncing your MEGA account in your PC" HOMEPAGE="http://mega.co.nz" -RTAG="_Linux" -if [[ ${PV} == *9999* ]];then + +if [[ ${PV} == 9999 ]];then + inherit git-r3 EGIT_REPO_URI="https://github.com/meganz/MEGAsync" - KEYWORDS="" - EGIT_SUBMODULES=( '*' ) else - EGIT_REPO_URI="https://github.com/meganz/MEGAsync" - EGIT_COMMIT="v${PV}.0${RTAG}" - EGIT_SUBMODULES=( '*' ) + SRC_URI=" + https://github.com/meganz/MEGAsync/archive/v${PV}.0_Linux.tar.gz -> ${P}.tar.gz + https://github.com/meganz/sdk/archive/${MEGA_SDK_REV}.tar.gz -> ${PN}-sdk-${PV}.tar.gz + " KEYWORDS="~amd64 ~x86" + S="${WORKDIR}"/MEGAsync-${PV}.0_Linux fi LICENSE="MEGA" SLOT="0" -IUSE="dolphin nautilus thunar +cryptopp +sqlite +zlib +curl freeimage readline examples threads java php python gnome" +IUSE="+cryptopp +curl +sqlite +zlib dolphin examples freeimage java libressl nautilus php python readline threads thunar" -CDEPEND=" +RDEPEND=" + app-arch/xz-utils + dev-libs/libgcrypt + dev-libs/libsodium + dev-libs/libuv + media-libs/libpng + net-dns/c-ares + x11-themes/hicolor-icon-theme + cryptopp? ( dev-libs/crypto++ ) + curl? ( + !libressl? ( net-misc/curl[ssl,curl_ssl_openssl] ) + libressl? ( net-misc/curl[ssl,curl_ssl_libressl] ) + ) + dolphin? ( kde-apps/dolphin ) + freeimage? ( media-libs/freeimage ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + nautilus? ( >=gnome-base/nautilus-3 ) + readline? ( sys-libs/readline:0 ) + sqlite? ( dev-db/sqlite:3 ) + thunar? ( xfce-base/thunar ) + zlib? ( sys-libs/zlib ) +" +DEPEND=" + ${RDEPEND} media-libs/libmediainfo media-libs/libraw dev-qt/qtcore:5 @@ -35,57 +62,24 @@ CDEPEND=" dev-qt/qtimageformats:5 dev-qt/qtsvg:5 " - -BDEPEND="${CDEPEND} - dev-lang/swig +BDEPEND=" app-doc/doxygen + dev-lang/swig dev-qt/linguist-tools " -RDEPEND="${CDEPEND} - x11-themes/hicolor-icon-theme - dev-libs/openssl - dev-libs/libgcrypt - media-libs/libpng - net-dns/c-ares - cryptopp? ( dev-libs/crypto++ ) - app-arch/xz-utils - dev-libs/libuv - sqlite? ( dev-db/sqlite:3 ) - dev-libs/libsodium - zlib? ( sys-libs/zlib ) - curl? ( net-misc/curl[ssl,curl_ssl_openssl] ) - freeimage? ( media-libs/freeimage ) - readline? ( sys-libs/readline:0 ) - dolphin? ( kde-apps/dolphin ) - nautilus? ( >=gnome-base/nautilus-3 ) - thunar? ( xfce-base/thunar ) -" - DOCS=( CREDITS.md README.md ) -PATCHES=( ) -if [[ ${PV} != *9999* ]];then - src_prepare(){ - if [ -e "${FILESDIR}/MEGAsync-${PV}.0_Linux.patch" ]; then - EPATCH_OPTS="-p0" epatch "${FILESDIR}/MEGAsync-${PV}.0_Linux.patch" - fi - if [ ! -z ${PATCHES} ]; then - epatch ${PATCHES} - fi - if use gnome; then - if [ -e "${FILESDIR}${P}-gnome.patch" ]; then - epatch "${FILESDIR}/${P}-gnome.patch" - fi - fi - eapply_user - cd src/MEGASync/mega - eautoreconf - } -fi +src_prepare() { + rmdir src/MEGASync/mega + mv "${WORKDIR}"/sdk-${MEGA_SDK_REV} src/MEGASync/mega + default + cd src/MEGASync/mega + eautoreconf +} -src_configure(){ - cd "${S}"/src/MEGASync/mega +src_configure() { + cd src/MEGASync/mega econf \ "--disable-silent-rules" \ "--disable-curl-checks" \ @@ -107,30 +101,30 @@ src_configure(){ "--enable-chat" \ "--enable-gcc-hardening" cd ../.. + local myeqmakeargs=( MEGA.pro CONFIG+="release" ) + eqmake5 ${myeqmakeargs[@]} - use dolphin && cmake-utils_src_configure + use dolphin && cmake_src_configure $(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro } -src_compile(){ +src_compile() { emake -C src INSTALL_ROOT="${D}" || die - use dolphin && cmake-utils_src_compile + use dolphin && cmake_src_compile } -src_install(){ - use dolphin && cmake-utils_src_install +src_install() { + use dolphin && cmake_src_install einstalldocs + dobin src/MEGASync/${PN} insinto usr/share/licenses/${PN} doins LICENCE.md installer/terms.txt - cd src/MEGASync - dobin ${PN} - cd platform/linux/data - domenu ${PN}.desktop - cd icons/hicolor + domenu src/MEGASync/platform/linux/data/${PN}.desktop + cd src/MEGASync/platform/linux/data/icons/hicolor for size in 16x16 32x32 48x48 128x128 256x256;do doicon -s $size $size/apps/mega.png done From 17b1a1064a770fde8b4f8a8b9a9e9d57312268d1 Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Fri, 11 Dec 2020 12:03:23 +1300 Subject: [PATCH 7/8] net-misc/megasync: fix 9999 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson --- net-misc/megasync/megasync-4.3.7.ebuild | 11 ++++++----- net-misc/megasync/megasync-9999.ebuild | 9 +++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/net-misc/megasync/megasync-4.3.7.ebuild b/net-misc/megasync/megasync-4.3.7.ebuild index 390ce3385a..61ef362c59 100644 --- a/net-misc/megasync/megasync-4.3.7.ebuild +++ b/net-misc/megasync/megasync-4.3.7.ebuild @@ -3,9 +3,7 @@ EAPI=7 -inherit autotools cmake desktop qmake-utils - -MEGA_SDK_REV="ba4834cb6c22f4e996f328db3aa5b82ef20eed3e" # commit of src/MEGASync/mega submodule +inherit autotools desktop qmake-utils xdg cmake DESCRIPTION="The official Qt-based program for syncing your MEGA account in your PC" HOMEPAGE="http://mega.co.nz" @@ -14,6 +12,7 @@ if [[ ${PV} == 9999 ]];then inherit git-r3 EGIT_REPO_URI="https://github.com/meganz/MEGAsync" else + MEGA_SDK_REV="ba4834cb6c22f4e996f328db3aa5b82ef20eed3e" # commit of src/MEGASync/mega submodule SRC_URI=" https://github.com/meganz/MEGAsync/archive/v${PV}.0_Linux.tar.gz -> ${P}.tar.gz https://github.com/meganz/sdk/archive/${MEGA_SDK_REV}.tar.gz -> ${PN}-sdk-${PV}.tar.gz @@ -71,8 +70,10 @@ BDEPEND=" DOCS=( CREDITS.md README.md ) src_prepare() { - rmdir src/MEGASync/mega - mv "${WORKDIR}"/sdk-${MEGA_SDK_REV} src/MEGASync/mega + if [[ ${PV} != 9999 ]]; then + rmdir src/MEGASync/mega + mv "${WORKDIR}"/sdk-${MEGA_SDK_REV} src/MEGASync/mega + fi default cd src/MEGASync/mega eautoreconf diff --git a/net-misc/megasync/megasync-9999.ebuild b/net-misc/megasync/megasync-9999.ebuild index 5a8311e0b2..61ef362c59 100644 --- a/net-misc/megasync/megasync-9999.ebuild +++ b/net-misc/megasync/megasync-9999.ebuild @@ -5,8 +5,6 @@ EAPI=7 inherit autotools desktop qmake-utils xdg cmake -MEGA_SDK_REV="ba4834cb6c22f4e996f328db3aa5b82ef20eed3e" # commit of src/MEGASync/mega submodule - DESCRIPTION="The official Qt-based program for syncing your MEGA account in your PC" HOMEPAGE="http://mega.co.nz" @@ -14,6 +12,7 @@ if [[ ${PV} == 9999 ]];then inherit git-r3 EGIT_REPO_URI="https://github.com/meganz/MEGAsync" else + MEGA_SDK_REV="ba4834cb6c22f4e996f328db3aa5b82ef20eed3e" # commit of src/MEGASync/mega submodule SRC_URI=" https://github.com/meganz/MEGAsync/archive/v${PV}.0_Linux.tar.gz -> ${P}.tar.gz https://github.com/meganz/sdk/archive/${MEGA_SDK_REV}.tar.gz -> ${PN}-sdk-${PV}.tar.gz @@ -71,8 +70,10 @@ BDEPEND=" DOCS=( CREDITS.md README.md ) src_prepare() { - rmdir src/MEGASync/mega - mv "${WORKDIR}"/sdk-${MEGA_SDK_REV} src/MEGASync/mega + if [[ ${PV} != 9999 ]]; then + rmdir src/MEGASync/mega + mv "${WORKDIR}"/sdk-${MEGA_SDK_REV} src/MEGASync/mega + fi default cd src/MEGASync/mega eautoreconf From 828be86ca51385916354962961fb259450aaaafa Mon Sep 17 00:00:00 2001 From: Denis Reva Date: Fri, 11 Dec 2020 09:48:20 +0500 Subject: [PATCH 8/8] sys-fs/erofs-utils: bumped up to 1.2+9999 version Thank David Michael for ebuild: https://bugs.gentoo.org/701284 Version 1.2 with patch now supports -fno-common Live ebuild (message from D.Michael): This updates the live ebuild with the new features. It doesn't need the patch from 1.2, since that's in the experimental branch. It actually does need the sed call to fix selinux+fuse at the moment, since that is not addressed upstream. I dropped it here anyway assuming it will be fixed relatively soon. Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Denis Reva --- sys-fs/erofs-utils/Manifest | 1 + sys-fs/erofs-utils/erofs-utils-1.2.ebuild | 45 ++++++++++++++ sys-fs/erofs-utils/erofs-utils-9999.ebuild | 38 ++++++++++++ .../files/erofs-utils-1.2-no-common.patch | 61 +++++++++++++++++++ sys-fs/erofs-utils/metadata.xml | 1 + 5 files changed, 146 insertions(+) create mode 100644 sys-fs/erofs-utils/erofs-utils-1.2.ebuild create mode 100644 sys-fs/erofs-utils/erofs-utils-9999.ebuild create mode 100644 sys-fs/erofs-utils/files/erofs-utils-1.2-no-common.patch diff --git a/sys-fs/erofs-utils/Manifest b/sys-fs/erofs-utils/Manifest index 3bf92e0bfe..4b9d3aab55 100644 --- a/sys-fs/erofs-utils/Manifest +++ b/sys-fs/erofs-utils/Manifest @@ -1 +1,2 @@ DIST erofs-utils-1.1.tar.gz 46133 BLAKE2B 24a2f16059e39bd65203f4a28721b8aad70599d6201ead02c291234de631bd3def1c403fa8b50b6dce4af3eea2768b912c4f56ad20c3c26db3853ba3174775ac SHA512 f300b536f0ba91a05a7eb3dc9a9ec402c98966ad7c0e1f2f664a650caaffce6c4433722374418c6d03e69ce2e74785e55f9bcc45e6717a8bc67e5352e450806b +DIST erofs-utils-1.2.tar.gz 60991 BLAKE2B 08b9bea397f52d158a40f095811853315a3b553618f380d1ece012c813d708c2331b2a445bb59c4b86d81edab33c834e37aeb0aeeb9acb157b7aebed309cb591 SHA512 167311beb2d4722436051956076d670f6a54da72e1690d19d43e0c46dd972f9f61427b4792b469813a6a4ff2e3c445646cf063d37b4ee2b52f88eb14e7bf2713 diff --git a/sys-fs/erofs-utils/erofs-utils-1.2.ebuild b/sys-fs/erofs-utils/erofs-utils-1.2.ebuild new file mode 100644 index 0000000000..62a2d24c46 --- /dev/null +++ b/sys-fs/erofs-utils/erofs-utils-1.2.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Userspace tools for EROFS images" +HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git" +SRC_URI="${HOMEPAGE}/snapshot/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="fuse lz4 selinux +uuid" + +RDEPEND=" + fuse? ( sys-fs/fuse:0 ) + lz4? ( >=app-arch/lz4-1.9 ) + selinux? ( sys-libs/libselinux ) + uuid? ( sys-apps/util-linux ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${P}-no-common.patch" +) + +src_prepare() { + default + use fuse && use selinux && sed -i \ + -e 's/.*CFLAGS}.*/& ${libselinux_CFLAGS}/' \ + -e 's/.*LIBS}.*/& ${libselinux_LIBS}/' \ + fuse/Makefile.am + eautoreconf +} + +src_configure() { + econf \ + $(use_enable fuse) \ + $(use_enable lz4) \ + $(use_with selinux) \ + $(use_with uuid) +} diff --git a/sys-fs/erofs-utils/erofs-utils-9999.ebuild b/sys-fs/erofs-utils/erofs-utils-9999.ebuild new file mode 100644 index 0000000000..1b9df41119 --- /dev/null +++ b/sys-fs/erofs-utils/erofs-utils-9999.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools git-r3 + +DESCRIPTION="Userspace tools for EROFS images" +HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git" +EGIT_BRANCH="experimental" +EGIT_REPO_URI="${HOMEPAGE}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="" +IUSE="fuse lz4 selinux +uuid" + +RDEPEND=" + fuse? ( sys-fs/fuse:0 ) + lz4? ( >=app-arch/lz4-1.9 ) + selinux? ( sys-libs/libselinux ) + uuid? ( sys-apps/util-linux ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable fuse) \ + $(use_enable lz4) \ + $(use_with selinux) \ + $(use_with uuid) +} diff --git a/sys-fs/erofs-utils/files/erofs-utils-1.2-no-common.patch b/sys-fs/erofs-utils/files/erofs-utils-1.2-no-common.patch new file mode 100644 index 0000000000..689e485d7c --- /dev/null +++ b/sys-fs/erofs-utils/files/erofs-utils-1.2-no-common.patch @@ -0,0 +1,61 @@ +From ac0d13efa1fe673e677343cda4795d820500da6b Mon Sep 17 00:00:00 2001 +From: Gao Xiang +Date: Tue, 8 Dec 2020 18:57:41 +0800 +Subject: erofs-utils: fix multiple definition of `sbi' + +As nl6720 reported [1], lib/inode.o (mkfs) and lib/super.o (erofsfuse) +could be compiled together by some options. Fix it now. + +[1] https://lore.kernel.org/r/10789285.Na0ui7I3VY@walnut + +Link: https://lore.kernel.org/r/20201208105741.9614-1-hsiangkao@aol.com +Fixes: 5e35b75ad499 ("erofs-utils: introduce fuse implementation") +Reported-by: nl6720 +Signed-off-by: Gao Xiang +--- + lib/config.c | 1 + + lib/inode.c | 2 -- + lib/super.c | 2 -- + 3 files changed, 1 insertion(+), 4 deletions(-) + +diff --git a/lib/config.c b/lib/config.c +index 3155112..3ecd481 100644 +--- a/lib/config.c ++++ b/lib/config.c +@@ -11,6 +11,7 @@ + #include "erofs/internal.h" + + struct erofs_configure cfg; ++struct erofs_sb_info sbi; + + void erofs_init_configure(void) + { +diff --git a/lib/inode.c b/lib/inode.c +index 3d634fc..0c4839d 100644 +--- a/lib/inode.c ++++ b/lib/inode.c +@@ -22,8 +22,6 @@ + #include "erofs/xattr.h" + #include "erofs/exclude.h" + +-struct erofs_sb_info sbi; +- + #define S_SHIFT 12 + static unsigned char erofs_ftype_by_mode[S_IFMT >> S_SHIFT] = { + [S_IFREG >> S_SHIFT] = EROFS_FT_REG_FILE, +diff --git a/lib/super.c b/lib/super.c +index 2d36692..025cefe 100644 +--- a/lib/super.c ++++ b/lib/super.c +@@ -11,8 +11,6 @@ + #include "erofs/io.h" + #include "erofs/print.h" + +-struct erofs_sb_info sbi; +- + static bool check_layout_compatibility(struct erofs_sb_info *sbi, + struct erofs_super_block *dsb) + { +-- +cgit 1.2.3-1.el7 + diff --git a/sys-fs/erofs-utils/metadata.xml b/sys-fs/erofs-utils/metadata.xml index e4bdaaa462..277295be69 100644 --- a/sys-fs/erofs-utils/metadata.xml +++ b/sys-fs/erofs-utils/metadata.xml @@ -32,5 +32,6 @@ Allow interaction with libuuid in sys-apps/util-linux. It's recommended turn on + Enable support for Filesystem in Userspace via sys-fs/fuse