* [gentoo-commits] repo/gentoo:master commit in: app-misc/mosquitto/, app-misc/mosquitto/files/
@ 2018-04-30 1:26 Thomas Deutschmann
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Deutschmann @ 2018-04-30 1:26 UTC (permalink / raw
To: gentoo-commits
commit: a10e73daa7b72d562e006beb77817712dbb606e5
Author: Lucas Ramage <ramage.lucas <AT> openmailbox <DOT> org>
AuthorDate: Thu Apr 26 17:19:14 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Apr 30 01:26:19 2018 +0000
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 00000000000..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.000000000 +0000
++++ b/test/broker/c/Makefile 2016-05-05 09:40:31.440608209 +0100
+@@ -13,7 +13,9 @@
+ $(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
+
+ 08-tls-psk-bridge.test : 08-tls-psk-bridge.c
++ifeq ($(WITH_BRIDGE),yes)
+ $(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
++endif
+
+
+ reallyclean : clean
diff --git a/app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild b/app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild
new file mode 100644
index 00000000000..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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/mosquitto/, app-misc/mosquitto/files/
@ 2021-08-21 0:44 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2021-08-21 0:44 UTC (permalink / raw
To: gentoo-commits
commit: 49d86e3fbe90ef95a393ebd628174f38b5a514a4
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 21 00:43:17 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Aug 21 00:44:39 2021 +0000
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 <mattst88 <AT> 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 00000000000..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 <roger@atchoo.org>
+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 \
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/mosquitto/, app-misc/mosquitto/files/
@ 2023-03-29 16:51 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2023-03-29 16:51 UTC (permalink / raw
To: gentoo-commits
commit: 5cb59f66ac4f379b267af8074afda23206cca8aa
Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 18 18:04:39 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 16:51:15 2023 +0000
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 <expeditioneer <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/30215
Signed-off-by: Matt Turner <mattst88 <AT> 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 000000000000..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 000000000000..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:"
+ 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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/mosquitto/, app-misc/mosquitto/files/
@ 2023-05-30 3:22 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2023-05-30 3:22 UTC (permalink / raw
To: gentoo-commits
commit: efe3ee96988bc5eff55bde4b5fc37a7b7e3c2616
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue May 30 03:20:04 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue May 30 03:22:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efe3ee96
app-misc/mosquitto: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> 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..000000000000
--- 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..000000000000
--- 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 been"
- elog "installed to /usr/share/mosquitto/ for your convenience."
- elog
- fi
- done
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-05-30 3:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-30 3:22 [gentoo-commits] repo/gentoo:master commit in: app-misc/mosquitto/, app-misc/mosquitto/files/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2023-03-29 16:51 Matt Turner
2021-08-21 0:44 Matt Turner
2018-04-30 1:26 Thomas Deutschmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox