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

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

2023-11-29 Thread Matt Turner

commit: 4d0f6ea3c6a5f6216ea75a4c6c7e960f7f2b08f3
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Nov 29 17:40:36 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Nov 29 17:41:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d0f6ea3

app-misc/mosquitto: Drop old versions

Bug: https://bugs.gentoo.org/918540
Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/Manifest   |   2 -
 app-misc/mosquitto/mosquitto-2.0.15-r1.ebuild | 127 --
 app-misc/mosquitto/mosquitto-2.0.17.ebuild| 127 --
 3 files changed, 256 deletions(-)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index d688c1a81622..b32d0c372120 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,3 +1 @@
-DIST mosquitto-2.0.15.tar.gz 792632 BLAKE2B 
a6e986998473c16efd4c5fc5fd743782e085b3e7e30bcdcb867f0ae87f85e608f5d50d0dcc5bbbcc2f25eb6a618ab2f287fdcba47660fa593fe1636d08eb183e
 SHA512 
8a0c58222ea0b9304e7f096f6d13965478072baf1d1c9bc931b32a33f5ea8196c2dd54bde8d83fec7ed9cd413cb5fb115ce0a6701ca20664df52fdd7ca63ddaf
-DIST mosquitto-2.0.17.tar.gz 795960 BLAKE2B 
50a351ee6d5b29adc2f234fad9a8a084d35be5d219e8d20283a256075dc69c03ec39543924600dc424408951e2af5a6ae4afada20bf82a4f54dbbed101daee9b
 SHA512 
0882380461bf110abe10c5487334b0ae5ce8d890a2ad8f9b419278a0f04fc821918f50408c50c843bf09741eb62d5b9a1ab10df262d46cd70aafc3e063344a9a
 DIST mosquitto-2.0.18.tar.gz 796351 BLAKE2B 
6e1d8078ee2813870d79489f312857a12614dc8f1fa3c72269ab29555897ec61d7ba54fcb5e5383f8e852cdb6fffa1d7cb2003ce15da12b986989a6187a186a0
 SHA512 
63f7e2811964bab5856848e6918627c47afc6534ff60aad5ece3d2fa330b407c9df14027610826e343ee68ff7d8d5d93f2459713061251ded478c42766946767

diff --git a/app-misc/mosquitto/mosquitto-2.0.15-r1.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.15-r1.ebuild
deleted file mode 100644
index ab041935459f..
--- a/app-misc/mosquitto/mosquitto-2.0.15-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-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 +persistence +srv ssl systemd tcpd test websockets"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( bridge )"
-
-RDEPEND="
-   acct-user/mosquitto
-   acct-group/mosquitto
-   dev-libs/cJSON:=
-   srv? ( net-dns/c-ares:= )
-   ssl? (
-   dev-libs/openssl:0=
-   )
-   systemd? ( sys-apps/systemd )
-   tcpd? ( sys-apps/tcp-wrappers )
-   websockets? ( net-libs/libwebsockets[lejp] )
-"
-DEPEND="
-   ${RDEPEND}
-   test? ( dev-util/cunit )
-"
-BDEPEND="
-   test? ( ${PYTHON_DEPS} )
-"
-
-pkg_setup() {
-   use test && python_setup
-}
-
-_emake() {
-   local LIBDIR=$(get_libdir)
-   emake \
-   CC="$(tc-getCC)" \
-   CXX="$(tc-getCXX)" \
-   CLIENT_LDFLAGS="${LDFLAGS}" \
-   LIB_SUFFIX="${LIBDIR:3}" \
-   WITH_BRIDGE="$(usex bridge)" \
-   WITH_PERSISTENCE="$(usex persistence)" \
-   WITH_SRV="$(usex srv)" \
-   WITH_SYSTEMD="$(usex systemd)" \
-   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 failing tests
-   sed -i \
-   -e '/06-bridge-reconnect-local-out.py/d' \
-   test/broker/Makefile || die
-   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
-
-   use test && 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
-   insinto

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

2023-11-29 Thread Arthur Zamarin

commit: b089db89b283d390cfb6c49781cbb2cbd46f18bf
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Nov 29 12:46:05 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Nov 29 12:46:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b089db89

app-misc/mosquitto: Stabilize 2.0.18 arm, #916239

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.18.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.18.ebuild
index fc5534cf24a7..2e9ac3251f32 100644
--- a/app-misc/mosquitto/mosquitto-2.0.18.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.18.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 systemd tcpd test websockets"
 RESTRICT="!test? ( test )"

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

2023-11-29 Thread Arthur Zamarin

commit: 2ce94588d1b6cb80c1ffa4ee7204a73c150a4d3f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Nov 29 12:46:02 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Nov 29 12:46:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ce94588

app-misc/mosquitto: Stabilize 2.0.18 x86, #916239

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.18.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.18.ebuild
index 2a727ce47c16..fc5534cf24a7 100644
--- a/app-misc/mosquitto/mosquitto-2.0.18.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.18.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 systemd tcpd test websockets"
 RESTRICT="!test? ( test )"

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

2023-11-28 Thread Matt Turner

commit: e20737182cd7ad513afad85237d891b4f945e6f8
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Nov 28 20:25:29 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Nov 28 23:40:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2073718

app-misc/mosquitto: Add python_check_deps()

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.18.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/app-misc/mosquitto/mosquitto-2.0.18.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.18.ebuild
index a13257cc2258..2a727ce47c16 100644
--- a/app-misc/mosquitto/mosquitto-2.0.18.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.18.ebuild
@@ -41,6 +41,10 @@ BDEPEND="
)
 "
 
+python_check_deps() {
+   python_has_version -b "dev-python/psutil[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
use test && python_setup
 }

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

2023-11-27 Thread Arthur Zamarin

commit: d0d81c1bbc88f776c15ddd768518612648eba752
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Nov 28 05:44:01 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Nov 28 05:44:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0d81c1b

app-misc/mosquitto: Stabilize 2.0.18 amd64, #916239

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.18.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.18.ebuild
index 82b318a897de..a13257cc2258 100644
--- a/app-misc/mosquitto/mosquitto-2.0.18.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.18.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 systemd tcpd test websockets"
 RESTRICT="!test? ( test )"

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

2023-11-25 Thread Matt Turner

commit: 6813d9ecd03c92807dab39d01537149622e04c6c
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Nov 25 16:26:36 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Nov 25 16:31:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6813d9ec

app-misc/mosquitto: Enable USE=bridge by default

It's required for tests.

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.18.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.18.ebuild
index fdefe0ec14b1..5d60035a64bd 100644
--- a/app-misc/mosquitto/mosquitto-2.0.18.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz;
 LICENSE="EPL-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="bridge examples +persistence +srv ssl systemd tcpd test websockets"
+IUSE="+bridge examples +persistence +srv ssl systemd tcpd test websockets"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( bridge )"

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

2023-11-25 Thread Matt Turner

commit: bbca38847e58218897f92584e76d887ae7a52319
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Nov 25 16:30:00 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Nov 25 16:31:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbca3884

app-misc/mosquitto: Fix subslot operators

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.18.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.18.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.18.ebuild
index bc6e50271419..82b318a897de 100644
--- a/app-misc/mosquitto/mosquitto-2.0.18.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.18.ebuild
@@ -21,12 +21,12 @@ REQUIRED_USE="test? ( bridge )"
 RDEPEND="
acct-user/mosquitto
acct-group/mosquitto
-   dev-libs/cJSON:=
+   dev-libs/cJSON
srv? ( net-dns/c-ares:= )
ssl? (
dev-libs/openssl:0=
)
-   systemd? ( sys-apps/systemd )
+   systemd? ( sys-apps/systemd:= )
tcpd? ( sys-apps/tcp-wrappers )
websockets? ( net-libs/libwebsockets[lejp] )
 "

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

2023-11-25 Thread Matt Turner

commit: d8d65ac221b73b44ae9043e6df84a537202b13dd
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Nov 25 16:26:56 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Nov 25 16:31:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8d65ac2

app-misc/mosquitto: Add missing test dep on psutil

Closes: https://bugs.gentoo.org/915717
Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.18.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.18.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.18.ebuild
index 5d60035a64bd..bc6e50271419 100644
--- a/app-misc/mosquitto/mosquitto-2.0.18.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.18.ebuild
@@ -35,7 +35,10 @@ DEPEND="
test? ( dev-util/cunit )
 "
 BDEPEND="
-   test? ( ${PYTHON_DEPS} )
+   test? (
+   ${PYTHON_DEPS}
+   $(python_gen_any_dep 'dev-python/psutil[${PYTHON_USEDEP}]')
+   )
 "
 
 pkg_setup() {

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

2023-09-21 Thread Matt Turner

commit: db5eae5dee08433e11be5c0ba047a335620b17c5
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Sep 22 04:12:40 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Sep 22 04:12:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db5eae5d

app-misc/mosquitto: Version bump to 2.0.18

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/Manifest|   1 +
 app-misc/mosquitto/mosquitto-2.0.18.ebuild | 127 +
 2 files changed, 128 insertions(+)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 0d79110b0008..d688c1a81622 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,2 +1,3 @@
 DIST mosquitto-2.0.15.tar.gz 792632 BLAKE2B 
a6e986998473c16efd4c5fc5fd743782e085b3e7e30bcdcb867f0ae87f85e608f5d50d0dcc5bbbcc2f25eb6a618ab2f287fdcba47660fa593fe1636d08eb183e
 SHA512 
8a0c58222ea0b9304e7f096f6d13965478072baf1d1c9bc931b32a33f5ea8196c2dd54bde8d83fec7ed9cd413cb5fb115ce0a6701ca20664df52fdd7ca63ddaf
 DIST mosquitto-2.0.17.tar.gz 795960 BLAKE2B 
50a351ee6d5b29adc2f234fad9a8a084d35be5d219e8d20283a256075dc69c03ec39543924600dc424408951e2af5a6ae4afada20bf82a4f54dbbed101daee9b
 SHA512 
0882380461bf110abe10c5487334b0ae5ce8d890a2ad8f9b419278a0f04fc821918f50408c50c843bf09741eb62d5b9a1ab10df262d46cd70aafc3e063344a9a
+DIST mosquitto-2.0.18.tar.gz 796351 BLAKE2B 
6e1d8078ee2813870d79489f312857a12614dc8f1fa3c72269ab29555897ec61d7ba54fcb5e5383f8e852cdb6fffa1d7cb2003ce15da12b986989a6187a186a0
 SHA512 
63f7e2811964bab5856848e6918627c47afc6534ff60aad5ece3d2fa330b407c9df14027610826e343ee68ff7d8d5d93f2459713061251ded478c42766946767

diff --git a/app-misc/mosquitto/mosquitto-2.0.18.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.18.ebuild
new file mode 100644
index ..fdefe0ec14b1
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-2.0.18.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+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 +persistence +srv ssl systemd tcpd test websockets"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="
+   acct-user/mosquitto
+   acct-group/mosquitto
+   dev-libs/cJSON:=
+   srv? ( net-dns/c-ares:= )
+   ssl? (
+   dev-libs/openssl:0=
+   )
+   systemd? ( sys-apps/systemd )
+   tcpd? ( sys-apps/tcp-wrappers )
+   websockets? ( net-libs/libwebsockets[lejp] )
+"
+DEPEND="
+   ${RDEPEND}
+   test? ( dev-util/cunit )
+"
+BDEPEND="
+   test? ( ${PYTHON_DEPS} )
+"
+
+pkg_setup() {
+   use test && python_setup
+}
+
+_emake() {
+   local LIBDIR=$(get_libdir)
+   emake \
+   CC="$(tc-getCC)" \
+   CXX="$(tc-getCXX)" \
+   CLIENT_LDFLAGS="${LDFLAGS}" \
+   LIB_SUFFIX="${LIBDIR:3}" \
+   WITH_BRIDGE="$(usex bridge)" \
+   WITH_PERSISTENCE="$(usex persistence)" \
+   WITH_SRV="$(usex srv)" \
+   WITH_SYSTEMD="$(usex systemd)" \
+   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 failing tests
+   sed -i \
+   -e '/06-bridge-reconnect-local-out.py/d' \
+   test/broker/Makefile || die
+   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
+
+   use test && 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
+   insinto /usr/share/mosquitto
+   doins misc/letsencrypt/mosquitto-copy.sh
+   systemd_newunit "${FILESDIR}/mosquitto.notify.service"

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

2023-09-07 Thread Matt Turner

commit: 7e3dbf30af73559bfcd5f14b1e235bd201f50f51
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Sep  8 04:40:10 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Sep  8 04:52:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e3dbf30

app-misc/mosquitto: Version bump to 2.0.17

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/Manifest|   1 +
 app-misc/mosquitto/mosquitto-2.0.17.ebuild | 127 +
 2 files changed, 128 insertions(+)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index cde6f01b4783..0d79110b0008 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1 +1,2 @@
 DIST mosquitto-2.0.15.tar.gz 792632 BLAKE2B 
a6e986998473c16efd4c5fc5fd743782e085b3e7e30bcdcb867f0ae87f85e608f5d50d0dcc5bbbcc2f25eb6a618ab2f287fdcba47660fa593fe1636d08eb183e
 SHA512 
8a0c58222ea0b9304e7f096f6d13965478072baf1d1c9bc931b32a33f5ea8196c2dd54bde8d83fec7ed9cd413cb5fb115ce0a6701ca20664df52fdd7ca63ddaf
+DIST mosquitto-2.0.17.tar.gz 795960 BLAKE2B 
50a351ee6d5b29adc2f234fad9a8a084d35be5d219e8d20283a256075dc69c03ec39543924600dc424408951e2af5a6ae4afada20bf82a4f54dbbed101daee9b
 SHA512 
0882380461bf110abe10c5487334b0ae5ce8d890a2ad8f9b419278a0f04fc821918f50408c50c843bf09741eb62d5b9a1ab10df262d46cd70aafc3e063344a9a

diff --git a/app-misc/mosquitto/mosquitto-2.0.17.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.17.ebuild
new file mode 100644
index ..fdefe0ec14b1
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-2.0.17.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+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 +persistence +srv ssl systemd tcpd test websockets"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="
+   acct-user/mosquitto
+   acct-group/mosquitto
+   dev-libs/cJSON:=
+   srv? ( net-dns/c-ares:= )
+   ssl? (
+   dev-libs/openssl:0=
+   )
+   systemd? ( sys-apps/systemd )
+   tcpd? ( sys-apps/tcp-wrappers )
+   websockets? ( net-libs/libwebsockets[lejp] )
+"
+DEPEND="
+   ${RDEPEND}
+   test? ( dev-util/cunit )
+"
+BDEPEND="
+   test? ( ${PYTHON_DEPS} )
+"
+
+pkg_setup() {
+   use test && python_setup
+}
+
+_emake() {
+   local LIBDIR=$(get_libdir)
+   emake \
+   CC="$(tc-getCC)" \
+   CXX="$(tc-getCXX)" \
+   CLIENT_LDFLAGS="${LDFLAGS}" \
+   LIB_SUFFIX="${LIBDIR:3}" \
+   WITH_BRIDGE="$(usex bridge)" \
+   WITH_PERSISTENCE="$(usex persistence)" \
+   WITH_SRV="$(usex srv)" \
+   WITH_SYSTEMD="$(usex systemd)" \
+   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 failing tests
+   sed -i \
+   -e '/06-bridge-reconnect-local-out.py/d' \
+   test/broker/Makefile || die
+   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
+
+   use test && 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
+   insinto /usr/share/mosquitto
+   doins misc/letsencrypt/mosquitto-copy.sh
+   systemd_newunit "${FILESDIR}/mosquitto.notify.service" mosquitto.service
+
+   if use examples; then
+   docompress -x "/usr/share/doc/${PF}/examples"
+   dodoc -r examples
+   fi
+}
+
+pkg_postinst() {
+   for v in ${REPLACING_VERSIONS}; do
+   if [[ $(ver_cut 1 "$v") -lt 2 ]]; then
+   elog
+

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

2023-05-29 Thread Matt Turner

commit: efe3ee96988bc5eff55bde4b5fc37a7b7e3c2616
Author: Matt Turner  gentoo  org>
AuthorDate: Tue May 30 03:20:04 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue May 30 03:22:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efe3ee96

app-misc/mosquitto: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/files/mosquitto.service |  12 ---
 app-misc/mosquitto/mosquitto-2.0.15.ebuild | 125 -
 2 files changed, 137 deletions(-)

diff --git a/app-misc/mosquitto/files/mosquitto.service 
b/app-misc/mosquitto/files/mosquitto.service
deleted file mode 100644
index ebdc28e3448a..
--- a/app-misc/mosquitto/files/mosquitto.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Mosquitto MQTT Broker daemon
-ConditionPathExists=/etc/mosquitto/mosquitto.conf
-Requires=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf
-Restart=always
-
-[Install]
-WantedBy=multi-user.target

diff --git a/app-misc/mosquitto/mosquitto-2.0.15.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.15.ebuild
deleted file mode 100644
index dc9f01d4b765..
--- a/app-misc/mosquitto/mosquitto-2.0.15.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-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 +persistence +srv ssl tcpd test websockets"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( bridge )"
-
-RDEPEND="
-   acct-user/mosquitto
-   acct-group/mosquitto
-   dev-libs/cJSON:=
-   srv? ( net-dns/c-ares:= )
-   ssl? (
-   dev-libs/openssl:0=
-   )
-   tcpd? ( sys-apps/tcp-wrappers )
-   websockets? ( net-libs/libwebsockets[lejp] )
-"
-DEPEND="
-   ${RDEPEND}
-   test? ( dev-util/cunit )
-"
-BDEPEND="
-   test? ( ${PYTHON_DEPS} )
-"
-
-pkg_setup() {
-   use test && python_setup
-}
-
-_emake() {
-   local LIBDIR=$(get_libdir)
-   emake \
-   CC="$(tc-getCC)" \
-   CXX="$(tc-getCXX)" \
-   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 failing tests
-   sed -i \
-   -e '/06-bridge-reconnect-local-out.py/d' \
-   test/broker/Makefile || die
-   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
-
-   use test && 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
-   insinto /usr/share/mosquitto
-   doins misc/letsencrypt/mosquitto-copy.sh
-   systemd_dounit "${FILESDIR}/mosquitto.service"
-
-   if use examples; then
-   docompress -x "/usr/share/doc/${PF}/examples"
-   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

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

2023-05-08 Thread Matt Turner

commit: e6c55de8609f752a60f2cbe64e206f33c47d29f2
Author: Matt Turner  gentoo  org>
AuthorDate: Tue May  9 01:50:19 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue May  9 01:50:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6c55de8

app-misc/mosquitto: Propagate stable keywords

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.15-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.15-r1.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.15-r1.ebuild
index 29bf8bdd7b4a..ab041935459f 100644
--- a/app-misc/mosquitto/mosquitto-2.0.15-r1.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.15-r1.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 systemd tcpd test websockets"
 RESTRICT="!test? ( test )"

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

2023-03-29 Thread Matt Turner

commit: 5cb59f66ac4f379b267af8074afda23206cca8aa
Author: Dennis Lamm  gentoo  org>
AuthorDate: Sat Mar 18 18:04:39 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Mar 29 16:51:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cb59f66

app-misc/mosquitto: added systemd notify support

Closes: https://bugs.gentoo.org/878969
Signed-off-by: Dennis Lamm  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/30215
Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/files/mosquitto.notify.service |  15 +++
 app-misc/mosquitto/mosquitto-2.0.15-r1.ebuild | 127 ++
 2 files changed, 142 insertions(+)

diff --git a/app-misc/mosquitto/files/mosquitto.notify.service 
b/app-misc/mosquitto/files/mosquitto.notify.service
new file mode 100644
index ..5cbce2151e9d
--- /dev/null
+++ b/app-misc/mosquitto/files/mosquitto.notify.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Mosquitto MQTT Broker
+Documentation=man:mosquitto.conf(5) man:mosquitto(8)
+After=network.target
+Wants=network.target
+
+[Service]
+Type=notify
+NotifyAccess=main
+ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

diff --git a/app-misc/mosquitto/mosquitto-2.0.15-r1.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.15-r1.ebuild
new file mode 100644
index ..29bf8bdd7b4a
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-2.0.15-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+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 +persistence +srv ssl systemd tcpd test websockets"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="
+   acct-user/mosquitto
+   acct-group/mosquitto
+   dev-libs/cJSON:=
+   srv? ( net-dns/c-ares:= )
+   ssl? (
+   dev-libs/openssl:0=
+   )
+   systemd? ( sys-apps/systemd )
+   tcpd? ( sys-apps/tcp-wrappers )
+   websockets? ( net-libs/libwebsockets[lejp] )
+"
+DEPEND="
+   ${RDEPEND}
+   test? ( dev-util/cunit )
+"
+BDEPEND="
+   test? ( ${PYTHON_DEPS} )
+"
+
+pkg_setup() {
+   use test && python_setup
+}
+
+_emake() {
+   local LIBDIR=$(get_libdir)
+   emake \
+   CC="$(tc-getCC)" \
+   CXX="$(tc-getCXX)" \
+   CLIENT_LDFLAGS="${LDFLAGS}" \
+   LIB_SUFFIX="${LIBDIR:3}" \
+   WITH_BRIDGE="$(usex bridge)" \
+   WITH_PERSISTENCE="$(usex persistence)" \
+   WITH_SRV="$(usex srv)" \
+   WITH_SYSTEMD="$(usex systemd)" \
+   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 failing tests
+   sed -i \
+   -e '/06-bridge-reconnect-local-out.py/d' \
+   test/broker/Makefile || die
+   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
+
+   use test && 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
+   insinto /usr/share/mosquitto
+   doins misc/letsencrypt/mosquitto-copy.sh
+   systemd_newunit "${FILESDIR}/mosquitto.notify.service" mosquitto.service
+
+   if use examples; then
+   docompress -x "/usr/share/doc/${PF}/examples"
+   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:"
+

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

2022-10-31 Thread Matt Turner

commit: ba311e645d3c161397bab624978e481a9e566227
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Oct 31 15:30:24 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Oct 31 15:30:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba311e64

app-misc/mosquitto: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/Manifest|   1 -
 app-misc/mosquitto/mosquitto-2.0.14.ebuild | 122 -
 2 files changed, 123 deletions(-)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index b02492d6ee37..cde6f01b4783 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,2 +1 @@
-DIST mosquitto-2.0.14.tar.gz 787414 BLAKE2B 
926e39756a0293404c8591e489e64e47cd95640d7884f2cfb687a0d548b709d8aff6d671a4941aae8b3506315d28567520c183b762639822d2d78afe323d111e
 SHA512 
a9e4f41b9af679b30318570e86a465546024651373df10e3b132f4593b89d22d0dbac01bb7371a57132ba030a2e73971c612acb5c9ac12f5ccd06aa38d9444c2
 DIST mosquitto-2.0.15.tar.gz 792632 BLAKE2B 
a6e986998473c16efd4c5fc5fd743782e085b3e7e30bcdcb867f0ae87f85e608f5d50d0dcc5bbbcc2f25eb6a618ab2f287fdcba47660fa593fe1636d08eb183e
 SHA512 
8a0c58222ea0b9304e7f096f6d13965478072baf1d1c9bc931b32a33f5ea8196c2dd54bde8d83fec7ed9cd413cb5fb115ce0a6701ca20664df52fdd7ca63ddaf

diff --git a/app-misc/mosquitto/mosquitto-2.0.14.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.14.ebuild
deleted file mode 100644
index ba5ac5d51a0f..
--- a/app-misc/mosquitto/mosquitto-2.0.14.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 +persistence +srv ssl tcpd test websockets"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( bridge )"
-
-RDEPEND="
-   acct-user/mosquitto
-   acct-group/mosquitto
-   dev-libs/cJSON:=
-   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)" \
-   CXX="$(tc-getCXX)" \
-   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 '/01-connect-575314.py/d' \
-   test/broker/Makefile || die
-   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
-}
-
-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
-   insinto /usr/share/mosquitto
-   doins misc/letsencrypt/mosquitto-copy.sh
-   systemd_dounit "${FILESDIR}/mosquitto.service"
-
-   if use examples; then
-   docompress -x "/usr/share/doc/${PF}/examples"
-   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

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

2022-10-09 Thread Agostino Sarubbo

commit: f453e8399d63165b6049ab1adb164c5255543d6b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Oct  9 08:54:37 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Oct  9 08:54:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f453e839

app-misc/mosquitto: Stabilize 2.0.15 x86, #876154

Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.15.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.15.ebuild
index 55313dc9a8d0..7b38d6cbaf58 100644
--- a/app-misc/mosquitto/mosquitto-2.0.15.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.15.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 )"

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

2022-10-09 Thread Agostino Sarubbo

commit: 3b8917e9903f13d82245be7b03b99336bc63d363
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Oct  9 08:49:04 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Oct  9 08:49:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b8917e9

app-misc/mosquitto: Stabilize 2.0.15 arm, #876154

Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.15.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.15.ebuild
index 5768ef74d41b..55313dc9a8d0 100644
--- a/app-misc/mosquitto/mosquitto-2.0.15.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.15.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 )"

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

2022-10-08 Thread Sam James

commit: 821eb42dcdadb982cae4c1d9222fb472feb8ac13
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  8 19:27:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  8 19:28:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=821eb42d

app-misc/mosquitto: Stabilize 2.0.15 amd64, #876154

Signed-off-by: Sam James  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.15.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.15.ebuild
index 61e5bef8a003..5768ef74d41b 100644
--- a/app-misc/mosquitto/mosquitto-2.0.15.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.15.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 )"

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

