gentoo resync : 20.06.2021

6 files changed, 47 insertions, 249 deletions

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index ef6f4f5b6d39..2ce0da6a04d4 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,13 +1,9 @@
 AUX mosquitto 559 BLAKE2B 16a34850c13d9fd6007b5fbd26b4db9e31caa0ee91b8eee8dbca605c273756bf6c92458d5093eee56f603cce7f10956ee084403e188d49693a759538976f411f SHA512 0bb0e648484269c2a5396118340177af10fae9ccbe4973371f7c8f5e31c96ff97c5146680415c450bad63397baa5c076e7c994f897fd3af2fcce0d1e0965ee22
 AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb4773bb4418260c6ed6d0120eaa2e3f7ba4842fc7014e5b51d1ba376cf1db2009b7a55a53a4e6747221 SHA512 3552618733fc106705375c5a1126db72e356694705312072f27f18e21c142cd75ae3ff1f17854ce54cdee092ff9e01fd75c1a8a12d68f75ead8a3697c69623e9
-DIST mosquitto-1.6.10.tar.gz 613060 BLAKE2B 8c148479f79a1aa8a9abdb2bd386dbf9466f1afa41f4e0ed4d29a52adf7571ebca47231f32ec8cbf2760eb7a27bd6633985851fe4c8cb413572c32588a12097b SHA512 2050a7a7af864057a177728f1cab9f6db70d6d1ea609d90c637723c2c9cfc9716429739302abd6742bde932716fae340854fff35956693dfee4ef31ce7b04a25
-DIST mosquitto-1.6.12.tar.gz 618718 BLAKE2B 4e7744d212f0fda980e485d102702547e76b39e4b98904afb05b372af8deba4eaaec2186dc61e8b218808a2435ed81f5fa621ebf41d5877c25b091ff64e8eb8b SHA512 68cd2e4aa14254c0332ad78eac1f885e0e4e9f2332540d3778b8c7df096db7618b8467b5bb25f70ddc3306d01dd36eb9a9e2bf2738da77e196c7a1ccaed869d2
-DIST mosquitto-1.6.8.tar.gz 589873 BLAKE2B aa2e13397f7d4b6305af3180cd042cd143054e154cf8e6d93b05bc5a10d48419174711a1893fe60c1303a2f83cfbc5341cf03ec595e3640f503a2407e869491b SHA512 c15897df4e0979ee29a1e67cc671f56db600a078e9eb0bea376248b3f53b13ceed36616ad3678e2c9e07d6834a6d75e4efca2c40086069c1546e0223be04c071
-DIST mosquitto-1.6.9.tar.gz 610934 BLAKE2B 59d126a2b26be895f078be0c0dcf3513e56fc135dc956d9361ee191bd7ad6972b4692cd1824ad7a4e86a982df70c1e198e937f9ab23bf778069690098f87c815 SHA512 f78228a1e8305e4d89b34250981ed2c5fe5317636003636dc90f6fa2b1e3ca3c8fadb705ee7301f5252456cb093a6547bd46a255ca3d9fb5cdced697738d6eb7
+DIST mosquitto-1.6.15.tar.gz 620117 BLAKE2B 0107ed0af902b84c73b857ccd97dfe96b1c7ed8604b843ad40f62d3f1246ded4ef1691158311ac9a672ca331f569d13547165f3a0386c77e94ddc13c8a9e3e00 SHA512 30fa2e8a15b87a33d6c8fc3a1f5d45d8e15d284fade116ac5b7bc8722609d565bed22ac592c303fc74352e3272067b2b0c8da463abffc6490cf959ce177329f3
 DIST mosquitto-2.0.10.tar.gz 759106 BLAKE2B 9cf94d29ee52a9086d8be176f5bba12b8b958a758fc03765c95298a5e7752c63510f6e12915a67d92a4e49b3ecfaa897b615b825375540728681bc9d628a992c SHA512 c356bfe5dc9317e1943cf14c20ae52af544aefc0138349abd3be5001032ce63579aa059dd62901a0802f08d059a9dc29b6fbcba852e3c4cd702189433ceac174
