Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 656572 | Differences between
and this patch

Collapse All | Expand All

(-)a/app-misc/mosquitto/Manifest (+1 lines)
Lines 1-2 Link Here
1
DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 92bcb1fd9e67711d6ce8db5e767be31a1321866205cf4cad684d8b77a8b14a2eaf5e4367a74d5dd8f814f0d229dc77ce878879632c0c34c6a23f7975bf6ae8c7 SHA512 dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2
1
DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 92bcb1fd9e67711d6ce8db5e767be31a1321866205cf4cad684d8b77a8b14a2eaf5e4367a74d5dd8f814f0d229dc77ce878879632c0c34c6a23f7975bf6ae8c7 SHA512 dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2
2
DIST mosquitto-1.4.15.tar.gz 368961 BLAKE2B 28bfab7d41d9e057ba8b52e0c428967ecc5d0c25a3d73dca420ae883c2b462ee02da1eeb9c22f4d392f0ccf62224acab6f24d4a0798a594f4b9f90c907fa1495 SHA512 36b06547553cf28af3ca9b728c42fc27e849c4ae84d7964572d430233ab26e2b59eee2a215ac23ddf2d0bef419e7c70e64e2a22c397fadb3e0677314d03f1100
2
DIST mosquitto-1.4.15.tar.gz 368961 BLAKE2B 28bfab7d41d9e057ba8b52e0c428967ecc5d0c25a3d73dca420ae883c2b462ee02da1eeb9c22f4d392f0ccf62224acab6f24d4a0798a594f4b9f90c907fa1495 SHA512 36b06547553cf28af3ca9b728c42fc27e849c4ae84d7964572d430233ab26e2b59eee2a215ac23ddf2d0bef419e7c70e64e2a22c397fadb3e0677314d03f1100
3
DIST mosquitto-1.5.tar.gz 419614 BLAKE2B d405e1e4f967f1030229a2e64793b84a3c8dc356a3b8d95a9bfc50a623cdb79517bbcfda87275f23c44002f3a41a20db58fed5a33d2c7d63da95e0d6d15951bb SHA512 29b82bc0c6510fa5062cb43c06bd91ce5223be5689cba077df8b2cb5ac377cb125b8a8bb292b53bcec0d4b186977c25c3ecdd8c92d4ed996fde07f8c759c0668
(-)a/app-misc/mosquitto/files/mosquitto-1.5-fix-socket_get_address.patch (+30 lines)
Line 0 Link Here
1
--- a/test/broker/c/Makefile	2016-02-14 14:36:55.000000000 +0000
Line 0 Link Here
1
# Fix missing rename of mosquitto__socket_get_address. Mosquitto bug 810.
2
3
diff --git a/src/conf.c b/src/conf.c
4
index f3d812d..daf2bf4 100644
5
--- a/src/conf.c
6
+++ b/src/conf.c
7
@@ -735,8 +735,8 @@ int config__read_file_core(struct mosquitto__config *config, bool reload, struct
8
 	struct mosquitto__listener *cur_listener = &config->default_listener;
9
 #ifdef WITH_BRIDGE
10
 	char *address;
11
-	int i;
12
 #endif
13
+	int i;
14
 	int lineno_ext;
15
 	struct mosquitto__security_options *cur_security_options = NULL;
16
 
17
diff --git a/src/net.c b/src/net.c
18
index 7397de5..670b7e2 100644
19
--- a/src/net.c
20
+++ b/src/net.c
21
@@ -114,7 +114,7 @@ int net__socket_accept(struct mosquitto_db *db, mosq_sock_t listensock)
22
 	fromhost(&wrap_req);
23
 	if(!hosts_access(&wrap_req)){
24
 		/* Access is denied */
25
-		if(!mosquitto__socket_get_address(new_sock, address, 1024)){
26
+		if(!net__socket_get_address(new_sock, address, 1024)){
27
 			log__printf(NULL, MOSQ_LOG_NOTICE, "Client connection from %s denied access by tcpd.", address);
28
 		}
29
 		COMPAT_CLOSE(new_sock);
(-)a/app-misc/mosquitto/mosquitto-1.5.ebuild (-1 / +106 lines)
Line 0 Link Here
0
- 
1
# Copyright 1999-2018 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
3
4
EAPI=6
5
PYTHON_COMPAT=( python2_7 )
6
7
inherit systemd user toolchain-funcs python-any-r1
8
9
DESCRIPTION="An Open Source MQTT v3 Broker"
10
HOMEPAGE="https://mosquitto.org/"
11
SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
12
13
LICENSE="EPL-1.0"
14
SLOT="0"
15
KEYWORDS="~amd64 ~arm ~x86"
16
IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
17
18
REQUIRED_USE="test? ( bridge )"
19
20
RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
21
	ssl? ( dev-libs/openssl:0= )"
22
DEPEND="${RDEPEND}
23
	${PYTHON_DEPS}
24
	srv? ( net-dns/c-ares )
25
	websockets? ( net-libs/libwebsockets )"
26
27
PATCHES=(
28
	"${FILESDIR}/${P}-conditional-tests.patch"
29
	"${FILESDIR}/${P}-fix-socket_get_address.patch"
30
)
31
32
_emake() {
33
	LIBDIR=$(get_libdir)
34
	emake \
35
		CC="$(tc-getCC)" \
36
		LIB_SUFFIX="${LIBDIR:3}" \
37
		WITH_BRIDGE="$(usex bridge)" \
38
		WITH_PERSISTENCE="$(usex persistence)" \
39
		WITH_SRV="$(usex srv)" \
40
		WITH_TLS="$(usex ssl)" \
41
		WITH_WEBSOCKETS="$(usex websockets)" \
42
		WITH_WRAP="$(usex tcpd)" \
43
		"$@"
44
}
45
46
pkg_setup() {
47
	enewgroup mosquitto
48
	enewuser mosquitto -1 -1 -1 mosquitto
49
}
50
51
src_prepare() {
52
	default
53
	if use persistence; then
54
		sed -i -e "/^#autosave_interval/s|^#||" \
55
			-e "s|^#persistence false$|persistence true|" \
56
			-e "/^#persistence_file/s|^#||" \
57
			-e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
58
			mosquitto.conf || die
59
	fi
60
61
	# Remove prestripping
62
	sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
63
		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
64
65
	python_setup
66
	rm test/{broker,lib}/ptest.py
67
	python_fix_shebang test
68
}
69
70
src_compile() {
71
	_emake
72
}
73
74
src_test() {
75
	_emake test
76
}
77
78
src_install() {
79
	_emake DESTDIR="${D}" prefix=/usr install
80
	keepdir /var/lib/mosquitto
81
	fowners mosquitto:mosquitto /var/lib/mosquitto
82
	dodoc readme.md CONTRIBUTING.md ChangeLog.txt
83
	doinitd "${FILESDIR}"/mosquitto
84
	insinto /etc/mosquitto
85
	doins mosquitto.conf
86
	systemd_dounit "${FILESDIR}/mosquitto.service"
87
88
	if use examples; then
89
		docompress -x "/usr/share/doc/${PF}/examples"
90
		docinto "/usr/share/doc/${PF}"
91
		doins -r examples
92
	fi
93
}
94
95
pkg_postinst() {
96
	if [[ -z "${REPLACING_VERSIONS}" ]]; then
97
		elog "The Python module has been moved out of mosquitto."
98
		elog "See https://mosquitto.org/documentation/python/"
99
	else
100
		elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
101
		elog ""
102
		elog "    rc-update add mosquitto default"
103
		elog "    or"
104
		elog "    systemctl enable mosquitto"
105
	fi
106
}

Return to bug 656572