2022-10-08 Thread Matt Turner

commit: 967c7a1e07a72c46f24e4f0413c8b4dc2d1bfa0f
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Oct  8 14:32:09 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Oct  8 14:32:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=967c7a1e

app-misc/mosquitto: Move libwebsockets to RDEPEND

Closes: https://bugs.gentoo.org/857888
Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.15.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.15.ebuild
index a584158956db..61e5bef8a003 100644
--- a/app-misc/mosquitto/mosquitto-2.0.15.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.15.ebuild
@@ -27,11 +27,11 @@ RDEPEND="
dev-libs/openssl:0=
)
tcpd? ( sys-apps/tcp-wrappers )
+   websockets? ( net-libs/libwebsockets[lejp] )
 "
 DEPEND="
${RDEPEND}
test? ( dev-util/cunit )
-   websockets? ( net-libs/libwebsockets[lejp] )
 "
 BDEPEND="
test? ( ${PYTHON_DEPS} )

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

2022-08-18 Thread Matt Turner

commit: 3535975cfd500525a358cd54e9f91036b93856a8
Author: Marc Cramer  posteo  net>
AuthorDate: Thu Aug 18 20:26:37 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Aug 19 03:28:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3535975c

app-misc/mosquitto: Version bump to 2.0.15

... with some updates by mattst88:

* Bump to EAPI=8
* Add Python 3.11 compatibility
* Move ${PYTHON_DEPS} from DEPEND to BDEPEND, and only under USE=test
* Move python_setup to pkg_setup(), and only under USE=test
* Call python_fix_shebang only under USE=test
* Remove no-op prestripping sed
* Update failing test list

Closes: https://github.com/gentoo/gentoo/pull/26915
Signed-off-by: Marc Cramer  posteo.net>
Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/Manifest|   1 +
 app-misc/mosquitto/mosquitto-2.0.15.ebuild | 125 +
 2 files changed, 126 insertions(+)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index c5a5d28f4bef..b02492d6ee37 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1 +1,2 @@
 DIST mosquitto-2.0.14.tar.gz 787414 BLAKE2B 
926e39756a0293404c8591e489e64e47cd95640d7884f2cfb687a0d548b709d8aff6d671a4941aae8b3506315d28567520c183b762639822d2d78afe323d111e
 SHA512 
a9e4f41b9af679b30318570e86a465546024651373df10e3b132f4593b89d22d0dbac01bb7371a57132ba030a2e73971c612acb5c9ac12f5ccd06aa38d9444c2
+DIST mosquitto-2.0.15.tar.gz 792632 BLAKE2B 
a6e986998473c16efd4c5fc5fd743782e085b3e7e30bcdcb867f0ae87f85e608f5d50d0dcc5bbbcc2f25eb6a618ab2f287fdcba47660fa593fe1636d08eb183e
 SHA512 
8a0c58222ea0b9304e7f096f6d13965478072baf1d1c9bc931b32a33f5ea8196c2dd54bde8d83fec7ed9cd413cb5fb115ce0a6701ca20664df52fdd7ca63ddaf

diff --git a/app-misc/mosquitto/mosquitto-2.0.15.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.15.ebuild
new file mode 100644
index ..a584158956db
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-2.0.15.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+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 +persistence +srv ssl tcpd test websockets"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="
+   acct-user/mosquitto
+   acct-group/mosquitto
+   dev-libs/cJSON:=
+   srv? ( net-dns/c-ares:= )
+   ssl? (
+   dev-libs/openssl:0=
+   )
+   tcpd? ( sys-apps/tcp-wrappers )
+"
+DEPEND="
+   ${RDEPEND}
+   test? ( dev-util/cunit )
+   websockets? ( net-libs/libwebsockets[lejp] )
+"
+BDEPEND="
+   test? ( ${PYTHON_DEPS} )
+"
+
+pkg_setup() {
+   use test && python_setup
+}
+
+_emake() {
+   local LIBDIR=$(get_libdir)
+   emake \
+   CC="$(tc-getCC)" \
+   CXX="$(tc-getCXX)" \
+   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 failing tests
+   sed -i \
+   -e '/06-bridge-reconnect-local-out.py/d' \
+   test/broker/Makefile || die
+   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
+
+   use test && 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
+   insinto /usr/share/mosquitto
+   doins misc/letsencrypt/mosquitto-copy.sh
+   systemd_dounit "${FILESDIR}/mosquitto.service"
+
+

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

2022-01-23 Thread Matt Turner

commit: 8555f7eccea8abff59332749e61a263409642780
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jan 24 05:51:45 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jan 24 05:55:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8555f7ec

app-misc/mosquitto: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/Manifest|   1 -
 app-misc/mosquitto/mosquitto-2.0.12.ebuild | 122 -
 2 files changed, 123 deletions(-)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 7995fc2866db..c5a5d28f4bef 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,2 +1 @@
-DIST mosquitto-2.0.12.tar.gz 783859 BLAKE2B 
3bac953fc7f49e19f1914186044c75d7f8b5b23e656acfb7d4c306740d0add20c08760fc206fc871c5cecf8500eb1c88acc4905bddce159d1e8f0c4e2c28b818
 SHA512 
acf80980f124073fd2fdd99981bde840654fb40a6b6f1d6ef483e35880b45d029cfa9390a98753de6476f4ade068266cb4c6e3c753a0362c0309a5745ac4ebab
 DIST mosquitto-2.0.14.tar.gz 787414 BLAKE2B 
926e39756a0293404c8591e489e64e47cd95640d7884f2cfb687a0d548b709d8aff6d671a4941aae8b3506315d28567520c183b762639822d2d78afe323d111e
 SHA512 
a9e4f41b9af679b30318570e86a465546024651373df10e3b132f4593b89d22d0dbac01bb7371a57132ba030a2e73971c612acb5c9ac12f5ccd06aa38d9444c2

diff --git a/app-misc/mosquitto/mosquitto-2.0.12.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.12.ebuild
deleted file mode 100644
index 48ab5d740aff..
--- a/app-misc/mosquitto/mosquitto-2.0.12.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 +persistence +srv ssl tcpd test websockets"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( bridge )"
-
-RDEPEND="
-   acct-user/mosquitto
-   acct-group/mosquitto
-   dev-libs/cJSON:=
-   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)" \
-   CXX="$(tc-getCXX)" \
-   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 '/01-connect-575314.py/d' \
-   test/broker/Makefile || die
-   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
-}
-
-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
-   insinto /usr/share/mosquitto
-   doins misc/letsencrypt/mosquitto-copy.sh
-   systemd_dounit "${FILESDIR}/mosquitto.service"
-
-   if use examples; then
-   docompress -x "/usr/share/doc/${PF}/examples"
-   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

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

2022-01-08 Thread Arthur Zamarin

commit: 4fdac498865f277fe621e35411be601f687a3154
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jan  8 10:36:08 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jan  8 10:36:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fdac498

app-misc/mosquitto: Stabilize 2.0.14 arm, #830742

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.14.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.14.ebuild
index 4c5558b40cfe..ba5ac5d51a0f 100644
--- a/app-misc/mosquitto/mosquitto-2.0.14.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.14.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 )"

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

2022-01-08 Thread Jakov Smolić

commit: 0f01d33777011f838ea2b39572834a5b5e2ba3c4
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Jan  8 10:34:45 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Jan  8 10:34:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f01d337

app-misc/mosquitto: Stabilize 2.0.14 x86, #830742

Signed-off-by: Jakov Smolić  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.14.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.14.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.14.ebuild
index 056871a3f293..20c245778616 100644
--- a/app-misc/mosquitto/mosquitto-2.0.14.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 )"

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

2022-01-08 Thread Jakov Smolić

commit: 4c0ba768b065826898939a8a6efa74da82ff1935
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Jan  8 10:34:56 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Jan  8 10:34:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c0ba768

app-misc/mosquitto: Stabilize 2.0.14 amd64, #830742

Signed-off-by: Jakov Smolić  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.14.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.14.ebuild
index 20c245778616..4c5558b40cfe 100644
--- a/app-misc/mosquitto/mosquitto-2.0.14.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.14.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 )"

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

2021-12-01 Thread Matt Turner

commit: b445ab1bfd4a8221c697e535885f17c0a7b36853
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Dec  2 01:43:03 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Dec  2 01:43:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b445ab1b

app-misc/mosquitto: Drop old

Bug: https://bugs.gentoo.org/827962
Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/Manifest|   3 -
 ...2.0.11-Fix-installation-using-WITH_TLS-no.patch |  29 -
 app-misc/mosquitto/mosquitto-1.6.15.ebuild | 114 --
 app-misc/mosquitto/mosquitto-2.0.11.ebuild | 128 -
 app-misc/mosquitto/mosquitto-2.0.13.ebuild | 122 
 5 files changed, 396 deletions(-)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 57a1ba78a9e1..7995fc2866db 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,5 +1,2 @@
-DIST mosquitto-1.6.15.tar.gz 620117 BLAKE2B 
0107ed0af902b84c73b857ccd97dfe96b1c7ed8604b843ad40f62d3f1246ded4ef1691158311ac9a672ca331f569d13547165f3a0386c77e94ddc13c8a9e3e00
 SHA512 
30fa2e8a15b87a33d6c8fc3a1f5d45d8e15d284fade116ac5b7bc8722609d565bed22ac592c303fc74352e3272067b2b0c8da463abffc6490cf959ce177329f3
-DIST mosquitto-2.0.11.tar.gz 760325 BLAKE2B 
adde701bb87ec8071eaaf74fca37f81c4eae97bf98de0fe471f1dfbfb64ccda15b34611b0ffc3d2099a37994151363ad5c717bfa7695fabc1a4927ebd14ae66e
 SHA512 
d0c7c52cb76c4711e54f841217529326d682c4decfc7a1bc96d872904e68df444ca3918fab7ba041b62f7b5420c89c631227b69a8eec51fd2e2dd480d8244710
 DIST mosquitto-2.0.12.tar.gz 783859 BLAKE2B 
3bac953fc7f49e19f1914186044c75d7f8b5b23e656acfb7d4c306740d0add20c08760fc206fc871c5cecf8500eb1c88acc4905bddce159d1e8f0c4e2c28b818
 SHA512 
acf80980f124073fd2fdd99981bde840654fb40a6b6f1d6ef483e35880b45d029cfa9390a98753de6476f4ade068266cb4c6e3c753a0362c0309a5745ac4ebab
-DIST mosquitto-2.0.13.tar.gz 786806 BLAKE2B 
83c5c93a209225a24812c494e6065fb4ed4c65ccb34ac60918e5c32683702a9d44f162ccc366d8c2612c6fa867b56e01aaea04b2387f44b77294259198439ad0
 SHA512 
f22331c0a5a501b3df50b5c4788b735599024837eec4f455d422253a20e6f4ac528044ff4a7611094af87a8059e9a836157e5dc092efedf958ed7c96e5b9f9d0
 DIST mosquitto-2.0.14.tar.gz 787414 BLAKE2B 
926e39756a0293404c8591e489e64e47cd95640d7884f2cfb687a0d548b709d8aff6d671a4941aae8b3506315d28567520c183b762639822d2d78afe323d111e
 SHA512 
a9e4f41b9af679b30318570e86a465546024651373df10e3b132f4593b89d22d0dbac01bb7371a57132ba030a2e73971c612acb5c9ac12f5ccd06aa38d9444c2

