[gentoo-commits] repo/gentoo:master commit in: app-misc/mosquitto/

[Aaron Bauman]

commit:     3f6f600d1d7518682040ed9df870c3cc15435b74
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  2 18:03:52 2017 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Sep  2 18:03:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f6f600d

app-misc/mosquitto: drop vulnerable wrt bug #625290

 app-misc/mosquitto/Manifest                |  2 -
 app-misc/mosquitto/mosquitto-1.4.10.ebuild | 95 -----------------------------
 app-misc/mosquitto/mosquitto-1.4.11.ebuild | 96 ------------------------------
 3 files changed, 193 deletions(-)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 13a5ecee843..d26b54e15ac 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,3 +1 @@
-DIST mosquitto-1.4.10.tar.gz 359569 SHA256 437648d68a4a781dd8d913814cd5451f59ab4a5fcf84cccaf7c36e6a07459770 SHA512 fe5d6d7196a137a496ba6881c77d852396baefb4f0b83ccd9a22175fc05b09e48a09ea249e30ec7db966e11de134ebcc4e2e9b1fd40b31dc59fb0fa2f60b75a1 WHIRLPOOL 9510060701259e78c39bf88989ce8142d11e0b53348a20c1a71ffc69b98d7c1725c9315026d392d8d86d131bc55c86492a91ddde94eca0d353f1d3ab6ef6900f
-DIST mosquitto-1.4.11.tar.gz 361468 SHA256 ca47533bbc1b7c5e15d6e5d96d3efc59677f2515b6692263c34b7c48f33280c5 SHA512 c05ca8679b9a6f540868f4ccf701257fcabc114d5450ac0bbbe80b91bb7cd4fc52668773e945506760c7a5bd8a494e0a56100714112e5d2713d57bfab8951587 WHIRLPOOL d4418b951ff55eaba1fc67b324f1ecdd0d55c0eea066be9793de30e8561d0fe0e36537adb688fc98764758998086eb64b827041e76160ddc858c6066f83e8f21
 DIST mosquitto-1.4.14.tar.gz 365596 SHA256 156b1fa731d12baad4b8b22f7b6a8af50ba881fc711b81e9919ec103cf2942d1 SHA512 dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2 WHIRLPOOL 428494b277869d6d8d100663f1fd8f14e21028d0b2f802da634a2f033a9df4383246d6ad0802b27b41dfad7a50d3120830018dd7592888b468976798b8a2f0bf

diff --git a/app-misc/mosquitto/mosquitto-1.4.10.ebuild b/app-misc/mosquitto/mosquitto-1.4.10.ebuild
deleted file mode 100644
index e7137583c9b..00000000000
--- a/app-misc/mosquitto/mosquitto-1.4.10.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils systemd user python-any-r1
-
-DESCRIPTION="An Open Source MQTT v3 Broker"
-HOMEPAGE="http://mosquitto.org/"
-SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz"
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="bridge examples +persistence +srv ssl tcpd"
-
-RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	srv? ( net-dns/c-ares )"
-
-pkg_setup() {
-	enewgroup mosquitto
-	enewuser mosquitto -1 -1 -1 mosquitto
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-conditional-tests.patch"
-	if use persistence; then
-		sed -i -e "s:^#autosave_interval:autosave_interval:" \
-			-e "s:^#persistence false$:persistence true:" \
-			-e "s:^#persistence_file:persistence_file:" \
-			-e "s:^#persistence_location$:persistence_location /var/lib/mosquitto/:" \
-			mosquitto.conf || die
-	fi
-	python_setup
-	python_fix_shebang test
-}
-
-src_configure() {
-	LIBDIR=$(get_libdir)
-	QA_PRESTRIPPED="/usr/sbin/mosquitto
-		/usr/bin/mosquitto_passwd
-		/usr/bin/mosquitto_sub
-		/usr/bin/mosquitto_pub
-		/usr/${LIBDIR}/libmosquittopp.so.1
-		/usr/${LIBDIR}/libmosquitto.so.1"
-
-	makeopts=(
-		"LIB_SUFFIX=${LIBDIR:3}"
-		"WITH_BRIDGE=$(usex bridge)"
-		"WITH_PERSISTENCE=$(usex persistence)"
-		"WITH_SRV=$(usex srv)"
-		"WITH_TLS=$(usex ssl)"
-		"WITH_WRAP=$(usex tcpd)"
-	)
-}
-
-src_compile() {
-	emake "${makeopts[@]}"
-}
-
-src_test() {
-	emake "${makeopts[@]}" test
-}
-
-src_install() {
-	emake "${makeopts[@]}" 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"
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r examples/*
-	fi
-}
-
-pkg_postinst() {
-	elog ""
-	elog "The Python module has been moved out of mosquitto."
-	elog "See http://mosquitto.org/documentation/python/"
-	elog ""
-	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"
-}

diff --git a/app-misc/mosquitto/mosquitto-1.4.11.ebuild b/app-misc/mosquitto/mosquitto-1.4.11.ebuild
deleted file mode 100644
index 3f4677c38d1..00000000000
--- a/app-misc/mosquitto/mosquitto-1.4.11.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils systemd user toolchain-funcs python-any-r1
-
-DESCRIPTION="An Open Source MQTT v3 Broker"
-HOMEPAGE="http://mosquitto.org/"
-SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz"
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm"
-IUSE="bridge examples +persistence +srv ssl tcpd websockets"
-
-RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	srv? ( net-dns/c-ares )
-	websockets? ( net-libs/libwebsockets )"
-
-pkg_setup() {
-	enewgroup mosquitto
-	enewuser mosquitto -1 -1 -1 mosquitto
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.4.10-conditional-tests.patch"
-	if use persistence; then
-		sed -i -e "s:^#autosave_interval:autosave_interval:" \
-			-e "s:^#persistence false$:persistence true:" \
-			-e "s:^#persistence_file:persistence_file:" \
-			-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
-
-	python_setup
-	python_fix_shebang test
-}
-
-src_configure() {
-	LIBDIR=$(get_libdir)
-	makeopts=(
-		"CC=$(tc-getCC)"
-		"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_compile() {
-	emake "${makeopts[@]}"
-}
-
-src_test() {
-	emake "${makeopts[@]}" test
-}
-
-src_install() {
-	emake "${makeopts[@]}" 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"
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r examples/*
-	fi
-}
-
-pkg_postinst() {
-	elog ""
-	elog "The Python module has been moved out of mosquitto."
-	elog "See http://mosquitto.org/documentation/python/"
-	elog ""
-	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"
-}