-EBUILD mosquitto-1.6.10.ebuild 2828 BLAKE2B 6f7ebe1099d6a6a606bfebf85afec716951aaaff24a3a2e01d7edcdb2f7a4da15496f47aee5282aab37d6b6a663c980217f79aecffd056d4131a1878911c2f3e SHA512 d4bf9db26020f8bd1eb10c8be04fc7201a8afdbfb9e4c52c40d532aaae8e6b3fa3c3636e67631942d9aa02d75adb82314955aa544b5d33fb92b40d4646a87877
-EBUILD mosquitto-1.6.12.ebuild 2826 BLAKE2B 7e4ed5867bfe471e70977a4d7e42fbeea0b8e9acc8ec82b0814682d13852cfc13973fc6d6e2cc79a3956bfa2fe422c949ecaef500954e405db98f20f3a83ee74 SHA512 34982359687d167b118db33162130938db3b04caabacf3311a219f2a6ac7bcb7b0888e06f18a7698d9f3dd47e21e0aef5f647425e559bd85c0d0b8df8a2a8272
-EBUILD mosquitto-1.6.8.ebuild 2781 BLAKE2B 83eab150d52ad54fc49731a725a7a2cbe63b6363f1b9316018b57564a54033a070a9b8d1215bacf3980ecdfc5244f82def9f24f61e343b261389501631edc6a6 SHA512 0cda010e5dd81fcd6b166eb5210e048074052ca488d91ed0ec25ba982dc70b507d0d3c0b0b7435c66a008e6e700c0d7e9641d0b3996a90b9d658e7ecf9914d5f
-EBUILD mosquitto-1.6.9.ebuild 2821 BLAKE2B d19eb74ba76ba9414085db255124a0133550a09772b445b40a2384fe50ee767c60aede6d5e255716cf46bf6bc5bc9e72d818669ff3365e9939a36781700a4b04 SHA512 bd025b3c148f7eb7483652f052750687de0bf45f06dec56c4ca8e763488d901bacc729f004eb0ef971ae9f3754be44e7696a441c9c0e901472e0622c2595f01d
-EBUILD mosquitto-2.0.10.ebuild 2593 BLAKE2B 02b19d92a6e3cf15ce79d1990e1ad75d53fb22cdf145a9069746996def6b1024076a8a795e8616ae25321868cfa5090e784ae384a49f4d6c971f314ec43ddefd SHA512 c44fa14f441f0e32aec37211cc38b81f033db7f6c348d442a7842ea72257be576bc0dffb91a4c355dfd0eec86829df7afa4df52970ecf7d0614bdf5da87f9c3e
+DIST mosquitto-2.0.11.tar.gz 760325 BLAKE2B adde701bb87ec8071eaaf74fca37f81c4eae97bf98de0fe471f1dfbfb64ccda15b34611b0ffc3d2099a37994151363ad5c717bfa7695fabc1a4927ebd14ae66e SHA512 d0c7c52cb76c4711e54f841217529326d682c4decfc7a1bc96d872904e68df444ca3918fab7ba041b62f7b5420c89c631227b69a8eec51fd2e2dd480d8244710
+EBUILD mosquitto-1.6.15.ebuild 2828 BLAKE2B 6f7ebe1099d6a6a606bfebf85afec716951aaaff24a3a2e01d7edcdb2f7a4da15496f47aee5282aab37d6b6a663c980217f79aecffd056d4131a1878911c2f3e SHA512 d4bf9db26020f8bd1eb10c8be04fc7201a8afdbfb9e4c52c40d532aaae8e6b3fa3c3636e67631942d9aa02d75adb82314955aa544b5d33fb92b40d4646a87877
+EBUILD mosquitto-2.0.10.ebuild 3169 BLAKE2B af88ca3d4c0292367c5c1ee53789b879875bf1652328affba734cadfe0891531281afb55e82a83d107bf5ad3eff1a39338d0f67f010574b3980348265dcb74c3 SHA512 e36f9dcb75f7d7bfc83adb0f1b8da82419e3f4e2184ef894adb155f4e965c5b470b0e2269aad4f1ece829ca27f4d8579ad96647946d1c865aae4e8f7abd5cc70
+EBUILD mosquitto-2.0.11.ebuild 3173 BLAKE2B d0cd87200760b8c529cfa6b38bb171a60dc688cb51d9722f891b9cd116c4fa7ddd662770eb7ece4fa462a3ab3447571d95204aedef539ec7370bca93a9183134 SHA512 d089782cd6886edf8f7cf685adb755b62156f92fdc877c83e66607c2ed98ddfda8b2955c3ee88ba91e8f28d187fefb8a67b7567890186dfda7e9043273a0cce8
 MISC metadata.xml 611 BLAKE2B d40adc8754f0c20b5c0634b75f12df935d246c67d3a9edccb8db262888b5dd6154fbfc21c270b854e61bb0389c625e3608623dcec519e05badc96f1bbdadf38f SHA512 93161a58861a9ea1ab372495fb66bb695d3be5e59dea96418aaf1f5fad936827d7d65a154711ef8c6c9fc752a69fef20c90741ac2627dfdefb8d38d63a3121fb