diff --git 
a/app-misc/mosquitto/files/2.0.11-Fix-installation-using-WITH_TLS-no.patch 
b/app-misc/mosquitto/files/2.0.11-Fix-installation-using-WITH_TLS-no.patch
deleted file mode 100644
index 0a08e2997f0b..
--- a/app-misc/mosquitto/files/2.0.11-Fix-installation-using-WITH_TLS-no.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 342aa0ad1a645f468a24266f402d92541d4fd58a Mon Sep 17 00:00:00 2001
-From: Roger Light 
-Date: Fri, 20 Aug 2021 23:49:59 +0100
-Subject: [PATCH] Fix installation using WITH_TLS=no.
-
-Closes #2281. Thanks to Matt Turner.

- ChangeLog.txt  | 3 +++
- apps/mosquitto_passwd/Makefile | 2 ++
- 2 files changed, 5 insertions(+)
-
-diff --git a/apps/mosquitto_passwd/Makefile b/apps/mosquitto_passwd/Makefile
-index 3238cf3e..1fbf5e12 100644
 a/apps/mosquitto_passwd/Makefile
-+++ b/apps/mosquitto_passwd/Makefile
-@@ -37,8 +37,10 @@ password_mosq.o : ../../src/password_mosq.c 
../../src/password_mosq.h
-   ${CROSS_COMPILE}${CC} $(APP_CPPFLAGS) $(APP_CFLAGS) -c $< -o $@
- 
- install : all
-+ifeq ($(WITH_TLS),yes)
-   $(INSTALL) -d "${DESTDIR}$(prefix)/bin"
-   $(INSTALL) ${STRIP_OPTS} mosquitto_passwd 
"${DESTDIR}${prefix}/bin/mosquitto_passwd"
-+endif
- 
- uninstall :
-   -rm -f "${DESTDIR}${prefix}/bin/mosquitto_passwd"
--- 
-2.31.1
-

diff --git a/app-misc/mosquitto/mosquitto-1.6.15.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.15.ebuild
deleted file mode 100644
index 63497c19ccdb..
--- a/app-misc/mosquitto/mosquitto-1.6.15.ebuild
+++ /dev/null
@@ -1,114 +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 ~arm64 ~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? (

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

2021-11-24 Thread Matt Turner

commit: 8f1651109966303d82aa67b52021328de0afd03d
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Nov 25 06:41:20 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Nov 25 06:52:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f165110

app-misc/mosquitto: Version bump to 2.0.14

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/Manifest|   1 +
 app-misc/mosquitto/mosquitto-2.0.14.ebuild | 122 +
 2 files changed, 123 insertions(+)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 6cb1210345d6..57a1ba78a9e1 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -2,3 +2,4 @@ DIST mosquitto-1.6.15.tar.gz 620117 BLAKE2B 
0107ed0af902b84c73b857ccd97dfe96b1c7
 DIST mosquitto-2.0.11.tar.gz 760325 BLAKE2B 
adde701bb87ec8071eaaf74fca37f81c4eae97bf98de0fe471f1dfbfb64ccda15b34611b0ffc3d2099a37994151363ad5c717bfa7695fabc1a4927ebd14ae66e
 SHA512 
d0c7c52cb76c4711e54f841217529326d682c4decfc7a1bc96d872904e68df444ca3918fab7ba041b62f7b5420c89c631227b69a8eec51fd2e2dd480d8244710
 DIST mosquitto-2.0.12.tar.gz 783859 BLAKE2B 
3bac953fc7f49e19f1914186044c75d7f8b5b23e656acfb7d4c306740d0add20c08760fc206fc871c5cecf8500eb1c88acc4905bddce159d1e8f0c4e2c28b818
 SHA512 
acf80980f124073fd2fdd99981bde840654fb40a6b6f1d6ef483e35880b45d029cfa9390a98753de6476f4ade068266cb4c6e3c753a0362c0309a5745ac4ebab
 DIST mosquitto-2.0.13.tar.gz 786806 BLAKE2B 
83c5c93a209225a24812c494e6065fb4ed4c65ccb34ac60918e5c32683702a9d44f162ccc366d8c2612c6fa867b56e01aaea04b2387f44b77294259198439ad0
 SHA512 
f22331c0a5a501b3df50b5c4788b735599024837eec4f455d422253a20e6f4ac528044ff4a7611094af87a8059e9a836157e5dc092efedf958ed7c96e5b9f9d0
+DIST mosquitto-2.0.14.tar.gz 787414 BLAKE2B 
926e39756a0293404c8591e489e64e47cd95640d7884f2cfb687a0d548b709d8aff6d671a4941aae8b3506315d28567520c183b762639822d2d78afe323d111e
 SHA512 
a9e4f41b9af679b30318570e86a465546024651373df10e3b132f4593b89d22d0dbac01bb7371a57132ba030a2e73971c612acb5c9ac12f5ccd06aa38d9444c2

diff --git a/app-misc/mosquitto/mosquitto-2.0.14.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.14.ebuild
new file mode 100644
index ..056871a3f293
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-2.0.14.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+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 +persistence +srv ssl tcpd test websockets"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="
+   acct-user/mosquitto
+   acct-group/mosquitto
+   dev-libs/cJSON:=
+   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)" \
+   CXX="$(tc-getCXX)" \
+   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 '/01-connect-575314.py/d' \
+   test/broker/Makefile || die
+   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
+}
+
+src_compile() {
+   _emake
+}
+
+src_test() {
+   _emake test
+}
+
+src_install() {
+   _emake DESTDIR="${D}" prefix=/usr install
+

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

2021-11-09 Thread Jakov Smolić

commit: 5562df7344e5bc72ce00ce3fff3c042afc561c7c
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Nov  9 22:05:22 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Nov  9 22:05:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5562df73

app-misc/mosquitto: Stabilize 2.0.12 x86, #819078

Signed-off-by: Jakov Smolić  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.12.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.12.ebuild
index c14cfdabf2c..48ab5d740af 100644
--- a/app-misc/mosquitto/mosquitto-2.0.12.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.12.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 )"

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

2021-11-06 Thread Matt Turner

commit: f4442d59b68a818e2ab4a7d13812999f4044ab0a
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Nov  7 04:26:06 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Nov  7 04:28:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4442d59

app-misc/mosquitto: Version bump to 2.0.13

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/Manifest|   1 +
 app-misc/mosquitto/mosquitto-2.0.13.ebuild | 122 +
 2 files changed, 123 insertions(+)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 5daa9507d7f..6cb1210345d 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,3 +1,4 @@
 DIST mosquitto-1.6.15.tar.gz 620117 BLAKE2B 
0107ed0af902b84c73b857ccd97dfe96b1c7ed8604b843ad40f62d3f1246ded4ef1691158311ac9a672ca331f569d13547165f3a0386c77e94ddc13c8a9e3e00
 SHA512 
30fa2e8a15b87a33d6c8fc3a1f5d45d8e15d284fade116ac5b7bc8722609d565bed22ac592c303fc74352e3272067b2b0c8da463abffc6490cf959ce177329f3
 DIST mosquitto-2.0.11.tar.gz 760325 BLAKE2B 
adde701bb87ec8071eaaf74fca37f81c4eae97bf98de0fe471f1dfbfb64ccda15b34611b0ffc3d2099a37994151363ad5c717bfa7695fabc1a4927ebd14ae66e
 SHA512 
d0c7c52cb76c4711e54f841217529326d682c4decfc7a1bc96d872904e68df444ca3918fab7ba041b62f7b5420c89c631227b69a8eec51fd2e2dd480d8244710
 DIST mosquitto-2.0.12.tar.gz 783859 BLAKE2B 
3bac953fc7f49e19f1914186044c75d7f8b5b23e656acfb7d4c306740d0add20c08760fc206fc871c5cecf8500eb1c88acc4905bddce159d1e8f0c4e2c28b818
 SHA512 
acf80980f124073fd2fdd99981bde840654fb40a6b6f1d6ef483e35880b45d029cfa9390a98753de6476f4ade068266cb4c6e3c753a0362c0309a5745ac4ebab
+DIST mosquitto-2.0.13.tar.gz 786806 BLAKE2B 
83c5c93a209225a24812c494e6065fb4ed4c65ccb34ac60918e5c32683702a9d44f162ccc366d8c2612c6fa867b56e01aaea04b2387f44b77294259198439ad0
 SHA512 
f22331c0a5a501b3df50b5c4788b735599024837eec4f455d422253a20e6f4ac528044ff4a7611094af87a8059e9a836157e5dc092efedf958ed7c96e5b9f9d0

diff --git a/app-misc/mosquitto/mosquitto-2.0.13.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.13.ebuild
new file mode 100644
index 000..056871a3f29
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-2.0.13.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+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 +persistence +srv ssl tcpd test websockets"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="
+   acct-user/mosquitto
+   acct-group/mosquitto
+   dev-libs/cJSON:=
+   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)" \
+   CXX="$(tc-getCXX)" \
+   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 '/01-connect-575314.py/d' \
+   test/broker/Makefile || die
+   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
+}
+
+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
+

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

2021-11-06 Thread Sam James

commit: 91587a4954346e8c465173a85a13f470d9329fa4
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov  7 02:17:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov  7 02:17:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91587a49

app-misc/mosquitto: don't call c++ directly (fixes cross-compilation)

Closes: https://bugs.gentoo.org/793740
Signed-off-by: Sam James  gentoo.org>

 app-misc/mosquitto/mosquitto-1.6.15.ebuild | 1 +
 app-misc/mosquitto/mosquitto-2.0.11.ebuild | 1 +
 app-misc/mosquitto/mosquitto-2.0.12.ebuild | 1 +
 3 files changed, 3 insertions(+)

diff --git a/app-misc/mosquitto/mosquitto-1.6.15.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.15.ebuild
index e6439ec04b8..63497c19ccd 100644
--- a/app-misc/mosquitto/mosquitto-1.6.15.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.15.ebuild
@@ -36,6 +36,7 @@ _emake() {
local LIBDIR=$(get_libdir)
emake \
CC="$(tc-getCC)" \
+   CXX="$(tc-getCXX)" \
CLIENT_LDFLAGS="${LDFLAGS}" \
LIB_SUFFIX="${LIBDIR:3}" \
WITH_BRIDGE="$(usex bridge)" \

diff --git a/app-misc/mosquitto/mosquitto-2.0.11.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.11.ebuild
index 381c55f77b1..51e634414e8 100644
--- a/app-misc/mosquitto/mosquitto-2.0.11.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.11.ebuild
@@ -41,6 +41,7 @@ _emake() {
local LIBDIR=$(get_libdir)
emake \
CC="$(tc-getCC)" \
+   CXX="$(tc-getCXX)" \
CLIENT_LDFLAGS="${LDFLAGS}" \
LIB_SUFFIX="${LIBDIR:3}" \
WITH_BRIDGE="$(usex bridge)" \

diff --git a/app-misc/mosquitto/mosquitto-2.0.12.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.12.ebuild
index a92c72a7902..c14cfdabf2c 100644
--- a/app-misc/mosquitto/mosquitto-2.0.12.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.12.ebuild
@@ -37,6 +37,7 @@ _emake() {
local LIBDIR=$(get_libdir)
emake \
CC="$(tc-getCC)" \
+   CXX="$(tc-getCXX)" \
CLIENT_LDFLAGS="${LDFLAGS}" \
LIB_SUFFIX="${LIBDIR:3}" \
WITH_BRIDGE="$(usex bridge)" \

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

2021-11-03 Thread Jakov Smolić

commit: 69dd051476800339e96445ca58fa77edc8d1228d
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Nov  4 00:42:00 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Nov  4 00:42:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69dd0514

app-misc/mosquitto: Stabilize 2.0.12 amd64, #819078

Signed-off-by: Jakov Smolić  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.12.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.12.ebuild
index f7492567a6b..a92c72a7902 100644
--- a/app-misc/mosquitto/mosquitto-2.0.12.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.12.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 )"

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

2021-10-29 Thread Sam James

commit: f4aade52b0340b881f3854f87053b8b53dbe4785
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 29 11:14:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 29 11:14:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4aade52

app-misc/mosquitto: Stabilize 2.0.12 arm, #819078

Signed-off-by: Sam James  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.12.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.12.ebuild
index ca44457030a..f7492567a6b 100644
--- a/app-misc/mosquitto/mosquitto-2.0.12.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.12.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 )"

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

2021-09-09 Thread Matt Turner

commit: aa4abe9c6239fc1cd82c0036692be3ababeb3423
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Sep 10 00:21:11 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Sep 10 01:19:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa4abe9c

app-misc/mosquitto: Version bump to 2.0.12

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/Manifest|   1 +
 app-misc/mosquitto/mosquitto-2.0.12.ebuild | 121 +
 2 files changed, 122 insertions(+)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index c809b1ab6bf..5daa9507d7f 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,2 +1,3 @@
 DIST mosquitto-1.6.15.tar.gz 620117 BLAKE2B 
0107ed0af902b84c73b857ccd97dfe96b1c7ed8604b843ad40f62d3f1246ded4ef1691158311ac9a672ca331f569d13547165f3a0386c77e94ddc13c8a9e3e00
 SHA512 
30fa2e8a15b87a33d6c8fc3a1f5d45d8e15d284fade116ac5b7bc8722609d565bed22ac592c303fc74352e3272067b2b0c8da463abffc6490cf959ce177329f3
 DIST mosquitto-2.0.11.tar.gz 760325 BLAKE2B 
adde701bb87ec8071eaaf74fca37f81c4eae97bf98de0fe471f1dfbfb64ccda15b34611b0ffc3d2099a37994151363ad5c717bfa7695fabc1a4927ebd14ae66e
 SHA512 
d0c7c52cb76c4711e54f841217529326d682c4decfc7a1bc96d872904e68df444ca3918fab7ba041b62f7b5420c89c631227b69a8eec51fd2e2dd480d8244710
+DIST mosquitto-2.0.12.tar.gz 783859 BLAKE2B 
3bac953fc7f49e19f1914186044c75d7f8b5b23e656acfb7d4c306740d0add20c08760fc206fc871c5cecf8500eb1c88acc4905bddce159d1e8f0c4e2c28b818
 SHA512 
acf80980f124073fd2fdd99981bde840654fb40a6b6f1d6ef483e35880b45d029cfa9390a98753de6476f4ade068266cb4c6e3c753a0362c0309a5745ac4ebab

diff --git a/app-misc/mosquitto/mosquitto-2.0.12.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.12.ebuild
new file mode 100644
index 000..ca44457030a
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-2.0.12.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+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 +persistence +srv ssl tcpd test websockets"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="
+   acct-user/mosquitto
+   acct-group/mosquitto
+   dev-libs/cJSON:=
+   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 '/01-connect-575314.py/d' \
+   test/broker/Makefile || die
+   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
+}
+
+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
+   insinto /usr/share/mosquitto
+   doins misc/letsencrypt/mosquitto-copy.sh
+   systemd_dounit "${FILESDIR}/mosquitto.service"
+
+   if use examples; then
+

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

2021-08-20 Thread Matt Turner

commit: 49d86e3fbe90ef95a393ebd628174f38b5a514a4
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Aug 21 00:43:17 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Aug 21 00:44:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49d86e3f

app-misc/mosquitto: Fix installation with USE=-ssl

Closes: https://bugs.gentoo.org/806244
Signed-off-by: Matt Turner  gentoo.org>

 ...2.0.11-Fix-installation-using-WITH_TLS-no.patch | 29 ++
 app-misc/mosquitto/mosquitto-2.0.11.ebuild |  4 +++
 2 files changed, 33 insertions(+)

diff --git 
a/app-misc/mosquitto/files/2.0.11-Fix-installation-using-WITH_TLS-no.patch 
b/app-misc/mosquitto/files/2.0.11-Fix-installation-using-WITH_TLS-no.patch
new file mode 100644
index 000..0a08e2997f0
--- /dev/null
+++ b/app-misc/mosquitto/files/2.0.11-Fix-installation-using-WITH_TLS-no.patch
@@ -0,0 +1,29 @@
+From 342aa0ad1a645f468a24266f402d92541d4fd58a Mon Sep 17 00:00:00 2001
+From: Roger Light 
+Date: Fri, 20 Aug 2021 23:49:59 +0100
+Subject: [PATCH] Fix installation using WITH_TLS=no.
+
+Closes #2281. Thanks to Matt Turner.
+---
+ ChangeLog.txt  | 3 +++
+ apps/mosquitto_passwd/Makefile | 2 ++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/apps/mosquitto_passwd/Makefile b/apps/mosquitto_passwd/Makefile
+index 3238cf3e..1fbf5e12 100644
+--- a/apps/mosquitto_passwd/Makefile
 b/apps/mosquitto_passwd/Makefile
+@@ -37,8 +37,10 @@ password_mosq.o : ../../src/password_mosq.c 
../../src/password_mosq.h
+   ${CROSS_COMPILE}${CC} $(APP_CPPFLAGS) $(APP_CFLAGS) -c $< -o $@
+ 
+ install : all
++ifeq ($(WITH_TLS),yes)
+   $(INSTALL) -d "${DESTDIR}$(prefix)/bin"
+   $(INSTALL) ${STRIP_OPTS} mosquitto_passwd 
"${DESTDIR}${prefix}/bin/mosquitto_passwd"
++endif
+ 
+ uninstall :
+   -rm -f "${DESTDIR}${prefix}/bin/mosquitto_passwd"
+-- 
+2.31.1
+

diff --git a/app-misc/mosquitto/mosquitto-2.0.11.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.11.ebuild
index f8288904bbe..381c55f77b1 100644
--- a/app-misc/mosquitto/mosquitto-2.0.11.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.11.ebuild
@@ -33,6 +33,10 @@ DEPEND="${PYTHON_DEPS}
test? ( dev-util/cunit )
websockets? ( net-libs/libwebsockets[lejp] )"
 
