From 7750cd794da77bfa401364df3b29189b4ffbb04d Mon Sep 17 00:00:00 2001 From: Lucas Ramage Date: Tue, 29 May 2018 10:35:07 -0400 Subject: app-misc/mosquitto: bump version to 1.5.1 Signed-off-by: Lucas Ramage Bug: https://bugs.gentoo.org/656572 Closes: https://bugs.gentoo.org/658552 Closes: https://bugs.gentoo.org/658340 Package-Manager: Portage-2.3.24, Repoman-2.3.6 Signed-off-by: Virgil Dupras --- app-misc/mosquitto/Manifest | 1 + .../files/mosquitto-1.4.15-conditional-tests.patch | 12 --- .../mosquitto-1.5-fix-socket_get_address.patch | 29 ++++++ .../files/mosquitto-fix-conditional-tests.patch | 12 +++ app-misc/mosquitto/metadata.xml | 2 +- app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild | 102 -------------------- app-misc/mosquitto/mosquitto-1.4.15-r3.ebuild | 102 ++++++++++++++++++++ app-misc/mosquitto/mosquitto-1.5.1.ebuild | 106 +++++++++++++++++++++ 8 files changed, 251 insertions(+), 115 deletions(-) delete mode 100644 app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch create mode 100644 app-misc/mosquitto/files/mosquitto-1.5-fix-socket_get_address.patch create mode 100644 app-misc/mosquitto/files/mosquitto-fix-conditional-tests.patch delete mode 100644 app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild create mode 100644 app-misc/mosquitto/mosquitto-1.4.15-r3.ebuild create mode 100644 app-misc/mosquitto/mosquitto-1.5.1.ebuild (limited to 'app-misc') diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest index e57c2e973ef3..83420091448d 100644 --- a/app-misc/mosquitto/Manifest +++ b/app-misc/mosquitto/Manifest @@ -1,2 +1,3 @@ DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 92bcb1fd9e67711d6ce8db5e767be31a1321866205cf4cad684d8b77a8b14a2eaf5e4367a74d5dd8f814f0d229dc77ce878879632c0c34c6a23f7975bf6ae8c7 SHA512 dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2 DIST mosquitto-1.4.15.tar.gz 368961 BLAKE2B 28bfab7d41d9e057ba8b52e0c428967ecc5d0c25a3d73dca420ae883c2b462ee02da1eeb9c22f4d392f0ccf62224acab6f24d4a0798a594f4b9f90c907fa1495 SHA512 36b06547553cf28af3ca9b728c42fc27e849c4ae84d7964572d430233ab26e2b59eee2a215ac23ddf2d0bef419e7c70e64e2a22c397fadb3e0677314d03f1100 +DIST mosquitto-1.5.1.tar.gz 430066 BLAKE2B ab2df1b77cfcb71c95d3412c4c3da4cf0af1a48d700642a12c8e0334762e9e8868ba0cbd69311d7aa324f2920d3be227149ba4e0bd7558ba10e5d7d1f0b24996 SHA512 7b076a977778ca87f9fa4579eb4a6b62b171df746920719e9bd6efce0a4815c15edc9da177669819509184d2b01ed0756be8259adba344df690efe0547fd6741 diff --git a/app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch b/app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch deleted file mode 100644 index 1642597c5620..000000000000 --- a/app-misc/mosquitto/files/mosquitto-1.4.15-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/files/mosquitto-1.5-fix-socket_get_address.patch b/app-misc/mosquitto/files/mosquitto-1.5-fix-socket_get_address.patch new file mode 100644 index 000000000000..7e9778e8b70f --- /dev/null +++ b/app-misc/mosquitto/files/mosquitto-1.5-fix-socket_get_address.patch @@ -0,0 +1,29 @@ +# Fix missing rename of mosquitto__socket_get_address. Mosquitto bug 810. + +diff --git a/src/conf.c b/src/conf.c +index f3d812d..daf2bf4 100644 +--- a/src/conf.c ++++ b/src/conf.c +@@ -735,8 +735,8 @@ int config__read_file_core(struct mosquitto__config *config, bool reload, struct + struct mosquitto__listener *cur_listener = &config->default_listener; + #ifdef WITH_BRIDGE + char *address; +- int i; + #endif ++ int i; + int lineno_ext; + struct mosquitto__security_options *cur_security_options = NULL; + +diff --git a/src/net.c b/src/net.c +index 7397de5..670b7e2 100644 +--- a/src/net.c ++++ b/src/net.c +@@ -114,7 +114,7 @@ int net__socket_accept(struct mosquitto_db *db, mosq_sock_t listensock) + fromhost(&wrap_req); + if(!hosts_access(&wrap_req)){ + /* Access is denied */ +- if(!mosquitto__socket_get_address(new_sock, address, 1024)){ ++ if(!net__socket_get_address(new_sock, address, 1024)){ + log__printf(NULL, MOSQ_LOG_NOTICE, "Client connection from %s denied access by tcpd.", address); + } + COMPAT_CLOSE(new_sock); diff --git a/app-misc/mosquitto/files/mosquitto-fix-conditional-tests.patch b/app-misc/mosquitto/files/mosquitto-fix-conditional-tests.patch new file mode 100644 index 000000000000..1642597c5620 --- /dev/null +++ b/app-misc/mosquitto/files/mosquitto-fix-conditional-tests.patch @@ -0,0 +1,12 @@ +--- 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/metadata.xml b/app-misc/mosquitto/metadata.xml index 2b05da7a5d48..ec6718456c6e 100644 --- a/app-misc/mosquitto/metadata.xml +++ b/app-misc/mosquitto/metadata.xml @@ -2,7 +2,7 @@ - ramage.lucas@openmailbox.org + ramage.lucas@protonmail.com Lucas Ramage diff --git a/app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild b/app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild deleted file mode 100644 index 48165a4db6f3..000000000000 --- a/app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild +++ /dev/null @@ -1,102 +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="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" - -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 )" - -PATCHES=( "${FILESDIR}/${P}-conditional-tests.patch" ) - -_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() { - 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 - - 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" - docinto "/usr/share/doc/${PF}" - doins -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.4.15-r3.ebuild b/app-misc/mosquitto/mosquitto-1.4.15-r3.ebuild new file mode 100644 index 000000000000..8905f6d3f499 --- /dev/null +++ b/app-misc/mosquitto/mosquitto-1.4.15-r3.ebuild @@ -0,0 +1,102 @@ +# 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="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" + +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 )" + +PATCHES=( "${FILESDIR}/${PN}-fix-conditional-tests.patch" ) + +_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() { + 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 + + 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" + docinto "/usr/share/doc/${PF}" + doins -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.5.1.ebuild b/app-misc/mosquitto/mosquitto-1.5.1.ebuild new file mode 100644 index 000000000000..cc7bf4b128f4 --- /dev/null +++ b/app-misc/mosquitto/mosquitto-1.5.1.ebuild @@ -0,0 +1,106 @@ +# 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="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" + +REQUIRED_USE="test? ( bridge )" + +RDEPEND="tcpd? ( sys-apps/tcp-wrappers ) + srv? ( net-dns/c-ares ) + ssl? ( dev-libs/openssl:0= )" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + websockets? ( net-libs/libwebsockets )" + +PATCHES=( + "${FILESDIR}/${PN}-fix-conditional-tests.patch" + "${FILESDIR}/${P}-fix-socket_get_address.patch" +) + +_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() { + 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 + + python_setup + rm test/{broker,lib}/ptest.py || die + 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" + docinto "/usr/share/doc/${PF}" + doins -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 +} -- cgit v1.2.3-65-gdbad