1 |
commit: 3d4c8ecf1539c3a38eeb3a8ff078d7414013fc0d |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 25 10:09:47 2020 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 25 10:09:47 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d4c8ecf |
7 |
|
8 |
net-misc/crossbar: remove last-rited pkg |
9 |
|
10 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
11 |
|
12 |
net-misc/crossbar/Manifest | 5 - |
13 |
net-misc/crossbar/crossbar-17.12.1.ebuild | 172 ------------- |
14 |
net-misc/crossbar/crossbar-17.6.1_p3-r1.ebuild | 163 ------------- |
15 |
net-misc/crossbar/crossbar-17.8.1.ebuild | 172 ------------- |
16 |
net-misc/crossbar/crossbar-17.9.1.ebuild | 172 ------------- |
17 |
net-misc/crossbar/crossbar-18.3.1.ebuild | 169 ------------- |
18 |
net-misc/crossbar/files/confd | 11 - |
19 |
net-misc/crossbar/files/config.json.sample | 60 ----- |
20 |
.../files/crossbar-17.8.1-Revert-Torservices.patch | 246 ------------------- |
21 |
.../files/crossbar-17.9.1-Revert-Torservices.patch | 270 --------------------- |
22 |
net-misc/crossbar/files/initd | 35 --- |
23 |
net-misc/crossbar/metadata.xml | 22 -- |
24 |
12 files changed, 1497 deletions(-) |
25 |
|
26 |
diff --git a/net-misc/crossbar/Manifest b/net-misc/crossbar/Manifest |
27 |
deleted file mode 100644 |
28 |
index 1048f72fdfa..00000000000 |
29 |
--- a/net-misc/crossbar/Manifest |
30 |
+++ /dev/null |
31 |
@@ -1,5 +0,0 @@ |
32 |
-DIST crossbar-17.12.1.tar.gz 736982 BLAKE2B bd2af652d376bf8ffe6cc23b0a798bb905ce835ba9282a276e1e5878d01a52370fd887f9e96339e4a2e45b89ca41918a936be7a010d9c1054a3c9f2a8361bd50 SHA512 082432f04fcf578012392d02ddafb4bcd6a61da4a1467a6ae767ca75293747cf84ee7bf27d1e2078e5c637c66b3fbd848b14cfc39eaefd1b98b5ad3b64c0a58d |
33 |
-DIST crossbar-17.6.1.post3.tar.gz 725054 BLAKE2B 1c60ae9a29f9d2831dd219c30751c65c07639810c24ea27f35c1fb27fd55c6b97f225e9fef9bbb00c79233a52a5e7ae6f4a61020c028f697e3fbdec1ada41980 SHA512 c3efac2c7f7a41e6544eb98057afb249908453d6ddfb81c514f0705ed967374d50f844fe1a80395652b81a7c23abc90a03a0d6c88287f10cbfe99e64cb70919d |
34 |
-DIST crossbar-17.8.1.tar.gz 1545668 BLAKE2B 812a4b423bf663386255332de2ab90afb4f0a44d205a193d71523e7fa0aba2bf1644b2136200c6ae4b1639de2764b7139ee6081a5167b21abc2bdec6400c5a60 SHA512 21ed2031ddebe93fcd4fcd01243b2aa8979444e833386db83b10d032cfc3c3f9d47cf638d4cf26eb2801e91892c85115fec91e0a6f071a619f014132663f6c32 |
35 |
-DIST crossbar-17.9.1.tar.gz 730753 BLAKE2B 8fb93b017b6af8264aa828a6353d1c6f5fd7f224797504f67f77b5cf2759ada5f9609eb6815da96afadfc2bae90acb2837be19ed0896e1a8ce37ff384fcea367 SHA512 fee96e1c900c756536dc9bf6088c512a50accbae0e8010b7e058de8ed2ebb2f366e5d5051ab2f07517dd642f4d65c65e9b701b00d7bca1b9352c58f38f892563 |
36 |
-DIST crossbar-18.3.1.tar.gz 736736 BLAKE2B 546a7d4ff173928179eeff86aef50e3517067e6aede145a5185e891fe749e0e2c507b577ea3be8f416c5894e8c43db42d8ceaabbdc64823b305219c2f6277ff4 SHA512 cb85ba44054c59eecb751896c5f0d793ccc8990c9d00733de546512b7e500a90ef4042d49ec6f648ec3677687950fbee62208c9bbb6692de65df4f238a2414dc |
37 |
|
38 |
diff --git a/net-misc/crossbar/crossbar-17.12.1.ebuild b/net-misc/crossbar/crossbar-17.12.1.ebuild |
39 |
deleted file mode 100644 |
40 |
index 713e12a96e9..00000000000 |
41 |
--- a/net-misc/crossbar/crossbar-17.12.1.ebuild |
42 |
+++ /dev/null |
43 |
@@ -1,172 +0,0 @@ |
44 |
-# Copyright 1999-2020 Gentoo Authors |
45 |
-# Distributed under the terms of the GNU General Public License v2 |
46 |
- |
47 |
-EAPI=6 |
48 |
-PYTHON_COMPAT=( python2_7 python3_6 ) |
49 |
- |
50 |
-inherit user systemd distutils-r1 |
51 |
- |
52 |
-MY_PV="${PV}" |
53 |
-MY_P="${PN}-${MY_PV}" |
54 |
- |
55 |
-DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework" |
56 |
-HOMEPAGE="https://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.org/project/crossbar/" |
57 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" |
58 |
- |
59 |
-LICENSE="AGPL-3" |
60 |
-SLOT="0" |
61 |
-KEYWORDS="~amd64" |
62 |
-IUSE="test tor" |
63 |
-RESTRICT="!test? ( test )" |
64 |
- |
65 |
-RDEPEND=" |
66 |
- >=dev-python/attrs-17.2.0[${PYTHON_USEDEP}] |
67 |
- >=dev-python/autobahn-17.10.1[${PYTHON_USEDEP}] |
68 |
- >=dev-python/bitstring-3.1.5[${PYTHON_USEDEP}] |
69 |
- >=dev-python/cbor-1.0.0[${PYTHON_USEDEP}] |
70 |
- >=dev-python/click-6.7[${PYTHON_USEDEP}] |
71 |
- >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}] |
72 |
- >=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}] |
73 |
- $(python_gen_cond_dep '>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]' python2_7) |
74 |
- >=dev-python/hyper-h2-3.0.1[${PYTHON_USEDEP}] |
75 |
- =dev-python/idna-2.5[${PYTHON_USEDEP}] |
76 |
- >=dev-python/incremental-17.5.0[${PYTHON_USEDEP}] |
77 |
- $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.18[${PYTHON_USEDEP}]' python2_7) |
78 |
- >=dev-python/jinja-2.9.6[${PYTHON_USEDEP}] |
79 |
- >=dev-python/lmdb-0.92[${PYTHON_USEDEP}] |
80 |
- >=dev-python/mistune-0.7.4[${PYTHON_USEDEP}] |
81 |
- >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}] |
82 |
- >=dev-python/priority-1.3.0[${PYTHON_USEDEP}] |
83 |
- >=dev-python/psutil-5.2.2[${PYTHON_USEDEP}] |
84 |
- >=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}] |
85 |
- >=dev-python/pyasn1-modules-0.0.9[${PYTHON_USEDEP}] |
86 |
- >=dev-python/pygments-2.2.0[${PYTHON_USEDEP}] |
87 |
- >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}] |
88 |
- >=dev-python/pytrie-0.3[${PYTHON_USEDEP}] |
89 |
- >=dev-python/py-ubjson-0.9.0[${PYTHON_USEDEP}] |
90 |
- >=dev-python/pynacl-1.1.2[${PYTHON_USEDEP}] |
91 |
- >=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] |
92 |
- >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] |
93 |
- >=dev-python/sdnotify-0.3.1[${PYTHON_USEDEP}] |
94 |
- >=dev-python/service_identity-17.0.0[${PYTHON_USEDEP}] |
95 |
- >=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}] |
96 |
- >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] |
97 |
- >=dev-python/shutilwhich-1.1.0[${PYTHON_USEDEP}] |
98 |
- >=dev-python/treq-17.3.1[${PYTHON_USEDEP}] |
99 |
- >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] |
100 |
- >=dev-python/txaio-2.8.2[${PYTHON_USEDEP}] |
101 |
- >=dev-python/u-msgpack-2.4.1[${PYTHON_USEDEP}] |
102 |
- >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] |
103 |
- >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] |
104 |
- tor? ( >=dev-python/txtorcon-0.19.3[${PYTHON_USEDEP}] ) |
105 |
-" |
106 |
-DEPEND=" |
107 |
- !dev-python/crossbar |
108 |
- >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] |
109 |
- >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] |
110 |
- test? ( |
111 |
- dev-python/mock[${PYTHON_USEDEP}] |
112 |
- ) |
113 |
-" |
114 |
-DOCS=( |
115 |
- README.rst LICENSE-FOR-API LICENSE COPYRIGHT |
116 |
-) |
117 |
- |
118 |
-S="${WORKDIR}"/${MY_P} |
119 |
- |
120 |
-python_prepare_all() { |
121 |
- # don't install the copyright, license... let dodoc do it |
122 |
- sed -e "s/^ data_files=.*//" -i setup.py || die |
123 |
- |
124 |
- if ! use tor; then |
125 |
- eapply "${FILESDIR}/${PN}-17.9.1-Revert-Torservices.patch" |
126 |
- sed -e "s/^txtorcon.*//" -i requirements-min.txt || die |
127 |
- fi |
128 |
- # remove these py2 deps from setuptools install_requires |
129 |
- # it is not filtered out for >=py3.4 and results in test fails |
130 |
- sed -e "s/^ipaddress.*//" -i requirements-min.txt || die |
131 |
- sed -e "s/^enum34.*//" -i requirements-min.txt || die |
132 |
- |
133 |
- distutils-r1_python_prepare_all |
134 |
-} |
135 |
- |
136 |
-pkg_setup() { |
137 |
- enewuser crossbar |
138 |
-} |
139 |
- |
140 |
-python_test() { |
141 |
- pushd "${TEST_DIR}" > /dev/null || die |
142 |
- /usr/bin/trial crossbar || die "Tests failed with ${EPYTHON}" |
143 |
- popd > /dev/null || die |
144 |
-} |
145 |
- |
146 |
-python_install_all() { |
147 |
- distutils-r1_python_install_all |
148 |
- |
149 |
- keepdir /var/lib/crossbar |
150 |
- insinto /var/lib/crossbar |
151 |
- doins "${FILESDIR}/config.json.sample" |
152 |
- |
153 |
- newconfd "${FILESDIR}/confd" crossbar |
154 |
- newinitd "${FILESDIR}/initd" crossbar |
155 |
-} |
156 |
- |
157 |
-pkg_posinst() { |
158 |
- einfo "For exapmle configurations and scripts" |
159 |
- einfo "See: https://github.com/crossbario/crossbar-examples" |
160 |
- |
161 |
- if [[ -n ${REPLACING_VERSIONS} ]]; then |
162 |
- ewarn |
163 |
- ewarn "Starting with net-misc/crossbar-17.6.1_p3-r1, more than one instance of crossbar" |
164 |
- ewarn "can be run simultaneously. Note that \"BASEDIR\" in the crossbar conf.d/crossbar file" |
165 |
- ewarn "is the common base directory for all instances. If you are migrating from an older" |
166 |
- ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." |
167 |
- ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." |
168 |
- ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" |
169 |
- ewarn " ln --symbolic --relative /etc/init.d/crossbar /etc/init.d/crossbar.myinstance" |
170 |
- ewarn " rc-update add crossbar.myinstance default" |
171 |
- ewarn " /etc/init.d/crossbar.myinstance start" |
172 |
- ewarn "Systems using systemd can do the following:" |
173 |
- ewarn " systemctl enable crossbar@××××××××××.service" |
174 |
- ewarn " systemctl enable crossbar.target" |
175 |
- ewarn " systemctl start crossbar.target" |
176 |
- fi |
177 |
-} |
178 |
- |
179 |
-pkg_config() { |
180 |
- local crossbar_path="/var/lib/crossbar" |
181 |
- local log_path="/var/log/crossbar" |
182 |
- einfo "This will prepare a new crossbar instance in ${crossbar_path}." |
183 |
- einfo "Press Control-C to abort." |
184 |
- |
185 |
- einfo "Enter the name for the new instance: " |
186 |
- read instance_name |
187 |
- [[ -z "${instance_name}" ]] && die "Invalid instance name" |
188 |
- |
189 |
- local instance_path="${crossbar_path}/${instance_name}" |
190 |
- local instance_log_path="${log_path}/${instance_name}" |
191 |
- |
192 |
- if [[ -e "${instance_path}" ]]; then |
193 |
- eerror "The instance with the specified name already exists:" |
194 |
- eerror "${instance_path}" |
195 |
- die "Instance already exists" |
196 |
- fi |
197 |
- |
198 |
- if [[ ! -d "${instance_path}" ]]; then |
199 |
- mkdir --parents "${instance_path}" || die "Unable to create directory ${crossbar_path}" |
200 |
- fi |
201 |
- chown --recursive crossbar "${instance_path}" || die "Setting permissions for instance failed" |
202 |
- cp "${crossbar_path}/config.json.sample" "${instance_path}/config.json" \ |
203 |
- || die "Moving sample configuration failed" |
204 |
- ln --symbolic --relative "/etc/init.d/crossbar" "/etc/init.d/crossbar.${instance_name}" \ |
205 |
- || die "Unable to create link to init file" |
206 |
- |
207 |
- if [[ ! -d "${instance_log_path}" ]]; then |
208 |
- mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" |
209 |
- fi |
210 |
- ln --symbolic --relative "${instance_log_path}/node.log" "${instance_path}/node.log" \ |
211 |
- || die "Unable to create link to log file" |
212 |
- |
213 |
- einfo "Successfully created a crossbar instance at ${instance_path}." |
214 |
- einfo "To change the default settings edit the config.json file in this directory." |
215 |
-} |
216 |
|
217 |
diff --git a/net-misc/crossbar/crossbar-17.6.1_p3-r1.ebuild b/net-misc/crossbar/crossbar-17.6.1_p3-r1.ebuild |
218 |
deleted file mode 100644 |
219 |
index 29ce90de46a..00000000000 |
220 |
--- a/net-misc/crossbar/crossbar-17.6.1_p3-r1.ebuild |
221 |
+++ /dev/null |
222 |
@@ -1,163 +0,0 @@ |
223 |
-# Copyright 1999-2019 Gentoo Authors |
224 |
-# Distributed under the terms of the GNU General Public License v2 |
225 |
- |
226 |
-EAPI=6 |
227 |
-# Not quite ready for py3, unconditionally deps on too many backported |
228 |
-# pkgs installed in newer pythons that shouldn't need them. |
229 |
-PYTHON_COMPAT=( python2_7 ) |
230 |
- |
231 |
-inherit user systemd distutils-r1 |
232 |
- |
233 |
-MY_PV="17.6.1.post3" |
234 |
-MY_P="${PN}-${MY_PV}" |
235 |
- |
236 |
-DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework" |
237 |
-HOMEPAGE="https://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.org/project/crossbar/" |
238 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" |
239 |
- |
240 |
-LICENSE="AGPL-3" |
241 |
-SLOT="0" |
242 |
-KEYWORDS="~amd64" |
243 |
-IUSE="test" |
244 |
-RESTRICT="!test? ( test )" |
245 |
- |
246 |
-RDEPEND=" |
247 |
- >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] |
248 |
- >=dev-python/twisted-17.1.0[${PYTHON_USEDEP}] |
249 |
- $(python_gen_cond_dep '>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]' python2_7) |
250 |
- >=dev-python/txaio-2.8.0[${PYTHON_USEDEP}] |
251 |
- >=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}] |
252 |
- >=dev-python/pyasn1-modules-0.0.9[${PYTHON_USEDEP}] |
253 |
- >=dev-python/incremental-17.5.0[${PYTHON_USEDEP}] |
254 |
- >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] |
255 |
- <dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}] |
256 |
- >=dev-python/priority-1.3.0[${PYTHON_USEDEP}] |
257 |
- >=dev-python/service_identity-17.0.0[${PYTHON_USEDEP}] |
258 |
- >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}] |
259 |
- >=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}] |
260 |
- >=dev-python/autobahn-17.6.2[${PYTHON_USEDEP}] |
261 |
- >=dev-python/jinja-2.9.6[${PYTHON_USEDEP}] |
262 |
- >=dev-python/treq-17.3.1[${PYTHON_USEDEP}] |
263 |
- >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] |
264 |
- >=dev-python/click-6.7[${PYTHON_USEDEP}] |
265 |
- >=dev-python/attrs-17.2.0[${PYTHON_USEDEP}] |
266 |
- >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}] |
267 |
- $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.18[${PYTHON_USEDEP}]' python2_7) |
268 |
- >=dev-python/cbor-1.0.0[${PYTHON_USEDEP}] |
269 |
- >=dev-python/bitstring-3.1.5[${PYTHON_USEDEP}] |
270 |
- >=dev-python/pygments-2.2.0[${PYTHON_USEDEP}] |
271 |
- >=dev-python/pytrie-0.3[${PYTHON_USEDEP}] |
272 |
- >=dev-python/psutil-5.2.2[${PYTHON_USEDEP}] |
273 |
- >=dev-python/py-ubjson-0.9.0[${PYTHON_USEDEP}] |
274 |
- >=dev-python/pynacl-1.1.2[${PYTHON_USEDEP}] |
275 |
- >=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] |
276 |
- >=dev-python/lmdb-0.92[${PYTHON_USEDEP}] |
277 |
- >=dev-python/mistune-0.7.4[${PYTHON_USEDEP}] |
278 |
- >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}] |
279 |
- >=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}] |
280 |
- >=dev-python/sdnotify-0.3.1[${PYTHON_USEDEP}] |
281 |
- >=dev-python/shutilwhich-1.1.0[${PYTHON_USEDEP}] |
282 |
- >=dev-python/u-msgpack-2.4.1[${PYTHON_USEDEP}] |
283 |
- >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] |
284 |
-" |
285 |
-DEPEND=" |
286 |
- !dev-python/crossbar |
287 |
- >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] |
288 |
- >=dev-python/twisted-17.1.0[${PYTHON_USEDEP}] |
289 |
- test? ( |
290 |
- dev-python/mock[${PYTHON_USEDEP}] |
291 |
- ) |
292 |
-" |
293 |
-DOCS=( |
294 |
- README.rst LICENSE-FOR-API LICENSE COPYRIGHT |
295 |
-) |
296 |
- |
297 |
-S="${WORKDIR}"/${MY_P} |
298 |
- |
299 |
-python_prepare_all() { |
300 |
- # don't install the copyright, license... let dodoc do it |
301 |
- sed -e "s/^ data_files=.*//" -i setup.py || die |
302 |
- |
303 |
- distutils-r1_python_prepare_all |
304 |
-} |
305 |
- |
306 |
-pkg_setup() { |
307 |
- enewuser crossbar |
308 |
-} |
309 |
- |
310 |
-python_test() { |
311 |
- pushd "${TEST_DIR}" > /dev/null || die |
312 |
- /usr/bin/trial crossbar || die "Tests failed with ${EPYTHON}" |
313 |
- popd > /dev/null || die |
314 |
-} |
315 |
- |
316 |
-python_install_all() { |
317 |
- distutils-r1_python_install_all |
318 |
- |
319 |
- keepdir /var/lib/crossbar |
320 |
- insinto /var/lib/crossbar |
321 |
- doins "${FILESDIR}/config.json.sample" |
322 |
- |
323 |
- newconfd "${FILESDIR}/confd" crossbar |
324 |
- newinitd "${FILESDIR}/initd" crossbar |
325 |
-} |
326 |
- |
327 |
-pkg_posinst() { |
328 |
- einfo "For exapmle configurations and scripts" |
329 |
- einfo "See: https://github.com/crossbario/crossbar-examples" |
330 |
- |
331 |
- if [[ -n ${REPLACING_VERSIONS} ]]; then |
332 |
- ewarn |
333 |
- ewarn "Starting with net-misc/crossbar-17.6.1_p3-r1, more than one instance of crossbar" |
334 |
- ewarn "can be run simultaneously. Note that \"BASEDIR\" in the crossbar conf.d/crossbar file" |
335 |
- ewarn "is the common base directory for all instances. If you are migrating from an older" |
336 |
- ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." |
337 |
- ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." |
338 |
- ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" |
339 |
- ewarn " ln --symbolic --relative /etc/init.d/crossbar /etc/init.d/crossbar.myinstance" |
340 |
- ewarn " rc-update add crossbar.myinstance default" |
341 |
- ewarn " /etc/init.d/crossbar.myinstance start" |
342 |
- ewarn "Systems using systemd can do the following:" |
343 |
- ewarn " systemctl enable crossbar@××××××××××.service" |
344 |
- ewarn " systemctl enable crossbar.target" |
345 |
- ewarn " systemctl start crossbar.target" |
346 |
- fi |
347 |
-} |
348 |
- |
349 |
-pkg_config() { |
350 |
- local crossbar_path="/var/lib/crossbar" |
351 |
- local log_path="/var/log/crossbar" |
352 |
- einfo "This will prepare a new crossbar instance in ${crossbar_path}." |
353 |
- einfo "Press Control-C to abort." |
354 |
- |
355 |
- einfo "Enter the name for the new instance: " |
356 |
- read instance_name |
357 |
- [[ -z "${instance_name}" ]] && die "Invalid instance name" |
358 |
- |
359 |
- local instance_path="${crossbar_path}/${instance_name}" |
360 |
- local instance_log_path="${log_path}/${instance_name}" |
361 |
- |
362 |
- if [[ -e "${instance_path}" ]]; then |
363 |
- eerror "The instance with the specified name already exists:" |
364 |
- eerror "${instance_path}" |
365 |
- die "Instance already exists" |
366 |
- fi |
367 |
- |
368 |
- if [[ ! -d "${instance_path}" ]]; then |
369 |
- mkdir --parents "${instance_path}" || die "Unable to create directory ${crossbar_path}" |
370 |
- fi |
371 |
- chown --recursive crossbar "${instance_path}" || die "Setting permissions for instance failed" |
372 |
- cp "${crossbar_path}/config.json.sample" "${instance_path}/config.json" \ |
373 |
- || die "Moving sample configuration failed" |
374 |
- ln --symbolic --relative "/etc/init.d/crossbar" "/etc/init.d/crossbar.${instance_name}" \ |
375 |
- || die "Unable to create link to init file" |
376 |
- |
377 |
- if [[ ! -d "${instance_log_path}" ]]; then |
378 |
- mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" |
379 |
- fi |
380 |
- ln --symbolic --relative "${instance_log_path}/node.log" "${instance_path}/node.log" \ |
381 |
- || die "Unable to create link to log file" |
382 |
- |
383 |
- einfo "Successfully created a crossbar instance at ${instance_path}." |
384 |
- einfo "To change the default settings edit the config.json file in this directory." |
385 |
-} |
386 |
|
387 |
diff --git a/net-misc/crossbar/crossbar-17.8.1.ebuild b/net-misc/crossbar/crossbar-17.8.1.ebuild |
388 |
deleted file mode 100644 |
389 |
index 1dac2d54040..00000000000 |
390 |
--- a/net-misc/crossbar/crossbar-17.8.1.ebuild |
391 |
+++ /dev/null |
392 |
@@ -1,172 +0,0 @@ |
393 |
-# Copyright 1999-2020 Gentoo Authors |
394 |
-# Distributed under the terms of the GNU General Public License v2 |
395 |
- |
396 |
-EAPI=6 |
397 |
-PYTHON_COMPAT=( python2_7 python3_6 ) |
398 |
- |
399 |
-inherit user systemd distutils-r1 |
400 |
- |
401 |
-MY_PV="${PV}" |
402 |
-MY_P="${PN}-${MY_PV}" |
403 |
- |
404 |
-DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework" |
405 |
-HOMEPAGE="https://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.org/project/crossbar/" |
406 |
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" |
407 |
-SRC_URI="https://github.com/crossbario/crossbar/archive/v17.8.1.tar.gz -> ${P}.tar.gz" |
408 |
- |
409 |
-LICENSE="AGPL-3" |
410 |
-SLOT="0" |
411 |
-KEYWORDS="~amd64" |
412 |
-IUSE="test tor" |
413 |
-RESTRICT="!test? ( test )" |
414 |
- |
415 |
-RDEPEND=" |
416 |
- >=dev-python/attrs-17.2.0[${PYTHON_USEDEP}] |
417 |
- >=dev-python/autobahn-17.7.1[${PYTHON_USEDEP}] |
418 |
- >=dev-python/bitstring-3.1.5[${PYTHON_USEDEP}] |
419 |
- >=dev-python/cbor-1.0.0[${PYTHON_USEDEP}] |
420 |
- >=dev-python/click-6.7[${PYTHON_USEDEP}] |
421 |
- >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}] |
422 |
- >=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}] |
423 |
- $(python_gen_cond_dep '>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]' python2_7) |
424 |
- >=dev-python/hyper-h2-3.0.1[${PYTHON_USEDEP}] |
425 |
- >=dev-python/incremental-17.5.0[${PYTHON_USEDEP}] |
426 |
- $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.18[${PYTHON_USEDEP}]' python2_7) |
427 |
- >=dev-python/jinja-2.9.6[${PYTHON_USEDEP}] |
428 |
- >=dev-python/lmdb-0.92[${PYTHON_USEDEP}] |
429 |
- >=dev-python/mistune-0.7.4[${PYTHON_USEDEP}] |
430 |
- >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}] |
431 |
- >=dev-python/priority-1.3.0[${PYTHON_USEDEP}] |
432 |
- >=dev-python/psutil-5.2.2[${PYTHON_USEDEP}] |
433 |
- >=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}] |
434 |
- >=dev-python/pyasn1-modules-0.0.9[${PYTHON_USEDEP}] |
435 |
- >=dev-python/pygments-2.2.0[${PYTHON_USEDEP}] |
436 |
- >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}] |
437 |
- >=dev-python/pytrie-0.3[${PYTHON_USEDEP}] |
438 |
- >=dev-python/py-ubjson-0.9.0[${PYTHON_USEDEP}] |
439 |
- >=dev-python/pynacl-1.1.2[${PYTHON_USEDEP}] |
440 |
- >=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] |
441 |
- >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] |
442 |
- >=dev-python/sdnotify-0.3.1[${PYTHON_USEDEP}] |
443 |
- >=dev-python/service_identity-17.0.0[${PYTHON_USEDEP}] |
444 |
- >=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}] |
445 |
- >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] |
446 |
- >=dev-python/shutilwhich-1.1.0[${PYTHON_USEDEP}] |
447 |
- >=dev-python/treq-17.3.1[${PYTHON_USEDEP}] |
448 |
- >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] |
449 |
- >=dev-python/txaio-2.8.1[${PYTHON_USEDEP}] |
450 |
- >=dev-python/u-msgpack-2.4.1[${PYTHON_USEDEP}] |
451 |
- >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] |
452 |
- >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] |
453 |
- tor? ( >=dev-python/txtorcon-0.19.3[${PYTHON_USEDEP}] ) |
454 |
-" |
455 |
-DEPEND=" |
456 |
- !dev-python/crossbar |
457 |
- >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] |
458 |
- >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] |
459 |
- test? ( |
460 |
- dev-python/mock[${PYTHON_USEDEP}] |
461 |
- ) |
462 |
-" |
463 |
-DOCS=( |
464 |
- README.rst LICENSE-FOR-API LICENSE COPYRIGHT |
465 |
-) |
466 |
- |
467 |
-S="${WORKDIR}"/${MY_P} |
468 |
- |
469 |
-python_prepare_all() { |
470 |
- # don't install the copyright, license... let dodoc do it |
471 |
- sed -e "s/^ data_files=.*//" -i setup.py || die |
472 |
- |
473 |
- if ! use tor; then |
474 |
- eapply "${FILESDIR}/${PN}-17.8.1-Revert-Torservices.patch" |
475 |
- sed -e "s/^txtorcon.*//" -i requirements-min.txt || die |
476 |
- fi |
477 |
- # remove these py2 deps from setuptools install_requires |
478 |
- # it is not filtered out for >=py3.4 and results in test fails |
479 |
- sed -e "s/^ipaddress.*//" -i requirements-min.txt || die |
480 |
- sed -e "s/^enum34.*//" -i requirements-min.txt || die |
481 |
- |
482 |
- distutils-r1_python_prepare_all |
483 |
-} |
484 |
- |
485 |
-pkg_setup() { |
486 |
- enewuser crossbar |
487 |
-} |
488 |
- |
489 |
-python_test() { |
490 |
- pushd "${TEST_DIR}" > /dev/null || die |
491 |
- /usr/bin/trial crossbar || die "Tests failed with ${EPYTHON}" |
492 |
- popd > /dev/null || die |
493 |
-} |
494 |
- |
495 |
-python_install_all() { |
496 |
- distutils-r1_python_install_all |
497 |
- |
498 |
- keepdir /var/lib/crossbar |
499 |
- insinto /var/lib/crossbar |
500 |
- doins "${FILESDIR}/config.json.sample" |
501 |
- |
502 |
- newconfd "${FILESDIR}/confd" crossbar |
503 |
- newinitd "${FILESDIR}/initd" crossbar |
504 |
-} |
505 |
- |
506 |
-pkg_posinst() { |
507 |
- einfo "For exapmle configurations and scripts" |
508 |
- einfo "See: https://github.com/crossbario/crossbar-examples" |
509 |
- |
510 |
- if [[ -n ${REPLACING_VERSIONS} ]]; then |
511 |
- ewarn |
512 |
- ewarn "Starting with net-misc/crossbar-17.6.1_p3-r1, more than one instance of crossbar" |
513 |
- ewarn "can be run simultaneously. Note that \"BASEDIR\" in the crossbar conf.d/crossbar file" |
514 |
- ewarn "is the common base directory for all instances. If you are migrating from an older" |
515 |
- ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." |
516 |
- ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." |
517 |
- ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" |
518 |
- ewarn " ln --symbolic --relative /etc/init.d/crossbar /etc/init.d/crossbar.myinstance" |
519 |
- ewarn " rc-update add crossbar.myinstance default" |
520 |
- ewarn " /etc/init.d/crossbar.myinstance start" |
521 |
- ewarn "Systems using systemd can do the following:" |
522 |
- ewarn " systemctl enable crossbar@××××××××××.service" |
523 |
- ewarn " systemctl enable crossbar.target" |
524 |
- ewarn " systemctl start crossbar.target" |
525 |
- fi |
526 |
-} |
527 |
- |
528 |
-pkg_config() { |
529 |
- local crossbar_path="/var/lib/crossbar" |
530 |
- local log_path="/var/log/crossbar" |
531 |
- einfo "This will prepare a new crossbar instance in ${crossbar_path}." |
532 |
- einfo "Press Control-C to abort." |
533 |
- |
534 |
- einfo "Enter the name for the new instance: " |
535 |
- read instance_name |
536 |
- [[ -z "${instance_name}" ]] && die "Invalid instance name" |
537 |
- |
538 |
- local instance_path="${crossbar_path}/${instance_name}" |
539 |
- local instance_log_path="${log_path}/${instance_name}" |
540 |
- |
541 |
- if [[ -e "${instance_path}" ]]; then |
542 |
- eerror "The instance with the specified name already exists:" |
543 |
- eerror "${instance_path}" |
544 |
- die "Instance already exists" |
545 |
- fi |
546 |
- |
547 |
- if [[ ! -d "${instance_path}" ]]; then |
548 |
- mkdir --parents "${instance_path}" || die "Unable to create directory ${crossbar_path}" |
549 |
- fi |
550 |
- chown --recursive crossbar "${instance_path}" || die "Setting permissions for instance failed" |
551 |
- cp "${crossbar_path}/config.json.sample" "${instance_path}/config.json" \ |
552 |
- || die "Moving sample configuration failed" |
553 |
- ln --symbolic --relative "/etc/init.d/crossbar" "/etc/init.d/crossbar.${instance_name}" \ |
554 |
- || die "Unable to create link to init file" |
555 |
- |
556 |
- if [[ ! -d "${instance_log_path}" ]]; then |
557 |
- mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" |
558 |
- fi |
559 |
- ln --symbolic --relative "${instance_log_path}/node.log" "${instance_path}/node.log" \ |
560 |
- || die "Unable to create link to log file" |
561 |
- |
562 |
- einfo "Successfully created a crossbar instance at ${instance_path}." |
563 |
- einfo "To change the default settings edit the config.json file in this directory." |
564 |
-} |
565 |
|
566 |
diff --git a/net-misc/crossbar/crossbar-17.9.1.ebuild b/net-misc/crossbar/crossbar-17.9.1.ebuild |
567 |
deleted file mode 100644 |
568 |
index 3ce1782e9f4..00000000000 |
569 |
--- a/net-misc/crossbar/crossbar-17.9.1.ebuild |
570 |
+++ /dev/null |
571 |
@@ -1,172 +0,0 @@ |
572 |
-# Copyright 1999-2020 Gentoo Authors |
573 |
-# Distributed under the terms of the GNU General Public License v2 |
574 |
- |
575 |
-EAPI=6 |
576 |
-PYTHON_COMPAT=( python2_7 python3_6 ) |
577 |
- |
578 |
-inherit user systemd distutils-r1 |
579 |
- |
580 |
-MY_PV="${PV}" |
581 |
-MY_P="${PN}-${MY_PV}" |
582 |
- |
583 |
-DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework" |
584 |
-HOMEPAGE="https://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.org/project/crossbar/" |
585 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" |
586 |
- |
587 |
-LICENSE="AGPL-3" |
588 |
-SLOT="0" |
589 |
-KEYWORDS="~amd64" |
590 |
-IUSE="test tor" |
591 |
-RESTRICT="!test? ( test )" |
592 |
- |
593 |
-RDEPEND=" |
594 |
- >=dev-python/attrs-17.2.0[${PYTHON_USEDEP}] |
595 |
- ~dev-python/autobahn-${PV}[${PYTHON_USEDEP}] |
596 |
- >=dev-python/bitstring-3.1.5[${PYTHON_USEDEP}] |
597 |
- >=dev-python/cbor-1.0.0[${PYTHON_USEDEP}] |
598 |
- >=dev-python/click-6.7[${PYTHON_USEDEP}] |
599 |
- >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}] |
600 |
- >=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}] |
601 |
- $(python_gen_cond_dep '>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]' python2_7) |
602 |
- >=dev-python/hyper-h2-3.0.1[${PYTHON_USEDEP}] |
603 |
- =dev-python/idna-2.5[${PYTHON_USEDEP}] |
604 |
- >=dev-python/incremental-17.5.0[${PYTHON_USEDEP}] |
605 |
- $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.18[${PYTHON_USEDEP}]' python2_7) |
606 |
- >=dev-python/jinja-2.9.6[${PYTHON_USEDEP}] |
607 |
- >=dev-python/lmdb-0.92[${PYTHON_USEDEP}] |
608 |
- >=dev-python/mistune-0.7.4[${PYTHON_USEDEP}] |
609 |
- >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}] |
610 |
- >=dev-python/priority-1.3.0[${PYTHON_USEDEP}] |
611 |
- >=dev-python/psutil-5.2.2[${PYTHON_USEDEP}] |
612 |
- >=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}] |
613 |
- >=dev-python/pyasn1-modules-0.0.9[${PYTHON_USEDEP}] |
614 |
- >=dev-python/pygments-2.2.0[${PYTHON_USEDEP}] |
615 |
- >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}] |
616 |
- >=dev-python/pytrie-0.3[${PYTHON_USEDEP}] |
617 |
- >=dev-python/py-ubjson-0.9.0[${PYTHON_USEDEP}] |
618 |
- >=dev-python/pynacl-1.1.2[${PYTHON_USEDEP}] |
619 |
- >=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] |
620 |
- >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] |
621 |
- >=dev-python/sdnotify-0.3.1[${PYTHON_USEDEP}] |
622 |
- >=dev-python/service_identity-17.0.0[${PYTHON_USEDEP}] |
623 |
- >=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}] |
624 |
- >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] |
625 |
- >=dev-python/shutilwhich-1.1.0[${PYTHON_USEDEP}] |
626 |
- >=dev-python/treq-17.3.1[${PYTHON_USEDEP}] |
627 |
- >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] |
628 |
- >=dev-python/txaio-2.8.2[${PYTHON_USEDEP}] |
629 |
- >=dev-python/u-msgpack-2.4.1[${PYTHON_USEDEP}] |
630 |
- >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] |
631 |
- >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] |
632 |
- tor? ( >=dev-python/txtorcon-0.19.3[${PYTHON_USEDEP}] ) |
633 |
-" |
634 |
-DEPEND=" |
635 |
- !dev-python/crossbar |
636 |
- >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] |
637 |
- >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] |
638 |
- test? ( |
639 |
- dev-python/mock[${PYTHON_USEDEP}] |
640 |
- ) |
641 |
-" |
642 |
-DOCS=( |
643 |
- README.rst LICENSE-FOR-API LICENSE COPYRIGHT |
644 |
-) |
645 |
- |
646 |
-S="${WORKDIR}"/${MY_P} |
647 |
- |
648 |
-python_prepare_all() { |
649 |
- # don't install the copyright, license... let dodoc do it |
650 |
- sed -e "s/^ data_files=.*//" -i setup.py || die |
651 |
- |
652 |
- if ! use tor; then |
653 |
- eapply "${FILESDIR}/${PN}-17.9.1-Revert-Torservices.patch" |
654 |
- sed -e "s/^txtorcon.*//" -i requirements-min.txt || die |
655 |
- fi |
656 |
- # remove these py2 deps from setuptools install_requires |
657 |
- # it is not filtered out for >=py3.4 and results in test fails |
658 |
- sed -e "s/^ipaddress.*//" -i requirements-min.txt || die |
659 |
- sed -e "s/^enum34.*//" -i requirements-min.txt || die |
660 |
- |
661 |
- distutils-r1_python_prepare_all |
662 |
-} |
663 |
- |
664 |
-pkg_setup() { |
665 |
- enewuser crossbar |
666 |
-} |
667 |
- |
668 |
-python_test() { |
669 |
- pushd "${TEST_DIR}" > /dev/null || die |
670 |
- /usr/bin/trial crossbar || die "Tests failed with ${EPYTHON}" |
671 |
- popd > /dev/null || die |
672 |
-} |
673 |
- |
674 |
-python_install_all() { |
675 |
- distutils-r1_python_install_all |
676 |
- |
677 |
- keepdir /var/lib/crossbar |
678 |
- insinto /var/lib/crossbar |
679 |
- doins "${FILESDIR}/config.json.sample" |
680 |
- |
681 |
- newconfd "${FILESDIR}/confd" crossbar |
682 |
- newinitd "${FILESDIR}/initd" crossbar |
683 |
-} |
684 |
- |
685 |
-pkg_posinst() { |
686 |
- einfo "For exapmle configurations and scripts" |
687 |
- einfo "See: https://github.com/crossbario/crossbar-examples" |
688 |
- |
689 |
- if [[ -n ${REPLACING_VERSIONS} ]]; then |
690 |
- ewarn |
691 |
- ewarn "Starting with net-misc/crossbar-17.6.1_p3-r1, more than one instance of crossbar" |
692 |
- ewarn "can be run simultaneously. Note that \"BASEDIR\" in the crossbar conf.d/crossbar file" |
693 |
- ewarn "is the common base directory for all instances. If you are migrating from an older" |
694 |
- ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." |
695 |
- ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." |
696 |
- ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" |
697 |
- ewarn " ln --symbolic --relative /etc/init.d/crossbar /etc/init.d/crossbar.myinstance" |
698 |
- ewarn " rc-update add crossbar.myinstance default" |
699 |
- ewarn " /etc/init.d/crossbar.myinstance start" |
700 |
- ewarn "Systems using systemd can do the following:" |
701 |
- ewarn " systemctl enable crossbar@××××××××××.service" |
702 |
- ewarn " systemctl enable crossbar.target" |
703 |
- ewarn " systemctl start crossbar.target" |
704 |
- fi |
705 |
-} |
706 |
- |
707 |
-pkg_config() { |
708 |
- local crossbar_path="/var/lib/crossbar" |
709 |
- local log_path="/var/log/crossbar" |
710 |
- einfo "This will prepare a new crossbar instance in ${crossbar_path}." |
711 |
- einfo "Press Control-C to abort." |
712 |
- |
713 |
- einfo "Enter the name for the new instance: " |
714 |
- read instance_name |
715 |
- [[ -z "${instance_name}" ]] && die "Invalid instance name" |
716 |
- |
717 |
- local instance_path="${crossbar_path}/${instance_name}" |
718 |
- local instance_log_path="${log_path}/${instance_name}" |
719 |
- |
720 |
- if [[ -e "${instance_path}" ]]; then |
721 |
- eerror "The instance with the specified name already exists:" |
722 |
- eerror "${instance_path}" |
723 |
- die "Instance already exists" |
724 |
- fi |
725 |
- |
726 |
- if [[ ! -d "${instance_path}" ]]; then |
727 |
- mkdir --parents "${instance_path}" || die "Unable to create directory ${crossbar_path}" |
728 |
- fi |
729 |
- chown --recursive crossbar "${instance_path}" || die "Setting permissions for instance failed" |
730 |
- cp "${crossbar_path}/config.json.sample" "${instance_path}/config.json" \ |
731 |
- || die "Moving sample configuration failed" |
732 |
- ln --symbolic --relative "/etc/init.d/crossbar" "/etc/init.d/crossbar.${instance_name}" \ |
733 |
- || die "Unable to create link to init file" |
734 |
- |
735 |
- if [[ ! -d "${instance_log_path}" ]]; then |
736 |
- mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" |
737 |
- fi |
738 |
- ln --symbolic --relative "${instance_log_path}/node.log" "${instance_path}/node.log" \ |
739 |
- || die "Unable to create link to log file" |
740 |
- |
741 |
- einfo "Successfully created a crossbar instance at ${instance_path}." |
742 |
- einfo "To change the default settings edit the config.json file in this directory." |
743 |
-} |
744 |
|
745 |
diff --git a/net-misc/crossbar/crossbar-18.3.1.ebuild b/net-misc/crossbar/crossbar-18.3.1.ebuild |
746 |
deleted file mode 100644 |
747 |
index 9f47d7ef9b4..00000000000 |
748 |
--- a/net-misc/crossbar/crossbar-18.3.1.ebuild |
749 |
+++ /dev/null |
750 |
@@ -1,169 +0,0 @@ |
751 |
-# Copyright 1999-2020 Gentoo Authors |
752 |
-# Distributed under the terms of the GNU General Public License v2 |
753 |
- |
754 |
-EAPI=6 |
755 |
-PYTHON_COMPAT=( python2_7 python3_6 ) |
756 |
- |
757 |
-inherit user systemd distutils-r1 |
758 |
- |
759 |
-MY_PV="${PV}" |
760 |
-MY_P="${PN}-${MY_PV}" |
761 |
- |
762 |
-DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework" |
763 |
-HOMEPAGE="https://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.org/project/crossbar/" |
764 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" |
765 |
- |
766 |
-LICENSE="AGPL-3" |
767 |
-SLOT="0" |
768 |
-KEYWORDS="~amd64 ~arm64" |
769 |
-IUSE="test" |
770 |
-RESTRICT="!test? ( test )" |
771 |
- |
772 |
-RDEPEND=" |
773 |
- >=dev-python/attrs-17.2.0[${PYTHON_USEDEP}] |
774 |
- >=dev-python/autobahn-18.3.1[${PYTHON_USEDEP}] |
775 |
- >=dev-python/bitstring-3.1.5[${PYTHON_USEDEP}] |
776 |
- >=dev-python/cbor-1.0.0[${PYTHON_USEDEP}] |
777 |
- >=dev-python/click-6.7[${PYTHON_USEDEP}] |
778 |
- >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}] |
779 |
- >=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}] |
780 |
- $(python_gen_cond_dep '>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]' python2_7) |
781 |
- >=dev-python/hyper-h2-3.0.1[${PYTHON_USEDEP}] |
782 |
- =dev-python/idna-2.5[${PYTHON_USEDEP}] |
783 |
- >=dev-python/incremental-17.5.0[${PYTHON_USEDEP}] |
784 |
- $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.18[${PYTHON_USEDEP}]' python2_7) |
785 |
- >=dev-python/jinja-2.9.6[${PYTHON_USEDEP}] |
786 |
- >=dev-python/lmdb-0.92[${PYTHON_USEDEP}] |
787 |
- >=dev-python/mistune-0.7.4[${PYTHON_USEDEP}] |
788 |
- >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}] |
789 |
- >=dev-python/priority-1.3.0[${PYTHON_USEDEP}] |
790 |
- >=dev-python/psutil-5.2.2[${PYTHON_USEDEP}] |
791 |
- >=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}] |
792 |
- >=dev-python/pyasn1-modules-0.0.9[${PYTHON_USEDEP}] |
793 |
- >=dev-python/pygments-2.2.0[${PYTHON_USEDEP}] |
794 |
- >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}] |
795 |
- >=dev-python/pytrie-0.3[${PYTHON_USEDEP}] |
796 |
- >=dev-python/py-ubjson-0.9.0[${PYTHON_USEDEP}] |
797 |
- >=dev-python/pynacl-1.1.2[${PYTHON_USEDEP}] |
798 |
- >=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] |
799 |
- >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] |
800 |
- >=dev-python/sdnotify-0.3.1[${PYTHON_USEDEP}] |
801 |
- >=dev-python/service_identity-17.0.0[${PYTHON_USEDEP}] |
802 |
- >=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}] |
803 |
- >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] |
804 |
- >=dev-python/shutilwhich-1.1.0[${PYTHON_USEDEP}] |
805 |
- >=dev-python/treq-17.3.1[${PYTHON_USEDEP}] |
806 |
- >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] |
807 |
- >=dev-python/txaio-2.9.0[${PYTHON_USEDEP}] |
808 |
- >=dev-python/u-msgpack-2.4.1[${PYTHON_USEDEP}] |
809 |
- >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] |
810 |
- >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] |
811 |
- >=dev-python/txtorcon-0.19.3[${PYTHON_USEDEP}] |
812 |
-" |
813 |
-DEPEND=" |
814 |
- !dev-python/crossbar |
815 |
- >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] |
816 |
- >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] |
817 |
- test? ( |
818 |
- dev-python/mock[${PYTHON_USEDEP}] |
819 |
- ) |
820 |
-" |
821 |
-DOCS=( |
822 |
- README.rst LICENSE-FOR-API LICENSE COPYRIGHT |
823 |
-) |
824 |
- |
825 |
-S="${WORKDIR}"/${MY_P} |
826 |
- |
827 |
-python_prepare_all() { |
828 |
- # don't install the copyright, license... let dodoc do it |
829 |
- sed -e "s/^ data_files=.*//" -i setup.py || die |
830 |
- |
831 |
- # remove these py2 deps from setuptools install_requires |
832 |
- # it is not filtered out for >=py3.4 and results in test fails |
833 |
- sed -e "s/^ipaddress.*//" -i requirements-min.txt || die |
834 |
- sed -e "s/^enum34.*//" -i requirements-min.txt || die |
835 |
- |
836 |
- distutils-r1_python_prepare_all |
837 |
-} |
838 |
- |
839 |
-pkg_setup() { |
840 |
- enewuser crossbar |
841 |
-} |
842 |
- |
843 |
-python_test() { |
844 |
- pushd "${TEST_DIR}" > /dev/null || die |
845 |
- /usr/bin/trial crossbar || die "Tests failed with ${EPYTHON}" |
846 |
- popd > /dev/null || die |
847 |
-} |
848 |
- |
849 |
-python_install_all() { |
850 |
- distutils-r1_python_install_all |
851 |
- |
852 |
- keepdir /var/lib/crossbar |
853 |
- insinto /var/lib/crossbar |
854 |
- doins "${FILESDIR}/config.json.sample" |
855 |
- |
856 |
- newconfd "${FILESDIR}/confd" crossbar |
857 |
- newinitd "${FILESDIR}/initd" crossbar |
858 |
-} |
859 |
- |
860 |
-pkg_posinst() { |
861 |
- einfo "For exapmle configurations and scripts" |
862 |
- einfo "See: https://github.com/crossbario/crossbar-examples" |
863 |
- |
864 |
- if [[ -n ${REPLACING_VERSIONS} ]]; then |
865 |
- ewarn |
866 |
- ewarn "Starting with crossbar-18.3.1 the tor service capability and dependency are now built-in" |
867 |
- ewarn "Starting with net-misc/crossbar-17.6.1_p3-r1, more than one instance of crossbar" |
868 |
- ewarn "can be run simultaneously. Note that \"BASEDIR\" in the crossbar conf.d/crossbar file" |
869 |
- ewarn "is the common base directory for all instances. If you are migrating from an older" |
870 |
- ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." |
871 |
- ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." |
872 |
- ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" |
873 |
- ewarn " ln --symbolic --relative /etc/init.d/crossbar /etc/init.d/crossbar.myinstance" |
874 |
- ewarn " rc-update add crossbar.myinstance default" |
875 |
- ewarn " /etc/init.d/crossbar.myinstance start" |
876 |
- ewarn "Systems using systemd can do the following:" |
877 |
- ewarn " systemctl enable crossbar@××××××××××.service" |
878 |
- ewarn " systemctl enable crossbar.target" |
879 |
- ewarn " systemctl start crossbar.target" |
880 |
- fi |
881 |
-} |
882 |
- |
883 |
-pkg_config() { |
884 |
- local crossbar_path="/var/lib/crossbar" |
885 |
- local log_path="/var/log/crossbar" |
886 |
- einfo "This will prepare a new crossbar instance in ${crossbar_path}." |
887 |
- einfo "Press Control-C to abort." |
888 |
- |
889 |
- einfo "Enter the name for the new instance: " |
890 |
- read instance_name |
891 |
- [[ -z "${instance_name}" ]] && die "Invalid instance name" |
892 |
- |
893 |
- local instance_path="${crossbar_path}/${instance_name}" |
894 |
- local instance_log_path="${log_path}/${instance_name}" |
895 |
- |
896 |
- if [[ -e "${instance_path}" ]]; then |
897 |
- eerror "The instance with the specified name already exists:" |
898 |
- eerror "${instance_path}" |
899 |
- die "Instance already exists" |
900 |
- fi |
901 |
- |
902 |
- if [[ ! -d "${instance_path}" ]]; then |
903 |
- mkdir --parents "${instance_path}" || die "Unable to create directory ${crossbar_path}" |
904 |
- fi |
905 |
- chown --recursive crossbar "${instance_path}" || die "Setting permissions for instance failed" |
906 |
- cp "${crossbar_path}/config.json.sample" "${instance_path}/config.json" \ |
907 |
- || die "Moving sample configuration failed" |
908 |
- ln --symbolic --relative "/etc/init.d/crossbar" "/etc/init.d/crossbar.${instance_name}" \ |
909 |
- || die "Unable to create link to init file" |
910 |
- |
911 |
- if [[ ! -d "${instance_log_path}" ]]; then |
912 |
- mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" |
913 |
- fi |
914 |
- ln --symbolic --relative "${instance_log_path}/node.log" "${instance_path}/node.log" \ |
915 |
- || die "Unable to create link to log file" |
916 |
- |
917 |
- einfo "Successfully created a crossbar instance at ${instance_path}." |
918 |
- einfo "To change the default settings edit the config.json file in this directory." |
919 |
-} |
920 |
|
921 |
diff --git a/net-misc/crossbar/files/confd b/net-misc/crossbar/files/confd |
922 |
deleted file mode 100644 |
923 |
index e4a914f640f..00000000000 |
924 |
--- a/net-misc/crossbar/files/confd |
925 |
+++ /dev/null |
926 |
@@ -1,11 +0,0 @@ |
927 |
-# Path to the wamp router basedir. |
928 |
-BASEDIR="/var/lib/crossbar" |
929 |
- |
930 |
-# User account for the crossbar router. |
931 |
-# The basedir should be owned by this user. |
932 |
-USERNAME="crossbar" |
933 |
- |
934 |
-# loglevel {none,error,warn,info,debug,trace} |
935 |
-# How much Crossbar.io should log to the terminal, in |
936 |
-# order of verbosity. |
937 |
-LOGLEVEL="info" |
938 |
|
939 |
diff --git a/net-misc/crossbar/files/config.json.sample b/net-misc/crossbar/files/config.json.sample |
940 |
deleted file mode 100644 |
941 |
index d7b7d6af730..00000000000 |
942 |
--- a/net-misc/crossbar/files/config.json.sample |
943 |
+++ /dev/null |
944 |
@@ -1,60 +0,0 @@ |
945 |
-{ |
946 |
- "version": 2, |
947 |
- "controller": {}, |
948 |
- "workers": [ |
949 |
- { |
950 |
- "type": "router", |
951 |
- "realms": [ |
952 |
- { |
953 |
- "name": "realm1", |
954 |
- "roles": [ |
955 |
- { |
956 |
- "name": "anonymous", |
957 |
- "permissions": [ |
958 |
- { |
959 |
- "uri": "", |
960 |
- "match": "prefix", |
961 |
- "allow": { |
962 |
- "call": true, |
963 |
- "register": true, |
964 |
- "publish": true, |
965 |
- "subscribe": true |
966 |
- }, |
967 |
- "disclose": { |
968 |
- "caller": false, |
969 |
- "publisher": false |
970 |
- }, |
971 |
- "cache": true |
972 |
- } |
973 |
- ] |
974 |
- } |
975 |
- ] |
976 |
- } |
977 |
- ], |
978 |
- "transports": [ |
979 |
- { |
980 |
- "type": "universal", |
981 |
- "endpoint": { |
982 |
- "type": "tcp", |
983 |
- "port": 8080 |
984 |
- }, |
985 |
- "rawsocket": { |
986 |
- }, |
987 |
- "websocket": { |
988 |
- "ws": { |
989 |
- "type": "websocket" |
990 |
- } |
991 |
- }, |
992 |
- "web": { |
993 |
- "paths": { |
994 |
- "/": { |
995 |
- "type": "static", |
996 |
- "directory": "../web" |
997 |
- } |
998 |
- } |
999 |
- } |
1000 |
- } |
1001 |
- ] |
1002 |
- } |
1003 |
- ] |
1004 |
-} |
1005 |
|
1006 |
diff --git a/net-misc/crossbar/files/crossbar-17.8.1-Revert-Torservices.patch b/net-misc/crossbar/files/crossbar-17.8.1-Revert-Torservices.patch |
1007 |
deleted file mode 100644 |
1008 |
index 3a83bdf8fc6..00000000000 |
1009 |
--- a/net-misc/crossbar/files/crossbar-17.8.1-Revert-Torservices.patch |
1010 |
+++ /dev/null |
1011 |
@@ -1,246 +0,0 @@ |
1012 |
-From 97a2d923dff32397c9df5adb95ecb84bcd95d83d Mon Sep 17 00:00:00 2001 |
1013 |
-From: Brian Dolbec <dolsen@g.o> |
1014 |
-Date: Tue, 19 Sep 2017 17:44:08 -0700 |
1015 |
-Subject: [PATCH] Revert "Add built-in Tor services and connection support" |
1016 |
- |
1017 |
-This reverts commit f75db17642845f46bebd2f6f1d6a092974b9b390. |
1018 |
---- |
1019 |
- crossbar/common/checkconfig.py | 60 +-------------- |
1020 |
- crossbar/twisted/endpoint.py | 83 +-------------------- |
1021 |
- .../router/transport/Transport-Endpoints.md | 85 +--------------------- |
1022 |
- requirements-dev.txt | 1 - |
1023 |
- requirements-min.txt | 1 - |
1024 |
- 5 files changed, 4 insertions(+), 226 deletions(-) |
1025 |
- |
1026 |
-diff --git a/crossbar/common/checkconfig.py b/crossbar/common/checkconfig.py |
1027 |
-index a8e84d45..1f5d9c91 100644 |
1028 |
---- a/crossbar/common/checkconfig.py |
1029 |
-+++ b/crossbar/common/checkconfig.py |
1030 |
-@@ -867,31 +867,6 @@ def check_listening_endpoint_twisted(endpoint): |
1031 |
- # should/can we ask Twisted to parse it easily? |
1032 |
- |
1033 |
- |
1034 |
--def check_listening_endpoint_onion(endpoint): |
1035 |
-- """ |
1036 |
-- :param endpoint: The onion endpoint |
1037 |
-- :type endpoint: dict |
1038 |
-- """ |
1039 |
-- for k in endpoint: |
1040 |
-- if k not in ['type', 'port', 'private_key_file', 'tor_control_endpoint']: |
1041 |
-- raise InvalidConfigException( |
1042 |
-- "encountered unknown attribute '{}' in onion endpoint".format(k) |
1043 |
-- ) |
1044 |
-- |
1045 |
-- check_dict_args( |
1046 |
-- { |
1047 |
-- u"type": (True, [six.text_type]), |
1048 |
-- u"port": (True, [int, long]), |
1049 |
-- u"private_key_file": (True, [six.text_type]), |
1050 |
-- u"tor_control_endpoint": (True, [Mapping]) |
1051 |
-- }, |
1052 |
-- endpoint, |
1053 |
-- "onion endpoint config", |
1054 |
-- ) |
1055 |
-- |
1056 |
-- check_connecting_endpoint(endpoint[u"tor_control_endpoint"]) |
1057 |
-- |
1058 |
-- |
1059 |
- def check_connecting_endpoint_tcp(endpoint): |
1060 |
- """ |
1061 |
- Check a TCP connecting endpoint configuration. |
1062 |
-@@ -978,33 +953,6 @@ def check_connecting_endpoint_twisted(endpoint): |
1063 |
- check_endpoint_timeout(endpoint['timeout']) |
1064 |
- |
1065 |
- |
1066 |
--def check_connecting_endpoint_tor(endpoint): |
1067 |
-- """ |
1068 |
-- :param endpoint: The Tor connecting endpoint to check. |
1069 |
-- :type endpoint: dict |
1070 |
-- """ |
1071 |
-- for k in endpoint: |
1072 |
-- if k not in ['type', 'host', 'port', 'tor_socks_port', 'tls']: |
1073 |
-- raise InvalidConfigException( |
1074 |
-- "encountered unknown attribute '{}' in connecting endpoint".format(k) |
1075 |
-- ) |
1076 |
-- |
1077 |
-- if 'host' not in endpoint: |
1078 |
-- raise InvalidConfigException("missing mandatory attribute 'host' in connecting endpoint item\n\n{}".format(pformat(endpoint))) |
1079 |
-- |
1080 |
-- if 'port' not in endpoint: |
1081 |
-- raise InvalidConfigException("missing mandatory attribute 'port' in connecting endpoint item\n\n{}".format(pformat(endpoint))) |
1082 |
-- |
1083 |
-- if 'tor_socks_port' not in endpoint: |
1084 |
-- raise InvalidConfigException("missing mandatory attribute 'tor_socks_port' in connecting endpoint item\n\n{}".format(pformat(endpoint))) |
1085 |
-- |
1086 |
-- check_endpoint_port(endpoint['port']) |
1087 |
-- check_endpoint_port(endpoint['tor_socks_port']) |
1088 |
-- |
1089 |
-- if 'tls' in endpoint: |
1090 |
-- check_connecting_endpoint_tls(endpoint['tls']) |
1091 |
-- |
1092 |
-- |
1093 |
- def check_listening_endpoint(endpoint): |
1094 |
- """ |
1095 |
- Check a listening endpoint configuration. |
1096 |
-@@ -1022,7 +970,7 @@ def check_listening_endpoint(endpoint): |
1097 |
- raise InvalidConfigException("missing mandatory attribute 'type' in endpoint item\n\n{}".format(pformat(endpoint))) |
1098 |
- |
1099 |
- etype = endpoint['type'] |
1100 |
-- if etype not in ['tcp', 'unix', 'twisted', 'onion']: |
1101 |
-+ if etype not in ['tcp', 'unix', 'twisted']: |
1102 |
- raise InvalidConfigException("invalid attribute value '{}' for attribute 'type' in endpoint item\n\n{}".format(etype, pformat(endpoint))) |
1103 |
- |
1104 |
- if etype == 'tcp': |
1105 |
-@@ -1031,8 +979,6 @@ def check_listening_endpoint(endpoint): |
1106 |
- check_listening_endpoint_unix(endpoint) |
1107 |
- elif etype == 'twisted': |
1108 |
- check_listening_endpoint_twisted(endpoint) |
1109 |
-- elif etype == 'onion': |
1110 |
-- check_listening_endpoint_onion(endpoint) |
1111 |
- else: |
1112 |
- raise InvalidConfigException('logic error') |
1113 |
- |
1114 |
-@@ -1054,7 +1000,7 @@ def check_connecting_endpoint(endpoint): |
1115 |
- raise InvalidConfigException("missing mandatory attribute 'type' in endpoint item\n\n{}".format(pformat(endpoint))) |
1116 |
- |
1117 |
- etype = endpoint['type'] |
1118 |
-- if etype not in ['tcp', 'unix', 'twisted', 'tor']: |
1119 |
-+ if etype not in ['tcp', 'unix', 'twisted']: |
1120 |
- raise InvalidConfigException("invalid attribute value '{}' for attribute 'type' in endpoint item\n\n{}".format(etype, pformat(endpoint))) |
1121 |
- |
1122 |
- if etype == 'tcp': |
1123 |
-@@ -1063,8 +1009,6 @@ def check_connecting_endpoint(endpoint): |
1124 |
- check_connecting_endpoint_unix(endpoint) |
1125 |
- elif etype == 'twisted': |
1126 |
- check_connecting_endpoint_twisted(endpoint) |
1127 |
-- elif etype == 'tor': |
1128 |
-- check_connecting_endpoint_tor(endpoint) |
1129 |
- else: |
1130 |
- raise InvalidConfigException('logic error') |
1131 |
- |
1132 |
-diff --git a/crossbar/twisted/endpoint.py b/crossbar/twisted/endpoint.py |
1133 |
-index 483e5a39..251bfa5c 100644 |
1134 |
---- a/crossbar/twisted/endpoint.py |
1135 |
-+++ b/crossbar/twisted/endpoint.py |
1136 |
-@@ -33,7 +33,7 @@ from __future__ import absolute_import, division |
1137 |
- import six |
1138 |
- import os |
1139 |
- from os import environ |
1140 |
--from os.path import join, abspath, isabs, exists |
1141 |
-+from os.path import join, abspath |
1142 |
- |
1143 |
- from twisted.internet import defer |
1144 |
- from twisted.internet._sslverify import OpenSSLCertificateAuthorities |
1145 |
-@@ -48,11 +48,7 @@ from twisted.internet.endpoints import TCP4ServerEndpoint, \ |
1146 |
- UNIXClientEndpoint, \ |
1147 |
- serverFromString, \ |
1148 |
- clientFromString |
1149 |
--from twisted.internet.interfaces import IStreamServerEndpoint |
1150 |
- from twisted.python.filepath import FilePath |
1151 |
--from zope.interface import implementer |
1152 |
-- |
1153 |
--import txtorcon |
1154 |
- |
1155 |
- from crossbar.twisted.sharedport import SharedPort, SharedTLSPort |
1156 |
- |
1157 |
-@@ -318,12 +314,6 @@ def _create_tls_client_context(config, cbdir, log): |
1158 |
- return ctx |
1159 |
- |
1160 |
- |
1161 |
--def _ensure_absolute(fname, cbdir): |
1162 |
-- if isabs(fname): |
1163 |
-- return fname |
1164 |
-- return abspath(join(cbdir, fname)) |
1165 |
-- |
1166 |
-- |
1167 |
- def create_listening_endpoint_from_config(config, cbdir, reactor, log): |
1168 |
- """ |
1169 |
- Create a Twisted stream server endpoint from a Crossbar.io transport configuration. |
1170 |
-@@ -431,59 +421,6 @@ def create_listening_endpoint_from_config(config, cbdir, reactor, log): |
1171 |
- elif config['type'] == 'twisted': |
1172 |
- endpoint = serverFromString(reactor, config['server_string']) |
1173 |
- |
1174 |
-- # tor endpoint |
1175 |
-- elif config['type'] == 'onion': # or "tor"? r "tor_onion"? |
1176 |
-- port = config['port'] |
1177 |
-- private_key_fname = _ensure_absolute(config[u'private_key_file'], cbdir) |
1178 |
-- tor_control_ep = create_connecting_endpoint_from_config( |
1179 |
-- config[u'tor_control_endpoint'], cbdir, reactor, log |
1180 |
-- ) |
1181 |
-- |
1182 |
-- try: |
1183 |
-- with open(private_key_fname, 'r') as f: |
1184 |
-- private_key = f.read().strip() |
1185 |
-- except (IOError, OSError): |
1186 |
-- private_key = None |
1187 |
-- |
1188 |
-- @implementer(IStreamServerEndpoint) |
1189 |
-- class _EphemeralOnion(object): |
1190 |
-- |
1191 |
-- @defer.inlineCallbacks |
1192 |
-- def listen(self, proto_factory): |
1193 |
-- # we don't care which local TCP port we listen on, but |
1194 |
-- # we do need to know it |
1195 |
-- local_ep = TCP4ServerEndpoint(reactor, 0, interface=u"127.0.0.1") |
1196 |
-- target_port = yield local_ep.listen(proto_factory) |
1197 |
-- tor = yield txtorcon.connect( |
1198 |
-- reactor, |
1199 |
-- tor_control_ep, |
1200 |
-- ) |
1201 |
-- |
1202 |
-- # create and add the service |
1203 |
-- hs = txtorcon.EphemeralHiddenService( |
1204 |
-- ports=["{} 127.0.0.1:{}".format(port, target_port.getHost().port)], |
1205 |
-- key_blob_or_type=private_key if private_key else "NEW:BEST", |
1206 |
-- ) |
1207 |
-- log.info("Uploading descriptors can take more than 30s") |
1208 |
-- yield hs.add_to_tor(tor.protocol) |
1209 |
-- |
1210 |
-- # if it's new, store our private key |
1211 |
-- # XXX better "if private_key is None"? |
1212 |
-- if not exists(private_key_fname): |
1213 |
-- with open(private_key_fname, 'w') as f: |
1214 |
-- f.write(hs.private_key) |
1215 |
-- log.info("Wrote private key to '{fname}'", fname=private_key_fname) |
1216 |
-- |
1217 |
-- addr = txtorcon.TorOnionAddress(hs.hostname, port) |
1218 |
-- log.info( |
1219 |
-- "Listening on Tor onion service {addr.onion_uri}:{addr.onion_port}" |
1220 |
-- " with local port {local_port}", |
1221 |
-- addr=addr, |
1222 |
-- local_port=target_port.getHost().port, |
1223 |
-- ) |
1224 |
-- defer.returnValue(addr) |
1225 |
-- endpoint = _EphemeralOnion() |
1226 |
-- |
1227 |
- else: |
1228 |
- raise Exception("invalid endpoint type '{}'".format(config['type'])) |
1229 |
- |
1230 |
-@@ -656,24 +593,6 @@ def create_connecting_endpoint_from_config(config, cbdir, reactor, log): |
1231 |
- elif config['type'] == 'twisted': |
1232 |
- endpoint = clientFromString(reactor, config['client_string']) |
1233 |
- |
1234 |
-- elif config['type'] == 'tor': |
1235 |
-- host = config['host'] |
1236 |
-- port = config['port'] |
1237 |
-- socks_port = config['tor_socks_port'] |
1238 |
-- tls = config.get('tls', False) |
1239 |
-- if not tls and not host.endswith(u'.onion'): |
1240 |
-- log.warn("Non-TLS connection traversing Tor network; end-to-end encryption advised") |
1241 |
-- |
1242 |
-- socks_endpoint = TCP4ClientEndpoint( |
1243 |
-- reactor, "127.0.0.1", socks_port, |
1244 |
-- ) |
1245 |
-- endpoint = txtorcon.TorClientEndpoint( |
1246 |
-- host, port, |
1247 |
-- socks_endpoint=socks_endpoint, |
1248 |
-- reactor=reactor, |
1249 |
-- use_tls=tls, |
1250 |
-- ) |
1251 |
-- |
1252 |
- else: |
1253 |
- raise Exception("invalid endpoint type '{}'".format(config['type'])) |
1254 |
- |
1255 |
--- |
1256 |
-2.14.1 |
1257 |
- |
1258 |
|
1259 |
diff --git a/net-misc/crossbar/files/crossbar-17.9.1-Revert-Torservices.patch b/net-misc/crossbar/files/crossbar-17.9.1-Revert-Torservices.patch |
1260 |
deleted file mode 100644 |
1261 |
index dd4b2b58e45..00000000000 |
1262 |
--- a/net-misc/crossbar/files/crossbar-17.9.1-Revert-Torservices.patch |
1263 |
+++ /dev/null |
1264 |
@@ -1,270 +0,0 @@ |
1265 |
-From 97a2d923dff32397c9df5adb95ecb84bcd95d83d Mon Sep 17 00:00:00 2001 |
1266 |
-From: Brian Dolbec <dolsen@g.o> |
1267 |
-Date: Tue, 19 Sep 2017 17:44:08 -0700 |
1268 |
-Subject: [PATCH] Revert "Add built-in Tor services and connection support" |
1269 |
- |
1270 |
-This reverts commit f75db17642845f46bebd2f6f1d6a092974b9b390. |
1271 |
---- |
1272 |
- crossbar/common/checkconfig.py | 60 +-------------- |
1273 |
- crossbar/twisted/endpoint.py | 83 +-------------------- |
1274 |
- .../router/transport/Transport-Endpoints.md | 85 +--------------------- |
1275 |
- requirements-dev.txt | 1 - |
1276 |
- requirements-min.txt | 1 - |
1277 |
- 5 files changed, 4 insertions(+), 226 deletions(-) |
1278 |
- |
1279 |
-diff --git a/crossbar/common/checkconfig.py b/crossbar/common/checkconfig.py |
1280 |
-index a8e84d45..1f5d9c91 100644 |
1281 |
---- a/crossbar/common/checkconfig.py |
1282 |
-+++ b/crossbar/common/checkconfig.py |
1283 |
-@@ -867,31 +867,6 @@ def check_listening_endpoint_twisted(endpoint): |
1284 |
- # should/can we ask Twisted to parse it easily? |
1285 |
- |
1286 |
- |
1287 |
--def check_listening_endpoint_onion(endpoint): |
1288 |
-- """ |
1289 |
-- :param endpoint: The onion endpoint |
1290 |
-- :type endpoint: dict |
1291 |
-- """ |
1292 |
-- for k in endpoint: |
1293 |
-- if k not in ['type', 'port', 'private_key_file', 'tor_control_endpoint']: |
1294 |
-- raise InvalidConfigException( |
1295 |
-- "encountered unknown attribute '{}' in onion endpoint".format(k) |
1296 |
-- ) |
1297 |
-- |
1298 |
-- check_dict_args( |
1299 |
-- { |
1300 |
-- u"type": (True, [six.text_type]), |
1301 |
-- u"port": (True, six.integer_types), |
1302 |
-- u"private_key_file": (True, [six.text_type]), |
1303 |
-- u"tor_control_endpoint": (True, [Mapping]) |
1304 |
-- }, |
1305 |
-- endpoint, |
1306 |
-- "onion endpoint config", |
1307 |
-- ) |
1308 |
-- check_endpoint_port(u"port") |
1309 |
-- check_connecting_endpoint(endpoint[u"tor_control_endpoint"]) |
1310 |
-- |
1311 |
-- |
1312 |
- def check_connecting_endpoint_tcp(endpoint): |
1313 |
- """ |
1314 |
- Check a TCP connecting endpoint configuration. |
1315 |
-@@ -978,33 +953,6 @@ def check_connecting_endpoint_twisted(endpoint): |
1316 |
- check_endpoint_timeout(endpoint['timeout']) |
1317 |
- |
1318 |
- |
1319 |
--def check_connecting_endpoint_tor(endpoint): |
1320 |
-- """ |
1321 |
-- :param endpoint: The Tor connecting endpoint to check. |
1322 |
-- :type endpoint: dict |
1323 |
-- """ |
1324 |
-- for k in endpoint: |
1325 |
-- if k not in ['type', 'host', 'port', 'tor_socks_port', 'tls']: |
1326 |
-- raise InvalidConfigException( |
1327 |
-- "encountered unknown attribute '{}' in connecting endpoint".format(k) |
1328 |
-- ) |
1329 |
-- |
1330 |
-- if 'host' not in endpoint: |
1331 |
-- raise InvalidConfigException("missing mandatory attribute 'host' in connecting endpoint item\n\n{}".format(pformat(endpoint))) |
1332 |
-- |
1333 |
-- if 'port' not in endpoint: |
1334 |
-- raise InvalidConfigException("missing mandatory attribute 'port' in connecting endpoint item\n\n{}".format(pformat(endpoint))) |
1335 |
-- |
1336 |
-- if 'tor_socks_port' not in endpoint: |
1337 |
-- raise InvalidConfigException("missing mandatory attribute 'tor_socks_port' in connecting endpoint item\n\n{}".format(pformat(endpoint))) |
1338 |
-- |
1339 |
-- check_endpoint_port(endpoint['port']) |
1340 |
-- check_endpoint_port(endpoint['tor_socks_port']) |
1341 |
-- |
1342 |
-- if 'tls' in endpoint: |
1343 |
-- check_connecting_endpoint_tls(endpoint['tls']) |
1344 |
-- |
1345 |
-- |
1346 |
- def check_listening_endpoint(endpoint): |
1347 |
- """ |
1348 |
- Check a listening endpoint configuration. |
1349 |
-@@ -1022,7 +970,7 @@ def check_listening_endpoint(endpoint): |
1350 |
- raise InvalidConfigException("missing mandatory attribute 'type' in endpoint item\n\n{}".format(pformat(endpoint))) |
1351 |
- |
1352 |
- etype = endpoint['type'] |
1353 |
-- if etype not in ['tcp', 'unix', 'twisted', 'onion']: |
1354 |
-+ if etype not in ['tcp', 'unix', 'twisted']: |
1355 |
- raise InvalidConfigException("invalid attribute value '{}' for attribute 'type' in endpoint item\n\n{}".format(etype, pformat(endpoint))) |
1356 |
- |
1357 |
- if etype == 'tcp': |
1358 |
-@@ -1031,8 +979,6 @@ def check_listening_endpoint(endpoint): |
1359 |
- check_listening_endpoint_unix(endpoint) |
1360 |
- elif etype == 'twisted': |
1361 |
- check_listening_endpoint_twisted(endpoint) |
1362 |
-- elif etype == 'onion': |
1363 |
-- check_listening_endpoint_onion(endpoint) |
1364 |
- else: |
1365 |
- raise InvalidConfigException('logic error') |
1366 |
- |
1367 |
-@@ -1054,7 +1000,7 @@ def check_connecting_endpoint(endpoint): |
1368 |
- raise InvalidConfigException("missing mandatory attribute 'type' in endpoint item\n\n{}".format(pformat(endpoint))) |
1369 |
- |
1370 |
- etype = endpoint['type'] |
1371 |
-- if etype not in ['tcp', 'unix', 'twisted', 'tor']: |
1372 |
-+ if etype not in ['tcp', 'unix', 'twisted']: |
1373 |
- raise InvalidConfigException("invalid attribute value '{}' for attribute 'type' in endpoint item\n\n{}".format(etype, pformat(endpoint))) |
1374 |
- |
1375 |
- if etype == 'tcp': |
1376 |
-@@ -1063,8 +1009,6 @@ def check_connecting_endpoint(endpoint): |
1377 |
- check_connecting_endpoint_unix(endpoint) |
1378 |
- elif etype == 'twisted': |
1379 |
- check_connecting_endpoint_twisted(endpoint) |
1380 |
-- elif etype == 'tor': |
1381 |
-- check_connecting_endpoint_tor(endpoint) |
1382 |
- else: |
1383 |
- raise InvalidConfigException('logic error') |
1384 |
- |
1385 |
-diff --git a/crossbar/twisted/endpoint.py b/crossbar/twisted/endpoint.py |
1386 |
-index 483e5a39..251bfa5c 100644 |
1387 |
---- a/crossbar/twisted/endpoint.py |
1388 |
-+++ b/crossbar/twisted/endpoint.py |
1389 |
-@@ -33,7 +33,7 @@ from __future__ import absolute_import, division |
1390 |
- import six |
1391 |
- import os |
1392 |
- from os import environ |
1393 |
--from os.path import join, abspath, isabs, exists |
1394 |
-+from os.path import join, abspath |
1395 |
- |
1396 |
- from twisted.internet import defer |
1397 |
- from twisted.internet._sslverify import OpenSSLCertificateAuthorities |
1398 |
-@@ -48,11 +48,7 @@ from twisted.internet.endpoints import TCP4ServerEndpoint, \ |
1399 |
- UNIXClientEndpoint, \ |
1400 |
- serverFromString, \ |
1401 |
- clientFromString |
1402 |
--from twisted.internet.interfaces import IStreamServerEndpoint |
1403 |
- from twisted.python.filepath import FilePath |
1404 |
--from zope.interface import implementer |
1405 |
-- |
1406 |
--import txtorcon |
1407 |
- |
1408 |
- from crossbar.twisted.sharedport import SharedPort, SharedTLSPort |
1409 |
- |
1410 |
-@@ -318,12 +314,6 @@ def _create_tls_client_context(config, cbdir, log): |
1411 |
- return ctx |
1412 |
- |
1413 |
- |
1414 |
--def _ensure_absolute(fname, cbdir): |
1415 |
-- if isabs(fname): |
1416 |
-- return fname |
1417 |
-- return abspath(join(cbdir, fname)) |
1418 |
-- |
1419 |
-- |
1420 |
- def create_listening_endpoint_from_config(config, cbdir, reactor, log): |
1421 |
- """ |
1422 |
- Create a Twisted stream server endpoint from a Crossbar.io transport configuration. |
1423 |
-@@ -431,59 +421,6 @@ def create_listening_endpoint_from_config(config, cbdir, reactor, log): |
1424 |
- elif config['type'] == 'twisted': |
1425 |
- endpoint = serverFromString(reactor, config['server_string']) |
1426 |
- |
1427 |
-- # tor endpoint |
1428 |
-- elif config['type'] == 'onion': # or "tor"? r "tor_onion"? |
1429 |
-- port = config['port'] |
1430 |
-- private_key_fname = _ensure_absolute(config[u'private_key_file'], cbdir) |
1431 |
-- tor_control_ep = create_connecting_endpoint_from_config( |
1432 |
-- config[u'tor_control_endpoint'], cbdir, reactor, log |
1433 |
-- ) |
1434 |
-- |
1435 |
-- try: |
1436 |
-- with open(private_key_fname, 'r') as f: |
1437 |
-- private_key = f.read().strip() |
1438 |
-- except (IOError, OSError): |
1439 |
-- private_key = None |
1440 |
-- |
1441 |
-- @implementer(IStreamServerEndpoint) |
1442 |
-- class _EphemeralOnion(object): |
1443 |
-- |
1444 |
-- @defer.inlineCallbacks |
1445 |
-- def listen(self, proto_factory): |
1446 |
-- # we don't care which local TCP port we listen on, but |
1447 |
-- # we do need to know it |
1448 |
-- local_ep = TCP4ServerEndpoint(reactor, 0, interface=u"127.0.0.1") |
1449 |
-- target_port = yield local_ep.listen(proto_factory) |
1450 |
-- tor = yield txtorcon.connect( |
1451 |
-- reactor, |
1452 |
-- tor_control_ep, |
1453 |
-- ) |
1454 |
-- |
1455 |
-- # create and add the service |
1456 |
-- hs = txtorcon.EphemeralHiddenService( |
1457 |
-- ports=["{} 127.0.0.1:{}".format(port, target_port.getHost().port)], |
1458 |
-- key_blob_or_type=private_key if private_key else "NEW:BEST", |
1459 |
-- ) |
1460 |
-- log.info("Uploading descriptors can take more than 30s") |
1461 |
-- yield hs.add_to_tor(tor.protocol) |
1462 |
-- |
1463 |
-- # if it's new, store our private key |
1464 |
-- # XXX better "if private_key is None"? |
1465 |
-- if not exists(private_key_fname): |
1466 |
-- with open(private_key_fname, 'w') as f: |
1467 |
-- f.write(hs.private_key) |
1468 |
-- log.info("Wrote private key to '{fname}'", fname=private_key_fname) |
1469 |
-- |
1470 |
-- addr = txtorcon.TorOnionAddress(hs.hostname, port) |
1471 |
-- log.info( |
1472 |
-- "Listening on Tor onion service {addr.onion_uri}:{addr.onion_port}" |
1473 |
-- " with local port {local_port}", |
1474 |
-- addr=addr, |
1475 |
-- local_port=target_port.getHost().port, |
1476 |
-- ) |
1477 |
-- defer.returnValue(addr) |
1478 |
-- endpoint = _EphemeralOnion() |
1479 |
-- |
1480 |
- else: |
1481 |
- raise Exception("invalid endpoint type '{}'".format(config['type'])) |
1482 |
- |
1483 |
-@@ -656,24 +593,6 @@ def create_connecting_endpoint_from_config(config, cbdir, reactor, log): |
1484 |
- elif config['type'] == 'twisted': |
1485 |
- endpoint = clientFromString(reactor, config['client_string']) |
1486 |
- |
1487 |
-- elif config['type'] == 'tor': |
1488 |
-- host = config['host'] |
1489 |
-- port = config['port'] |
1490 |
-- socks_port = config['tor_socks_port'] |
1491 |
-- tls = config.get('tls', False) |
1492 |
-- if not tls and not host.endswith(u'.onion'): |
1493 |
-- log.warn("Non-TLS connection traversing Tor network; end-to-end encryption advised") |
1494 |
-- |
1495 |
-- socks_endpoint = TCP4ClientEndpoint( |
1496 |
-- reactor, "127.0.0.1", socks_port, |
1497 |
-- ) |
1498 |
-- endpoint = txtorcon.TorClientEndpoint( |
1499 |
-- host, port, |
1500 |
-- socks_endpoint=socks_endpoint, |
1501 |
-- reactor=reactor, |
1502 |
-- use_tls=tls, |
1503 |
-- ) |
1504 |
-- |
1505 |
- else: |
1506 |
- raise Exception("invalid endpoint type '{}'".format(config['type'])) |
1507 |
- |
1508 |
-diff --git a/requirements-dev.txt b/requirements-dev.txt |
1509 |
-index fa75074a..d68d1e89 100644 |
1510 |
---- a/requirements-dev.txt |
1511 |
-+++ b/requirements-dev.txt |
1512 |
-@@ -4,7 +4,6 @@ colorama>=0.3.3 |
1513 |
- mock>=1.3.0 |
1514 |
- wheel>=0.26.0 |
1515 |
- hashin>=0.4.1 |
1516 |
--txtorcon>=0.19.3 |
1517 |
- |
1518 |
- # docs |
1519 |
- flask |
1520 |
-diff --git a/requirements-min.txt b/requirements-min.txt |
1521 |
-index 38ee5a71..83c8d802 100644 |
1522 |
---- a/requirements-min.txt |
1523 |
-+++ b/requirements-min.txt |
1524 |
-@@ -6,7 +6,6 @@ Twisted>=17.5.0 |
1525 |
- h2>=3.0.1 |
1526 |
- priority>=1.3.0 |
1527 |
- txaio>=2.8.2 |
1528 |
--txtorcon>=0.19.3 |
1529 |
- autobahn>=17.9.1 |
1530 |
- netaddr>=0.7.19 |
1531 |
- PyTrie>=0.3 |
1532 |
--- |
1533 |
-2.14.1 |
1534 |
- |
1535 |
|
1536 |
diff --git a/net-misc/crossbar/files/initd b/net-misc/crossbar/files/initd |
1537 |
deleted file mode 100644 |
1538 |
index 565dfb304ae..00000000000 |
1539 |
--- a/net-misc/crossbar/files/initd |
1540 |
+++ /dev/null |
1541 |
@@ -1,35 +0,0 @@ |
1542 |
-#!/sbin/openrc-run |
1543 |
-# Copyright 1999-2017 Gentoo Foundation |
1544 |
-# Distributed under the terms of the GNU General Public License v2 |
1545 |
- |
1546 |
-NODE=${RC_SVCNAME:9} |
1547 |
- |
1548 |
-command=/usr/bin/crossbar |
1549 |
-command_args="start --cbdir=${BASEDIR}/${NODE} --logtofile --colour=false --loglevel=${LOGLEVEL}" |
1550 |
-command_background=true |
1551 |
-description="start crossbar wamp router for ${NODE}" |
1552 |
-pidfile="${BASEDIR}/${NODE}/crossbar.pid" |
1553 |
- |
1554 |
- |
1555 |
-depend() { |
1556 |
- need net |
1557 |
-} |
1558 |
- |
1559 |
-checkconfig() { |
1560 |
- if [ -z "${BASEDIR}" ]; then |
1561 |
- eerror "BASEDIR not set" |
1562 |
- return 1 |
1563 |
- fi |
1564 |
- if [ -z "${USERNAME}" ]; then |
1565 |
- eerror "USERNAME not set" |
1566 |
- return 1 |
1567 |
- fi |
1568 |
- if [ ! -d "${BASEDIR}" ]; then |
1569 |
- eerror "${BASEDIR} is not a directory" |
1570 |
- return 1 |
1571 |
- fi |
1572 |
- if [ ! -e "${BASEDIR}/${NODE}" ]; then |
1573 |
- eerror "${BASEDIR} does not contain a ${NODE} sub directory" |
1574 |
- return 1 |
1575 |
- fi |
1576 |
-} |
1577 |
|
1578 |
diff --git a/net-misc/crossbar/metadata.xml b/net-misc/crossbar/metadata.xml |
1579 |
deleted file mode 100644 |
1580 |
index d9d6f959b0b..00000000000 |
1581 |
--- a/net-misc/crossbar/metadata.xml |
1582 |
+++ /dev/null |
1583 |
@@ -1,22 +0,0 @@ |
1584 |
-<?xml version="1.0" encoding="UTF-8"?> |
1585 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1586 |
-<pkgmetadata> |
1587 |
- <!-- maintainer-needed --> |
1588 |
- <upstream> |
1589 |
- <maintainer> |
1590 |
- <name>Crossbar.io Technologies GmbH</name> |
1591 |
- </maintainer> |
1592 |
- <remote-id type="pypi">crossbar</remote-id> |
1593 |
- <remote-id type="github">crossbariocrossbar</remote-id> |
1594 |
- </upstream> |
1595 |
- <longdescription> |
1596 |
- Crossbar.io is an open source networking platform |
1597 |
- for distributed and microservice applications. It implements the |
1598 |
- open Web Application Messaging Protocol (WAMP), is feature rich, |
1599 |
- scalable, robust and secure. Let Crossbar.io take care of the |
1600 |
- hard parts of messaging so you can focus on your app's features. |
1601 |
- </longdescription> |
1602 |
- <use> |
1603 |
- <flag name="tor">include tor services connections support</flag> |
1604 |
- </use> |
1605 |
-</pkgmetadata> |