+PATCHES=(
+   "${FILESDIR}"/${PV}-Fix-installation-using-WITH_TLS-no.patch
+)
+
 _emake() {
local LIBDIR=$(get_libdir)
emake \

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

2021-08-19 Thread Matt Turner

commit: ba487d3d9d34fa0dac16a847712aaae2538d9c7a
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Aug 19 19:02:33 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Aug 19 19:02:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba487d3d

app-misc/mosquitto: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/Manifest|   1 -
 app-misc/mosquitto/mosquitto-2.0.10.ebuild | 123 -
 2 files changed, 124 deletions(-)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 2eed118b798..c809b1ab6bf 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,3 +1,2 @@
 DIST mosquitto-1.6.15.tar.gz 620117 BLAKE2B 
0107ed0af902b84c73b857ccd97dfe96b1c7ed8604b843ad40f62d3f1246ded4ef1691158311ac9a672ca331f569d13547165f3a0386c77e94ddc13c8a9e3e00
 SHA512 
30fa2e8a15b87a33d6c8fc3a1f5d45d8e15d284fade116ac5b7bc8722609d565bed22ac592c303fc74352e3272067b2b0c8da463abffc6490cf959ce177329f3
-DIST mosquitto-2.0.10.tar.gz 759106 BLAKE2B 
9cf94d29ee52a9086d8be176f5bba12b8b958a758fc03765c95298a5e7752c63510f6e12915a67d92a4e49b3ecfaa897b615b825375540728681bc9d628a992c
 SHA512 
c356bfe5dc9317e1943cf14c20ae52af544aefc0138349abd3be5001032ce63579aa059dd62901a0802f08d059a9dc29b6fbcba852e3c4cd702189433ceac174
 DIST mosquitto-2.0.11.tar.gz 760325 BLAKE2B 
adde701bb87ec8071eaaf74fca37f81c4eae97bf98de0fe471f1dfbfb64ccda15b34611b0ffc3d2099a37994151363ad5c717bfa7695fabc1a4927ebd14ae66e
 SHA512 
d0c7c52cb76c4711e54f841217529326d682c4decfc7a1bc96d872904e68df444ca3918fab7ba041b62f7b5420c89c631227b69a8eec51fd2e2dd480d8244710

diff --git a/app-misc/mosquitto/mosquitto-2.0.10.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.10.ebuild
deleted file mode 100644
index efe0bf46447..000
--- a/app-misc/mosquitto/mosquitto-2.0.10.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
-
-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 +persistence +srv ssl tcpd test websockets"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( bridge )"
-
-RDEPEND="
-   acct-user/mosquitto
-   acct-group/mosquitto
-   dev-libs/cJSON:=
-   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
-
-   # 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
-}
-
-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
-

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

2021-08-19 Thread Matt Turner

commit: edc82ecaaf3dc14bb9061021af8a9f47e49b73c6
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Aug 19 19:02:22 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Aug 19 19:02:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edc82eca

app-misc/mosquitto: Propagate stable keywords

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.11.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.11.ebuild
index 7e129f60e2c..f8288904bbe 100644
--- a/app-misc/mosquitto/mosquitto-2.0.11.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.11.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 )"

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

2021-06-17 Thread Matt Turner

commit: fbb4410e49b51f8686eb8df806c8ebaa12cbb21d
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Jun 18 03:52:37 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Jun 18 05:10:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbb4410e

app-misc/mosquitto: Version bump to 1.6.15

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/Manifest|   1 +
 app-misc/mosquitto/mosquitto-1.6.15.ebuild | 113 +
 2 files changed, 114 insertions(+)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 93f377981e0..fa739219676 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,5 +1,6 @@
 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.15.tar.gz 620117 BLAKE2B 
0107ed0af902b84c73b857ccd97dfe96b1c7ed8604b843ad40f62d3f1246ded4ef1691158311ac9a672ca331f569d13547165f3a0386c77e94ddc13c8a9e3e00
 SHA512 
30fa2e8a15b87a33d6c8fc3a1f5d45d8e15d284fade116ac5b7bc8722609d565bed22ac592c303fc74352e3272067b2b0c8da463abffc6490cf959ce177329f3
 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-2.0.10.tar.gz 759106 BLAKE2B 
9cf94d29ee52a9086d8be176f5bba12b8b958a758fc03765c95298a5e7752c63510f6e12915a67d92a4e49b3ecfaa897b615b825375540728681bc9d628a992c
 SHA512 
c356bfe5dc9317e1943cf14c20ae52af544aefc0138349abd3be5001032ce63579aa059dd62901a0802f08d059a9dc29b6fbcba852e3c4cd702189433ceac174

diff --git a/app-misc/mosquitto/mosquitto-1.6.15.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.15.ebuild
new file mode 100644
index 000..e6439ec04b8
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.6.15.ebuild
@@ -0,0 +1,113 @@
+# 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 ~arm64 ~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' \
+

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

2021-06-17 Thread Matt Turner

commit: f0290f7ff6d164ed37b5f179befadb8a478b9708
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Jun 18 03:53:57 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Jun 18 05:10:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0290f7f

app-misc/mosquitto: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/Manifest|   4 -
 app-misc/mosquitto/mosquitto-1.6.10.ebuild | 113 -
 app-misc/mosquitto/mosquitto-1.6.12.ebuild | 113 -
 app-misc/mosquitto/mosquitto-1.6.8.ebuild  | 113 -
 app-misc/mosquitto/mosquitto-1.6.9.ebuild  | 113 -
 5 files changed, 456 deletions(-)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index fa739219676..2eed118b798 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,7 +1,3 @@
-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.15.tar.gz 620117 BLAKE2B 
0107ed0af902b84c73b857ccd97dfe96b1c7ed8604b843ad40f62d3f1246ded4ef1691158311ac9a672ca331f569d13547165f3a0386c77e94ddc13c8a9e3e00
 SHA512 
30fa2e8a15b87a33d6c8fc3a1f5d45d8e15d284fade116ac5b7bc8722609d565bed22ac592c303fc74352e3272067b2b0c8da463abffc6490cf959ce177329f3
-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-2.0.10.tar.gz 759106 BLAKE2B 
9cf94d29ee52a9086d8be176f5bba12b8b958a758fc03765c95298a5e7752c63510f6e12915a67d92a4e49b3ecfaa897b615b825375540728681bc9d628a992c
 SHA512 
c356bfe5dc9317e1943cf14c20ae52af544aefc0138349abd3be5001032ce63579aa059dd62901a0802f08d059a9dc29b6fbcba852e3c4cd702189433ceac174
 DIST mosquitto-2.0.11.tar.gz 760325 BLAKE2B 
adde701bb87ec8071eaaf74fca37f81c4eae97bf98de0fe471f1dfbfb64ccda15b34611b0ffc3d2099a37994151363ad5c717bfa7695fabc1a4927ebd14ae66e
 SHA512 
d0c7c52cb76c4711e54f841217529326d682c4decfc7a1bc96d872904e68df444ca3918fab7ba041b62f7b5420c89c631227b69a8eec51fd2e2dd480d8244710

diff --git a/app-misc/mosquitto/mosquitto-1.6.10.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.10.ebuild
deleted file mode 100644
index e6439ec04b8..000
--- a/app-misc/mosquitto/mosquitto-1.6.10.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 ~arm64 ~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

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

2021-06-17 Thread Matt Turner

commit: fd37f11ed00dda3990fa10e2a73cef773f97b1c4
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Jun 18 03:46:29 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Jun 18 05:10:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd37f11e

app-misc/mosquitto: Version bump to 2.0.11

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/Manifest|   1 +
 app-misc/mosquitto/mosquitto-2.0.11.ebuild | 123 +
 2 files changed, 124 insertions(+)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index c00299cfbf6..93f377981e0 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -3,3 +3,4 @@ DIST mosquitto-1.6.12.tar.gz 618718 BLAKE2B 
4e7744d212f0fda980e485d102702547e76b
 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-2.0.10.tar.gz 759106 BLAKE2B 
9cf94d29ee52a9086d8be176f5bba12b8b958a758fc03765c95298a5e7752c63510f6e12915a67d92a4e49b3ecfaa897b615b825375540728681bc9d628a992c
 SHA512 
c356bfe5dc9317e1943cf14c20ae52af544aefc0138349abd3be5001032ce63579aa059dd62901a0802f08d059a9dc29b6fbcba852e3c4cd702189433ceac174
+DIST mosquitto-2.0.11.tar.gz 760325 BLAKE2B 
adde701bb87ec8071eaaf74fca37f81c4eae97bf98de0fe471f1dfbfb64ccda15b34611b0ffc3d2099a37994151363ad5c717bfa7695fabc1a4927ebd14ae66e
 SHA512 
d0c7c52cb76c4711e54f841217529326d682c4decfc7a1bc96d872904e68df444ca3918fab7ba041b62f7b5420c89c631227b69a8eec51fd2e2dd480d8244710

diff --git a/app-misc/mosquitto/mosquitto-2.0.11.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.11.ebuild
new file mode 100644
index 000..7e129f60e2c
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-2.0.11.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+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 +persistence +srv ssl tcpd test websockets"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="
+   acct-user/mosquitto
+   acct-group/mosquitto
+   dev-libs/cJSON:=
+   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
+
+   # 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

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

2021-06-17 Thread Matt Turner

commit: d0e14624070f044ee4d0d2f4c1359cb15b649ab9
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Jun 18 02:14:27 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Jun 18 05:10:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0e14624

app-misc/mosquitto: Stabilize 2.0.10 arm, #793107

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.10.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.10.ebuild
index fca14e3becf..efe0bf46447 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 )"

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

2021-06-17 Thread Matt Turner

commit: fac38a8c716691174a9fe30801631690cdbde67d
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Jun 18 02:14:04 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Jun 18 05:10:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fac38a8c

app-misc/mosquitto: Stabilize 2.0.10 x86, #793107

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.10.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.10.ebuild
index 9c04ec32665..fca14e3becf 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 )"

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

2021-06-17 Thread Matt Turner

commit: b1777bbb3d5f288ce8185f06162f2747a6329403
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Jun 18 05:08:01 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Jun 18 05:10:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1777bbb

app-misc/mosquitto: Add migration elog info

And provide mosquitto-copy.sh.

Closes: https://bugs.gentoo.org/794070
Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.10.ebuild | 18 ++
 1 file changed, 18 insertions(+)

diff --git a/app-misc/mosquitto/mosquitto-2.0.10.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.10.ebuild
index 9129a115a3e..bfc38380fd1 100644
--- a/app-misc/mosquitto/mosquitto-2.0.10.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.10.ebuild
@@ -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
+}

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

2021-06-17 Thread Matt Turner

commit: 2c4745077009e4548ed09fc7573ecc410b5ae336
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Jun 18 02:13:56 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Jun 18 05:10:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c474507

app-misc/mosquitto: Stabilize 2.0.10 amd64, #793107

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.10.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.10.ebuild
index bfc38380fd1..9c04ec32665 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 )"

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

2021-05-07 Thread Thomas Deutschmann

commit: 4a78af0dbe2604bc375c3a5240959cc5ea882313
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat May  8 02:07:35 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat May  8 02:07:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a78af0d

app-misc/mosquitto: x86 keyworded (bug #782574)

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.10.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.10.ebuild
index 7ed6b145a41..9129a115a3e 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"

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

2021-05-02 Thread Mikle Kolyada

commit: 1f7f61f1d5e8a74329dc808925d8174747bf4061
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May  2 19:53:16 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May  2 19:53:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f7f61f1

app-misc/mosquitto: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 app-misc/mosquitto/mosquitto-1.6.10.ebuild | 7 +++
 app-misc/mosquitto/mosquitto-1.6.12.ebuild | 7 +++
 app-misc/mosquitto/mosquitto-1.6.8.ebuild  | 7 +++
 app-misc/mosquitto/mosquitto-1.6.9.ebuild  | 7 +++
 app-misc/mosquitto/mosquitto-2.0.10.ebuild | 5 ++---
 5 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/app-misc/mosquitto/mosquitto-1.6.10.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.10.ebuild
index 3711e89f61d..e6439ec04b8 100644
--- a/app-misc/mosquitto/mosquitto-1.6.10.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ 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"
+IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( bridge )"
@@ -23,8 +23,7 @@ RDEPEND="
acct-group/mosquitto
srv? ( net-dns/c-ares:= )
ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
)
tcpd? ( sys-apps/tcp-wrappers )"
 

diff --git a/app-misc/mosquitto/mosquitto-1.6.12.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.12.ebuild
index a60ecf8a3ca..3e4e46ebc04 100644
--- a/app-misc/mosquitto/mosquitto-1.6.12.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ 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"
+IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( bridge )"
@@ -23,8 +23,7 @@ RDEPEND="
acct-group/mosquitto
srv? ( net-dns/c-ares:= )
ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
)
tcpd? ( sys-apps/tcp-wrappers )"
 

diff --git a/app-misc/mosquitto/mosquitto-1.6.8.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.8.ebuild
index a3a8a935d8c..f5044e2f0b3 100644
--- a/app-misc/mosquitto/mosquitto-1.6.8.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz;
 LICENSE="EPL-1.0"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
-IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
+IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( bridge )"
@@ -23,8 +23,7 @@ RDEPEND="
acct-group/mosquitto
srv? ( net-dns/c-ares:= )
ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
)
tcpd? ( sys-apps/tcp-wrappers )"
 

diff --git a/app-misc/mosquitto/mosquitto-1.6.9.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.9.ebuild
index 44b883762e6..951f69319f6 100644
--- a/app-misc/mosquitto/mosquitto-1.6.9.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz;
 LICENSE="EPL-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
+IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( bridge )"
@@ -23,8 +23,7 @@ RDEPEND="
acct-group/mosquitto
srv? ( net-dns/c-ares:= )
ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
)
tcpd? ( sys-apps/tcp-wrappers )"
 

diff --git a/app-misc/mosquitto/mosquitto-2.0.10.ebuild

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

2021-04-27 Thread Sam James

commit: 19303554f32ac83a175f87fdfff7e1b2fc35f330
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 27 22:03:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 27 22:03:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19303554

app-misc/mosquitto: Keyword 2.0.10 arm, #782574

Signed-off-by: Sam James  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.10.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.10.ebuild
index bf4ac71c45e..40fa1801f2c 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 ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64"
 IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"

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

2021-04-27 Thread Sam James

commit: f69fb6bdf143e2a49349ca7045f60d4400680a2a
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 27 22:00:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 27 22:01:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f69fb6bd

app-misc/mosquitto: Keyword 2.0.10 arm64, #782574

Signed-off-by: Sam James  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.10.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.10.ebuild
index e4b7f99a67c..bf4ac71c45e 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"
+KEYWORDS="~amd64 ~arm64"
 IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"

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

2021-04-09 Thread Matt Turner

commit: 0d9648667b07ccba56fdf353726db7cc905ae6a1
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Apr  9 14:18:41 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Apr  9 14:20:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d964866

app-misc/mosquitto: Fix README installation

Closes: https://bugs.gentoo.org/781620
Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/mosquitto-2.0.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-2.0.10.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.10.ebuild
index a43bba7dc0d..e4b7f99a67c 100644
--- a/app-misc/mosquitto/mosquitto-2.0.10.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.10.ebuild
@@ -93,7 +93,7 @@ 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

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

2021-04-08 Thread Matt Turner

commit: 537405bd3918200974174660c761ccbbb0481ac3
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jan  3 23:16:18 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Apr  9 01:33:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=537405bd

app-misc/mosquitto: Version bump to 2.0.10

Closes: https://bugs.gentoo.org/768480
Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/Manifest|   1 +
 app-misc/mosquitto/mosquitto-2.0.10.ebuild | 106 +
 2 files changed, 107 insertions(+)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index fb616ab7881..c00299cfbf6 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -2,3 +2,4 @@ DIST mosquitto-1.6.10.tar.gz 613060 BLAKE2B 
8c148479f79a1aa8a9abdb2bd386dbf9466f
 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-2.0.10.tar.gz 759106 BLAKE2B 
9cf94d29ee52a9086d8be176f5bba12b8b958a758fc03765c95298a5e7752c63510f6e12915a67d92a4e49b3ecfaa897b615b825375540728681bc9d628a992c
 SHA512 
c356bfe5dc9317e1943cf14c20ae52af544aefc0138349abd3be5001032ce63579aa059dd62901a0802f08d059a9dc29b6fbcba852e3c4cd702189433ceac174

diff --git a/app-misc/mosquitto/mosquitto-2.0.10.ebuild 
b/app-misc/mosquitto/mosquitto-2.0.10.ebuild
new file mode 100644
index 000..a43bba7dc0d
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-2.0.10.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+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"
+IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="
+   acct-user/mosquitto
+   acct-group/mosquitto
+   dev-libs/cJSON:=
+   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
+
+   # Extend test timeout to prevent spurious failures
+   sed -i -e 's/SUB_TIMEOUT=1/SUB_TIMEOUT=3/' \
+

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

2020-10-31 Thread Piotr Karbowski

commit: ce2da29230306042ec8eb3071085f8df1aca59f6
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Sat Oct 31 16:12:31 2020 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Sat Oct 31 16:13:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce2da292

app-misc/mosquitto: 1.6.12 amd64 stable.

Signed-off-by: Piotr Karbowski  gentoo.org>

 app-misc/mosquitto/mosquitto-1.6.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-1.6.12.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.12.ebuild
index 3a7880c5f7e..fbf327498fa 100644
--- a/app-misc/mosquitto/mosquitto-1.6.12.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.12.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 libressl +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"

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

2020-10-12 Thread Agostino Sarubbo

commit: d60c0e5b7e1a453c1ad3a5faa10a180a61ad7325
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Oct 12 06:57:23 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Oct 12 06:57:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d60c0e5b

app-misc/mosquitto: arm stable wrt bug #744394

Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-misc/mosquitto/mosquitto-1.6.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-1.6.12.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.12.ebuild
index 63ca564833a..3a7880c5f7e 100644
--- a/app-misc/mosquitto/mosquitto-1.6.12.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.12.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 libressl +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"

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

2020-08-24 Thread Matt Turner

commit: c951a763f707ca38a385245ecfe2bc840caf3d5d
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Aug 24 20:44:17 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Aug 24 21:01:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c951a763

app-misc/mosquitto: Version bump to 1.6.12

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/Manifest|   1 +
 app-misc/mosquitto/mosquitto-1.6.12.ebuild | 114 +
 2 files changed, 115 insertions(+)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 03eb2b2d7e9..fb616ab7881 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,3 +1,4 @@
 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

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 000..63ca564833a
--- /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
+

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

2020-07-23 Thread Sam James

commit: 71d6e42b423bcc4e755fa254a5878b4df3b5ef16
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 23 23:19:52 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 23 23:19:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d6e42b

app-misc/mosquitto: arm64 keyworded (bug #733658)

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 app-misc/mosquitto/mosquitto-1.6.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-1.6.10.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.10.ebuild
index 4b5abada49c..63ca564833a 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 )"

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

