From: Mikle Kolyada Date: Tue, 25 Feb 2020 10:09:47 +0000 (+0300) Subject: net-misc/crossbar: remove last-rited pkg X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3d4c8ecf1539c3a38eeb3a8ff078d7414013fc0d;p=gentoo.git net-misc/crossbar: remove last-rited pkg Signed-off-by: Mikle Kolyada --- diff --git a/net-misc/crossbar/Manifest b/net-misc/crossbar/Manifest deleted file mode 100644 index 1048f72fdfaa..000000000000 --- a/net-misc/crossbar/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST crossbar-17.12.1.tar.gz 736982 BLAKE2B bd2af652d376bf8ffe6cc23b0a798bb905ce835ba9282a276e1e5878d01a52370fd887f9e96339e4a2e45b89ca41918a936be7a010d9c1054a3c9f2a8361bd50 SHA512 082432f04fcf578012392d02ddafb4bcd6a61da4a1467a6ae767ca75293747cf84ee7bf27d1e2078e5c637c66b3fbd848b14cfc39eaefd1b98b5ad3b64c0a58d -DIST crossbar-17.6.1.post3.tar.gz 725054 BLAKE2B 1c60ae9a29f9d2831dd219c30751c65c07639810c24ea27f35c1fb27fd55c6b97f225e9fef9bbb00c79233a52a5e7ae6f4a61020c028f697e3fbdec1ada41980 SHA512 c3efac2c7f7a41e6544eb98057afb249908453d6ddfb81c514f0705ed967374d50f844fe1a80395652b81a7c23abc90a03a0d6c88287f10cbfe99e64cb70919d -DIST crossbar-17.8.1.tar.gz 1545668 BLAKE2B 812a4b423bf663386255332de2ab90afb4f0a44d205a193d71523e7fa0aba2bf1644b2136200c6ae4b1639de2764b7139ee6081a5167b21abc2bdec6400c5a60 SHA512 21ed2031ddebe93fcd4fcd01243b2aa8979444e833386db83b10d032cfc3c3f9d47cf638d4cf26eb2801e91892c85115fec91e0a6f071a619f014132663f6c32 -DIST crossbar-17.9.1.tar.gz 730753 BLAKE2B 8fb93b017b6af8264aa828a6353d1c6f5fd7f224797504f67f77b5cf2759ada5f9609eb6815da96afadfc2bae90acb2837be19ed0896e1a8ce37ff384fcea367 SHA512 fee96e1c900c756536dc9bf6088c512a50accbae0e8010b7e058de8ed2ebb2f366e5d5051ab2f07517dd642f4d65c65e9b701b00d7bca1b9352c58f38f892563 -DIST crossbar-18.3.1.tar.gz 736736 BLAKE2B 546a7d4ff173928179eeff86aef50e3517067e6aede145a5185e891fe749e0e2c507b577ea3be8f416c5894e8c43db42d8ceaabbdc64823b305219c2f6277ff4 SHA512 cb85ba44054c59eecb751896c5f0d793ccc8990c9d00733de546512b7e500a90ef4042d49ec6f648ec3677687950fbee62208c9bbb6692de65df4f238a2414dc diff --git a/net-misc/crossbar/crossbar-17.12.1.ebuild b/net-misc/crossbar/crossbar-17.12.1.ebuild deleted file mode 100644 index 713e12a96e9b..000000000000 --- a/net-misc/crossbar/crossbar-17.12.1.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_6 ) - -inherit user systemd distutils-r1 - -MY_PV="${PV}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework" -HOMEPAGE="https://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.org/project/crossbar/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test tor" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/attrs-17.2.0[${PYTHON_USEDEP}] - >=dev-python/autobahn-17.10.1[${PYTHON_USEDEP}] - >=dev-python/bitstring-3.1.5[${PYTHON_USEDEP}] - >=dev-python/cbor-1.0.0[${PYTHON_USEDEP}] - >=dev-python/click-6.7[${PYTHON_USEDEP}] - >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]' python2_7) - >=dev-python/hyper-h2-3.0.1[${PYTHON_USEDEP}] - =dev-python/idna-2.5[${PYTHON_USEDEP}] - >=dev-python/incremental-17.5.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.18[${PYTHON_USEDEP}]' python2_7) - >=dev-python/jinja-2.9.6[${PYTHON_USEDEP}] - >=dev-python/lmdb-0.92[${PYTHON_USEDEP}] - >=dev-python/mistune-0.7.4[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}] - >=dev-python/priority-1.3.0[${PYTHON_USEDEP}] - >=dev-python/psutil-5.2.2[${PYTHON_USEDEP}] - >=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}] - >=dev-python/pyasn1-modules-0.0.9[${PYTHON_USEDEP}] - >=dev-python/pygments-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}] - >=dev-python/pytrie-0.3[${PYTHON_USEDEP}] - >=dev-python/py-ubjson-0.9.0[${PYTHON_USEDEP}] - >=dev-python/pynacl-1.1.2[${PYTHON_USEDEP}] - >=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] - >=dev-python/sdnotify-0.3.1[${PYTHON_USEDEP}] - >=dev-python/service_identity-17.0.0[${PYTHON_USEDEP}] - >=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}] - >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] - >=dev-python/shutilwhich-1.1.0[${PYTHON_USEDEP}] - >=dev-python/treq-17.3.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] - >=dev-python/txaio-2.8.2[${PYTHON_USEDEP}] - >=dev-python/u-msgpack-2.4.1[${PYTHON_USEDEP}] - >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] - >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] - tor? ( >=dev-python/txtorcon-0.19.3[${PYTHON_USEDEP}] ) -" -DEPEND=" - !dev-python/crossbar - >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] - test? ( - dev-python/mock[${PYTHON_USEDEP}] - ) -" -DOCS=( - README.rst LICENSE-FOR-API LICENSE COPYRIGHT -) - -S="${WORKDIR}"/${MY_P} - -python_prepare_all() { - # don't install the copyright, license... let dodoc do it - sed -e "s/^ data_files=.*//" -i setup.py || die - - if ! use tor; then - eapply "${FILESDIR}/${PN}-17.9.1-Revert-Torservices.patch" - sed -e "s/^txtorcon.*//" -i requirements-min.txt || die - fi - # remove these py2 deps from setuptools install_requires - # it is not filtered out for >=py3.4 and results in test fails - sed -e "s/^ipaddress.*//" -i requirements-min.txt || die - sed -e "s/^enum34.*//" -i requirements-min.txt || die - - distutils-r1_python_prepare_all -} - -pkg_setup() { - enewuser crossbar -} - -python_test() { - pushd "${TEST_DIR}" > /dev/null || die - /usr/bin/trial crossbar || die "Tests failed with ${EPYTHON}" - popd > /dev/null || die -} - -python_install_all() { - distutils-r1_python_install_all - - keepdir /var/lib/crossbar - insinto /var/lib/crossbar - doins "${FILESDIR}/config.json.sample" - - newconfd "${FILESDIR}/confd" crossbar - newinitd "${FILESDIR}/initd" crossbar -} - -pkg_posinst() { - einfo "For exapmle configurations and scripts" - einfo "See: https://github.com/crossbario/crossbar-examples" - - if [[ -n ${REPLACING_VERSIONS} ]]; then - ewarn - ewarn "Starting with net-misc/crossbar-17.6.1_p3-r1, more than one instance of crossbar" - ewarn "can be run simultaneously. Note that \"BASEDIR\" in the crossbar conf.d/crossbar file" - ewarn "is the common base directory for all instances. If you are migrating from an older" - ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." - ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." - ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" - ewarn " ln --symbolic --relative /etc/init.d/crossbar /etc/init.d/crossbar.myinstance" - ewarn " rc-update add crossbar.myinstance default" - ewarn " /etc/init.d/crossbar.myinstance start" - ewarn "Systems using systemd can do the following:" - ewarn " systemctl enable crossbar@myinstance.service" - ewarn " systemctl enable crossbar.target" - ewarn " systemctl start crossbar.target" - fi -} - -pkg_config() { - local crossbar_path="/var/lib/crossbar" - local log_path="/var/log/crossbar" - einfo "This will prepare a new crossbar instance in ${crossbar_path}." - einfo "Press Control-C to abort." - - einfo "Enter the name for the new instance: " - read instance_name - [[ -z "${instance_name}" ]] && die "Invalid instance name" - - local instance_path="${crossbar_path}/${instance_name}" - local instance_log_path="${log_path}/${instance_name}" - - if [[ -e "${instance_path}" ]]; then - eerror "The instance with the specified name already exists:" - eerror "${instance_path}" - die "Instance already exists" - fi - - if [[ ! -d "${instance_path}" ]]; then - mkdir --parents "${instance_path}" || die "Unable to create directory ${crossbar_path}" - fi - chown --recursive crossbar "${instance_path}" || die "Setting permissions for instance failed" - cp "${crossbar_path}/config.json.sample" "${instance_path}/config.json" \ - || die "Moving sample configuration failed" - ln --symbolic --relative "/etc/init.d/crossbar" "/etc/init.d/crossbar.${instance_name}" \ - || die "Unable to create link to init file" - - if [[ ! -d "${instance_log_path}" ]]; then - mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" - fi - ln --symbolic --relative "${instance_log_path}/node.log" "${instance_path}/node.log" \ - || die "Unable to create link to log file" - - einfo "Successfully created a crossbar instance at ${instance_path}." - einfo "To change the default settings edit the config.json file in this directory." -} diff --git a/net-misc/crossbar/crossbar-17.6.1_p3-r1.ebuild b/net-misc/crossbar/crossbar-17.6.1_p3-r1.ebuild deleted file mode 100644 index 29ce90de46a4..000000000000 --- a/net-misc/crossbar/crossbar-17.6.1_p3-r1.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -# Not quite ready for py3, unconditionally deps on too many backported -# pkgs installed in newer pythons that shouldn't need them. -PYTHON_COMPAT=( python2_7 ) - -inherit user systemd distutils-r1 - -MY_PV="17.6.1.post3" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework" -HOMEPAGE="https://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.org/project/crossbar/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.1.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]' python2_7) - >=dev-python/txaio-2.8.0[${PYTHON_USEDEP}] - >=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}] - >=dev-python/pyasn1-modules-0.0.9[${PYTHON_USEDEP}] - >=dev-python/incremental-17.5.0[${PYTHON_USEDEP}] - >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] - =dev-python/priority-1.3.0[${PYTHON_USEDEP}] - >=dev-python/service_identity-17.0.0[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}] - >=dev-python/autobahn-17.6.2[${PYTHON_USEDEP}] - >=dev-python/jinja-2.9.6[${PYTHON_USEDEP}] - >=dev-python/treq-17.3.1[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] - >=dev-python/click-6.7[${PYTHON_USEDEP}] - >=dev-python/attrs-17.2.0[${PYTHON_USEDEP}] - >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.18[${PYTHON_USEDEP}]' python2_7) - >=dev-python/cbor-1.0.0[${PYTHON_USEDEP}] - >=dev-python/bitstring-3.1.5[${PYTHON_USEDEP}] - >=dev-python/pygments-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pytrie-0.3[${PYTHON_USEDEP}] - >=dev-python/psutil-5.2.2[${PYTHON_USEDEP}] - >=dev-python/py-ubjson-0.9.0[${PYTHON_USEDEP}] - >=dev-python/pynacl-1.1.2[${PYTHON_USEDEP}] - >=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] - >=dev-python/lmdb-0.92[${PYTHON_USEDEP}] - >=dev-python/mistune-0.7.4[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}] - >=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}] - >=dev-python/sdnotify-0.3.1[${PYTHON_USEDEP}] - >=dev-python/shutilwhich-1.1.0[${PYTHON_USEDEP}] - >=dev-python/u-msgpack-2.4.1[${PYTHON_USEDEP}] - >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] -" -DEPEND=" - !dev-python/crossbar - >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.1.0[${PYTHON_USEDEP}] - test? ( - dev-python/mock[${PYTHON_USEDEP}] - ) -" -DOCS=( - README.rst LICENSE-FOR-API LICENSE COPYRIGHT -) - -S="${WORKDIR}"/${MY_P} - -python_prepare_all() { - # don't install the copyright, license... let dodoc do it - sed -e "s/^ data_files=.*//" -i setup.py || die - - distutils-r1_python_prepare_all -} - -pkg_setup() { - enewuser crossbar -} - -python_test() { - pushd "${TEST_DIR}" > /dev/null || die - /usr/bin/trial crossbar || die "Tests failed with ${EPYTHON}" - popd > /dev/null || die -} - -python_install_all() { - distutils-r1_python_install_all - - keepdir /var/lib/crossbar - insinto /var/lib/crossbar - doins "${FILESDIR}/config.json.sample" - - newconfd "${FILESDIR}/confd" crossbar - newinitd "${FILESDIR}/initd" crossbar -} - -pkg_posinst() { - einfo "For exapmle configurations and scripts" - einfo "See: https://github.com/crossbario/crossbar-examples" - - if [[ -n ${REPLACING_VERSIONS} ]]; then - ewarn - ewarn "Starting with net-misc/crossbar-17.6.1_p3-r1, more than one instance of crossbar" - ewarn "can be run simultaneously. Note that \"BASEDIR\" in the crossbar conf.d/crossbar file" - ewarn "is the common base directory for all instances. If you are migrating from an older" - ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." - ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." - ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" - ewarn " ln --symbolic --relative /etc/init.d/crossbar /etc/init.d/crossbar.myinstance" - ewarn " rc-update add crossbar.myinstance default" - ewarn " /etc/init.d/crossbar.myinstance start" - ewarn "Systems using systemd can do the following:" - ewarn " systemctl enable crossbar@myinstance.service" - ewarn " systemctl enable crossbar.target" - ewarn " systemctl start crossbar.target" - fi -} - -pkg_config() { - local crossbar_path="/var/lib/crossbar" - local log_path="/var/log/crossbar" - einfo "This will prepare a new crossbar instance in ${crossbar_path}." - einfo "Press Control-C to abort." - - einfo "Enter the name for the new instance: " - read instance_name - [[ -z "${instance_name}" ]] && die "Invalid instance name" - - local instance_path="${crossbar_path}/${instance_name}" - local instance_log_path="${log_path}/${instance_name}" - - if [[ -e "${instance_path}" ]]; then - eerror "The instance with the specified name already exists:" - eerror "${instance_path}" - die "Instance already exists" - fi - - if [[ ! -d "${instance_path}" ]]; then - mkdir --parents "${instance_path}" || die "Unable to create directory ${crossbar_path}" - fi - chown --recursive crossbar "${instance_path}" || die "Setting permissions for instance failed" - cp "${crossbar_path}/config.json.sample" "${instance_path}/config.json" \ - || die "Moving sample configuration failed" - ln --symbolic --relative "/etc/init.d/crossbar" "/etc/init.d/crossbar.${instance_name}" \ - || die "Unable to create link to init file" - - if [[ ! -d "${instance_log_path}" ]]; then - mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" - fi - ln --symbolic --relative "${instance_log_path}/node.log" "${instance_path}/node.log" \ - || die "Unable to create link to log file" - - einfo "Successfully created a crossbar instance at ${instance_path}." - einfo "To change the default settings edit the config.json file in this directory." -} diff --git a/net-misc/crossbar/crossbar-17.8.1.ebuild b/net-misc/crossbar/crossbar-17.8.1.ebuild deleted file mode 100644 index 1dac2d540405..000000000000 --- a/net-misc/crossbar/crossbar-17.8.1.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_6 ) - -inherit user systemd distutils-r1 - -MY_PV="${PV}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework" -HOMEPAGE="https://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.org/project/crossbar/" -#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -SRC_URI="https://github.com/crossbario/crossbar/archive/v17.8.1.tar.gz -> ${P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test tor" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/attrs-17.2.0[${PYTHON_USEDEP}] - >=dev-python/autobahn-17.7.1[${PYTHON_USEDEP}] - >=dev-python/bitstring-3.1.5[${PYTHON_USEDEP}] - >=dev-python/cbor-1.0.0[${PYTHON_USEDEP}] - >=dev-python/click-6.7[${PYTHON_USEDEP}] - >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]' python2_7) - >=dev-python/hyper-h2-3.0.1[${PYTHON_USEDEP}] - >=dev-python/incremental-17.5.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.18[${PYTHON_USEDEP}]' python2_7) - >=dev-python/jinja-2.9.6[${PYTHON_USEDEP}] - >=dev-python/lmdb-0.92[${PYTHON_USEDEP}] - >=dev-python/mistune-0.7.4[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}] - >=dev-python/priority-1.3.0[${PYTHON_USEDEP}] - >=dev-python/psutil-5.2.2[${PYTHON_USEDEP}] - >=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}] - >=dev-python/pyasn1-modules-0.0.9[${PYTHON_USEDEP}] - >=dev-python/pygments-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}] - >=dev-python/pytrie-0.3[${PYTHON_USEDEP}] - >=dev-python/py-ubjson-0.9.0[${PYTHON_USEDEP}] - >=dev-python/pynacl-1.1.2[${PYTHON_USEDEP}] - >=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] - >=dev-python/sdnotify-0.3.1[${PYTHON_USEDEP}] - >=dev-python/service_identity-17.0.0[${PYTHON_USEDEP}] - >=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}] - >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] - >=dev-python/shutilwhich-1.1.0[${PYTHON_USEDEP}] - >=dev-python/treq-17.3.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] - >=dev-python/txaio-2.8.1[${PYTHON_USEDEP}] - >=dev-python/u-msgpack-2.4.1[${PYTHON_USEDEP}] - >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] - >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] - tor? ( >=dev-python/txtorcon-0.19.3[${PYTHON_USEDEP}] ) -" -DEPEND=" - !dev-python/crossbar - >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] - test? ( - dev-python/mock[${PYTHON_USEDEP}] - ) -" -DOCS=( - README.rst LICENSE-FOR-API LICENSE COPYRIGHT -) - -S="${WORKDIR}"/${MY_P} - -python_prepare_all() { - # don't install the copyright, license... let dodoc do it - sed -e "s/^ data_files=.*//" -i setup.py || die - - if ! use tor; then - eapply "${FILESDIR}/${PN}-17.8.1-Revert-Torservices.patch" - sed -e "s/^txtorcon.*//" -i requirements-min.txt || die - fi - # remove these py2 deps from setuptools install_requires - # it is not filtered out for >=py3.4 and results in test fails - sed -e "s/^ipaddress.*//" -i requirements-min.txt || die - sed -e "s/^enum34.*//" -i requirements-min.txt || die - - distutils-r1_python_prepare_all -} - -pkg_setup() { - enewuser crossbar -} - -python_test() { - pushd "${TEST_DIR}" > /dev/null || die - /usr/bin/trial crossbar || die "Tests failed with ${EPYTHON}" - popd > /dev/null || die -} - -python_install_all() { - distutils-r1_python_install_all - - keepdir /var/lib/crossbar - insinto /var/lib/crossbar - doins "${FILESDIR}/config.json.sample" - - newconfd "${FILESDIR}/confd" crossbar - newinitd "${FILESDIR}/initd" crossbar -} - -pkg_posinst() { - einfo "For exapmle configurations and scripts" - einfo "See: https://github.com/crossbario/crossbar-examples" - - if [[ -n ${REPLACING_VERSIONS} ]]; then - ewarn - ewarn "Starting with net-misc/crossbar-17.6.1_p3-r1, more than one instance of crossbar" - ewarn "can be run simultaneously. Note that \"BASEDIR\" in the crossbar conf.d/crossbar file" - ewarn "is the common base directory for all instances. If you are migrating from an older" - ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." - ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." - ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" - ewarn " ln --symbolic --relative /etc/init.d/crossbar /etc/init.d/crossbar.myinstance" - ewarn " rc-update add crossbar.myinstance default" - ewarn " /etc/init.d/crossbar.myinstance start" - ewarn "Systems using systemd can do the following:" - ewarn " systemctl enable crossbar@myinstance.service" - ewarn " systemctl enable crossbar.target" - ewarn " systemctl start crossbar.target" - fi -} - -pkg_config() { - local crossbar_path="/var/lib/crossbar" - local log_path="/var/log/crossbar" - einfo "This will prepare a new crossbar instance in ${crossbar_path}." - einfo "Press Control-C to abort." - - einfo "Enter the name for the new instance: " - read instance_name - [[ -z "${instance_name}" ]] && die "Invalid instance name" - - local instance_path="${crossbar_path}/${instance_name}" - local instance_log_path="${log_path}/${instance_name}" - - if [[ -e "${instance_path}" ]]; then - eerror "The instance with the specified name already exists:" - eerror "${instance_path}" - die "Instance already exists" - fi - - if [[ ! -d "${instance_path}" ]]; then - mkdir --parents "${instance_path}" || die "Unable to create directory ${crossbar_path}" - fi - chown --recursive crossbar "${instance_path}" || die "Setting permissions for instance failed" - cp "${crossbar_path}/config.json.sample" "${instance_path}/config.json" \ - || die "Moving sample configuration failed" - ln --symbolic --relative "/etc/init.d/crossbar" "/etc/init.d/crossbar.${instance_name}" \ - || die "Unable to create link to init file" - - if [[ ! -d "${instance_log_path}" ]]; then - mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" - fi - ln --symbolic --relative "${instance_log_path}/node.log" "${instance_path}/node.log" \ - || die "Unable to create link to log file" - - einfo "Successfully created a crossbar instance at ${instance_path}." - einfo "To change the default settings edit the config.json file in this directory." -} diff --git a/net-misc/crossbar/crossbar-17.9.1.ebuild b/net-misc/crossbar/crossbar-17.9.1.ebuild deleted file mode 100644 index 3ce1782e9f49..000000000000 --- a/net-misc/crossbar/crossbar-17.9.1.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_6 ) - -inherit user systemd distutils-r1 - -MY_PV="${PV}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework" -HOMEPAGE="https://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.org/project/crossbar/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test tor" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/attrs-17.2.0[${PYTHON_USEDEP}] - ~dev-python/autobahn-${PV}[${PYTHON_USEDEP}] - >=dev-python/bitstring-3.1.5[${PYTHON_USEDEP}] - >=dev-python/cbor-1.0.0[${PYTHON_USEDEP}] - >=dev-python/click-6.7[${PYTHON_USEDEP}] - >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]' python2_7) - >=dev-python/hyper-h2-3.0.1[${PYTHON_USEDEP}] - =dev-python/idna-2.5[${PYTHON_USEDEP}] - >=dev-python/incremental-17.5.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.18[${PYTHON_USEDEP}]' python2_7) - >=dev-python/jinja-2.9.6[${PYTHON_USEDEP}] - >=dev-python/lmdb-0.92[${PYTHON_USEDEP}] - >=dev-python/mistune-0.7.4[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}] - >=dev-python/priority-1.3.0[${PYTHON_USEDEP}] - >=dev-python/psutil-5.2.2[${PYTHON_USEDEP}] - >=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}] - >=dev-python/pyasn1-modules-0.0.9[${PYTHON_USEDEP}] - >=dev-python/pygments-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}] - >=dev-python/pytrie-0.3[${PYTHON_USEDEP}] - >=dev-python/py-ubjson-0.9.0[${PYTHON_USEDEP}] - >=dev-python/pynacl-1.1.2[${PYTHON_USEDEP}] - >=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] - >=dev-python/sdnotify-0.3.1[${PYTHON_USEDEP}] - >=dev-python/service_identity-17.0.0[${PYTHON_USEDEP}] - >=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}] - >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] - >=dev-python/shutilwhich-1.1.0[${PYTHON_USEDEP}] - >=dev-python/treq-17.3.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] - >=dev-python/txaio-2.8.2[${PYTHON_USEDEP}] - >=dev-python/u-msgpack-2.4.1[${PYTHON_USEDEP}] - >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] - >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] - tor? ( >=dev-python/txtorcon-0.19.3[${PYTHON_USEDEP}] ) -" -DEPEND=" - !dev-python/crossbar - >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] - test? ( - dev-python/mock[${PYTHON_USEDEP}] - ) -" -DOCS=( - README.rst LICENSE-FOR-API LICENSE COPYRIGHT -) - -S="${WORKDIR}"/${MY_P} - -python_prepare_all() { - # don't install the copyright, license... let dodoc do it - sed -e "s/^ data_files=.*//" -i setup.py || die - - if ! use tor; then - eapply "${FILESDIR}/${PN}-17.9.1-Revert-Torservices.patch" - sed -e "s/^txtorcon.*//" -i requirements-min.txt || die - fi - # remove these py2 deps from setuptools install_requires - # it is not filtered out for >=py3.4 and results in test fails - sed -e "s/^ipaddress.*//" -i requirements-min.txt || die - sed -e "s/^enum34.*//" -i requirements-min.txt || die - - distutils-r1_python_prepare_all -} - -pkg_setup() { - enewuser crossbar -} - -python_test() { - pushd "${TEST_DIR}" > /dev/null || die - /usr/bin/trial crossbar || die "Tests failed with ${EPYTHON}" - popd > /dev/null || die -} - -python_install_all() { - distutils-r1_python_install_all - - keepdir /var/lib/crossbar - insinto /var/lib/crossbar - doins "${FILESDIR}/config.json.sample" - - newconfd "${FILESDIR}/confd" crossbar - newinitd "${FILESDIR}/initd" crossbar -} - -pkg_posinst() { - einfo "For exapmle configurations and scripts" - einfo "See: https://github.com/crossbario/crossbar-examples" - - if [[ -n ${REPLACING_VERSIONS} ]]; then - ewarn - ewarn "Starting with net-misc/crossbar-17.6.1_p3-r1, more than one instance of crossbar" - ewarn "can be run simultaneously. Note that \"BASEDIR\" in the crossbar conf.d/crossbar file" - ewarn "is the common base directory for all instances. If you are migrating from an older" - ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." - ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." - ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" - ewarn " ln --symbolic --relative /etc/init.d/crossbar /etc/init.d/crossbar.myinstance" - ewarn " rc-update add crossbar.myinstance default" - ewarn " /etc/init.d/crossbar.myinstance start" - ewarn "Systems using systemd can do the following:" - ewarn " systemctl enable crossbar@myinstance.service" - ewarn " systemctl enable crossbar.target" - ewarn " systemctl start crossbar.target" - fi -} - -pkg_config() { - local crossbar_path="/var/lib/crossbar" - local log_path="/var/log/crossbar" - einfo "This will prepare a new crossbar instance in ${crossbar_path}." - einfo "Press Control-C to abort." - - einfo "Enter the name for the new instance: " - read instance_name - [[ -z "${instance_name}" ]] && die "Invalid instance name" - - local instance_path="${crossbar_path}/${instance_name}" - local instance_log_path="${log_path}/${instance_name}" - - if [[ -e "${instance_path}" ]]; then - eerror "The instance with the specified name already exists:" - eerror "${instance_path}" - die "Instance already exists" - fi - - if [[ ! -d "${instance_path}" ]]; then - mkdir --parents "${instance_path}" || die "Unable to create directory ${crossbar_path}" - fi - chown --recursive crossbar "${instance_path}" || die "Setting permissions for instance failed" - cp "${crossbar_path}/config.json.sample" "${instance_path}/config.json" \ - || die "Moving sample configuration failed" - ln --symbolic --relative "/etc/init.d/crossbar" "/etc/init.d/crossbar.${instance_name}" \ - || die "Unable to create link to init file" - - if [[ ! -d "${instance_log_path}" ]]; then - mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" - fi - ln --symbolic --relative "${instance_log_path}/node.log" "${instance_path}/node.log" \ - || die "Unable to create link to log file" - - einfo "Successfully created a crossbar instance at ${instance_path}." - einfo "To change the default settings edit the config.json file in this directory." -} diff --git a/net-misc/crossbar/crossbar-18.3.1.ebuild b/net-misc/crossbar/crossbar-18.3.1.ebuild deleted file mode 100644 index 9f47d7ef9b48..000000000000 --- a/net-misc/crossbar/crossbar-18.3.1.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_6 ) - -inherit user systemd distutils-r1 - -MY_PV="${PV}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework" -HOMEPAGE="https://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.org/project/crossbar/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/attrs-17.2.0[${PYTHON_USEDEP}] - >=dev-python/autobahn-18.3.1[${PYTHON_USEDEP}] - >=dev-python/bitstring-3.1.5[${PYTHON_USEDEP}] - >=dev-python/cbor-1.0.0[${PYTHON_USEDEP}] - >=dev-python/click-6.7[${PYTHON_USEDEP}] - >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]' python2_7) - >=dev-python/hyper-h2-3.0.1[${PYTHON_USEDEP}] - =dev-python/idna-2.5[${PYTHON_USEDEP}] - >=dev-python/incremental-17.5.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.18[${PYTHON_USEDEP}]' python2_7) - >=dev-python/jinja-2.9.6[${PYTHON_USEDEP}] - >=dev-python/lmdb-0.92[${PYTHON_USEDEP}] - >=dev-python/mistune-0.7.4[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}] - >=dev-python/priority-1.3.0[${PYTHON_USEDEP}] - >=dev-python/psutil-5.2.2[${PYTHON_USEDEP}] - >=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}] - >=dev-python/pyasn1-modules-0.0.9[${PYTHON_USEDEP}] - >=dev-python/pygments-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}] - >=dev-python/pytrie-0.3[${PYTHON_USEDEP}] - >=dev-python/py-ubjson-0.9.0[${PYTHON_USEDEP}] - >=dev-python/pynacl-1.1.2[${PYTHON_USEDEP}] - >=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] - >=dev-python/sdnotify-0.3.1[${PYTHON_USEDEP}] - >=dev-python/service_identity-17.0.0[${PYTHON_USEDEP}] - >=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}] - >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] - >=dev-python/shutilwhich-1.1.0[${PYTHON_USEDEP}] - >=dev-python/treq-17.3.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] - >=dev-python/txaio-2.9.0[${PYTHON_USEDEP}] - >=dev-python/u-msgpack-2.4.1[${PYTHON_USEDEP}] - >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] - >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] - >=dev-python/txtorcon-0.19.3[${PYTHON_USEDEP}] -" -DEPEND=" - !dev-python/crossbar - >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] - test? ( - dev-python/mock[${PYTHON_USEDEP}] - ) -" -DOCS=( - README.rst LICENSE-FOR-API LICENSE COPYRIGHT -) - -S="${WORKDIR}"/${MY_P} - -python_prepare_all() { - # don't install the copyright, license... let dodoc do it - sed -e "s/^ data_files=.*//" -i setup.py || die - - # remove these py2 deps from setuptools install_requires - # it is not filtered out for >=py3.4 and results in test fails - sed -e "s/^ipaddress.*//" -i requirements-min.txt || die - sed -e "s/^enum34.*//" -i requirements-min.txt || die - - distutils-r1_python_prepare_all -} - -pkg_setup() { - enewuser crossbar -} - -python_test() { - pushd "${TEST_DIR}" > /dev/null || die - /usr/bin/trial crossbar || die "Tests failed with ${EPYTHON}" - popd > /dev/null || die -} - -python_install_all() { - distutils-r1_python_install_all - - keepdir /var/lib/crossbar - insinto /var/lib/crossbar - doins "${FILESDIR}/config.json.sample" - - newconfd "${FILESDIR}/confd" crossbar - newinitd "${FILESDIR}/initd" crossbar -} - -pkg_posinst() { - einfo "For exapmle configurations and scripts" - einfo "See: https://github.com/crossbario/crossbar-examples" - - if [[ -n ${REPLACING_VERSIONS} ]]; then - ewarn - ewarn "Starting with crossbar-18.3.1 the tor service capability and dependency are now built-in" - ewarn "Starting with net-misc/crossbar-17.6.1_p3-r1, more than one instance of crossbar" - ewarn "can be run simultaneously. Note that \"BASEDIR\" in the crossbar conf.d/crossbar file" - ewarn "is the common base directory for all instances. If you are migrating from an older" - ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." - ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." - ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" - ewarn " ln --symbolic --relative /etc/init.d/crossbar /etc/init.d/crossbar.myinstance" - ewarn " rc-update add crossbar.myinstance default" - ewarn " /etc/init.d/crossbar.myinstance start" - ewarn "Systems using systemd can do the following:" - ewarn " systemctl enable crossbar@myinstance.service" - ewarn " systemctl enable crossbar.target" - ewarn " systemctl start crossbar.target" - fi -} - -pkg_config() { - local crossbar_path="/var/lib/crossbar" - local log_path="/var/log/crossbar" - einfo "This will prepare a new crossbar instance in ${crossbar_path}." - einfo "Press Control-C to abort." - - einfo "Enter the name for the new instance: " - read instance_name - [[ -z "${instance_name}" ]] && die "Invalid instance name" - - local instance_path="${crossbar_path}/${instance_name}" - local instance_log_path="${log_path}/${instance_name}" - - if [[ -e "${instance_path}" ]]; then - eerror "The instance with the specified name already exists:" - eerror "${instance_path}" - die "Instance already exists" - fi - - if [[ ! -d "${instance_path}" ]]; then - mkdir --parents "${instance_path}" || die "Unable to create directory ${crossbar_path}" - fi - chown --recursive crossbar "${instance_path}" || die "Setting permissions for instance failed" - cp "${crossbar_path}/config.json.sample" "${instance_path}/config.json" \ - || die "Moving sample configuration failed" - ln --symbolic --relative "/etc/init.d/crossbar" "/etc/init.d/crossbar.${instance_name}" \ - || die "Unable to create link to init file" - - if [[ ! -d "${instance_log_path}" ]]; then - mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" - fi - ln --symbolic --relative "${instance_log_path}/node.log" "${instance_path}/node.log" \ - || die "Unable to create link to log file" - - einfo "Successfully created a crossbar instance at ${instance_path}." - einfo "To change the default settings edit the config.json file in this directory." -} diff --git a/net-misc/crossbar/files/confd b/net-misc/crossbar/files/confd deleted file mode 100644 index e4a914f640fd..000000000000 --- a/net-misc/crossbar/files/confd +++ /dev/null @@ -1,11 +0,0 @@ -# Path to the wamp router basedir. -BASEDIR="/var/lib/crossbar" - -# User account for the crossbar router. -# The basedir should be owned by this user. -USERNAME="crossbar" - -# loglevel {none,error,warn,info,debug,trace} -# How much Crossbar.io should log to the terminal, in -# order of verbosity. -LOGLEVEL="info" diff --git a/net-misc/crossbar/files/config.json.sample b/net-misc/crossbar/files/config.json.sample deleted file mode 100644 index d7b7d6af7300..000000000000 --- a/net-misc/crossbar/files/config.json.sample +++ /dev/null @@ -1,60 +0,0 @@ -{ - "version": 2, - "controller": {}, - "workers": [ - { - "type": "router", - "realms": [ - { - "name": "realm1", - "roles": [ - { - "name": "anonymous", - "permissions": [ - { - "uri": "", - "match": "prefix", - "allow": { - "call": true, - "register": true, - "publish": true, - "subscribe": true - }, - "disclose": { - "caller": false, - "publisher": false - }, - "cache": true - } - ] - } - ] - } - ], - "transports": [ - { - "type": "universal", - "endpoint": { - "type": "tcp", - "port": 8080 - }, - "rawsocket": { - }, - "websocket": { - "ws": { - "type": "websocket" - } - }, - "web": { - "paths": { - "/": { - "type": "static", - "directory": "../web" - } - } - } - } - ] - } - ] -} 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 deleted file mode 100644 index 3a83bdf8fc69..000000000000 --- a/net-misc/crossbar/files/crossbar-17.8.1-Revert-Torservices.patch +++ /dev/null @@ -1,246 +0,0 @@ -From 97a2d923dff32397c9df5adb95ecb84bcd95d83d Mon Sep 17 00:00:00 2001 -From: Brian Dolbec -Date: Tue, 19 Sep 2017 17:44:08 -0700 -Subject: [PATCH] Revert "Add built-in Tor services and connection support" - -This reverts commit f75db17642845f46bebd2f6f1d6a092974b9b390. ---- - crossbar/common/checkconfig.py | 60 +-------------- - crossbar/twisted/endpoint.py | 83 +-------------------- - .../router/transport/Transport-Endpoints.md | 85 +--------------------- - requirements-dev.txt | 1 - - requirements-min.txt | 1 - - 5 files changed, 4 insertions(+), 226 deletions(-) - -diff --git a/crossbar/common/checkconfig.py b/crossbar/common/checkconfig.py -index a8e84d45..1f5d9c91 100644 ---- a/crossbar/common/checkconfig.py -+++ b/crossbar/common/checkconfig.py -@@ -867,31 +867,6 @@ def check_listening_endpoint_twisted(endpoint): - # should/can we ask Twisted to parse it easily? - - --def check_listening_endpoint_onion(endpoint): -- """ -- :param endpoint: The onion endpoint -- :type endpoint: dict -- """ -- for k in endpoint: -- if k not in ['type', 'port', 'private_key_file', 'tor_control_endpoint']: -- raise InvalidConfigException( -- "encountered unknown attribute '{}' in onion endpoint".format(k) -- ) -- -- check_dict_args( -- { -- u"type": (True, [six.text_type]), -- u"port": (True, [int, long]), -- u"private_key_file": (True, [six.text_type]), -- u"tor_control_endpoint": (True, [Mapping]) -- }, -- endpoint, -- "onion endpoint config", -- ) -- -- check_connecting_endpoint(endpoint[u"tor_control_endpoint"]) -- -- - def check_connecting_endpoint_tcp(endpoint): - """ - Check a TCP connecting endpoint configuration. -@@ -978,33 +953,6 @@ def check_connecting_endpoint_twisted(endpoint): - check_endpoint_timeout(endpoint['timeout']) - - --def check_connecting_endpoint_tor(endpoint): -- """ -- :param endpoint: The Tor connecting endpoint to check. -- :type endpoint: dict -- """ -- for k in endpoint: -- if k not in ['type', 'host', 'port', 'tor_socks_port', 'tls']: -- raise InvalidConfigException( -- "encountered unknown attribute '{}' in connecting endpoint".format(k) -- ) -- -- if 'host' not in endpoint: -- raise InvalidConfigException("missing mandatory attribute 'host' in connecting endpoint item\n\n{}".format(pformat(endpoint))) -- -- if 'port' not in endpoint: -- raise InvalidConfigException("missing mandatory attribute 'port' in connecting endpoint item\n\n{}".format(pformat(endpoint))) -- -- if 'tor_socks_port' not in endpoint: -- raise InvalidConfigException("missing mandatory attribute 'tor_socks_port' in connecting endpoint item\n\n{}".format(pformat(endpoint))) -- -- check_endpoint_port(endpoint['port']) -- check_endpoint_port(endpoint['tor_socks_port']) -- -- if 'tls' in endpoint: -- check_connecting_endpoint_tls(endpoint['tls']) -- -- - def check_listening_endpoint(endpoint): - """ - Check a listening endpoint configuration. -@@ -1022,7 +970,7 @@ def check_listening_endpoint(endpoint): - raise InvalidConfigException("missing mandatory attribute 'type' in endpoint item\n\n{}".format(pformat(endpoint))) - - etype = endpoint['type'] -- if etype not in ['tcp', 'unix', 'twisted', 'onion']: -+ if etype not in ['tcp', 'unix', 'twisted']: - raise InvalidConfigException("invalid attribute value '{}' for attribute 'type' in endpoint item\n\n{}".format(etype, pformat(endpoint))) - - if etype == 'tcp': -@@ -1031,8 +979,6 @@ def check_listening_endpoint(endpoint): - check_listening_endpoint_unix(endpoint) - elif etype == 'twisted': - check_listening_endpoint_twisted(endpoint) -- elif etype == 'onion': -- check_listening_endpoint_onion(endpoint) - else: - raise InvalidConfigException('logic error') - -@@ -1054,7 +1000,7 @@ def check_connecting_endpoint(endpoint): - raise InvalidConfigException("missing mandatory attribute 'type' in endpoint item\n\n{}".format(pformat(endpoint))) - - etype = endpoint['type'] -- if etype not in ['tcp', 'unix', 'twisted', 'tor']: -+ if etype not in ['tcp', 'unix', 'twisted']: - raise InvalidConfigException("invalid attribute value '{}' for attribute 'type' in endpoint item\n\n{}".format(etype, pformat(endpoint))) - - if etype == 'tcp': -@@ -1063,8 +1009,6 @@ def check_connecting_endpoint(endpoint): - check_connecting_endpoint_unix(endpoint) - elif etype == 'twisted': - check_connecting_endpoint_twisted(endpoint) -- elif etype == 'tor': -- check_connecting_endpoint_tor(endpoint) - else: - raise InvalidConfigException('logic error') - -diff --git a/crossbar/twisted/endpoint.py b/crossbar/twisted/endpoint.py -index 483e5a39..251bfa5c 100644 ---- a/crossbar/twisted/endpoint.py -+++ b/crossbar/twisted/endpoint.py -@@ -33,7 +33,7 @@ from __future__ import absolute_import, division - import six - import os - from os import environ --from os.path import join, abspath, isabs, exists -+from os.path import join, abspath - - from twisted.internet import defer - from twisted.internet._sslverify import OpenSSLCertificateAuthorities -@@ -48,11 +48,7 @@ from twisted.internet.endpoints import TCP4ServerEndpoint, \ - UNIXClientEndpoint, \ - serverFromString, \ - clientFromString --from twisted.internet.interfaces import IStreamServerEndpoint - from twisted.python.filepath import FilePath --from zope.interface import implementer -- --import txtorcon - - from crossbar.twisted.sharedport import SharedPort, SharedTLSPort - -@@ -318,12 +314,6 @@ def _create_tls_client_context(config, cbdir, log): - return ctx - - --def _ensure_absolute(fname, cbdir): -- if isabs(fname): -- return fname -- return abspath(join(cbdir, fname)) -- -- - def create_listening_endpoint_from_config(config, cbdir, reactor, log): - """ - Create a Twisted stream server endpoint from a Crossbar.io transport configuration. -@@ -431,59 +421,6 @@ def create_listening_endpoint_from_config(config, cbdir, reactor, log): - elif config['type'] == 'twisted': - endpoint = serverFromString(reactor, config['server_string']) - -- # tor endpoint -- elif config['type'] == 'onion': # or "tor"? r "tor_onion"? -- port = config['port'] -- private_key_fname = _ensure_absolute(config[u'private_key_file'], cbdir) -- tor_control_ep = create_connecting_endpoint_from_config( -- config[u'tor_control_endpoint'], cbdir, reactor, log -- ) -- -- try: -- with open(private_key_fname, 'r') as f: -- private_key = f.read().strip() -- except (IOError, OSError): -- private_key = None -- -- @implementer(IStreamServerEndpoint) -- class _EphemeralOnion(object): -- -- @defer.inlineCallbacks -- def listen(self, proto_factory): -- # we don't care which local TCP port we listen on, but -- # we do need to know it -- local_ep = TCP4ServerEndpoint(reactor, 0, interface=u"127.0.0.1") -- target_port = yield local_ep.listen(proto_factory) -- tor = yield txtorcon.connect( -- reactor, -- tor_control_ep, -- ) -- -- # create and add the service -- hs = txtorcon.EphemeralHiddenService( -- ports=["{} 127.0.0.1:{}".format(port, target_port.getHost().port)], -- key_blob_or_type=private_key if private_key else "NEW:BEST", -- ) -- log.info("Uploading descriptors can take more than 30s") -- yield hs.add_to_tor(tor.protocol) -- -- # if it's new, store our private key -- # XXX better "if private_key is None"? -- if not exists(private_key_fname): -- with open(private_key_fname, 'w') as f: -- f.write(hs.private_key) -- log.info("Wrote private key to '{fname}'", fname=private_key_fname) -- -- addr = txtorcon.TorOnionAddress(hs.hostname, port) -- log.info( -- "Listening on Tor onion service {addr.onion_uri}:{addr.onion_port}" -- " with local port {local_port}", -- addr=addr, -- local_port=target_port.getHost().port, -- ) -- defer.returnValue(addr) -- endpoint = _EphemeralOnion() -- - else: - raise Exception("invalid endpoint type '{}'".format(config['type'])) - -@@ -656,24 +593,6 @@ def create_connecting_endpoint_from_config(config, cbdir, reactor, log): - elif config['type'] == 'twisted': - endpoint = clientFromString(reactor, config['client_string']) - -- elif config['type'] == 'tor': -- host = config['host'] -- port = config['port'] -- socks_port = config['tor_socks_port'] -- tls = config.get('tls', False) -- if not tls and not host.endswith(u'.onion'): -- log.warn("Non-TLS connection traversing Tor network; end-to-end encryption advised") -- -- socks_endpoint = TCP4ClientEndpoint( -- reactor, "127.0.0.1", socks_port, -- ) -- endpoint = txtorcon.TorClientEndpoint( -- host, port, -- socks_endpoint=socks_endpoint, -- reactor=reactor, -- use_tls=tls, -- ) -- - else: - raise Exception("invalid endpoint type '{}'".format(config['type'])) - --- -2.14.1 - 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 deleted file mode 100644 index dd4b2b58e455..000000000000 --- a/net-misc/crossbar/files/crossbar-17.9.1-Revert-Torservices.patch +++ /dev/null @@ -1,270 +0,0 @@ -From 97a2d923dff32397c9df5adb95ecb84bcd95d83d Mon Sep 17 00:00:00 2001 -From: Brian Dolbec -Date: Tue, 19 Sep 2017 17:44:08 -0700 -Subject: [PATCH] Revert "Add built-in Tor services and connection support" - -This reverts commit f75db17642845f46bebd2f6f1d6a092974b9b390. ---- - crossbar/common/checkconfig.py | 60 +-------------- - crossbar/twisted/endpoint.py | 83 +-------------------- - .../router/transport/Transport-Endpoints.md | 85 +--------------------- - requirements-dev.txt | 1 - - requirements-min.txt | 1 - - 5 files changed, 4 insertions(+), 226 deletions(-) - -diff --git a/crossbar/common/checkconfig.py b/crossbar/common/checkconfig.py -index a8e84d45..1f5d9c91 100644 ---- a/crossbar/common/checkconfig.py -+++ b/crossbar/common/checkconfig.py -@@ -867,31 +867,6 @@ def check_listening_endpoint_twisted(endpoint): - # should/can we ask Twisted to parse it easily? - - --def check_listening_endpoint_onion(endpoint): -- """ -- :param endpoint: The onion endpoint -- :type endpoint: dict -- """ -- for k in endpoint: -- if k not in ['type', 'port', 'private_key_file', 'tor_control_endpoint']: -- raise InvalidConfigException( -- "encountered unknown attribute '{}' in onion endpoint".format(k) -- ) -- -- check_dict_args( -- { -- u"type": (True, [six.text_type]), -- u"port": (True, six.integer_types), -- u"private_key_file": (True, [six.text_type]), -- u"tor_control_endpoint": (True, [Mapping]) -- }, -- endpoint, -- "onion endpoint config", -- ) -- check_endpoint_port(u"port") -- check_connecting_endpoint(endpoint[u"tor_control_endpoint"]) -- -- - def check_connecting_endpoint_tcp(endpoint): - """ - Check a TCP connecting endpoint configuration. -@@ -978,33 +953,6 @@ def check_connecting_endpoint_twisted(endpoint): - check_endpoint_timeout(endpoint['timeout']) - - --def check_connecting_endpoint_tor(endpoint): -- """ -- :param endpoint: The Tor connecting endpoint to check. -- :type endpoint: dict -- """ -- for k in endpoint: -- if k not in ['type', 'host', 'port', 'tor_socks_port', 'tls']: -- raise InvalidConfigException( -- "encountered unknown attribute '{}' in connecting endpoint".format(k) -- ) -- -- if 'host' not in endpoint: -- raise InvalidConfigException("missing mandatory attribute 'host' in connecting endpoint item\n\n{}".format(pformat(endpoint))) -- -- if 'port' not in endpoint: -- raise InvalidConfigException("missing mandatory attribute 'port' in connecting endpoint item\n\n{}".format(pformat(endpoint))) -- -- if 'tor_socks_port' not in endpoint: -- raise InvalidConfigException("missing mandatory attribute 'tor_socks_port' in connecting endpoint item\n\n{}".format(pformat(endpoint))) -- -- check_endpoint_port(endpoint['port']) -- check_endpoint_port(endpoint['tor_socks_port']) -- -- if 'tls' in endpoint: -- check_connecting_endpoint_tls(endpoint['tls']) -- -- - def check_listening_endpoint(endpoint): - """ - Check a listening endpoint configuration. -@@ -1022,7 +970,7 @@ def check_listening_endpoint(endpoint): - raise InvalidConfigException("missing mandatory attribute 'type' in endpoint item\n\n{}".format(pformat(endpoint))) - - etype = endpoint['type'] -- if etype not in ['tcp', 'unix', 'twisted', 'onion']: -+ if etype not in ['tcp', 'unix', 'twisted']: - raise InvalidConfigException("invalid attribute value '{}' for attribute 'type' in endpoint item\n\n{}".format(etype, pformat(endpoint))) - - if etype == 'tcp': -@@ -1031,8 +979,6 @@ def check_listening_endpoint(endpoint): - check_listening_endpoint_unix(endpoint) - elif etype == 'twisted': - check_listening_endpoint_twisted(endpoint) -- elif etype == 'onion': -- check_listening_endpoint_onion(endpoint) - else: - raise InvalidConfigException('logic error') - -@@ -1054,7 +1000,7 @@ def check_connecting_endpoint(endpoint): - raise InvalidConfigException("missing mandatory attribute 'type' in endpoint item\n\n{}".format(pformat(endpoint))) - - etype = endpoint['type'] -- if etype not in ['tcp', 'unix', 'twisted', 'tor']: -+ if etype not in ['tcp', 'unix', 'twisted']: - raise InvalidConfigException("invalid attribute value '{}' for attribute 'type' in endpoint item\n\n{}".format(etype, pformat(endpoint))) - - if etype == 'tcp': -@@ -1063,8 +1009,6 @@ def check_connecting_endpoint(endpoint): - check_connecting_endpoint_unix(endpoint) - elif etype == 'twisted': - check_connecting_endpoint_twisted(endpoint) -- elif etype == 'tor': -- check_connecting_endpoint_tor(endpoint) - else: - raise InvalidConfigException('logic error') - -diff --git a/crossbar/twisted/endpoint.py b/crossbar/twisted/endpoint.py -index 483e5a39..251bfa5c 100644 ---- a/crossbar/twisted/endpoint.py -+++ b/crossbar/twisted/endpoint.py -@@ -33,7 +33,7 @@ from __future__ import absolute_import, division - import six - import os - from os import environ --from os.path import join, abspath, isabs, exists -+from os.path import join, abspath - - from twisted.internet import defer - from twisted.internet._sslverify import OpenSSLCertificateAuthorities -@@ -48,11 +48,7 @@ from twisted.internet.endpoints import TCP4ServerEndpoint, \ - UNIXClientEndpoint, \ - serverFromString, \ - clientFromString --from twisted.internet.interfaces import IStreamServerEndpoint - from twisted.python.filepath import FilePath --from zope.interface import implementer -- --import txtorcon - - from crossbar.twisted.sharedport import SharedPort, SharedTLSPort - -@@ -318,12 +314,6 @@ def _create_tls_client_context(config, cbdir, log): - return ctx - - --def _ensure_absolute(fname, cbdir): -- if isabs(fname): -- return fname -- return abspath(join(cbdir, fname)) -- -- - def create_listening_endpoint_from_config(config, cbdir, reactor, log): - """ - Create a Twisted stream server endpoint from a Crossbar.io transport configuration. -@@ -431,59 +421,6 @@ def create_listening_endpoint_from_config(config, cbdir, reactor, log): - elif config['type'] == 'twisted': - endpoint = serverFromString(reactor, config['server_string']) - -- # tor endpoint -- elif config['type'] == 'onion': # or "tor"? r "tor_onion"? -- port = config['port'] -- private_key_fname = _ensure_absolute(config[u'private_key_file'], cbdir) -- tor_control_ep = create_connecting_endpoint_from_config( -- config[u'tor_control_endpoint'], cbdir, reactor, log -- ) -- -- try: -- with open(private_key_fname, 'r') as f: -- private_key = f.read().strip() -- except (IOError, OSError): -- private_key = None -- -- @implementer(IStreamServerEndpoint) -- class _EphemeralOnion(object): -- -- @defer.inlineCallbacks -- def listen(self, proto_factory): -- # we don't care which local TCP port we listen on, but -- # we do need to know it -- local_ep = TCP4ServerEndpoint(reactor, 0, interface=u"127.0.0.1") -- target_port = yield local_ep.listen(proto_factory) -- tor = yield txtorcon.connect( -- reactor, -- tor_control_ep, -- ) -- -- # create and add the service -- hs = txtorcon.EphemeralHiddenService( -- ports=["{} 127.0.0.1:{}".format(port, target_port.getHost().port)], -- key_blob_or_type=private_key if private_key else "NEW:BEST", -- ) -- log.info("Uploading descriptors can take more than 30s") -- yield hs.add_to_tor(tor.protocol) -- -- # if it's new, store our private key -- # XXX better "if private_key is None"? -- if not exists(private_key_fname): -- with open(private_key_fname, 'w') as f: -- f.write(hs.private_key) -- log.info("Wrote private key to '{fname}'", fname=private_key_fname) -- -- addr = txtorcon.TorOnionAddress(hs.hostname, port) -- log.info( -- "Listening on Tor onion service {addr.onion_uri}:{addr.onion_port}" -- " with local port {local_port}", -- addr=addr, -- local_port=target_port.getHost().port, -- ) -- defer.returnValue(addr) -- endpoint = _EphemeralOnion() -- - else: - raise Exception("invalid endpoint type '{}'".format(config['type'])) - -@@ -656,24 +593,6 @@ def create_connecting_endpoint_from_config(config, cbdir, reactor, log): - elif config['type'] == 'twisted': - endpoint = clientFromString(reactor, config['client_string']) - -- elif config['type'] == 'tor': -- host = config['host'] -- port = config['port'] -- socks_port = config['tor_socks_port'] -- tls = config.get('tls', False) -- if not tls and not host.endswith(u'.onion'): -- log.warn("Non-TLS connection traversing Tor network; end-to-end encryption advised") -- -- socks_endpoint = TCP4ClientEndpoint( -- reactor, "127.0.0.1", socks_port, -- ) -- endpoint = txtorcon.TorClientEndpoint( -- host, port, -- socks_endpoint=socks_endpoint, -- reactor=reactor, -- use_tls=tls, -- ) -- - else: - raise Exception("invalid endpoint type '{}'".format(config['type'])) - -diff --git a/requirements-dev.txt b/requirements-dev.txt -index fa75074a..d68d1e89 100644 ---- a/requirements-dev.txt -+++ b/requirements-dev.txt -@@ -4,7 +4,6 @@ colorama>=0.3.3 - mock>=1.3.0 - wheel>=0.26.0 - hashin>=0.4.1 --txtorcon>=0.19.3 - - # docs - flask -diff --git a/requirements-min.txt b/requirements-min.txt -index 38ee5a71..83c8d802 100644 ---- a/requirements-min.txt -+++ b/requirements-min.txt -@@ -6,7 +6,6 @@ Twisted>=17.5.0 - h2>=3.0.1 - priority>=1.3.0 - txaio>=2.8.2 --txtorcon>=0.19.3 - autobahn>=17.9.1 - netaddr>=0.7.19 - PyTrie>=0.3 --- -2.14.1 - diff --git a/net-misc/crossbar/files/initd b/net-misc/crossbar/files/initd deleted file mode 100644 index 565dfb304aea..000000000000 --- a/net-misc/crossbar/files/initd +++ /dev/null @@ -1,35 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -NODE=${RC_SVCNAME:9} - -command=/usr/bin/crossbar -command_args="start --cbdir=${BASEDIR}/${NODE} --logtofile --colour=false --loglevel=${LOGLEVEL}" -command_background=true -description="start crossbar wamp router for ${NODE}" -pidfile="${BASEDIR}/${NODE}/crossbar.pid" - - -depend() { - need net -} - -checkconfig() { - if [ -z "${BASEDIR}" ]; then - eerror "BASEDIR not set" - return 1 - fi - if [ -z "${USERNAME}" ]; then - eerror "USERNAME not set" - return 1 - fi - if [ ! -d "${BASEDIR}" ]; then - eerror "${BASEDIR} is not a directory" - return 1 - fi - if [ ! -e "${BASEDIR}/${NODE}" ]; then - eerror "${BASEDIR} does not contain a ${NODE} sub directory" - return 1 - fi -} diff --git a/net-misc/crossbar/metadata.xml b/net-misc/crossbar/metadata.xml deleted file mode 100644 index d9d6f959b0b7..000000000000 --- a/net-misc/crossbar/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - Crossbar.io Technologies GmbH - - crossbar - crossbariocrossbar - - - Crossbar.io is an open source networking platform - for distributed and microservice applications. It implements the - open Web Application Messaging Protocol (WAMP), is feature rich, - scalable, robust and secure. Let Crossbar.io take care of the - hard parts of messaging so you can focus on your app's features. - - - include tor services connections support - -