diff --git a/app-misc/mosquitto/mosquitto-1.6.10.ebuild b/app-misc/mosquitto/mosquitto-1.6.15.ebuild
index e6439ec04b86..e6439ec04b86 100644
--- a/app-misc/mosquitto/mosquitto-1.6.10.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.15.ebuild
diff --git a/app-misc/mosquitto/mosquitto-1.6.8.ebuild b/app-misc/mosquitto/mosquitto-1.6.8.ebuild
deleted file mode 100644
index f5044e2f0b3e..000000000000
--- a/app-misc/mosquitto/mosquitto-1.6.8.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit python-any-r1 systemd toolchain-funcs
-
-DESCRIPTION="An Open Source MQTT v3 Broker"
-HOMEPAGE="https://mosquitto.org/"
-SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( bridge )"
-
-RDEPEND="
-	acct-user/mosquitto
-	acct-group/mosquitto
-	srv? ( net-dns/c-ares:= )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	tcpd? ( sys-apps/tcp-wrappers )"
-
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}
-	test? ( dev-util/cunit )
-	websockets? ( net-libs/libwebsockets[lejp] )"
-
-_emake() {
-	local LIBDIR=$(get_libdir)
-	emake \
-		CC="$(tc-getCC)" \
-		CLIENT_LDFLAGS="${LDFLAGS}" \
-		LIB_SUFFIX="${LIBDIR:3}" \
-		WITH_BRIDGE="$(usex bridge)" \
-		WITH_PERSISTENCE="$(usex persistence)" \
-		WITH_SRV="$(usex srv)" \
-		WITH_TLS="$(usex ssl)" \
-		WITH_WEBSOCKETS="$(usex websockets)" \
-		WITH_WRAP="$(usex tcpd)" \
-		"$@"
-}
-
-src_prepare() {
-	default
-	if use persistence; then
-		sed -i -e "/^#autosave_interval/s|^#||" \
-			-e "s|^#persistence false$|persistence true|" \
-			-e "/^#persistence_file/s|^#||" \
-			-e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
-			mosquitto.conf || die
-	fi
-
-	# Remove prestripping
-	sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
-		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
-
-	# Remove failing tests
-	sed -i -e '/02-subpub-qos1-bad-pubcomp.py/d' \
-		-e '/02-subpub-qos1-bad-pubrec.py/d' \
-		-e '/02-subpub-qos2-bad-puback-1.py/d' \
-		-e '/02-subpub-qos2-bad-puback-2.py/d' \
-		-e '/02-subpub-qos2-bad-pubcomp.py/d' \
-		test/broker/Makefile || die
-	sed -i -e '/02-subscribe-qos1-async2.test/d' \
-		test/lib/Makefile || die
-
-	python_setup
-	python_fix_shebang test
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	_emake DESTDIR="${D}" prefix=/usr install
-	keepdir /var/lib/mosquitto
-	fowners mosquitto:mosquitto /var/lib/mosquitto
-	dodoc readme.md CONTRIBUTING.md ChangeLog.txt
-	doinitd "${FILESDIR}"/mosquitto
-	insinto /etc/mosquitto
-	doins mosquitto.conf
-	systemd_dounit "${FILESDIR}/mosquitto.service"
-
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "The Python module has been moved out of mosquitto."
-		elog "See https://mosquitto.org/documentation/python/"
-	else
-		elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
-		elog ""
-		elog "    rc-update add mosquitto default"
-		elog "or"
-		elog "    systemctl enable mosquitto"
-	fi
-}
diff --git a/app-misc/mosquitto/mosquitto-1.6.9.ebuild b/app-misc/mosquitto/mosquitto-1.6.9.ebuild
deleted file mode 100644
index 951f69319f66..000000000000
--- a/app-misc/mosquitto/mosquitto-1.6.9.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit python-any-r1 systemd toolchain-funcs
-
-DESCRIPTION="An Open Source MQTT v3 Broker"
-HOMEPAGE="https://mosquitto.org/ https://github.com/eclipse/mosquitto"
-SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( bridge )"
-
-RDEPEND="
-	acct-user/mosquitto
-	acct-group/mosquitto
-	srv? ( net-dns/c-ares:= )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	tcpd? ( sys-apps/tcp-wrappers )"
-
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}
-	test? ( dev-util/cunit )
-	websockets? ( net-libs/libwebsockets[lejp] )"
-
-_emake() {
-	local LIBDIR=$(get_libdir)
-	emake \
-		CC="$(tc-getCC)" \
-		CLIENT_LDFLAGS="${LDFLAGS}" \
-		LIB_SUFFIX="${LIBDIR:3}" \
-		WITH_BRIDGE="$(usex bridge)" \
-		WITH_PERSISTENCE="$(usex persistence)" \
-		WITH_SRV="$(usex srv)" \
-		WITH_TLS="$(usex ssl)" \
-		WITH_WEBSOCKETS="$(usex websockets)" \
-		WITH_WRAP="$(usex tcpd)" \
-		"$@"
-}
-
-src_prepare() {
-	default
-	if use persistence; then
-		sed -i -e "/^#autosave_interval/s|^#||" \
-			-e "s|^#persistence false$|persistence true|" \
-			-e "/^#persistence_file/s|^#||" \
-			-e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
-			mosquitto.conf || die
-	fi
-
-	# Remove prestripping
-	sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
-		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
-
-	# Remove failing tests
-	sed -i -e '/02-subpub-qos1-bad-pubcomp.py/d' \
-		-e '/02-subpub-qos1-bad-pubrec.py/d' \
-		-e '/02-subpub-qos2-bad-puback-1.py/d' \
-		-e '/02-subpub-qos2-bad-puback-2.py/d' \
-		-e '/02-subpub-qos2-bad-pubcomp.py/d' \
-		test/broker/Makefile || die
-	sed -i -e '/02-subscribe-qos1-async2.test/d' \
-		test/lib/Makefile || die
-
-	python_setup
-	python_fix_shebang test
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	_emake DESTDIR="${D}" prefix=/usr install
-	keepdir /var/lib/mosquitto
-	fowners mosquitto:mosquitto /var/lib/mosquitto
-	dodoc readme.md CONTRIBUTING.md ChangeLog.txt
-	doinitd "${FILESDIR}"/mosquitto
-	insinto /etc/mosquitto
-	doins mosquitto.conf
-	systemd_dounit "${FILESDIR}/mosquitto.service"
-
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "The Python module has been moved out of mosquitto."
-		elog "See https://mosquitto.org/documentation/python/"
-	else
-		elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
-		elog ""
-		elog "    rc-update add mosquitto default"
-		elog "or"
-		elog "    systemctl enable mosquitto"
-	fi
-}
diff --git a/app-misc/mosquitto/mosquitto-2.0.10.ebuild b/app-misc/mosquitto/mosquitto-2.0.10.ebuild
index 9129a115a3e4..efe0bf464474 100644
--- a/app-misc/mosquitto/mosquitto-2.0.10.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"
 