2020-06-30 Thread Matt Turner

commit: 0a8337be6e3e94db1635ad42fdefc741bb14c416
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Jul  1 02:06:36 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Jul  1 02:49:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a8337be

app-misc/mosquitto: Version bump to 1.6.10

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/Manifest|   1 +
 app-misc/mosquitto/mosquitto-1.6.10.ebuild | 114 +
 2 files changed, 115 insertions(+)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 964e6a872bc..03eb2b2d7e9 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,2 +1,3 @@
+DIST mosquitto-1.6.10.tar.gz 613060 BLAKE2B 
8c148479f79a1aa8a9abdb2bd386dbf9466f1afa41f4e0ed4d29a52adf7571ebca47231f32ec8cbf2760eb7a27bd6633985851fe4c8cb413572c32588a12097b
 SHA512 
2050a7a7af864057a177728f1cab9f6db70d6d1ea609d90c637723c2c9cfc9716429739302abd6742bde932716fae340854fff35956693dfee4ef31ce7b04a25
 DIST mosquitto-1.6.8.tar.gz 589873 BLAKE2B 
aa2e13397f7d4b6305af3180cd042cd143054e154cf8e6d93b05bc5a10d48419174711a1893fe60c1303a2f83cfbc5341cf03ec595e3640f503a2407e869491b
 SHA512 
c15897df4e0979ee29a1e67cc671f56db600a078e9eb0bea376248b3f53b13ceed36616ad3678e2c9e07d6834a6d75e4efca2c40086069c1546e0223be04c071
 DIST mosquitto-1.6.9.tar.gz 610934 BLAKE2B 
59d126a2b26be895f078be0c0dcf3513e56fc135dc956d9361ee191bd7ad6972b4692cd1824ad7a4e86a982df70c1e198e937f9ab23bf778069690098f87c815
 SHA512 
f78228a1e8305e4d89b34250981ed2c5fe5317636003636dc90f6fa2b1e3ca3c8fadb705ee7301f5252456cb093a6547bd46a255ca3d9fb5cdced697738d6eb7

diff --git a/app-misc/mosquitto/mosquitto-1.6.10.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.10.ebuild
new file mode 100644
index 000..4b5abada49c
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.6.10.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 ~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

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

2020-03-19 Thread Matt Turner

commit: 6ae4f2e8b50ff667b90ccfc6a7a1185387530975
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Mar 19 17:35:57 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Mar 19 17:38:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ae4f2e8

app-misc/mosquitto: Version bump to 1.6.9

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/Manifest   |   1 +
 app-misc/mosquitto/metadata.xml   |   3 +
 app-misc/mosquitto/mosquitto-1.6.9.ebuild | 114 ++
 3 files changed, 118 insertions(+)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 09fe6ec0cc8..964e6a872bc 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1 +1,2 @@
 DIST mosquitto-1.6.8.tar.gz 589873 BLAKE2B 
aa2e13397f7d4b6305af3180cd042cd143054e154cf8e6d93b05bc5a10d48419174711a1893fe60c1303a2f83cfbc5341cf03ec595e3640f503a2407e869491b
 SHA512 
c15897df4e0979ee29a1e67cc671f56db600a078e9eb0bea376248b3f53b13ceed36616ad3678e2c9e07d6834a6d75e4efca2c40086069c1546e0223be04c071
+DIST mosquitto-1.6.9.tar.gz 610934 BLAKE2B 
59d126a2b26be895f078be0c0dcf3513e56fc135dc956d9361ee191bd7ad6972b4692cd1824ad7a4e86a982df70c1e198e937f9ab23bf778069690098f87c815
 SHA512 
f78228a1e8305e4d89b34250981ed2c5fe5317636003636dc90f6fa2b1e3ca3c8fadb705ee7301f5252456cb093a6547bd46a255ca3d9fb5cdced697738d6eb7

diff --git a/app-misc/mosquitto/metadata.xml b/app-misc/mosquitto/metadata.xml
index 3dda59ac8d5..029cf18b51f 100644
--- a/app-misc/mosquitto/metadata.xml
+++ b/app-misc/mosquitto/metadata.xml
@@ -11,4 +11,7 @@
Include SRV lookup support.
Support the WebSocket protocol.

+   
+   eclipse/mosquitto
+   
 

diff --git a/app-misc/mosquitto/mosquitto-1.6.9.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.9.ebuild
new file mode 100644
index 000..4b5abada49c
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.6.9.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 ~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
+

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

2020-02-24 Thread Matt Turner

commit: 52dbd30a43aad4917a57cd1262ce2bb380d91085
Author: Lucas Ramage  protonmail  com>
AuthorDate: Mon Feb 24 19:47:36 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Feb 25 00:18:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52dbd30a

app-misc/mosquitto: Remove myself as maintainer

Closes: https://github.com/gentoo/gentoo/pull/14763
Signed-off-by: Lucas Ramage  protonmail.com>
Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/metadata.xml | 8 
 1 file changed, 8 deletions(-)

diff --git a/app-misc/mosquitto/metadata.xml b/app-misc/mosquitto/metadata.xml
index 821a61e2143..3dda59ac8d5 100644
--- a/app-misc/mosquitto/metadata.xml
+++ b/app-misc/mosquitto/metadata.xml
@@ -5,14 +5,6 @@
matts...@gentoo.org
Matt Turner

-   
-   ramage.lu...@protonmail.com
-   Lucas Ramage
-   
-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   

Enable bridge support in the MQTT 
broker.
Store messages and subscriptions to a 
file.

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

2020-01-31 Thread Matt Turner

commit: 2ab721cd655c89dc89af11136da2e2cc8cd596b8
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Feb  1 00:04:57 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Feb  1 00:08:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ab721cd

app-misc/mosquitto: Add myself as a maintainer

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/app-misc/mosquitto/metadata.xml b/app-misc/mosquitto/metadata.xml
index ec6718456c6..821a61e2143 100644
--- a/app-misc/mosquitto/metadata.xml
+++ b/app-misc/mosquitto/metadata.xml
@@ -1,6 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+   
+   matts...@gentoo.org
+   Matt Turner
+   

ramage.lu...@protonmail.com
Lucas Ramage

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

2020-01-22 Thread Matt Turner

commit: 3ca8da82ae3bde937b68ec88d5971d04aafdd0fb
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Jan 23 03:04:45 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Jan 23 03:09:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ca8da82

app-misc/mosquitto-1.6.8: arm stable, bug 705512

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/mosquitto-1.6.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-1.6.8.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.8.ebuild
index 87e7f10973d..491f0ca1ecc 100644
--- a/app-misc/mosquitto/mosquitto-1.6.8.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.8.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 x86"
 IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"

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

2020-01-22 Thread Matt Turner

commit: 703ff764832065558f514162664ac1e8d548c348
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Jan 23 03:08:38 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Jan 23 03:09:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=703ff764

app-misc/mosquitto: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/Manifest   |   1 -
 app-misc/mosquitto/mosquitto-1.6.7.ebuild | 114 --
 2 files changed, 115 deletions(-)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 430e2c8db3b..09fe6ec0cc8 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,2 +1 @@
-DIST mosquitto-1.6.7.tar.gz 591062 BLAKE2B 
a215e311197fd84f1fa1ff0b681c8d1157db1a3e538a5a16afa1f11d17a08a720d44ae16b306cb08d6b585c8c4d4b2e38df972ceebc4634c727f4c8e0994c170
 SHA512 
0a75cf192483053ce78c6d9e3be158bdf66366d7731a68cf29e24731f6936027af1d86045c2b973f642e42e58efa033dbfd17842e3e95550bac4c1f44ab346e9
 DIST mosquitto-1.6.8.tar.gz 589873 BLAKE2B 
aa2e13397f7d4b6305af3180cd042cd143054e154cf8e6d93b05bc5a10d48419174711a1893fe60c1303a2f83cfbc5341cf03ec595e3640f503a2407e869491b
 SHA512 
c15897df4e0979ee29a1e67cc671f56db600a078e9eb0bea376248b3f53b13ceed36616ad3678e2c9e07d6834a6d75e4efca2c40086069c1546e0223be04c071

diff --git a/app-misc/mosquitto/mosquitto-1.6.7.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.7.ebuild
deleted file mode 100644
index aa17c977656..000
--- a/app-misc/mosquitto/mosquitto-1.6.7.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-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 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 )"
-
-_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,

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

2020-01-17 Thread Agostino Sarubbo

commit: c2ebb883b8a422f2c5a73a100ac8c24384d8805c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jan 17 10:30:13 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jan 17 10:30:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2ebb883

app-misc/mosquitto: x86 stable wrt bug #705512

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-misc/mosquitto/mosquitto-1.6.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-1.6.8.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.8.ebuild
index b63803431d8..87e7f10973d 100644
--- a/app-misc/mosquitto/mosquitto-1.6.8.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.8.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 x86"
 IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"

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

2020-01-17 Thread Agostino Sarubbo

commit: 049cf6a9fb04def69c4dc0205590cbc5285f2bc4
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jan 17 09:28:57 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jan 17 09:29:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=049cf6a9

app-misc/mosquitto: amd64 stable wrt bug #705512

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-misc/mosquitto/mosquitto-1.6.8.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-misc/mosquitto/mosquitto-1.6.8.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.8.ebuild
index 25f2cf6d4c5..b63803431d8 100644
--- a/app-misc/mosquitto/mosquitto-1.6.8.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86"
 IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"

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

2019-12-20 Thread Matt Turner

commit: 7c16ad6e181ac72bc15ad81ff394e8d52858ba04
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Dec 20 20:40:59 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Dec 20 21:58:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c16ad6e

app-misc/mosquitto: Version bump to 1.6.8

Closes: https://bugs.gentoo.org/696946
Closes: https://bugs.gentoo.org/700816
Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/Manifest   |   1 +
 app-misc/mosquitto/mosquitto-1.6.8.ebuild | 114 ++
 2 files changed, 115 insertions(+)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index ae2670ea268..430e2c8db3b 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1 +1,2 @@
 DIST mosquitto-1.6.7.tar.gz 591062 BLAKE2B 
a215e311197fd84f1fa1ff0b681c8d1157db1a3e538a5a16afa1f11d17a08a720d44ae16b306cb08d6b585c8c4d4b2e38df972ceebc4634c727f4c8e0994c170
 SHA512 
0a75cf192483053ce78c6d9e3be158bdf66366d7731a68cf29e24731f6936027af1d86045c2b973f642e42e58efa033dbfd17842e3e95550bac4c1f44ab346e9
+DIST mosquitto-1.6.8.tar.gz 589873 BLAKE2B 
aa2e13397f7d4b6305af3180cd042cd143054e154cf8e6d93b05bc5a10d48419174711a1893fe60c1303a2f83cfbc5341cf03ec595e3640f503a2407e869491b
 SHA512 
c15897df4e0979ee29a1e67cc671f56db600a078e9eb0bea376248b3f53b13ceed36616ad3678e2c9e07d6834a6d75e4efca2c40086069c1546e0223be04c071

diff --git a/app-misc/mosquitto/mosquitto-1.6.8.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.8.ebuild
new file mode 100644
index 000..25f2cf6d4c5
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.6.8.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2019 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/;
+SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz;
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~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

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

2019-11-29 Thread Stefan Strogin

commit: 5ce7762c711cb6963dd0daedc49c415d252cc78b
Author: Stefan Strogin  gentoo  org>
AuthorDate: Sat Nov 30 02:17:22 2019 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Sat Nov 30 02:18:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ce7762c

app-misc/mosquitto: add USE=libressl

Closes: https://bugs.gentoo.org/699546
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Stefan Strogin  gentoo.org>

 app-misc/mosquitto/mosquitto-1.6.7.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app-misc/mosquitto/mosquitto-1.6.7.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.7.ebuild
index 374107d9db9..17caa62c555 100644
--- a/app-misc/mosquitto/mosquitto-1.6.7.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.7.ebuild
@@ -13,7 +13,7 @@ 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"
+IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
 
 REQUIRED_USE="test? ( bridge )"
 
@@ -21,7 +21,10 @@ RDEPEND="
acct-user/mosquitto
acct-group/mosquitto
srv? ( net-dns/c-ares:= )
-   ssl? ( dev-libs/openssl:0= )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )
tcpd? ( sys-apps/tcp-wrappers )"
 
 DEPEND="${PYTHON_DEPS}

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

2019-11-01 Thread Matt Turner

commit: 8524eff5dcce396a217456dd2cd18b182484de66
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Nov  1 19:58:22 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Nov  1 19:59:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8524eff5

app-misc/mosquitto: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/Manifest   |   1 -
 app-misc/mosquitto/mosquitto-1.5.6.ebuild | 106 --
 2 files changed, 107 deletions(-)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 84e48c74f07..ae2670ea268 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,2 +1 @@
-DIST mosquitto-1.5.6.tar.gz 439402 BLAKE2B 
7d887d7d2e02d9891613d441c76705c40744cd8c7acae330648e5a00560b4ba1fbc28b92ac84bf85d423c84de875c5309f364d04fca72516ab2276fe42512b0c
 SHA512 
99bd935f93ae25f0c7992870780cce4748b35ffd58fd0d39e20ee69f34c28d3eac289cf0c7dec078dbdced3bda12da4569d4b5e84ebdaa5514640f331ca3238b
 DIST mosquitto-1.6.7.tar.gz 591062 BLAKE2B 
a215e311197fd84f1fa1ff0b681c8d1157db1a3e538a5a16afa1f11d17a08a720d44ae16b306cb08d6b585c8c4d4b2e38df972ceebc4634c727f4c8e0994c170
 SHA512 
0a75cf192483053ce78c6d9e3be158bdf66366d7731a68cf29e24731f6936027af1d86045c2b973f642e42e58efa033dbfd17842e3e95550bac4c1f44ab346e9

diff --git a/app-misc/mosquitto/mosquitto-1.5.6.ebuild 
b/app-misc/mosquitto/mosquitto-1.5.6.ebuild
deleted file mode 100644
index 6f319fe32b3..000
--- a/app-misc/mosquitto/mosquitto-1.5.6.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 libressl +persistence +srv ssl tcpd test websockets"
-
-REQUIRED_USE="
-   test? ( bridge )
-"
-
-RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
-   srv? ( net-dns/c-ares )
-   ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   )"
-DEPEND="${RDEPEND}
-   ${PYTHON_DEPS}
-   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() {
-   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
-}

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

2019-11-01 Thread Mikle Kolyada

commit: 2eb5d06a304eeaaccaa00774bb479e463577d3ca
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Nov  1 11:25:43 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Nov  1 11:25:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eb5d06a

app-misc/mosquitto: arm stable wrt bug #695432

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada  gentoo.org>

 app-misc/mosquitto/mosquitto-1.6.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-1.6.7.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.7.ebuild
index 7a43de2971c..374107d9db9 100644
--- a/app-misc/mosquitto/mosquitto-1.6.7.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.7.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 x86"
 IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 
 REQUIRED_USE="test? ( bridge )"

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

2019-10-09 Thread Agostino Sarubbo

commit: ec3bc1cefb4264f471cd2930be8abe2e915b9aa9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Oct  9 11:09:28 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Oct  9 11:09:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec3bc1ce

app-misc/mosquitto: x86 stable wrt bug #695432

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-misc/mosquitto/mosquitto-1.6.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-1.6.7.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.7.ebuild
index 8429d6ea33f..7a43de2971c 100644
--- a/app-misc/mosquitto/mosquitto-1.6.7.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.7.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 x86"
 IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 
 REQUIRED_USE="test? ( bridge )"

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

2019-10-09 Thread Agostino Sarubbo

commit: 0c24c093b8bded7685b011176b39d1b2fd5a4114
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Oct  9 11:08:14 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Oct  9 11:08:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c24c093

app-misc/mosquitto: amd64 stable wrt bug #695432

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-misc/mosquitto/mosquitto-1.6.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-1.6.7.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.7.ebuild
index c259a27c56d..8429d6ea33f 100644
--- a/app-misc/mosquitto/mosquitto-1.6.7.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.7.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 ~x86"
 IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 
 REQUIRED_USE="test? ( bridge )"

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

2019-09-28 Thread Matt Turner

commit: 4c0bc0bdd0b8b5b4e1de382d524b1eaefcff7939
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Sep 28 18:59:16 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Sep 28 18:59:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c0bc0bd

app-misc/mosquitto: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/Manifest   |   2 -
 app-misc/mosquitto/mosquitto-1.5.8.ebuild | 101 ---
 app-misc/mosquitto/mosquitto-1.6.2.ebuild | 110 --
 3 files changed, 213 deletions(-)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 1dd940be2af..84e48c74f07 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,4 +1,2 @@
 DIST mosquitto-1.5.6.tar.gz 439402 BLAKE2B 
7d887d7d2e02d9891613d441c76705c40744cd8c7acae330648e5a00560b4ba1fbc28b92ac84bf85d423c84de875c5309f364d04fca72516ab2276fe42512b0c
 SHA512 
99bd935f93ae25f0c7992870780cce4748b35ffd58fd0d39e20ee69f34c28d3eac289cf0c7dec078dbdced3bda12da4569d4b5e84ebdaa5514640f331ca3238b
-DIST mosquitto-1.5.8.tar.gz 442834 BLAKE2B 
be5a7c2e7d28da0101fdfac9e5b0d7499abb71b464df3da11637c141947c75631e9c8952b219d20d598a156d0f8d5e86151c65ee4b55443dcef9c30eff49e3b3
 SHA512 
5cf2ae59077878be2784cc83fefe00fa3ff904646711545be519fc48557319c56dc7c15682fffc0dc42c530cdf59f550f25da9eec50a1a7deb222aa11bb669d3
-DIST mosquitto-1.6.2.tar.gz 576747 BLAKE2B 
c0815f1f0a964ee5cc26fc9a1d3c222b5261e29e1520f2b3ddacbe61e1af44c47040db1d9b71721f6ef9b42f378d1974d994065a8558a1f3f759dc5ca81db1a7
 SHA512 
d1c13df4409eb20ccc00a67b07a4af5c5ce668a403a4605e2bae4f5869b256ebe5d9a001d009cb0e34bc7b3cfee96779fc81099b170ff03af3ca43f05567912b
 DIST mosquitto-1.6.7.tar.gz 591062 BLAKE2B 
a215e311197fd84f1fa1ff0b681c8d1157db1a3e538a5a16afa1f11d17a08a720d44ae16b306cb08d6b585c8c4d4b2e38df972ceebc4634c727f4c8e0994c170
 SHA512 
