From cd8b6c60f3cbb06647bf3d03fb2ac29ccfc31c8f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 14 Nov 2023 10:30:49 +0000 Subject: gentoo auto-resync : 14:11:2023 - 10:30:49 --- net-libs/paho-mqtt-c/Manifest | 7 +- net-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild | 109 ------------------------- net-libs/paho-mqtt-c/paho-mqtt-c-1.3.13.ebuild | 102 +++++++++++++++++++++++ 3 files changed, 105 insertions(+), 113 deletions(-) delete mode 100644 net-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild create mode 100644 net-libs/paho-mqtt-c/paho-mqtt-c-1.3.13.ebuild (limited to 'net-libs/paho-mqtt-c') diff --git a/net-libs/paho-mqtt-c/Manifest b/net-libs/paho-mqtt-c/Manifest index 07694c835480..c46c45ef8d91 100644 --- a/net-libs/paho-mqtt-c/Manifest +++ b/net-libs/paho-mqtt-c/Manifest @@ -1,5 +1,4 @@ -DIST paho-mqtt-c-1.3.12-live.tar.gz 3642676 BLAKE2B c20e3bb1b4eae30b268639d30c1e4d72f6759850bef2dc13de424debb7a0785a5ba083af094e28cb80814df519831ac0e1da27d8aa4958361724aabea92c03e5 SHA512 af0f52944c46fe7874203b3b359d8fb8935d5bd6b394045138624b96130c6b756045fb3b486e224b7e55b3cb478197b8a049bbeb01ff7e3d16d0d3f12c521110 -DIST paho-mqtt-c-1.3.12.tar.gz 3622938 BLAKE2B 9eb7bca0367a3001f00122f2056b60ddf3633e0304661a424821c3e2b3370d65e09c51c62f90bb89f0e4ce291640e71ae0d3b093fe600efb87aa3744e431cafe SHA512 3152b557a8ab7c9b9c80277283e0f5e9965ce4c2ebbdaef0f238908d49e6fa1281aa72932ea112a836144b79656e4abe6e0cbd93840429a52e501a2c6b12d313 -DIST paho.mqtt.testing.tar.gz 175845 BLAKE2B 02c284c4e1cfe91bb87735e8fc61f206c3e93adf18c567ff330ae8d1c2bd04b7aa079ba3961610b7c9cc7e22340be000bf56772d5c39d1bc4d1b406bf564da66 SHA512 8328c6a010d76cf62ee2007a849acb61b84cf2dc058525bc967661984fdf26407dd52da83a3f2acda56e3c5d309301ea2a8ed264466d0fb933994dd248dbbe8d -EBUILD paho-mqtt-c-1.3.12.ebuild 2843 BLAKE2B 28fe874b959b11170e3e4768ee515bbb6e6011869afa30c7ef3c56583070e874f0a0b1427eecc49f61d982b9d5d54b3e8a5f87e860e501e573021c8322e607cb SHA512 8a064a7d0757aed0d05ddf0eddefa6b5cc29ee84310815acde47d4233213900d61ab998231fb38e914c19b730ebdfa3c646873d0638212b40b603344425cafc6 +DIST paho-mqtt-c-1.3.13.tar.gz 3489004 BLAKE2B c835f4e2a741539df900184825b4ce29138f76828ec329d9321c54a845607b8137292330b019e950640f36bb14b0252dfba4906be746742950e3f8f13985608e SHA512 0f436470bcff224461ed3227c8db10914f84bc2dcf76e51b55d4a78b80abaa4e636ac8f7a20e517524625888335c738e975283e5d573ae8d59147aa4de7963fc +DIST paho.mqtt.testing-a4dc694010217b291ee78ee13a6d1db812f9babd.tar.gz 175858 BLAKE2B 7ba1be3e09740f45907c4ba2a5314830a56c4f6626af3fab15928647b235908429a96ece312e7f5b8fa044583c81e6d8deacc0fbd290e6e08fbc328524dba3f1 SHA512 a20ea68cfac7f2a4e140c9b9ebacf4debd544098151545dedb72fe1e3629b3a495df7e15b0e131d52c4e86fb8d165cb7b2ceee019c15599b0cb5d914da0e7723 +EBUILD paho-mqtt-c-1.3.13.ebuild 2542 BLAKE2B b18c6f262daccd46ce8df6de20a5b11ebcc6584172d57238d67cf6f7b6574437d6b9e3123e2e5095e97751d850463acfee698f496aca9d8fccb74bd61f10989c SHA512 1f5e5596a1b1eb0a4cb7a2d58b20a0f738ee30889d77334d93f2b6548a4a62d3288c4f9c9463be42e06285a262c84266154faead359badff1455291e169c7e76 MISC metadata.xml 812 BLAKE2B acf5c65842b641cbc813df4786c3cb65b6e7155b5082b5bee50bf7abb6531fab53bb4a4fad9452a062d7612cc663eb4e3327a4e9c9c9a9349f1b139289c7943c SHA512 f1aa7056cde248fb0976bf8b635017311aa6a53961fdf5c02eb601c1ffdc0079693d430ef143410a8873a07cf4809443fde98436c0ff640a0625361ffe488789 diff --git a/net-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild b/net-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild deleted file mode 100644 index 63188c99824f..000000000000 --- a/net-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cmake python-any-r1 toolchain-funcs - -MY_TEST_UTILS="paho.mqtt.testing" -MY_TEST_COMMIT="577f955352e41205c554d44966c2908e90026345" -MY_LIVE_COMMIT="7db21329301b1f527c925dff789442db3ca3c1e7" - -DESCRIPTION="An Eclipse Paho C client library for MQTT for Windows, Linux and MacOS." -HOMEPAGE="https://eclipse.org/paho" -SRC_URI=" - https://github.com/eclipse/paho.mqtt.c/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/eclipse/paho.mqtt.c/archive/${MY_LIVE_COMMIT}.tar.gz -> ${P}-live.tar.gz - https://github.com/eclipse/${MY_TEST_UTILS}/archive/${MY_TEST_COMMIT}.tar.gz -> ${MY_TEST_UTILS}.tar.gz -" - -LICENSE="EPL-2.0" -SLOT="1.3" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples +high-performance +ssl test" - -# Building samples needs ssl: #912262 -REQUIRED_USE="examples? ( ssl )" - -# Tests require net-redirections to be enabled in bash. See bug #915718 -BDEPEND=" - doc? ( app-doc/doxygen - media-gfx/graphviz ) - ssl? ( dev-libs/openssl ) - test? ( - dev-lang/python - app-shells/bash[net] - ) -" - -# Tests can be run only if a MQTT broker is available -RESTRICT="!test? ( test )" - -S="${WORKDIR}/paho.mqtt.c-${PV}" - -BUILD_DIR="${S}_build" - -src_prepare(){ - cmake_src_prepare - if use test; then - # removing old certs - rm -r "${S}"/test/ssl || die - mv "${WORKDIR}"/paho.mqtt.c-"${MY_LIVE_COMMIT}"/test/ssl "${S}"/test/ssl || die - - mv "${WORKDIR}/${MY_TEST_UTILS}-${MY_TEST_COMMIT}" "${WORKDIR}/${MY_TEST_UTILS}" || die - fi -} - -src_configure(){ - local mycmakeargs=( - -DPAHO_BUILD_SHARED=TRUE - -DPAHO_HIGH_PERFORMANCE="$(usex high-performance "TRUE" "FALSE")" - -DPAHO_WITH_SSL="$(usex ssl "TRUE" "FALSE")" - -DPAHO_BUILD_DOCUMENTATION="$(usex doc "TRUE" "FALSE")" - -DPAHO_BUILD_SAMPLES="$(usex examples "TRUE" "FALSE")" - -DPAHO_ENABLE_TESTING="$(usex test "TRUE" "FALSE")" - ) - cmake_src_configure -} - -src_test() { - if tc-is-cross-compiler; then - elog "Disabling tests due to crosscompiling." - return - fi - - cd "${WORKDIR}/${MY_TEST_UTILS}/interoperability" || die - - ${EPYTHON} startbroker.py -c localhost_testing.conf \ - > "${T}/testbroker.log" & - local -r startbroker_pid=$! - - ${EPYTHON} "${S}"/test/mqttsas.py \ - > "${T}/testmqttsas.log" & - local -r mqttsas_pid=$! - - local port ports - ports=(1883 1888{3..8}) - - for port in ${ports[@]}; do - einfo "Waiting for TCP port ${port} to become available" - if timeout 30 bash -c \ - 'until printf "" >/dev/tcp/${0}/${1} 2>> "${T}/portlog"; do sleep 1; done' \ - localhost "${port}"; then - continue - fi - - kill ${startbroker_pid} ${mqttsas_pid} - die "Timeout waiting for port ${port} to become available" - done - - local myctestargs=( - -j 1 - --timeout 600 - ) - cmake_src_test - - kill ${startbroker_pid} ${mqttsas_pid} || die -} diff --git a/net-libs/paho-mqtt-c/paho-mqtt-c-1.3.13.ebuild b/net-libs/paho-mqtt-c/paho-mqtt-c-1.3.13.ebuild new file mode 100644 index 000000000000..4cb7bd4741a7 --- /dev/null +++ b/net-libs/paho-mqtt-c/paho-mqtt-c-1.3.13.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake python-any-r1 toolchain-funcs + +TEST_UTILS="paho.mqtt.testing" +TEST_COMMIT="a4dc694010217b291ee78ee13a6d1db812f9babd" + +DESCRIPTION="An Eclipse Paho C client library for MQTT for Windows, Linux and MacOS." +HOMEPAGE="https://eclipse.org/paho" +SRC_URI=" + https://github.com/eclipse/paho.mqtt.c/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/eclipse/${TEST_UTILS}/archive/${TEST_COMMIT}.tar.gz -> ${TEST_UTILS}-${TEST_COMMIT}.tar.gz +" +S="${WORKDIR}/paho.mqtt.c-${PV}" + +LICENSE="EPL-2.0" +SLOT="1.3" +KEYWORDS="~amd64 ~x86" +IUSE="doc examples +high-performance +ssl test" + +# Building samples needs ssl: #912262 +REQUIRED_USE="examples? ( ssl )" + +# Tests require net-redirections to be enabled in bash. See bug #915718 +BDEPEND=" + doc? ( app-doc/doxygen + media-gfx/graphviz ) + ssl? ( dev-libs/openssl ) + test? ( + dev-lang/python + app-shells/bash[net] + ) +" + +# Tests can be run only if a MQTT broker is available +RESTRICT="!test? ( test )" + +BUILD_DIR="${S}_build" + +src_prepare(){ + cmake_src_prepare + if use test; then + mv "${WORKDIR}/${TEST_UTILS}-${TEST_COMMIT}" "${WORKDIR}/${TEST_UTILS}" || die + fi +} + +src_configure(){ + local mycmakeargs=( + -DPAHO_BUILD_SHARED=TRUE + -DPAHO_HIGH_PERFORMANCE="$(usex high-performance "TRUE" "FALSE")" + -DPAHO_WITH_SSL="$(usex ssl "TRUE" "FALSE")" + -DPAHO_BUILD_DOCUMENTATION="$(usex doc "TRUE" "FALSE")" + -DPAHO_BUILD_SAMPLES="$(usex examples "TRUE" "FALSE")" + -DPAHO_ENABLE_TESTING="$(usex test "TRUE" "FALSE")" + ) + cmake_src_configure +} + +src_test() { + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + cd "${WORKDIR}/${TEST_UTILS}/interoperability" || die + + ${EPYTHON} startbroker.py -c localhost_testing.conf \ + > "${T}/testbroker.log" & + local -r startbroker_pid=$! + + ${EPYTHON} "${S}"/test/mqttsas.py \ + > "${T}/testmqttsas.log" & + local -r mqttsas_pid=$! + + local port ports + ports=(1883 1888{3..8}) + + for port in ${ports[@]}; do + einfo "Waiting for TCP port ${port} to become available" + if timeout 30 bash -c \ + 'until printf "" >/dev/tcp/${0}/${1} 2>> "${T}/portlog"; do sleep 1; done' \ + localhost "${port}"; then + continue + fi + + kill ${startbroker_pid} ${mqttsas_pid} + die "Timeout waiting for port ${port} to become available" + done + + local myctestargs=( + -j 1 + --timeout 600 + ) + cmake_src_test + + kill ${startbroker_pid} ${mqttsas_pid} || die +} -- cgit v1.2.3