@@ -96,6 +96,8 @@ src_install() {
 	doinitd "${FILESDIR}"/mosquitto
 	insinto /etc/mosquitto
 	doins mosquitto.conf
+	insinto /usr/share/mosquitto
+	doins misc/letsencrypt/mosquitto-copy.sh
 	systemd_dounit "${FILESDIR}/mosquitto.service"
 
 	if use examples; then
@@ -103,3 +105,19 @@ src_install() {
 		dodoc -r examples
 	fi
 }
+
+pkg_postinst() {
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ $(ver_cut 1 "$v") -lt 2 ]]; then
+			elog
+			elog "Please read the migration guide at:"
+			elog "https://mosquitto.org/documentation/migrating-to-2-0/"
+			elog
+			elog "If you use Lets Encrypt TLS certificates, take note of"
+			elog "the changes required to run the daemon as the unprivileged"
+			elog "mosquitto user. The mosquitto-copy.sh script has been"
+			elog "installed to /usr/share/mosquitto/ for your convenience."
+			elog
+		fi
+	done
+}
diff --git a/app-misc/mosquitto/mosquitto-1.6.12.ebuild b/app-misc/mosquitto/mosquitto-2.0.11.ebuild
index 3e4e46ebc04b..7e129f60e2c1 100644
--- a/app-misc/mosquitto/mosquitto-1.6.12.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.11.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-any-r1 systemd toolchain-funcs
 