0a75cf192483053ce78c6d9e3be158bdf66366d7731a68cf29e24731f6936027af1d86045c2b973f642e42e58efa033dbfd17842e3e95550bac4c1f44ab346e9

diff --git a/app-misc/mosquitto/mosquitto-1.5.8.ebuild 
b/app-misc/mosquitto/mosquitto-1.5.8.ebuild
deleted file mode 100644
index 739d887f2e6..000
--- a/app-misc/mosquitto/mosquitto-1.5.8.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 systemd toolchain-funcs user
-
-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="srv? ( net-dns/c-ares )
-   ssl? ( dev-libs/openssl:0= )
-   tcpd? ( sys-apps/tcp-wrappers )"
-
-DEPEND="${PYTHON_DEPS}
-   ${RDEPEND}
-   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() {
-   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"
-   dodoc -r examples
-   fi
-}
-
-pkg_postinst() {
-   if [[ -z "${REPLACING_VERSIONS}" ]]; then
-   elog "The Python module has been moved out of mosquitto."
-   elog "See

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

2019-09-27 Thread Matt Turner

commit: 4b7136842b37b19feb43720adc615c971681d7b4
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Sep 26 20:54:27 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Sep 27 16:18:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b713684

app-misc/mosquitto: Version bump to 1.6.7

Signed-off-by: Matt Turner  gentoo.org>

 app-misc/mosquitto/Manifest   |   1 +
 app-misc/mosquitto/mosquitto-1.6.7.ebuild | 110 ++
 2 files changed, 111 insertions(+)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index f3c840ee08f..1dd940be2af 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,3 +1,4 @@
 DIST mosquitto-1.5.6.tar.gz 439402 BLAKE2B 
7d887d7d2e02d9891613d441c76705c40744cd8c7acae330648e5a00560b4ba1fbc28b92ac84bf85d423c84de875c5309f364d04fca72516ab2276fe42512b0c
 SHA512 
99bd935f93ae25f0c7992870780cce4748b35ffd58fd0d39e20ee69f34c28d3eac289cf0c7dec078dbdced3bda12da4569d4b5e84ebdaa5514640f331ca3238b
 DIST mosquitto-1.5.8.tar.gz 442834 BLAKE2B 
be5a7c2e7d28da0101fdfac9e5b0d7499abb71b464df3da11637c141947c75631e9c8952b219d20d598a156d0f8d5e86151c65ee4b55443dcef9c30eff49e3b3
 SHA512 
5cf2ae59077878be2784cc83fefe00fa3ff904646711545be519fc48557319c56dc7c15682fffc0dc42c530cdf59f550f25da9eec50a1a7deb222aa11bb669d3
 DIST mosquitto-1.6.2.tar.gz 576747 BLAKE2B 
c0815f1f0a964ee5cc26fc9a1d3c222b5261e29e1520f2b3ddacbe61e1af44c47040db1d9b71721f6ef9b42f378d1974d994065a8558a1f3f759dc5ca81db1a7
 SHA512 
d1c13df4409eb20ccc00a67b07a4af5c5ce668a403a4605e2bae4f5869b256ebe5d9a001d009cb0e34bc7b3cfee96779fc81099b170ff03af3ca43f05567912b
+DIST mosquitto-1.6.7.tar.gz 591062 BLAKE2B 
a215e311197fd84f1fa1ff0b681c8d1157db1a3e538a5a16afa1f11d17a08a720d44ae16b306cb08d6b585c8c4d4b2e38df972ceebc4634c727f4c8e0994c170
 SHA512 
0a75cf192483053ce78c6d9e3be158bdf66366d7731a68cf29e24731f6936027af1d86045c2b973f642e42e58efa033dbfd17842e3e95550bac4c1f44ab346e9

diff --git a/app-misc/mosquitto/mosquitto-1.6.7.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.7.ebuild
new file mode 100644
index 000..c259a27c56d
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.6.7.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+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"
+
+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 )"
+
+_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
+

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

2019-06-22 Thread Michał Górny

commit: 4d1390aca408b99b4e97e873c307c47ae17b4be6
Author: Lucas Ramage  protonmail  com>
AuthorDate: Sat May 18 01:54:05 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jun 22 07:31:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d1390ac

app-misc/mosquitto: bump to 1.6.2

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Lucas Ramage  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12037
Signed-off-by: Michał Górny  gentoo.org>

 app-misc/mosquitto/Manifest   |   1 +
 app-misc/mosquitto/mosquitto-1.6.2.ebuild | 110 ++
 2 files changed, 111 insertions(+)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index f959bb3ee21..f3c840ee08f 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,2 +1,3 @@
 DIST mosquitto-1.5.6.tar.gz 439402 BLAKE2B 
7d887d7d2e02d9891613d441c76705c40744cd8c7acae330648e5a00560b4ba1fbc28b92ac84bf85d423c84de875c5309f364d04fca72516ab2276fe42512b0c
 SHA512 
99bd935f93ae25f0c7992870780cce4748b35ffd58fd0d39e20ee69f34c28d3eac289cf0c7dec078dbdced3bda12da4569d4b5e84ebdaa5514640f331ca3238b
 DIST mosquitto-1.5.8.tar.gz 442834 BLAKE2B 
be5a7c2e7d28da0101fdfac9e5b0d7499abb71b464df3da11637c141947c75631e9c8952b219d20d598a156d0f8d5e86151c65ee4b55443dcef9c30eff49e3b3
 SHA512 
5cf2ae59077878be2784cc83fefe00fa3ff904646711545be519fc48557319c56dc7c15682fffc0dc42c530cdf59f550f25da9eec50a1a7deb222aa11bb669d3
+DIST mosquitto-1.6.2.tar.gz 576747 BLAKE2B 
c0815f1f0a964ee5cc26fc9a1d3c222b5261e29e1520f2b3ddacbe61e1af44c47040db1d9b71721f6ef9b42f378d1974d994065a8558a1f3f759dc5ca81db1a7
 SHA512 
d1c13df4409eb20ccc00a67b07a4af5c5ce668a403a4605e2bae4f5869b256ebe5d9a001d009cb0e34bc7b3cfee96779fc81099b170ff03af3ca43f05567912b

diff --git a/app-misc/mosquitto/mosquitto-1.6.2.ebuild 
b/app-misc/mosquitto/mosquitto-1.6.2.ebuild
new file mode 100644
index 000..0eb52c398c3
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.6.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_7 )
+
+inherit python-any-r1 systemd toolchain-funcs user
+
+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="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 )"
+
+_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)" \
+   "$@"
+}
+
+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
+
+   # 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' \
+   -e '/11-message-expiry.py/d' test/broker/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
+

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

2019-04-27 Thread David Seifert

commit: d41f65aac311d90b458e0ee4bf7c65e6ca6a7bed
Author: David Seifert  gentoo  org>
AuthorDate: Sat Apr 27 16:35:04 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Apr 27 20:27:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d41f65aa

app-misc/mosquitto: [QA] Fix USE=libressl semantics

Closes: https://bugs.gentoo.org/684006
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: David Seifert  gentoo.org>

 app-misc/mosquitto/mosquitto-1.5.6.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-1.5.6.ebuild 
b/app-misc/mosquitto/mosquitto-1.5.6.ebuild
index 7b6a16c2daf..6f319fe32b3 100644
--- a/app-misc/mosquitto/mosquitto-1.5.6.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.5.6.ebuild
@@ -16,7 +16,6 @@ KEYWORDS="amd64 arm x86"
 IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
 
 REQUIRED_USE="
-   libressl? ( ssl )
test? ( bridge )
 "

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

2019-04-25 Thread Michał Górny

commit: 2868458db1b991415983a0233dab79ec82030114
Author: Lucas Ramage  protonmail  com>
AuthorDate: Sat Apr 13 02:10:48 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Apr 25 14:34:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2868458d

app-misc/mosquitto: bump to version 1.5.8

Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Lucas Ramage  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11689
Signed-off-by: Michał Górny  gentoo.org>

 app-misc/mosquitto/Manifest   |   1 +
 app-misc/mosquitto/mosquitto-1.5.8.ebuild | 101 ++
 2 files changed, 102 insertions(+)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index da71fd286d0..f959bb3ee21 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1 +1,2 @@
 DIST mosquitto-1.5.6.tar.gz 439402 BLAKE2B 
7d887d7d2e02d9891613d441c76705c40744cd8c7acae330648e5a00560b4ba1fbc28b92ac84bf85d423c84de875c5309f364d04fca72516ab2276fe42512b0c
 SHA512 
99bd935f93ae25f0c7992870780cce4748b35ffd58fd0d39e20ee69f34c28d3eac289cf0c7dec078dbdced3bda12da4569d4b5e84ebdaa5514640f331ca3238b
+DIST mosquitto-1.5.8.tar.gz 442834 BLAKE2B 
be5a7c2e7d28da0101fdfac9e5b0d7499abb71b464df3da11637c141947c75631e9c8952b219d20d598a156d0f8d5e86151c65ee4b55443dcef9c30eff49e3b3
 SHA512 
5cf2ae59077878be2784cc83fefe00fa3ff904646711545be519fc48557319c56dc7c15682fffc0dc42c530cdf59f550f25da9eec50a1a7deb222aa11bb669d3

diff --git a/app-misc/mosquitto/mosquitto-1.5.8.ebuild 
b/app-misc/mosquitto/mosquitto-1.5.8.ebuild
new file mode 100644
index 000..739d887f2e6
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.5.8.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 systemd toolchain-funcs user
+
+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="srv? ( net-dns/c-ares )
+   ssl? ( dev-libs/openssl:0= )
+   tcpd? ( sys-apps/tcp-wrappers )"
+
+DEPEND="${PYTHON_DEPS}
+   ${RDEPEND}
+   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() {
+   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"
+   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
+}

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

2019-03-28 Thread Patrice Clement

commit: b544f1de171519fa30bb99f5a5d266f123307ac9
Author: Stijn Tintel  linux-ipv6  be>
AuthorDate: Wed Mar 27 17:54:31 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Mar 28 23:12:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b544f1de

app-misc/mosquitto: LibreSSL support.

Mosquitto supports LibreSSL since version 1.5.5.

Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Stijn Tintel  linux-ipv6.be>
Closes: https://github.com/gentoo/gentoo/pull/11519
Signed-off-by: Patrice Clement  gentoo.org>

 app-misc/mosquitto/mosquitto-1.5.6.ebuild | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app-misc/mosquitto/mosquitto-1.5.6.ebuild 
b/app-misc/mosquitto/mosquitto-1.5.6.ebuild
index 2a915dd90e4..7b6a16c2daf 100644
--- a/app-misc/mosquitto/mosquitto-1.5.6.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.5.6.ebuild
@@ -13,13 +13,19 @@ 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"
+IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
 
-REQUIRED_USE="test? ( bridge )"
+REQUIRED_USE="
+   libressl? ( ssl )
+   test? ( bridge )
+"
 
 RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
srv? ( net-dns/c-ares )
-   ssl? ( dev-libs/openssl:0= )"
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )"
 DEPEND="${RDEPEND}
${PYTHON_DEPS}
websockets? ( net-libs/libwebsockets )"

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

2019-03-26 Thread Patrice Clement

commit: 6ff1aae28f02a921c39f5a204e54e434f55c7045
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Mar 25 18:10:19 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Mar 26 16:45:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ff1aae2

app-misc/mosquitto: remove unused patches.

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11497
Signed-off-by: Patrice Clement  gentoo.org>

 .../files/mosquitto-1.4.10-conditional-tests.patch | 43 --
 .../mosquitto-1.5-fix-socket_get_address.patch | 29 ---
 .../files/mosquitto-fix-conditional-tests.patch| 12 --
 3 files changed, 84 deletions(-)

diff --git a/app-misc/mosquitto/files/mosquitto-1.4.10-conditional-tests.patch 
b/app-misc/mosquitto/files/mosquitto-1.4.10-conditional-tests.patch
deleted file mode 100644
index 12b4fc56bc3..000
--- a/app-misc/mosquitto/files/mosquitto-1.4.10-conditional-tests.patch
+++ /dev/null
@@ -1,43 +0,0 @@
 a/test/broker/Makefile 2016-06-02 22:20:22.0 +0100
-+++ b/test/broker/Makefile 2016-07-08 14:17:33.772666865 +0100
-@@ -63,6 +63,7 @@
-   ./05-clean-session-qos1.py 
- 
- 06 :
-+ifeq ($(WITH_BRIDGE),yes)
-   ./06-bridge-reconnect-local-out.py
-   ./06-bridge-br2b-disconnect-qos1.py
-   ./06-bridge-br2b-disconnect-qos2.py
-@@ -70,6 +71,7 @@
-   ./06-bridge-b2br-disconnect-qos2.py
-   ./06-bridge-fail-persist-resend-qos1.py
-   ./06-bridge-fail-persist-resend-qos2.py
-+endif
- 
- 07 :
-   ./07-will-qos0.py
-@@ -87,10 +89,12 @@
-   ./08-ssl-connect-cert-auth-crl.py
-   ./08-ssl-connect-identity.py
-   ./08-ssl-connect-no-identity.py
-+ifeq ($(WITH_BRIDGE),yes)
-   ./08-ssl-bridge.py
-   ./08-tls-psk-pub.py
-   ./08-tls-psk-bridge.py
- endif
-+endif
- 
- 09 :
-   ./09-plugin-auth-unpwd-success.py
 a/test/broker/c/Makefile   2016-02-14 14:36:55.0 +
