Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/mosquitto/files/, app-misc/mosquitto/
Date: Mon, 16 Apr 2018 13:38:14
Message-Id: 1523885880.39a54f4318fee7b07d8121525e8889c960277de8.whissi@gentoo
commit:     39a54f4318fee7b07d8121525e8889c960277de8
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 16 13:05:25 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 13:38:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39a54f43

Revert "app-misc/mosquitto: add patch against CVE-2017-7652."

This reverts commit 45182783da2fdcb0d34bfeb72a4f9e619254234a.

Reasons:

  - Has nothing to do with CVE-2017-7652.

  - Patch doesn't apply. [Bug 653238]

Bug: https://bugs.gentoo.org/653238

 .../mosquitto-1.4.15-r1-conditional-tests.patch    |  12 ---
 app-misc/mosquitto/mosquitto-1.4.15-r1.ebuild      | 100 ---------------------
 2 files changed, 112 deletions(-)

diff --git a/app-misc/mosquitto/files/mosquitto-1.4.15-r1-conditional-tests.patch b/app-misc/mosquitto/files/mosquitto-1.4.15-r1-conditional-tests.patch
deleted file mode 100644
index 1642597c562..00000000000
--- a/app-misc/mosquitto/files/mosquitto-1.4.15-r1-conditional-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/test/broker/c/Makefile	2016-02-14 14:36:55.000000000 +0000
-+++ b/test/broker/c/Makefile	2016-05-05 09:40:31.440608209 +0100
-@@ -13,7 +13,9 @@
- 	$(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
- 
- 08-tls-psk-bridge.test : 08-tls-psk-bridge.c
-+ifeq ($(WITH_BRIDGE),yes)
- 	$(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
-+endif
- 
- 
- reallyclean : clean

diff --git a/app-misc/mosquitto/mosquitto-1.4.15-r1.ebuild b/app-misc/mosquitto/mosquitto-1.4.15-r1.ebuild
deleted file mode 100644
index 961c208d40b..00000000000
--- a/app-misc/mosquitto/mosquitto-1.4.15-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit 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 ~arm ~x86"
-IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
-
-REQUIRED_USE="test? ( bridge )"
-
-RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	srv? ( net-dns/c-ares )
-	websockets? ( net-libs/libwebsockets )"
-
-_emake() {
-	LIBDIR=$(get_libdir)
-	emake \
-		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)" \
-		"$@"
-}
-
-pkg_setup() {
-	enewgroup mosquitto
-	enewuser mosquitto -1 -1 -1 mosquitto
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-conditional-tests.patch"
-	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
-
-	python_setup
-	python_fix_shebang test
-	eapply_user
-}
-
-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"
-		docinto "/usr/share/doc/${PF}"
-		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"
-}