1 |
commit: 440f6895ecf74dccec69fb9c469a667aa036c1a9 |
2 |
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 22 17:13:36 2016 +0000 |
4 |
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 22 17:13:36 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=440f6895 |
7 |
|
8 |
app-misc/mosquitto: Version bump to 1.4.9 |
9 |
|
10 |
Proxy commit for Neil Bothwick |
11 |
Gentoo-Bug: 588502 |
12 |
|
13 |
Package-Manager: portage-2.3.0 |
14 |
|
15 |
app-misc/mosquitto/Manifest | 1 + |
16 |
.../files/mosquitto-1.4.9-conditional-tests.patch | 43 ++++++++++ |
17 |
app-misc/mosquitto/mosquitto-1.4.9.ebuild | 97 ++++++++++++++++++++++ |
18 |
3 files changed, 141 insertions(+) |
19 |
|
20 |
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest |
21 |
index 7e0827a..5d27f28 100644 |
22 |
--- a/app-misc/mosquitto/Manifest |
23 |
+++ b/app-misc/mosquitto/Manifest |
24 |
@@ -1 +1,2 @@ |
25 |
DIST mosquitto-1.4.8.tar.gz 326120 SHA256 d96eb5610e57cc3e273f4527d3f54358ab7711459941a9e64bc4d0a85c2acfda SHA512 4bad8683e98ec858468c53f85f53b42a4166667cebf665d11d3dabe604711f5031da007c8f6d6cb49b8bc91b87eb452bc1f8bfa6adf2d439d2223180b316f9bc WHIRLPOOL b2931c55f3e70316cb57ae180f361c1dedf67e86fec9f235aa3b817884e6af13b8b9b8dc83e375a877d85b1d423ea586ee0698b08af88873a1131d58b4ed402a |
26 |
+DIST mosquitto-1.4.9.tar.gz 325712 SHA256 1df3ae07de40b80a74cd37a7b026895c544cdd3b42c9e0719ae91623aa98c58b SHA512 5994159d9a8da248a877f3032f36ca9a865d9b4efaafac329620864049992a77d414e02252cbbfef89ea2c37dc761b1885a89e19fc8e82b2a42d38f31e761d4d WHIRLPOOL c03a2c8254dce35bb56c243b17ab255e6d4f8210e73d6855d3abff5d3dcf976ca303082d902616ca4b6bf4ea9b2fcc69e52d3ccde7feac41d3ccf5809b157fed |
27 |
|
28 |
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 |
29 |
new file mode 100644 |
30 |
index 0000000..12b4fc5 |
31 |
--- /dev/null |
32 |
+++ b/app-misc/mosquitto/files/mosquitto-1.4.9-conditional-tests.patch |
33 |
@@ -0,0 +1,43 @@ |
34 |
+--- a/test/broker/Makefile 2016-06-02 22:20:22.000000000 +0100 |
35 |
++++ b/test/broker/Makefile 2016-07-08 14:17:33.772666865 +0100 |
36 |
+@@ -63,6 +63,7 @@ |
37 |
+ ./05-clean-session-qos1.py |
38 |
+ |
39 |
+ 06 : |
40 |
++ifeq ($(WITH_BRIDGE),yes) |
41 |
+ ./06-bridge-reconnect-local-out.py |
42 |
+ ./06-bridge-br2b-disconnect-qos1.py |
43 |
+ ./06-bridge-br2b-disconnect-qos2.py |
44 |
+@@ -70,6 +71,7 @@ |
45 |
+ ./06-bridge-b2br-disconnect-qos2.py |
46 |
+ ./06-bridge-fail-persist-resend-qos1.py |
47 |
+ ./06-bridge-fail-persist-resend-qos2.py |
48 |
++endif |
49 |
+ |
50 |
+ 07 : |
51 |
+ ./07-will-qos0.py |
52 |
+@@ -87,10 +89,12 @@ |
53 |
+ ./08-ssl-connect-cert-auth-crl.py |
54 |
+ ./08-ssl-connect-identity.py |
55 |
+ ./08-ssl-connect-no-identity.py |
56 |
++ifeq ($(WITH_BRIDGE),yes) |
57 |
+ ./08-ssl-bridge.py |
58 |
+ ./08-tls-psk-pub.py |
59 |
+ ./08-tls-psk-bridge.py |
60 |
+ endif |
61 |
++endif |
62 |
+ |
63 |
+ 09 : |
64 |
+ ./09-plugin-auth-unpwd-success.py |
65 |
+--- a/test/broker/c/Makefile 2016-02-14 14:36:55.000000000 +0000 |
66 |
++++ b/test/broker/c/Makefile 2016-05-05 09:40:31.440608209 +0100 |
67 |
+@@ -13,7 +13,9 @@ |
68 |
+ $(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1 |
69 |
+ |
70 |
+ 08-tls-psk-bridge.test : 08-tls-psk-bridge.c |
71 |
++ifeq ($(WITH_BRIDGE),yes) |
72 |
+ $(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1 |
73 |
++endif |
74 |
+ |
75 |
+ |
76 |
+ reallyclean : clean |
77 |
|
78 |
diff --git a/app-misc/mosquitto/mosquitto-1.4.9.ebuild b/app-misc/mosquitto/mosquitto-1.4.9.ebuild |
79 |
new file mode 100644 |
80 |
index 0000000..a9ebf16 |
81 |
--- /dev/null |
82 |
+++ b/app-misc/mosquitto/mosquitto-1.4.9.ebuild |
83 |
@@ -0,0 +1,97 @@ |
84 |
+# Copyright 1999-2016 Gentoo Foundation |
85 |
+# Distributed under the terms of the GNU General Public License v2 |
86 |
+# $Id$ |
87 |
+ |
88 |
+EAPI="5" |
89 |
+PYTHON_COMPAT=( python2_7 ) |
90 |
+ |
91 |
+inherit eutils systemd user python-any-r1 |
92 |
+ |
93 |
+DESCRIPTION="An Open Source MQTT v3 Broker" |
94 |
+HOMEPAGE="http://mosquitto.org/" |
95 |
+SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz" |
96 |
+LICENSE="EPL-1.0" |
97 |
+SLOT="0" |
98 |
+KEYWORDS="~amd64 ~x86" |
99 |
+IUSE="bridge examples +persistence +srv ssl tcpd" |
100 |
+ |
101 |
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers ) |
102 |
+ ssl? ( dev-libs/openssl:0= )" |
103 |
+DEPEND="${RDEPEND} |
104 |
+ ${PYTHON_DEPS} |
105 |
+ srv? ( net-dns/c-ares )" |
106 |
+ |
107 |
+LIBDIR=$(get_libdir) |
108 |
+QA_PRESTRIPPED="/usr/sbin/mosquitto |
109 |
+ /usr/bin/mosquitto_passwd |
110 |
+ /usr/bin/mosquitto_sub |
111 |
+ /usr/bin/mosquitto_pub |
112 |
+ /usr/${LIBDIR}/libmosquittopp.so.1 |
113 |
+ /usr/${LIBDIR}/libmosquitto.so.1" |
114 |
+ |
115 |
+pkg_setup() { |
116 |
+ enewgroup mosquitto |
117 |
+ enewuser mosquitto -1 -1 -1 mosquitto |
118 |
+} |
119 |
+ |
120 |
+src_prepare() { |
121 |
+ epatch "${FILESDIR}/${P}-conditional-tests.patch" |
122 |
+ if use persistence; then |
123 |
+ sed -i -e "s:^#autosave_interval:autosave_interval:" \ |
124 |
+ -e "s:^#persistence false$:persistence true:" \ |
125 |
+ -e "s:^#persistence_file:persistence_file:" \ |
126 |
+ -e "s:^#persistence_location$:persistence_location /var/lib/mosquitto/:" \ |
127 |
+ mosquitto.conf || die |
128 |
+ fi |
129 |
+ python_setup |
130 |
+ python_fix_shebang test |
131 |
+} |
132 |
+ |
133 |
+src_configure() { |
134 |
+ makeopts=( |
135 |
+ "LIB_SUFFIX=${LIBDIR:3}" |
136 |
+ "WITH_BRIDGE=$(usex bridge)" |
137 |
+ "WITH_PERSISTENCE=$(usex persistence)" |
138 |
+ "WITH_SRV=$(usex srv)" |
139 |
+ "WITH_TLS=$(usex ssl)" |
140 |
+ "WITH_WRAP=$(usex tcpd)" |
141 |
+ ) |
142 |
+ einfo "${makeopts[@]}" |
143 |
+} |
144 |
+ |
145 |
+src_compile() { |
146 |
+ emake "${makeopts[@]}" |
147 |
+} |
148 |
+ |
149 |
+src_test() { |
150 |
+ emake "${makeopts[@]}" test |
151 |
+} |
152 |
+ |
153 |
+src_install() { |
154 |
+ emake "${makeopts[@]}" DESTDIR="${D}" prefix=/usr install |
155 |
+ keepdir /var/lib/mosquitto |
156 |
+ fowners mosquitto:mosquitto /var/lib/mosquitto |
157 |
+ dodoc readme.md CONTRIBUTING.md ChangeLog.txt |
158 |
+ doinitd "${FILESDIR}"/mosquitto |
159 |
+ insinto /etc/mosquitto |
160 |
+ doins mosquitto.conf |
161 |
+ systemd_dounit "${FILESDIR}/mosquitto.service" |
162 |
+ |
163 |
+ if use examples; then |
164 |
+ docompress -x "/usr/share/doc/${PF}/examples" |
165 |
+ insinto "/usr/share/doc/${PF}/examples" |
166 |
+ doins -r examples/* |
167 |
+ fi |
168 |
+} |
169 |
+ |
170 |
+pkg_postinst() { |
171 |
+ elog "" |
172 |
+ elog "The Python module has been moved out of mosquitto." |
173 |
+ elog "See http://mosquitto.org/documentation/python/" |
174 |
+ elog "" |
175 |
+ elog "To start the mosquitto daemon at boot, add it to the default runlevel with:" |
176 |
+ elog "" |
177 |
+ elog " rc-update add mosquitto default" |
178 |
+ elog " or" |
179 |
+ elog " systemctl enable mosquitto" |
180 |
+} |