-+++ 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
deleted file mode 100644
index 7e9778e8b70..000
--- a/app-misc/mosquitto/files/mosquitto-1.5-fix-socket_get_address.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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 = >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(_req);
-   if(!hosts_access(_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
deleted file mode 100644
index 1642597c562..000
--- a/app-misc/mosquitto/files/mosquitto-fix-conditional-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 a/test/broker/c/Makefile   2016-02-14 14:36:55.0 +
-+++ 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

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

2019-03-20 Thread Aaron Bauman

commit: c172b0046f51ffe1ff4712c6cbfb228626323410
Author: Aaron Bauman  gentoo  org>
AuthorDate: Wed Mar 20 13:43:24 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed Mar 20 13:43:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c172b004

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

Signed-off-by: Aaron Bauman  gentoo.org>

 app-misc/mosquitto/Manifest|   5 --
 app-misc/mosquitto/mosquitto-1.4.14.ebuild |  96 --
 app-misc/mosquitto/mosquitto-1.5.3.ebuild  | 101 ---
 app-misc/mosquitto/mosquitto-1.5.4.ebuild  | 101 ---
 app-misc/mosquitto/mosquitto-1.5.5.ebuild  | 101 ---
 app-misc/mosquitto/mosquitto-1.5.ebuild| 106 -
 6 files changed, 510 deletions(-)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index a1312a50869..da71fd286d0 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,6 +1 @@
-DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 
92bcb1fd9e67711d6ce8db5e767be31a1321866205cf4cad684d8b77a8b14a2eaf5e4367a74d5dd8f814f0d229dc77ce878879632c0c34c6a23f7975bf6ae8c7
 SHA512 
dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2
-DIST mosquitto-1.5.3.tar.gz 425844 BLAKE2B 
d868dd67cd86e57f6af8e5556e0cee520f60cac4f16a24ceeec163acf5663339908d77304b7e70898ef5afaeeabb57c2a2857df297600180e1b9db6f2bf990b1
 SHA512 
8aa4f85914316c2dc08908a649779946ab33b23ea669c6f7eed0d8a1af7ae26381cfe1a50c32d220658f8693ef6a86045690824af4b7ca0271426ff3455e7796
-DIST mosquitto-1.5.4.tar.gz 430602 BLAKE2B 
3d9aefdd6caac926fd211df20932904dbccd4bae923bcf2ca1f698d962098fdd606145d229c849dc87ab4daf10af97dc1ecd9e1b4073e9abf67ca8bd17856311
 SHA512 
4e7ae21304afa843d4d48a8ea0bcf0173deca25961bcd294f86eedbdd8ec59eeca3c8cf5f2d72765128756b2cdf9460f5718041a67c66ce6ac76679cdac247c7
-DIST mosquitto-1.5.5.tar.gz 431998 BLAKE2B 
d6963235c70fd5ad1f73ea6964e800041afd6fad89a83f3d2c5fd6d843048f328dc93368c99e83820f110dfabd56783fa175a1169bc75316331df62f846409f3
 SHA512 
4984a8c3a48450ae87dfca9ea82542c22a5c1b214b7c6d134789675431ba1bcebaceea2fe32c5d32c91ec47b9ded7b61c0c2caf6551f10e4f8dc455a5351
 DIST mosquitto-1.5.6.tar.gz 439402 BLAKE2B 
7d887d7d2e02d9891613d441c76705c40744cd8c7acae330648e5a00560b4ba1fbc28b92ac84bf85d423c84de875c5309f364d04fca72516ab2276fe42512b0c
 SHA512 
99bd935f93ae25f0c7992870780cce4748b35ffd58fd0d39e20ee69f34c28d3eac289cf0c7dec078dbdced3bda12da4569d4b5e84ebdaa5514640f331ca3238b
-DIST mosquitto-1.5.tar.gz 419614 BLAKE2B 
d405e1e4f967f1030229a2e64793b84a3c8dc356a3b8d95a9bfc50a623cdb79517bbcfda87275f23c44002f3a41a20db58fed5a33d2c7d63da95e0d6d15951bb
 SHA512 
29b82bc0c6510fa5062cb43c06bd91ce5223be5689cba077df8b2cb5ac377cb125b8a8bb292b53bcec0d4b186977c25c3ecdd8c92d4ed996fde07f8c759c0668

diff --git a/app-misc/mosquitto/mosquitto-1.4.14.ebuild 
b/app-misc/mosquitto/mosquitto-1.4.14.ebuild
deleted file mode 100644
index 04008dcbd0b..000
--- a/app-misc/mosquitto/mosquitto-1.4.14.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 arm x86"
-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)"
-

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

2019-03-18 Thread Thomas Deutschmann

commit: 7ab74eaad33844cad047090204cd541ad2654382
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Mar 19 01:55:40 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Mar 19 02:03:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ab74eaa

app-misc/mosquitto: x86 stable (bug #677638)

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 app-misc/mosquitto/mosquitto-1.5.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-1.5.6.ebuild 
b/app-misc/mosquitto/mosquitto-1.5.6.ebuild
index de91f7acda1..2a915dd90e4 100644
--- a/app-misc/mosquitto/mosquitto-1.5.6.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.5.6.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 x86"
 IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 
 REQUIRED_USE="test? ( bridge )"

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

2019-03-16 Thread Mikle Kolyada

commit: 1ed2b5ba9c69ddb2ad75817de1fa9dcc8f46fd92
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Mar 16 13:59:23 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Mar 16 13:59:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed2b5ba

app-misc/mosquitto: arm stable wrt bug #677638

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="arm"

 app-misc/mosquitto/mosquitto-1.5.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-1.5.6.ebuild 
b/app-misc/mosquitto/mosquitto-1.5.6.ebuild
index 71b7da8544c..de91f7acda1 100644
--- a/app-misc/mosquitto/mosquitto-1.5.6.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.5.6.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 ~x86"
 IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 
 REQUIRED_USE="test? ( bridge )"

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

2019-03-14 Thread Agostino Sarubbo

commit: f5d9be426f39d98f175cd660469c7d2e9deda75e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Mar 14 21:13:48 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Mar 14 21:13:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5d9be42

app-misc/mosquitto: amd64 stable wrt bug #677638

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 app-misc/mosquitto/mosquitto-1.5.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-1.5.6.ebuild 
b/app-misc/mosquitto/mosquitto-1.5.6.ebuild
index 30791550cf9..71b7da8544c 100644
--- a/app-misc/mosquitto/mosquitto-1.5.6.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.5.6.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 ~x86"
 IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 
 REQUIRED_USE="test? ( bridge )"

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

2019-02-16 Thread Patrice Clement

commit: 65f830a1752ce2004a7a9342964f3894a0d5f047
Author: Lucas Ramage  protonmail  com>
AuthorDate: Fri Feb 15 23:05:10 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Feb 16 22:29:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65f830a1

app-misc/mosquitto: bump to version 1.5.6.

Bug: https://bugs.gentoo.org/677638
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Lucas Ramage  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11060
Signed-off-by: Patrice Clement  gentoo.org>

 app-misc/mosquitto/Manifest   |   1 +
 app-misc/mosquitto/mosquitto-1.5.6.ebuild | 101 ++
 2 files changed, 102 insertions(+)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 9336c0b65a5..a1312a50869 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -2,4 +2,5 @@ DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 
92bcb1fd9e67711d6ce8db5e767be31a1321
 DIST mosquitto-1.5.3.tar.gz 425844 BLAKE2B 
d868dd67cd86e57f6af8e5556e0cee520f60cac4f16a24ceeec163acf5663339908d77304b7e70898ef5afaeeabb57c2a2857df297600180e1b9db6f2bf990b1
 SHA512 
8aa4f85914316c2dc08908a649779946ab33b23ea669c6f7eed0d8a1af7ae26381cfe1a50c32d220658f8693ef6a86045690824af4b7ca0271426ff3455e7796
 DIST mosquitto-1.5.4.tar.gz 430602 BLAKE2B 
3d9aefdd6caac926fd211df20932904dbccd4bae923bcf2ca1f698d962098fdd606145d229c849dc87ab4daf10af97dc1ecd9e1b4073e9abf67ca8bd17856311
 SHA512 
4e7ae21304afa843d4d48a8ea0bcf0173deca25961bcd294f86eedbdd8ec59eeca3c8cf5f2d72765128756b2cdf9460f5718041a67c66ce6ac76679cdac247c7
 DIST mosquitto-1.5.5.tar.gz 431998 BLAKE2B 
d6963235c70fd5ad1f73ea6964e800041afd6fad89a83f3d2c5fd6d843048f328dc93368c99e83820f110dfabd56783fa175a1169bc75316331df62f846409f3
 SHA512 
4984a8c3a48450ae87dfca9ea82542c22a5c1b214b7c6d134789675431ba1bcebaceea2fe32c5d32c91ec47b9ded7b61c0c2caf6551f10e4f8dc455a5351
+DIST mosquitto-1.5.6.tar.gz 439402 BLAKE2B 
7d887d7d2e02d9891613d441c76705c40744cd8c7acae330648e5a00560b4ba1fbc28b92ac84bf85d423c84de875c5309f364d04fca72516ab2276fe42512b0c
 SHA512 
99bd935f93ae25f0c7992870780cce4748b35ffd58fd0d39e20ee69f34c28d3eac289cf0c7dec078dbdced3bda12da4569d4b5e84ebdaa5514640f331ca3238b
 DIST mosquitto-1.5.tar.gz 419614 BLAKE2B 
d405e1e4f967f1030229a2e64793b84a3c8dc356a3b8d95a9bfc50a623cdb79517bbcfda87275f23c44002f3a41a20db58fed5a33d2c7d63da95e0d6d15951bb
 SHA512 
29b82bc0c6510fa5062cb43c06bd91ce5223be5689cba077df8b2cb5ac377cb125b8a8bb292b53bcec0d4b186977c25c3ecdd8c92d4ed996fde07f8c759c0668

diff --git a/app-misc/mosquitto/mosquitto-1.5.6.ebuild 
b/app-misc/mosquitto/mosquitto-1.5.6.ebuild
new file mode 100644
index 000..30791550cf9
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.5.6.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 )"
+
+_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

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

2019-01-17 Thread Patrice Clement

commit: 625c336da99af7ed08adc56ab05ccca57f6c88c9
Author: Lucas Ramage  protonmail  com>
AuthorDate: Wed Jan 16 02:47:14 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Jan 17 08:53:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=625c336d

app-misc/mosquitto: version bump to 1.5.5.

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Lucas Ramage  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10845
Signed-off-by: Patrice Clement  gentoo.org>

 app-misc/mosquitto/Manifest   |   1 +
 app-misc/mosquitto/mosquitto-1.5.5.ebuild | 101 ++
 2 files changed, 102 insertions(+)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index a4a3696a6d5..9336c0b65a5 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,4 +1,5 @@
 DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 
92bcb1fd9e67711d6ce8db5e767be31a1321866205cf4cad684d8b77a8b14a2eaf5e4367a74d5dd8f814f0d229dc77ce878879632c0c34c6a23f7975bf6ae8c7
 SHA512 
dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2
 DIST mosquitto-1.5.3.tar.gz 425844 BLAKE2B 
d868dd67cd86e57f6af8e5556e0cee520f60cac4f16a24ceeec163acf5663339908d77304b7e70898ef5afaeeabb57c2a2857df297600180e1b9db6f2bf990b1
 SHA512 
8aa4f85914316c2dc08908a649779946ab33b23ea669c6f7eed0d8a1af7ae26381cfe1a50c32d220658f8693ef6a86045690824af4b7ca0271426ff3455e7796
 DIST mosquitto-1.5.4.tar.gz 430602 BLAKE2B 
3d9aefdd6caac926fd211df20932904dbccd4bae923bcf2ca1f698d962098fdd606145d229c849dc87ab4daf10af97dc1ecd9e1b4073e9abf67ca8bd17856311
 SHA512 
4e7ae21304afa843d4d48a8ea0bcf0173deca25961bcd294f86eedbdd8ec59eeca3c8cf5f2d72765128756b2cdf9460f5718041a67c66ce6ac76679cdac247c7
+DIST mosquitto-1.5.5.tar.gz 431998 BLAKE2B 
d6963235c70fd5ad1f73ea6964e800041afd6fad89a83f3d2c5fd6d843048f328dc93368c99e83820f110dfabd56783fa175a1169bc75316331df62f846409f3
 SHA512 
4984a8c3a48450ae87dfca9ea82542c22a5c1b214b7c6d134789675431ba1bcebaceea2fe32c5d32c91ec47b9ded7b61c0c2caf6551f10e4f8dc455a5351
 DIST mosquitto-1.5.tar.gz 419614 BLAKE2B 
d405e1e4f967f1030229a2e64793b84a3c8dc356a3b8d95a9bfc50a623cdb79517bbcfda87275f23c44002f3a41a20db58fed5a33d2c7d63da95e0d6d15951bb
 SHA512 
29b82bc0c6510fa5062cb43c06bd91ce5223be5689cba077df8b2cb5ac377cb125b8a8bb292b53bcec0d4b186977c25c3ecdd8c92d4ed996fde07f8c759c0668

diff --git a/app-misc/mosquitto/mosquitto-1.5.5.ebuild 
b/app-misc/mosquitto/mosquitto-1.5.5.ebuild
new file mode 100644
index 000..30791550cf9
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.5.5.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 )"
+
+_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
+

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

2018-12-14 Thread Patrice Clement

commit: 3d2896819c8c9315384cfe0b998d5592cfaa2f5c
Author: Lucas Ramage  protonmail  com>
AuthorDate: Fri Nov 30 04:07:26 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Fri Dec 14 22:51:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d289681

app-misc/mosquitto: version bump to 1.5.4.

Closes: https://bugs.gentoo.org/670698
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Lucas Ramage  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10525
Signed-off-by: Patrice Clement  gentoo.org>

 app-misc/mosquitto/Manifest   |   1 +
 app-misc/mosquitto/mosquitto-1.5.4.ebuild | 101 ++
 2 files changed, 102 insertions(+)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index ddfa4ca9715..a4a3696a6d5 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,3 +1,4 @@
 DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 
92bcb1fd9e67711d6ce8db5e767be31a1321866205cf4cad684d8b77a8b14a2eaf5e4367a74d5dd8f814f0d229dc77ce878879632c0c34c6a23f7975bf6ae8c7
 SHA512 
dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2
 DIST mosquitto-1.5.3.tar.gz 425844 BLAKE2B 
d868dd67cd86e57f6af8e5556e0cee520f60cac4f16a24ceeec163acf5663339908d77304b7e70898ef5afaeeabb57c2a2857df297600180e1b9db6f2bf990b1
 SHA512 
8aa4f85914316c2dc08908a649779946ab33b23ea669c6f7eed0d8a1af7ae26381cfe1a50c32d220658f8693ef6a86045690824af4b7ca0271426ff3455e7796
+DIST mosquitto-1.5.4.tar.gz 430602 BLAKE2B 
3d9aefdd6caac926fd211df20932904dbccd4bae923bcf2ca1f698d962098fdd606145d229c849dc87ab4daf10af97dc1ecd9e1b4073e9abf67ca8bd17856311
 SHA512 
4e7ae21304afa843d4d48a8ea0bcf0173deca25961bcd294f86eedbdd8ec59eeca3c8cf5f2d72765128756b2cdf9460f5718041a67c66ce6ac76679cdac247c7
 DIST mosquitto-1.5.tar.gz 419614 BLAKE2B 
d405e1e4f967f1030229a2e64793b84a3c8dc356a3b8d95a9bfc50a623cdb79517bbcfda87275f23c44002f3a41a20db58fed5a33d2c7d63da95e0d6d15951bb
 SHA512 
29b82bc0c6510fa5062cb43c06bd91ce5223be5689cba077df8b2cb5ac377cb125b8a8bb292b53bcec0d4b186977c25c3ecdd8c92d4ed996fde07f8c759c0668

diff --git a/app-misc/mosquitto/mosquitto-1.5.4.ebuild 
b/app-misc/mosquitto/mosquitto-1.5.4.ebuild
new file mode 100644
index 000..44c2e14ee22
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.5.4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 )"
+
+_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
+}
+

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

2018-12-07 Thread Mikle Kolyada

commit: 496ab09085454b7331e23f217e17bc2241a5e901
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Dec  7 12:48:34 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Dec  7 12:48:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=496ab090

app-misc/mosquitto: arm stable wrt bug #668436

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-misc/mosquitto/mosquitto-1.5.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-1.5.3.ebuild 
b/app-misc/mosquitto/mosquitto-1.5.3.ebuild
index ffc14bbf4db..46cf3f99a9e 100644
--- a/app-misc/mosquitto/mosquitto-1.5.3.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.5.3.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 x86"
 IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 
 REQUIRED_USE="test? ( bridge )"

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

2018-12-06 Thread Thomas Deutschmann

commit: 32ad052dc27f8b5d05b68281e33f3cce01a7e100
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Dec  7 02:14:55 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Dec  7 02:40:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32ad052d

app-misc/mosquitto: x86 stable (bug #668436)

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 app-misc/mosquitto/mosquitto-1.5.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-1.5.3.ebuild 
b/app-misc/mosquitto/mosquitto-1.5.3.ebuild
index d25a8f0f4da..ffc14bbf4db 100644
--- a/app-misc/mosquitto/mosquitto-1.5.3.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.5.3.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 x86"
 IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 
 REQUIRED_USE="test? ( bridge )"

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

2018-12-05 Thread Agostino Sarubbo

commit: 13ea19584662ee3734bb7f28c1cdf54aa1d16daf
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Dec  5 09:38:01 2018 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Dec  5 09:38:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13ea1958

app-misc/mosquitto: amd64 stable wrt bug #668436

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 app-misc/mosquitto/mosquitto-1.5.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-1.5.3.ebuild 
b/app-misc/mosquitto/mosquitto-1.5.3.ebuild
index 44c2e14ee22..d25a8f0f4da 100644
--- a/app-misc/mosquitto/mosquitto-1.5.3.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.5.3.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 ~x86"
 IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 
 REQUIRED_USE="test? ( bridge )"

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

2018-10-25 Thread Virgil Dupras

commit: afdf30764f85a99b4de9eaa6fb72bc473350dbd9
Author: Lucas Ramage  protonmail  com>
AuthorDate: Thu Oct 25 00:57:11 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Fri Oct 26 00:34:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afdf3076

app-misc/mosquitto: bump to version 1.5.3

Closes: https://bugs.gentoo.org/668436
Signed-off-by: Lucas Ramage  protonmail.com>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/10221
Signed-off-by: Virgil Dupras  gentoo.org>

 app-misc/mosquitto/Manifest   |   1 +
 app-misc/mosquitto/mosquitto-1.5.3.ebuild | 101 ++
 2 files changed, 102 insertions(+)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 66c09e49408..ddfa4ca9715 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.5.3.tar.gz 425844 BLAKE2B 
d868dd67cd86e57f6af8e5556e0cee520f60cac4f16a24ceeec163acf5663339908d77304b7e70898ef5afaeeabb57c2a2857df297600180e1b9db6f2bf990b1
 SHA512 
8aa4f85914316c2dc08908a649779946ab33b23ea669c6f7eed0d8a1af7ae26381cfe1a50c32d220658f8693ef6a86045690824af4b7ca0271426ff3455e7796
 DIST mosquitto-1.5.tar.gz 419614 BLAKE2B 
d405e1e4f967f1030229a2e64793b84a3c8dc356a3b8d95a9bfc50a623cdb79517bbcfda87275f23c44002f3a41a20db58fed5a33d2c7d63da95e0d6d15951bb
 SHA512 
29b82bc0c6510fa5062cb43c06bd91ce5223be5689cba077df8b2cb5ac377cb125b8a8bb292b53bcec0d4b186977c25c3ecdd8c92d4ed996fde07f8c759c0668

diff --git a/app-misc/mosquitto/mosquitto-1.5.3.ebuild 
b/app-misc/mosquitto/mosquitto-1.5.3.ebuild
new file mode 100644
index 000..44c2e14ee22
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.5.3.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 )"
+
+_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

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

2018-10-11 Thread Virgil Dupras

commit: 3f834e59e8cbe7627d5a776dab60eaf59aa40d70
Author: Virgil Dupras  gentoo  org>
AuthorDate: Fri Oct 12 03:10:03 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Fri Oct 12 03:10:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f834e59

app-misc/mosquitto: downgrade broken package

Patches didn't apply cleanly and I pushed without having tested. Sorry.
Downgrading to 1.5, version for which the patch has been created.

Closes: https://bugs.gentoo.org/668410
Signed-off-by: Virgil Dupras  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-misc/mosquitto/Manifest | 2 +-
 app-misc/mosquitto/{mosquitto-1.5.1.ebuild => mosquitto-1.5.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index edeb703fb8b..66c09e49408 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,2 +1,2 @@
 DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 
92bcb1fd9e67711d6ce8db5e767be31a1321866205cf4cad684d8b77a8b14a2eaf5e4367a74d5dd8f814f0d229dc77ce878879632c0c34c6a23f7975bf6ae8c7
 SHA512 
dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2
-DIST mosquitto-1.5.1.tar.gz 430066 BLAKE2B 
ab2df1b77cfcb71c95d3412c4c3da4cf0af1a48d700642a12c8e0334762e9e8868ba0cbd69311d7aa324f2920d3be227149ba4e0bd7558ba10e5d7d1f0b24996
 SHA512 
7b076a98ca87f9fa4579eb4a6b62b171df746920719e9bd6efce0a4815c15edc9da177669819509184d2b01ed0756be8259adba344df690efe0547fd6741
+DIST mosquitto-1.5.tar.gz 419614 BLAKE2B 
d405e1e4f967f1030229a2e64793b84a3c8dc356a3b8d95a9bfc50a623cdb79517bbcfda87275f23c44002f3a41a20db58fed5a33d2c7d63da95e0d6d15951bb
 SHA512 
29b82bc0c6510fa5062cb43c06bd91ce5223be5689cba077df8b2cb5ac377cb125b8a8bb292b53bcec0d4b186977c25c3ecdd8c92d4ed996fde07f8c759c0668

diff --git a/app-misc/mosquitto/mosquitto-1.5.1.ebuild 
b/app-misc/mosquitto/mosquitto-1.5.ebuild
similarity index 98%
rename from app-misc/mosquitto/mosquitto-1.5.1.ebuild
rename to app-misc/mosquitto/mosquitto-1.5.ebuild
index cc7bf4b128f..a2251b4ffda 100644
--- a/app-misc/mosquitto/mosquitto-1.5.1.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6

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

2018-10-11 Thread Virgil Dupras

commit: 28a61d271f12604285852fcbe20b4bfa1b454cde
Author: Virgil Dupras  gentoo  org>
AuthorDate: Thu Oct 11 15:59:54 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Thu Oct 11 15:59:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28a61d27

app-misc/mosquitto: remove old

Signed-off-by: Virgil Dupras  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-misc/mosquitto/Manifest   |   1 -
 app-misc/mosquitto/mosquitto-1.4.14-r1.ebuild |  97 
 app-misc/mosquitto/mosquitto-1.4.15-r3.ebuild | 102 --
 app-misc/mosquitto/mosquitto-1.4.15.ebuild|  99 -
 4 files changed, 299 deletions(-)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 83420091448..edeb703fb8b 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,3 +1,2 @@
 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 
7b076a98ca87f9fa4579eb4a6b62b171df746920719e9bd6efce0a4815c15edc9da177669819509184d2b01ed0756be8259adba344df690efe0547fd6741

diff --git a/app-misc/mosquitto/mosquitto-1.4.14-r1.ebuild 
b/app-misc/mosquitto/mosquitto-1.4.14-r1.ebuild
deleted file mode 100644
index 96530da48cb..000
--- a/app-misc/mosquitto/mosquitto-1.4.14-r1.ebuild
+++ /dev/null
@@ -1,97 +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 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() {
-   eapply "${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
-   eapply_user
-}
-
-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

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

2018-10-11 Thread Virgil Dupras

commit: 7750cd794da77bfa401364df3b29189b4ffbb04d
Author: Lucas Ramage  protonmail  com>
AuthorDate: Tue May 29 14:35:07 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Thu Oct 11 15:53:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7750cd79

app-misc/mosquitto: bump version to 1.5.1

Signed-off-by: Lucas Ramage  protonmail.com>
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  gentoo.org>

 app-misc/mosquitto/Manifest|  1 +
 .../mosquitto-1.5-fix-socket_get_address.patch | 29 ++
 ...patch => mosquitto-fix-conditional-tests.patch} |  0
 app-misc/mosquitto/metadata.xml|  2 +-
 ...1.4.15-r2.ebuild => mosquitto-1.4.15-r3.ebuild} |  2 +-
 ...tto-1.4.15-r2.ebuild => mosquitto-1.5.1.ebuild} |  8 --
 6 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index e57c2e973ef..83420091448 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 
