public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/paho-mqtt-c/
@ 2023-07-03  8:15 Florian Schmaus
  0 siblings, 0 replies; 5+ messages in thread
From: Florian Schmaus @ 2023-07-03  8:15 UTC (permalink / raw
  To: gentoo-commits

commit:     231ea4658d1823cb4b42a624685d3e035c8a3641
Author:     Giuseppe Foti <foti.giuseppe <AT> gmail <DOT> com>
AuthorDate: Sat May 20 16:40:13 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Jul  3 08:15:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=231ea465

dev-libs/paho-mqtt-c: new package, add 1.3.12

Signed-off-by: Giuseppe Foti <foti.giuseppe <AT> gmail.com>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-libs/paho-mqtt-c/Manifest                  |  2 +
 dev-libs/paho-mqtt-c/metadata.xml              | 23 +++++++++
 dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild | 70 ++++++++++++++++++++++++++
 3 files changed, 95 insertions(+)

diff --git a/dev-libs/paho-mqtt-c/Manifest b/dev-libs/paho-mqtt-c/Manifest
new file mode 100644
index 000000000000..1804bd73b21b
--- /dev/null
+++ b/dev-libs/paho-mqtt-c/Manifest
@@ -0,0 +1,2 @@
+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

diff --git a/dev-libs/paho-mqtt-c/metadata.xml b/dev-libs/paho-mqtt-c/metadata.xml
new file mode 100644
index 000000000000..b2e9b98f3ec3
--- /dev/null
+++ b/dev-libs/paho-mqtt-c/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>foti.giuseppe@gmail.com</email>
+		<name>Giuseppe Foti</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="high-performance">
+			The debugging aids internal tracing and heap tracking are not included
+		</flag>
+	</use>
+	<longdescription lang="en">
+		These libraries enable applications to connect to an MQTT broker to publish messages, and to subscribe to topics and receive published messages.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">eclipse/paho.mqtt.c</remote-id>
+	</upstream>
+</pkgmetadata>

diff --git a/dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild b/dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild
new file mode 100644
index 000000000000..1b948ab91968
--- /dev/null
+++ b/dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit cmake python-any-r1 toolchain-funcs
+
+MY_TEST_UTILS="paho.mqtt.testing"
+MY_TEST_COMMIT="577f955352e41205c554d44966c2908e90026345"
+
+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/${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="+high-performance +ssl doc test"
+
+BDEPEND="
+	doc? ( app-doc/doxygen
+	       media-gfx/graphviz )
+	ssl? ( dev-libs/openssl )
+	test? ( dev-lang/python )
+"
+
+# 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_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_ENABLE_TESTING="$(usex test "TRUE" "FALSE")"
+	)
+	cmake_src_configure
+	if use test; then
+		mv "${WORKDIR}"/"${MY_TEST_UTILS}"-"${MY_TEST_COMMIT}" "${WORKDIR}"/"${MY_TEST_UTILS}" || die
+		# a subdir in test
+		mv "${WORKDIR}"/"${MY_TEST_UTILS}" "${BUILD_DIR}"/test/ || die
+		cp "${S}"/test/*.py "${BUILD_DIR}"/test/ || die
+	fi
+}
+
+src_test() {
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+	if use test; then
+		echo "RUNNING TESTS"
+
+		${EPYTHON} "${BUILD_DIR}"/test/"${MY_TEST_UTILS}"/interoperability/startbroker.py -c \
+		"${BUILD_DIR}"/test/"${MY_TEST_UTILS}"/interoperability/localhost_testing.conf &
+
+		${EPYTHON} "${BUILD_DIR}"/test/mqttsas.py &
+		cmake_src_test
+	fi
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/paho-mqtt-c/
@ 2023-07-03  8:37 Florian Schmaus
  0 siblings, 0 replies; 5+ messages in thread
From: Florian Schmaus @ 2023-07-03  8:37 UTC (permalink / raw
  To: gentoo-commits

commit:     46be39d0634fca9e20e2882472f775b18f64b1c9
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  3 08:35:52 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Jul  3 08:36:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46be39d0

dev-libs/paho-mqtt-c: style fixes

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild b/dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild
index 1b948ab91968..f1713fe8f0c1 100644
--- a/dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild
+++ b/dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild
@@ -24,7 +24,7 @@ IUSE="+high-performance +ssl doc test"
 
 BDEPEND="
 	doc? ( app-doc/doxygen
-	       media-gfx/graphviz )
+		   media-gfx/graphviz )
 	ssl? ( dev-libs/openssl )
 	test? ( dev-lang/python )
 "
@@ -38,11 +38,11 @@ BUILD_DIR="${S}_build"
 
 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_ENABLE_TESTING="$(usex test "TRUE" "FALSE")"
+		-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_ENABLE_TESTING="$(usex test "TRUE" "FALSE")"
 	)
 	cmake_src_configure
 	if use test; then
@@ -58,13 +58,10 @@ src_test() {
 		elog "Disabling tests due to crosscompiling."
 		return
 	fi
-	if use test; then
-		echo "RUNNING TESTS"
 
-		${EPYTHON} "${BUILD_DIR}"/test/"${MY_TEST_UTILS}"/interoperability/startbroker.py -c \
-		"${BUILD_DIR}"/test/"${MY_TEST_UTILS}"/interoperability/localhost_testing.conf &
+	${EPYTHON} "${BUILD_DIR}"/test/"${MY_TEST_UTILS}"/interoperability/startbroker.py -c \
+			   "${BUILD_DIR}"/test/"${MY_TEST_UTILS}"/interoperability/localhost_testing.conf &
 
-		${EPYTHON} "${BUILD_DIR}"/test/mqttsas.py &
-		cmake_src_test
-	fi
+	${EPYTHON} "${BUILD_DIR}"/test/mqttsas.py &
+	cmake_src_test
 }


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/paho-mqtt-c/
@ 2023-07-17 14:24 Florian Schmaus
  0 siblings, 0 replies; 5+ messages in thread
From: Florian Schmaus @ 2023-07-17 14:24 UTC (permalink / raw
  To: gentoo-commits

commit:     ff8c8c0f3f35f889a92ce4eac351151cc6db6b18
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 17 14:14:08 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Jul 17 14:21:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff8c8c0f

dev-libs/paho-mqtt-c: wait for broker ports in src_test

Closes: https://bugs.gentoo.org/909552
Closes: https://github.com/gentoo/gentoo/pull/31922
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
Co-authored-by: Giuseppe Foti <foti.giuseppe <AT> gmail.com>

 dev-libs/paho-mqtt-c/Manifest                  |  1 +
 dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild | 52 +++++++++++++++++++++-----
 2 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/dev-libs/paho-mqtt-c/Manifest b/dev-libs/paho-mqtt-c/Manifest
index 1804bd73b21b..aaf25ad26fc3 100644
--- a/dev-libs/paho-mqtt-c/Manifest
+++ b/dev-libs/paho-mqtt-c/Manifest
@@ -1,2 +1,3 @@
+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

diff --git a/dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild b/dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild
index f1713fe8f0c1..a7d86494e837 100644
--- a/dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild
+++ b/dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild
@@ -9,11 +9,13 @@ 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
 "
 
@@ -36,6 +38,17 @@ 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
@@ -45,12 +58,6 @@ src_configure(){
 		-DPAHO_ENABLE_TESTING="$(usex test "TRUE" "FALSE")"
 	)
 	cmake_src_configure
-	if use test; then
-		mv "${WORKDIR}"/"${MY_TEST_UTILS}"-"${MY_TEST_COMMIT}" "${WORKDIR}"/"${MY_TEST_UTILS}" || die
-		# a subdir in test
-		mv "${WORKDIR}"/"${MY_TEST_UTILS}" "${BUILD_DIR}"/test/ || die
-		cp "${S}"/test/*.py "${BUILD_DIR}"/test/ || die
-	fi
 }
 
 src_test() {
@@ -59,9 +66,36 @@ src_test() {
 		return
 	fi
 
-	${EPYTHON} "${BUILD_DIR}"/test/"${MY_TEST_UTILS}"/interoperability/startbroker.py -c \
-			   "${BUILD_DIR}"/test/"${MY_TEST_UTILS}"/interoperability/localhost_testing.conf &
+	cd "${WORKDIR}/${MY_TEST_UTILS}/interoperability" || die
 
-	${EPYTHON} "${BUILD_DIR}"/test/mqttsas.py &
+	${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
 }


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/paho-mqtt-c/
@ 2023-07-17 14:24 Florian Schmaus
  0 siblings, 0 replies; 5+ messages in thread
From: Florian Schmaus @ 2023-07-17 14:24 UTC (permalink / raw
  To: gentoo-commits

commit:     cbebc6fc0187c83ca8d7c646034b38d9a2859a24
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 17 14:17:45 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Jul 17 14:21:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbebc6fc

dev-libs/paho-mqtt-c: sort USE flags

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild b/dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild
index 6396acb6fad5..e417fe9118a4 100644
--- a/dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild
+++ b/dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 LICENSE="EPL-2.0"
 SLOT="1.3"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples +high-performance +ssl doc test"
+IUSE="doc examples +high-performance +ssl test"
 
 BDEPEND="
 	doc? ( app-doc/doxygen


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/paho-mqtt-c/
@ 2023-07-17 14:24 Florian Schmaus
  0 siblings, 0 replies; 5+ messages in thread
From: Florian Schmaus @ 2023-07-17 14:24 UTC (permalink / raw
  To: gentoo-commits

commit:     13ac8eed853cd51e285eabb75dadd68bc7d33c0b
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 17 14:17:11 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Jul 17 14:21:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13ac8eed

dev-libs/paho-mqtt-c: add 'examples' USE flag

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild b/dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild
index a7d86494e837..6396acb6fad5 100644
--- a/dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild
+++ b/dev-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 LICENSE="EPL-2.0"
 SLOT="1.3"
 KEYWORDS="~amd64 ~x86"
-IUSE="+high-performance +ssl doc test"
+IUSE="examples +high-performance +ssl doc test"
 
 BDEPEND="
 	doc? ( app-doc/doxygen
@@ -55,6 +55,7 @@ src_configure(){
 		-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


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2023-07-17 14:24 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-03  8:37 [gentoo-commits] repo/gentoo:master commit in: dev-libs/paho-mqtt-c/ Florian Schmaus
  -- strict thread matches above, loose matches on Subject: below --
2023-07-17 14:24 Florian Schmaus
2023-07-17 14:24 Florian Schmaus
2023-07-17 14:24 Florian Schmaus
2023-07-03  8:15 Florian Schmaus

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox