gentoo resync : 25.08.2020

3 files changed, 118 insertions, 2 deletions

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 60a6bac4b093..ce7e754ef8fb 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,9 +1,11 @@
 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
-EBUILD mosquitto-1.6.10.ebuild 2884 BLAKE2B 80875c72c5c2569b06ece1aca53939f6e6156ff6ad1a9daf5dbf96de185a75dc496ec89faac43e492f6a25712599c27b432a8f508096dd224de27f1079ccc17b SHA512 d38a48bb3a73cf2942a1f1f48f01acd843a3e4a861aa3e906a05e99e610f6e290c86f652fc629b290ed82518fbbff3995a2ce0958660a50ef5cc29d3fd183275
+EBUILD mosquitto-1.6.10.ebuild 2891 BLAKE2B ffa8c52fa329d7f63049441465494c7ee779c2df2910eb86d48e4d6255d04d9b4d3c284164f49e01fbca54be1095d126b0273d8789db5b7e5045d0ca146b229b SHA512 b73b05f93f445e124d2ab5aa31160cb5ad5b4ca58faec68a41cc228fc50a18fbd1f088a60f1e709a1e39d09bfd7d07c9bdf6d1f8dde7d6c7bb723049da6b04fb
+EBUILD mosquitto-1.6.12.ebuild 2891 BLAKE2B ffa8c52fa329d7f63049441465494c7ee779c2df2910eb86d48e4d6255d04d9b4d3c284164f49e01fbca54be1095d126b0273d8789db5b7e5045d0ca146b229b SHA512 b73b05f93f445e124d2ab5aa31160cb5ad5b4ca58faec68a41cc228fc50a18fbd1f088a60f1e709a1e39d09bfd7d07c9bdf6d1f8dde7d6c7bb723049da6b04fb
 EBUILD mosquitto-1.6.8.ebuild 2844 BLAKE2B 184a91a2834bce30e09267647ceb52a7a2be5aaa38497cdfb0432ba7fa06a4175f45089da2ebaa96e9f51dcccb02aa41564e3b7583d8236854bac083a45b8b7d SHA512 7ada49932aa9eae6b67e0d38e7654c5f4228b3d47682a13b2f27b09e008814fa0b2940bea45b1c393d325932d226423ed2eac9e8d0d9d19d004fbca1846ab9f7
 EBUILD mosquitto-1.6.9.ebuild 2884 BLAKE2B 80875c72c5c2569b06ece1aca53939f6e6156ff6ad1a9daf5dbf96de185a75dc496ec89faac43e492f6a25712599c27b432a8f508096dd224de27f1079ccc17b SHA512 d38a48bb3a73cf2942a1f1f48f01acd843a3e4a861aa3e906a05e99e610f6e290c86f652fc629b290ed82518fbbff3995a2ce0958660a50ef5cc29d3fd183275
 MISC metadata.xml 611 BLAKE2B be4691b67eeb17bd99ecf3783ddb5a7065f4ea89d2a4ff1a73fd572e6f720f105c7d49b91b7328e69e10b69b46e4e06147451586e3dee08f7a46bbeda3307deb SHA512 3fd1d005ee668217d3fb24c3954bdebe469f2194b332539f561fd168c8e738bc00cb858c497aa83629cc347481e9609c588ec889be260bf49c822e304bd21ff7
diff --git a/app-misc/mosquitto/mosquitto-1.6.10.ebuild b/app-misc/mosquitto/mosquitto-1.6.10.ebuild
index 4b5abada49c6..63ca564833ad 100644
--- a/app-misc/mosquitto/mosquitto-1.6.10.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.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 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"
 
diff --git a/app-misc/mosquitto/mosquitto-1.6.12.ebuild b/app-misc/mosquitto/mosquitto-1.6.12.ebuild
new file mode 100644
index 000000000000..63ca564833ad
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.6.12.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,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 ~arm64 ~x86"
+IUSE="bridge examples libressl +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? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl: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
+}