7b076a98ca87f9fa4579eb4a6b62b171df746920719e9bd6efce0a4815c15edc9da177669819509184d2b01ed0756be8259adba344df690efe0547fd6741

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 000..7e9778e8b70
--- /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 = >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(_req);
+   if(!hosts_access(_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-1.4.15-conditional-tests.patch 
b/app-misc/mosquitto/files/mosquitto-fix-conditional-tests.patch
similarity index 100%
rename from app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch
rename to app-misc/mosquitto/files/mosquitto-fix-conditional-tests.patch

diff --git a/app-misc/mosquitto/metadata.xml b/app-misc/mosquitto/metadata.xml
index 2b05da7a5d4..ec6718456c6 100644
--- a/app-misc/mosquitto/metadata.xml
+++ b/app-misc/mosquitto/metadata.xml
@@ -2,7 +2,7 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 

-   ramage.lu...@openmailbox.org
+   ramage.lu...@protonmail.com
Lucas Ramage



diff --git a/app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild 
b/app-misc/mosquitto/mosquitto-1.4.15-r3.ebuild
similarity index 97%
copy from app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild
copy to app-misc/mosquitto/mosquitto-1.4.15-r3.ebuild
index 48165a4db6f..8905f6d3f49 100644
--- a/app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.4.15-r3.ebuild
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}
srv? ( net-dns/c-ares )
websockets? ( net-libs/libwebsockets )"
 
-PATCHES=( "${FILESDIR}/${P}-conditional-tests.patch" )
+PATCHES=( "${FILESDIR}/${PN}-fix-conditional-tests.patch" )
 
 _emake() {
LIBDIR=$(get_libdir)

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

2018-04-29 Thread Thomas Deutschmann

commit: a10e73daa7b72d562e006beb77817712dbb606e5
Author: Lucas Ramage  openmailbox  org>
AuthorDate: Thu Apr 26 17:19:14 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Apr 30 01:26:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a10e73da

app-misc/mosquitto: fix conditional tests for v1.4.15

Closes: https://bugs.gentoo.org/650632
Closes: https://bugs.gentoo.org/653238
Closes: https://github.com/gentoo/gentoo/pull/8027
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../files/mosquitto-1.4.15-conditional-tests.patch |  12 +++
 app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild  | 102 +
 2 files changed, 114 insertions(+)

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
new file mode 100644
index 000..1642597c562
--- /dev/null
+++ b/app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch
@@ -0,0 +1,12 @@
+--- a/test/broker/c/Makefile   2016-02-14 14:36:55.0 +
 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-r2.ebuild 
b/app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild
new file mode 100644
index 000..48165a4db6f
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.4.15-r2.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}/${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
+}

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

2018-04-16 Thread Thomas Deutschmann

commit: 39a54f4318fee7b07d8121525e8889c960277de8
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Apr 16 13:05:25 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Apr 16 13:38:00 2018 +
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..000
--- 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.0 +
-+++ 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..000
--- 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"
-}

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

2018-03-23 Thread Michał Górny

commit: 2cee2c07a68cc9d0e9798a61d400ef4904219c94
Author: lramage94  openmailbox  org>
AuthorDate: Sun Mar  4 22:32:41 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Mar 23 22:27:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cee2c07

app-misc/mosquitto: bump version to 1.4.15

Closes: https://github.com/gentoo/gentoo/pull/7362
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-misc/mosquitto/Manifest|  1 +
 app-misc/mosquitto/mosquitto-1.4.15.ebuild | 99 ++
 2 files changed, 100 insertions(+)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 781bd37391c..e57c2e973ef 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1 +1,2 @@
 DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 
92bcb1fd9e67711d6ce8db5e767be31a1321866205cf4cad684d8b77a8b14a2eaf5e4367a74d5dd8f814f0d229dc77ce878879632c0c34c6a23f7975bf6ae8c7
 SHA512 
dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2
+DIST mosquitto-1.4.15.tar.gz 368961 BLAKE2B 
28bfab7d41d9e057ba8b52e0c428967ecc5d0c25a3d73dca420ae883c2b462ee02da1eeb9c22f4d392f0ccf62224acab6f24d4a0798a594f4b9f90c907fa1495
 SHA512 
36b06547553cf28af3ca9b728c42fc27e849c4ae84d7964572d430233ab26e2b59eee2a215ac23ddf2d0bef419e7c70e64e2a22c397fadb3e0677314d03f1100

diff --git a/app-misc/mosquitto/mosquitto-1.4.15.ebuild 
b/app-misc/mosquitto/mosquitto-1.4.15.ebuild
new file mode 100644
index 000..65dffc2f3f1
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.4.15.ebuild
@@ -0,0 +1,99 @@
+# 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() {
+   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"
+}

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

2018-02-17 Thread Patrice Clement

commit: a70344dce419cb7c2323441e90a013386a3598c6
Author: lramage94  openmailbox  org>
AuthorDate: Wed Feb  7 20:51:28 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Feb 17 15:10:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a70344dc

app-misc/mosquitto: add maintainer to metadata.xml file.

Closes: https://bugs.gentoo.org/647128

Package-Manager: Portage-2.3.19, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7135

 app-misc/mosquitto/metadata.xml | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/metadata.xml b/app-misc/mosquitto/metadata.xml
index 16890c32f16..2b05da7a5d4 100644
--- a/app-misc/mosquitto/metadata.xml
+++ b/app-misc/mosquitto/metadata.xml
@@ -1,7 +1,14 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
+   ramage.lu...@openmailbox.org
+   Lucas Ramage
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   

Enable bridge support in the MQTT 
broker.
Store messages and subscriptions to a 
file.

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

2018-02-17 Thread Patrice Clement

commit: ed018340232d1931e4d8a71a2224564a2e0bff0c
Author: lramage94  openmailbox  org>
AuthorDate: Fri Feb  9 15:01:58 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Feb 17 15:10:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed018340

app-misc/mosquitto: EAPI 6 bump.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-misc/mosquitto/mosquitto-1.4.14-r1.ebuild | 97 +++
 1 file changed, 97 insertions(+)

diff --git a/app-misc/mosquitto/mosquitto-1.4.14-r1.ebuild 
b/app-misc/mosquitto/mosquitto-1.4.14-r1.ebuild
new file mode 100644
index 000..96530da48cb
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.4.14-r1.ebuild
@@ -0,0 +1,97 @@
+# 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 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() {
+   eapply "${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
+   eapply_user
+}
+
+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"
+}

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

2018-02-07 Thread Michał Górny

commit: a05571487d976a2fda3738be0b3d24e3fac9de62
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Feb  7 09:27:53 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Feb  7 09:29:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0557148

app-misc/mosquitto: Drop maintainer per inactivity

Closes: https://bugs.gentoo.org/633008

 app-misc/mosquitto/metadata.xml | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/app-misc/mosquitto/metadata.xml b/app-misc/mosquitto/metadata.xml
index 53e88eadda1..16890c32f16 100644
--- a/app-misc/mosquitto/metadata.xml
+++ b/app-misc/mosquitto/metadata.xml
@@ -1,14 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   n...@digimed.co.uk
-   Neil Bothwick
-   
-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   
+   

Enable bridge support in the MQTT 
broker.
Store messages and subscriptions to a 
file.

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

2017-12-23 Thread David Seifert

commit: 035d8b59f3fd641631fb455a3e5792b605efee22
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Nov 29 17:18:24 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Dec 23 13:12:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=035d8b59

app-misc/mosquitto: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/6344

 .../files/mosquitto-1.4.8-conditional-tests.patch  | 41 -
 .../files/mosquitto-1.4.9-conditional-tests.patch  | 43 --
 2 files changed, 84 deletions(-)

diff --git a/app-misc/mosquitto/files/mosquitto-1.4.8-conditional-tests.patch 
b/app-misc/mosquitto/files/mosquitto-1.4.8-conditional-tests.patch
deleted file mode 100644
index 811cee645c9..000
--- a/app-misc/mosquitto/files/mosquitto-1.4.8-conditional-tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
 a/test/broker/Makefile 2016-02-14 14:36:55.0 +
-+++ b/test/broker/Makefile 2016-05-05 09:53:30.548519257 +0100
-@@ -63,11 +63,13 @@
-   ./05-clean-session-qos1.py 
- 
- 06 :
-+ifeq ($(WITH_BRIDGE),yes)
-   ./06-bridge-reconnect-local-out.py
-   ./06-bridge-br2b-disconnect-qos1.py
-   ./06-bridge-br2b-disconnect-qos2.py
-   ./06-bridge-b2br-disconnect-qos1.py
-   ./06-bridge-b2br-disconnect-qos2.py
-+endif
- 
- 07 :
-   ./07-will-qos0.py
-@@ -85,10 +87,12 @@
-   ./08-ssl-connect-cert-auth-crl.py
-   ./08-ssl-connect-identity.py
-   ./08-ssl-connect-no-identity.py
-+ifeq ($(WITH_BRIDGE),yes)
-   ./08-ssl-bridge.py
-   ./08-tls-psk-pub.py
-   ./08-tls-psk-bridge.py
- endif
-+endif
- 
- 09 :
-   ./09-plugin-auth-unpwd-success.py
 a/test/broker/c/Makefile   2016-02-14 14:36:55.0 +
-+++ 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.4.9-conditional-tests.patch 
b/app-misc/mosquitto/files/mosquitto-1.4.9-conditional-tests.patch
deleted file mode 100644
index 12b4fc56bc3..000
--- a/app-misc/mosquitto/files/mosquitto-1.4.9-conditional-tests.patch
+++ /dev/null
@@ -1,43 +0,0 @@
 a/test/broker/Makefile 2016-06-02 22:20:22.0 +0100
-+++ b/test/broker/Makefile 2016-07-08 14:17:33.772666865 +0100
-@@ -63,6 +63,7 @@
-   ./05-clean-session-qos1.py 
- 
- 06 :
-+ifeq ($(WITH_BRIDGE),yes)
-   ./06-bridge-reconnect-local-out.py
-   ./06-bridge-br2b-disconnect-qos1.py
-   ./06-bridge-br2b-disconnect-qos2.py
-@@ -70,6 +71,7 @@
-   ./06-bridge-b2br-disconnect-qos2.py
-   ./06-bridge-fail-persist-resend-qos1.py
-   ./06-bridge-fail-persist-resend-qos2.py
-+endif
- 
- 07 :
-   ./07-will-qos0.py
-@@ -87,10 +89,12 @@
-   ./08-ssl-connect-cert-auth-crl.py
-   ./08-ssl-connect-identity.py
-   ./08-ssl-connect-no-identity.py
-+ifeq ($(WITH_BRIDGE),yes)
-   ./08-ssl-bridge.py
-   ./08-tls-psk-pub.py
-   ./08-tls-psk-bridge.py
- endif
-+endif
- 
- 09 :
-   ./09-plugin-auth-unpwd-success.py
 a/test/broker/c/Makefile   2016-02-14 14:36:55.0 +
-+++ 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

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

2017-09-03 Thread Aaron Bauman

commit: 1715b68da3dbd3d4263da9469a661ee43ea92c3c
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sun Sep  3 12:34:36 2017 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sun Sep  3 12:34:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1715b68d

app-misc/mosquitto: arm stable

 app-misc/mosquitto/mosquitto-1.4.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-1.4.14.ebuild 
b/app-misc/mosquitto/mosquitto-1.4.14.ebuild
index 94e5de9884f..04008dcbd0b 100644
--- a/app-misc/mosquitto/mosquitto-1.4.14.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.4.14.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://mosquitto.org/;
 SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz;
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE="bridge examples +persistence +srv ssl tcpd websockets"
 
 RDEPEND="tcpd? ( sys-apps/tcp-wrappers )

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

2017-09-02 Thread Aaron Bauman

commit: 3f6f600d1d7518682040ed9df870c3cc15435b74
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sat Sep  2 18:03:52 2017 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sat Sep  2 18:03:52 2017 +
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..000
--- 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

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

2017-09-02 Thread Aaron Bauman

commit: aa382b7d7239634cedf8575ec161a678333473f6
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sat Sep  2 18:00:07 2017 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sat Sep  2 18:01:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa382b7d

app-misc/mosquitto: x86 stable

Gentoo-bug: 625290
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 app-misc/mosquitto/mosquitto-1.4.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-1.4.14.ebuild 
b/app-misc/mosquitto/mosquitto-1.4.14.ebuild
index 4851231f6f3..94e5de9884f 100644
--- a/app-misc/mosquitto/mosquitto-1.4.14.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.4.14.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://mosquitto.org/;
 SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz;
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="bridge examples +persistence +srv ssl tcpd websockets"
 
 RDEPEND="tcpd? ( sys-apps/tcp-wrappers )

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

2017-09-02 Thread Aaron Bauman

commit: 2ea3583fb3ee2efc0dd9501ab43d814b2b9d715c
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sat Sep  2 17:57:32 2017 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sat Sep  2 18:01:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ea3583f

app-misc/mosquitto: amd64 stable

Gentoo-bug: 625290
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 app-misc/mosquitto/mosquitto-1.4.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-1.4.14.ebuild 
b/app-misc/mosquitto/mosquitto-1.4.14.ebuild
index 3f4677c38d1..4851231f6f3 100644
--- a/app-misc/mosquitto/mosquitto-1.4.14.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.4.14.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://mosquitto.org/;
 SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz;
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="bridge examples +persistence +srv ssl tcpd websockets"
 
 RDEPEND="tcpd? ( sys-apps/tcp-wrappers )

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

2017-08-03 Thread Markus Meier

commit: b511cc6303de46a9d852d3fd9b7e8068fd4a7e8f
Author: Markus Meier  gentoo  org>
AuthorDate: Fri Aug  4 04:28:48 2017 +
Commit: Markus Meier  gentoo  org>
CommitDate: Fri Aug  4 04:28:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b511cc63

app-misc/mosquitto: arm stable, bug #601146

Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"

 app-misc/mosquitto/mosquitto-1.4.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/mosquitto/mosquitto-1.4.10.ebuild 
b/app-misc/mosquitto/mosquitto-1.4.10.ebuild
index 8bae940d9fb..e7137583c9b 100644
--- a/app-misc/mosquitto/mosquitto-1.4.10.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.4.10.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://mosquitto.org/;
 SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz;
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 x86 ~arm"
+KEYWORDS="amd64 arm x86"
 IUSE="bridge examples +persistence +srv ssl tcpd"
 
 RDEPEND="tcpd? ( sys-apps/tcp-wrappers )

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

2017-07-20 Thread Manuel Rüger

commit: 2e2f8a2964df8be140e80249385aeed626c1de1b
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Jul 20 14:30:17 2017 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Jul 20 14:30:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e2f8a29

app-misc/mosquitto: Version bump to 1.4.14

Gentoo-Bug: 625290
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 app-misc/mosquitto/Manifest|  1 +
 app-misc/mosquitto/mosquitto-1.4.14.ebuild | 96 ++
 2 files changed, 97 insertions(+)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 97732b6a437..13a5ecee843 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,2 +1,3 @@
 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.14.ebuild 
b/app-misc/mosquitto/mosquitto-1.4.14.ebuild
new file mode 100644
index 000..3f4677c38d1
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.4.14.ebuild
@@ -0,0 +1,96 @@
+# 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

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

2017-05-28 Thread Manuel Rüger

commit: ee8b421a75f07ba080244b75cb351a7a08edf58d
Author: Manuel Rüger  gentoo  org>
AuthorDate: Sun May 28 22:04:03 2017 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sun May 28 22:05:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee8b421a

app-misc/mosquitto: Version bump to 1.4.11, proxy commit for Neil Bothwick

* Add support for WebSockets (bug 588504)
* Fix prestripped files
* Respect CC

Gentoo-Bug: 615678

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-misc/mosquitto/Manifest|  1 +
 app-misc/mosquitto/metadata.xml|  1 +
 app-misc/mosquitto/mosquitto-1.4.11.ebuild | 96 ++
 3 files changed, 98 insertions(+)

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index d404db1ef51..97732b6a437 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1 +1,2 @@
 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

diff --git a/app-misc/mosquitto/metadata.xml b/app-misc/mosquitto/metadata.xml
index da548ae04a8..53e88eadda1 100644
--- a/app-misc/mosquitto/metadata.xml
+++ b/app-misc/mosquitto/metadata.xml
@@ -13,5 +13,6 @@
Enable bridge support in the MQTT 
broker.
Store messages and subscriptions to a 
file.
Include SRV lookup support.
+   Support the WebSocket protocol.

 

diff --git a/app-misc/mosquitto/mosquitto-1.4.11.ebuild 
b/app-misc/mosquitto/mosquitto-1.4.11.ebuild
new file mode 100644
index 000..3f4677c38d1
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.4.11.ebuild
@@ -0,0 +1,96 @@
+# 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
+}
+

1 2 >

1 - 100 of 108 matches

Mail list logo