@@ -12,7 +12,7 @@ SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"
 
@@ -21,6 +21,7 @@ REQUIRED_USE="test? ( bridge )"
 RDEPEND="
 	acct-user/mosquitto
 	acct-group/mosquitto
+	dev-libs/cJSON:=
 	srv? ( net-dns/c-ares:= )
 	ssl? (
 		dev-libs/openssl:0=
@@ -71,6 +72,10 @@ src_prepare() {
 	sed -i -e '/02-subscribe-qos1-async2.test/d' \
 		test/lib/Makefile || die
 
+	# Extend test timeout to prevent spurious failures
+	sed -i -e 's/SUB_TIMEOUT=1/SUB_TIMEOUT=3/' \
+		test/client/test.sh || die
+
 	python_setup
 	python_fix_shebang test
 }
@@ -87,10 +92,12 @@ src_install() {
 	_emake DESTDIR="${D}" prefix=/usr install
 	keepdir /var/lib/mosquitto
 	fowners mosquitto:mosquitto /var/lib/mosquitto
-	dodoc readme.md CONTRIBUTING.md ChangeLog.txt
+	dodoc README.md CONTRIBUTING.md ChangeLog.txt
 	doinitd "${FILESDIR}"/mosquitto
 	insinto /etc/mosquitto
 	doins mosquitto.conf
+	insinto /usr/share/mosquitto
+	doins misc/letsencrypt/mosquitto-copy.sh
 	systemd_dounit "${FILESDIR}/mosquitto.service"
 
 	if use examples; then
@@ -100,14 +107,17 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "The Python module has been moved out of mosquitto."
-		elog "See https://mosquitto.org/documentation/python/"
-	else
-		elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
-		elog ""
-		elog "    rc-update add mosquitto default"
-		elog "or"
-		elog "    systemctl enable mosquitto"
-	fi
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ $(ver_cut 1 "$v") -lt 2 ]]; then
+			elog
+			elog "Please read the migration guide at:"
+			elog "https://mosquitto.org/documentation/migrating-to-2-0/"
+			elog
+			elog "If you use Lets Encrypt TLS certificates, take note of"
+			elog "the changes required to run the daemon as the unprivileged"
+			elog "mosquitto user. The mosquitto-copy.sh script has been"
+			elog "installed to /usr/share/mosquitto/ for your convenience."
+			elog
+		fi
+	done
 }