[gentoo-commits] repo/gentoo:master commit in: net-mail/onionrouter/
commit: e2fc36612e6a233504ebff168131bc728216e897 Author: Craig Andrews gentoo org> AuthorDate: Mon Apr 15 23:44:31 2024 + Commit: Craig Andrews gentoo org> CommitDate: Mon Apr 15 23:45:34 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2fc3661 net-mail/onionrouter: enable py3.12 Closes: https://bugs.gentoo.org/929336 Signed-off-by: Craig Andrews gentoo.org> net-mail/onionrouter/onionrouter-0.6.2-r1.ebuild | 4 ++-- net-mail/onionrouter/onionrouter-.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-mail/onionrouter/onionrouter-0.6.2-r1.ebuild b/net-mail/onionrouter/onionrouter-0.6.2-r1.ebuild index f5a753cbc898..5ae0f03c0fb4 100644 --- a/net-mail/onionrouter/onionrouter-0.6.2-r1.ebuild +++ b/net-mail/onionrouter/onionrouter-0.6.2-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9,10,11} ) +PYTHON_COMPAT=( python3_{9,10,11,12} ) DISTUTILS_USE_PEP517=setuptools DISTUTILS_SINGLE_IMPL=1 diff --git a/net-mail/onionrouter/onionrouter-.ebuild b/net-mail/onionrouter/onionrouter-.ebuild index f5a753cbc898..5ae0f03c0fb4 100644 --- a/net-mail/onionrouter/onionrouter-.ebuild +++ b/net-mail/onionrouter/onionrouter-.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9,10,11} ) +PYTHON_COMPAT=( python3_{9,10,11,12} ) DISTUTILS_USE_PEP517=setuptools DISTUTILS_SINGLE_IMPL=1
[gentoo-commits] repo/gentoo:master commit in: net-mail/onionrouter/
commit: add5d781f12da8e7a447f055718dffe92450110b Author: Craig Andrews gentoo org> AuthorDate: Mon Feb 27 14:13:36 2023 + Commit: Craig Andrews gentoo org> CommitDate: Mon Feb 27 14:24:41 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=add5d781 net-mail/onionrouter: EAPI=8 Signed-off-by: Craig Andrews gentoo.org> .../{onionrouter-.ebuild => onionrouter-0.6.2-r1.ebuild} | 4 ++-- net-mail/onionrouter/onionrouter-.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-mail/onionrouter/onionrouter-.ebuild b/net-mail/onionrouter/onionrouter-0.6.2-r1.ebuild similarity index 96% copy from net-mail/onionrouter/onionrouter-.ebuild copy to net-mail/onionrouter/onionrouter-0.6.2-r1.ebuild index 6e70759dfa0c..f5a753cbc898 100644 --- a/net-mail/onionrouter/onionrouter-.ebuild +++ b/net-mail/onionrouter/onionrouter-0.6.2-r1.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{9,10,11} ) +DISTUTILS_USE_PEP517=setuptools DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 systemd diff --git a/net-mail/onionrouter/onionrouter-.ebuild b/net-mail/onionrouter/onionrouter-.ebuild index 6e70759dfa0c..f5a753cbc898 100644 --- a/net-mail/onionrouter/onionrouter-.ebuild +++ b/net-mail/onionrouter/onionrouter-.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{9,10,11} ) +DISTUTILS_USE_PEP517=setuptools DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 systemd
[gentoo-commits] repo/gentoo:master commit in: net-mail/onionrouter/
commit: e1d0a333eff9df59179a56c429aa903c44afe553 Author: Craig Andrews gentoo org> AuthorDate: Mon Feb 27 14:13:51 2023 + Commit: Craig Andrews gentoo org> CommitDate: Mon Feb 27 14:24:41 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1d0a333 net-mail/onionrouter: drop 0.6.2 Signed-off-by: Craig Andrews gentoo.org> net-mail/onionrouter/onionrouter-0.6.2.ebuild | 50 --- 1 file changed, 50 deletions(-) diff --git a/net-mail/onionrouter/onionrouter-0.6.2.ebuild b/net-mail/onionrouter/onionrouter-0.6.2.ebuild deleted file mode 100644 index 6e70759dfa0c.. --- a/net-mail/onionrouter/onionrouter-0.6.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9,10,11} ) -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 systemd - -DESCRIPTION=".onion discovery via SRV DNS lookups for use with postfix" -HOMEPAGE="https://pypi.org/project/onionrouter/ https://github.com/ehloonion/onionrouter/; -if [[ ${PV} == * ]] ; then - SRC_URI="" - EGIT_REPO_URI="https://github.com/ehloonion/onionrouter.git; - inherit git-r3 -else - KEYWORDS="~amd64" - SRC_URI="https://pypi.io/packages/source/${PN::1}/${PN}/${P}.tar.gz; -fi -IUSE="test" -RESTRICT="!test? ( test )" - -LICENSE="GPL-3+" -SLOT="0" - -RDEPEND="$(python_gen_cond_dep ' - dev-python/dnspython[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] -')" -BDEPEND="$(python_gen_cond_dep ' - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - ) -')" - -distutils_enable_tests pytest - -src_prepare() { - distutils-r1_src_prepare -} - -src_install() { - distutils-r1_src_install - systemd_dounit "${FILESDIR}/${PN}.service" - insinto /etc/onionrouter - doins "${S}/onionrouter/configs/onionrouter.ini" -}
[gentoo-commits] repo/gentoo:master commit in: net-mail/onionrouter/
commit: 50dbdfb56c46e15e90e43c627b1f4fa204a6cc33 Author: Craig Andrews gentoo org> AuthorDate: Mon Feb 27 14:09:04 2023 + Commit: Craig Andrews gentoo org> CommitDate: Mon Feb 27 14:24:40 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50dbdfb5 net-mail/onionrouter: Python 3.11 compatibility Closes: https://bugs.gentoo.org/897112 Signed-off-by: Craig Andrews gentoo.org> net-mail/onionrouter/onionrouter-0.6.2.ebuild | 2 +- net-mail/onionrouter/onionrouter-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-mail/onionrouter/onionrouter-0.6.2.ebuild b/net-mail/onionrouter/onionrouter-0.6.2.ebuild index e77f2b0c931f..6e70759dfa0c 100644 --- a/net-mail/onionrouter/onionrouter-0.6.2.ebuild +++ b/net-mail/onionrouter/onionrouter-0.6.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{9,10} ) +PYTHON_COMPAT=( python3_{9,10,11} ) DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_SETUPTOOLS=rdepend diff --git a/net-mail/onionrouter/onionrouter-.ebuild b/net-mail/onionrouter/onionrouter-.ebuild index e77f2b0c931f..6e70759dfa0c 100644 --- a/net-mail/onionrouter/onionrouter-.ebuild +++ b/net-mail/onionrouter/onionrouter-.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{9,10} ) +PYTHON_COMPAT=( python3_{9,10,11} ) DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_SETUPTOOLS=rdepend
[gentoo-commits] repo/gentoo:master commit in: net-mail/onionrouter/files/, net-mail/onionrouter/
commit: 39cc42da4b1b3082ff84e114fca8762f5b87a385 Author: Craig Andrews gentoo org> AuthorDate: Fri Oct 15 15:16:14 2021 + Commit: Craig Andrews gentoo org> CommitDate: Fri Oct 15 15:17:25 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39cc42da net-mail/onionrouter: Cleanup old version Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Craig Andrews gentoo.org> net-mail/onionrouter/Manifest | 1 - .../files/onionrouter-0.6.1-pyyaml-6.0.patch | 24 -- net-mail/onionrouter/onionrouter-0.6.1-r1.ebuild | 54 -- 3 files changed, 79 deletions(-) diff --git a/net-mail/onionrouter/Manifest b/net-mail/onionrouter/Manifest index ac1a8da0f39..3c4449ec1d7 100644 --- a/net-mail/onionrouter/Manifest +++ b/net-mail/onionrouter/Manifest @@ -1,2 +1 @@ -DIST onionrouter-0.6.1.tar.gz 26584 BLAKE2B e1d722ba4e7ec617e39fda54299cd71d9d47bbd34fd44a19ffef8f2349f9b238251b47d01c369223393a9d7f2e0a05c5d8b7dc9f991c7d386ba800086b8cc226 SHA512 5d08e7a7310e69e29eaba2098a62cef4b5044c207f4a78b4cfebfd2a9d18bd812b485793ff7395186d4949ad9604b4e82dc0e9b1200abf03108466bf531a6d15 DIST onionrouter-0.6.2.tar.gz 27920 BLAKE2B e9158fe7e066968d9569fb84085a85300774f6b2a2f070216755a3444c6a0352da847a7a383bed4cd792083c1fc8d71039c2c7b3e4c0c21aeca6bcb0c440de44 SHA512 4d5db2f856d6a52dfd43b7d3fea4317a1238ba6410c1da953e1cb59519ef8c18e3b73f676beff9612a853030762570f386dca24a7d7be4add23493e0b344535e diff --git a/net-mail/onionrouter/files/onionrouter-0.6.1-pyyaml-6.0.patch b/net-mail/onionrouter/files/onionrouter-0.6.1-pyyaml-6.0.patch deleted file mode 100644 index 32dedec5712..000 --- a/net-mail/onionrouter/files/onionrouter-0.6.1-pyyaml-6.0.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://github.com/ehloonion/onionrouter/pull/26 - -From 45853184a610fd83c77adaebb240f164214bd450 Mon Sep 17 00:00:00 2001 -From: Craig Andrews -Date: Thu, 14 Oct 2021 22:45:25 -0400 -Subject: [PATCH] Allow pyyaml 6.0 - - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index ad634ac..3b7d94c 100644 a/setup.py -+++ b/setup.py -@@ -11,7 +11,7 @@ - - requirements = [ - "dnspython>=2.0.0,<3.0.0", --"PyYAML>=4.2b1,<6.0.0", -+"PyYAML>=4.2b1", - ] - - test_requirements = [ diff --git a/net-mail/onionrouter/onionrouter-0.6.1-r1.ebuild b/net-mail/onionrouter/onionrouter-0.6.1-r1.ebuild deleted file mode 100644 index e977bc3b27f..000 --- a/net-mail/onionrouter/onionrouter-0.6.1-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9,10} ) -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 systemd - -DESCRIPTION=".onion discovery via SRV DNS lookups for use with postfix" -HOMEPAGE="https://pypi.org/project/onionrouter/ https://github.com/ehloonion/onionrouter/; -if [[ ${PV} == * ]] ; then - SRC_URI="" - EGIT_REPO_URI="https://github.com/ehloonion/onionrouter.git; - inherit git-r3 -else - KEYWORDS="~amd64" - SRC_URI="https://pypi.io/packages/source/${PN::1}/${PN}/${P}.tar.gz; -fi -IUSE="test" -RESTRICT="!test? ( test )" - -LICENSE="GPL-3+" -SLOT="0" - -RDEPEND="$(python_gen_cond_dep ' - dev-python/dnspython[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] -')" -BDEPEND="$(python_gen_cond_dep ' - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - ) -')" - -PATCHES=( - "${FILESDIR}/${P}-pyyaml-6.0.patch" -) - -distutils_enable_tests pytest - -src_prepare() { - distutils-r1_src_prepare -} - -src_install() { - distutils-r1_src_install - systemd_dounit "${FILESDIR}/${PN}.service" - insinto /etc/onionrouter - doins "${S}/onionrouter/configs/onionrouter.ini" -}
[gentoo-commits] repo/gentoo:master commit in: net-mail/onionrouter/
commit: bde4c9a48f2da15c9880bf02bf2568f578fedbd9 Author: Craig Andrews gentoo org> AuthorDate: Fri Oct 15 15:15:45 2021 + Commit: Craig Andrews gentoo org> CommitDate: Fri Oct 15 15:17:24 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bde4c9a4 net-mail/onionrouter: 0.6.2 version bump Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Craig Andrews gentoo.org> net-mail/onionrouter/Manifest | 1 + net-mail/onionrouter/onionrouter-0.6.2.ebuild | 50 +++ 2 files changed, 51 insertions(+) diff --git a/net-mail/onionrouter/Manifest b/net-mail/onionrouter/Manifest index 5e359ce3fad..ac1a8da0f39 100644 --- a/net-mail/onionrouter/Manifest +++ b/net-mail/onionrouter/Manifest @@ -1 +1,2 @@ DIST onionrouter-0.6.1.tar.gz 26584 BLAKE2B e1d722ba4e7ec617e39fda54299cd71d9d47bbd34fd44a19ffef8f2349f9b238251b47d01c369223393a9d7f2e0a05c5d8b7dc9f991c7d386ba800086b8cc226 SHA512 5d08e7a7310e69e29eaba2098a62cef4b5044c207f4a78b4cfebfd2a9d18bd812b485793ff7395186d4949ad9604b4e82dc0e9b1200abf03108466bf531a6d15 +DIST onionrouter-0.6.2.tar.gz 27920 BLAKE2B e9158fe7e066968d9569fb84085a85300774f6b2a2f070216755a3444c6a0352da847a7a383bed4cd792083c1fc8d71039c2c7b3e4c0c21aeca6bcb0c440de44 SHA512 4d5db2f856d6a52dfd43b7d3fea4317a1238ba6410c1da953e1cb59519ef8c18e3b73f676beff9612a853030762570f386dca24a7d7be4add23493e0b344535e diff --git a/net-mail/onionrouter/onionrouter-0.6.2.ebuild b/net-mail/onionrouter/onionrouter-0.6.2.ebuild new file mode 100644 index 000..396599972a7 --- /dev/null +++ b/net-mail/onionrouter/onionrouter-0.6.2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9,10} ) +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 systemd + +DESCRIPTION=".onion discovery via SRV DNS lookups for use with postfix" +HOMEPAGE="https://pypi.org/project/onionrouter/ https://github.com/ehloonion/onionrouter/; +if [[ ${PV} == * ]] ; then + SRC_URI="" + EGIT_REPO_URI="https://github.com/ehloonion/onionrouter.git; + inherit git-r3 +else + KEYWORDS="~amd64" + SRC_URI="https://pypi.io/packages/source/${PN::1}/${PN}/${P}.tar.gz; +fi +IUSE="test" +RESTRICT="!test? ( test )" + +LICENSE="GPL-3+" +SLOT="0" + +RDEPEND="$(python_gen_cond_dep ' + dev-python/dnspython[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] +')" +BDEPEND="$(python_gen_cond_dep ' + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + ) +')" + +distutils_enable_tests pytest + +src_prepare() { + distutils-r1_src_prepare +} + +src_install() { + distutils-r1_src_install + systemd_dounit "${FILESDIR}/${PN}.service" + insinto /etc/onionrouter + doins "${S}/onionrouter/configs/onionrouter.ini" +}
[gentoo-commits] repo/gentoo:master commit in: net-mail/onionrouter/
commit: ffe8b05075e6d8bd7293c41bec413beb96d58300 Author: Craig Andrews gentoo org> AuthorDate: Fri Oct 15 03:16:32 2021 + Commit: Craig Andrews gentoo org> CommitDate: Fri Oct 15 03:16:57 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffe8b050 net-mail/onionrouter: Cleanup old version Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Craig Andrews gentoo.org> net-mail/onionrouter/onionrouter-0.6.1.ebuild | 50 --- 1 file changed, 50 deletions(-) diff --git a/net-mail/onionrouter/onionrouter-0.6.1.ebuild b/net-mail/onionrouter/onionrouter-0.6.1.ebuild deleted file mode 100644 index 2efd032bc84..000 --- a/net-mail/onionrouter/onionrouter-0.6.1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 systemd - -DESCRIPTION=".onion discovery via SRV DNS lookups for use with postfix" -HOMEPAGE="https://pypi.org/project/onionrouter/ https://github.com/ehloonion/onionrouter/; -if [[ ${PV} == * ]] ; then - SRC_URI="" - EGIT_REPO_URI="https://github.com/ehloonion/onionrouter.git; - inherit git-r3 -else - KEYWORDS="~amd64" - SRC_URI="https://pypi.io/packages/source/${PN::1}/${PN}/${P}.tar.gz; -fi -IUSE="test" -RESTRICT="!test? ( test )" - -LICENSE="GPL-3+" -SLOT="0" - -RDEPEND="$(python_gen_cond_dep ' - dev-python/dnspython[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] -')" -BDEPEND="$(python_gen_cond_dep ' - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - ) -')" - -distutils_enable_tests pytest - -src_prepare() { - distutils-r1_src_prepare -} - -src_install() { - distutils-r1_src_install - systemd_dounit "${FILESDIR}/${PN}.service" - insinto /etc/onionrouter - doins "${S}/onionrouter/configs/onionrouter.ini" -}
[gentoo-commits] repo/gentoo:master commit in: net-mail/onionrouter/, net-mail/onionrouter/files/
commit: 326caf9d88469e804cd3bfc8674c34d9e467d6c4 Author: Craig Andrews gentoo org> AuthorDate: Fri Oct 15 03:16:13 2021 + Commit: Craig Andrews gentoo org> CommitDate: Fri Oct 15 03:16:57 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=326caf9d net-mail/onionrouter: dev-python/pyyaml-6.0 and Python 3.10 support Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Craig Andrews gentoo.org> .../files/onionrouter-0.6.1-pyyaml-6.0.patch | 24 ++ ...ter-.ebuild => onionrouter-0.6.1-r1.ebuild} | 8 ++-- net-mail/onionrouter/onionrouter-.ebuild | 4 ++-- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/net-mail/onionrouter/files/onionrouter-0.6.1-pyyaml-6.0.patch b/net-mail/onionrouter/files/onionrouter-0.6.1-pyyaml-6.0.patch new file mode 100644 index 000..32dedec5712 --- /dev/null +++ b/net-mail/onionrouter/files/onionrouter-0.6.1-pyyaml-6.0.patch @@ -0,0 +1,24 @@ +https://github.com/ehloonion/onionrouter/pull/26 + +From 45853184a610fd83c77adaebb240f164214bd450 Mon Sep 17 00:00:00 2001 +From: Craig Andrews +Date: Thu, 14 Oct 2021 22:45:25 -0400 +Subject: [PATCH] Allow pyyaml 6.0 + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index ad634ac..3b7d94c 100644 +--- a/setup.py b/setup.py +@@ -11,7 +11,7 @@ + + requirements = [ + "dnspython>=2.0.0,<3.0.0", +-"PyYAML>=4.2b1,<6.0.0", ++"PyYAML>=4.2b1", + ] + + test_requirements = [ diff --git a/net-mail/onionrouter/onionrouter-.ebuild b/net-mail/onionrouter/onionrouter-0.6.1-r1.ebuild similarity index 89% copy from net-mail/onionrouter/onionrouter-.ebuild copy to net-mail/onionrouter/onionrouter-0.6.1-r1.ebuild index 2efd032bc84..e977bc3b27f 100644 --- a/net-mail/onionrouter/onionrouter-.ebuild +++ b/net-mail/onionrouter/onionrouter-0.6.1-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7,8,9,10} ) DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_SETUPTOOLS=rdepend @@ -36,6 +36,10 @@ BDEPEND="$(python_gen_cond_dep ' ) ')" +PATCHES=( + "${FILESDIR}/${P}-pyyaml-6.0.patch" +) + distutils_enable_tests pytest src_prepare() { diff --git a/net-mail/onionrouter/onionrouter-.ebuild b/net-mail/onionrouter/onionrouter-.ebuild index 2efd032bc84..396599972a7 100644 --- a/net-mail/onionrouter/onionrouter-.ebuild +++ b/net-mail/onionrouter/onionrouter-.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7,8,9,10} ) DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_SETUPTOOLS=rdepend
[gentoo-commits] repo/gentoo:master commit in: net-mail/onionrouter/
commit: 3ff7ebb5b744ded62e020a6d697b40b2cef82682 Author: Craig Andrews gentoo org> AuthorDate: Fri Oct 30 13:56:36 2020 + Commit: Craig Andrews gentoo org> CommitDate: Fri Oct 30 13:57:13 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ff7ebb5 net-mail/onionrouter: Cleanup old version Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Craig Andrews gentoo.org> net-mail/onionrouter/Manifest | 1 - net-mail/onionrouter/onionrouter-0.6.0.ebuild | 50 --- 2 files changed, 51 deletions(-) diff --git a/net-mail/onionrouter/Manifest b/net-mail/onionrouter/Manifest index 1ecf64b1152..5e359ce3fad 100644 --- a/net-mail/onionrouter/Manifest +++ b/net-mail/onionrouter/Manifest @@ -1,2 +1 @@ -DIST onionrouter-0.6.0.tar.gz 26525 BLAKE2B 59d0709d3d0344422840b89908aedb97a0b869208d9f5e690bede317f0fe20a11ff1f2f2fac11a7827736ddc5e6d27ce6b12cd9395a82f31f7bb51ab4ca511c1 SHA512 251228e677ca1df182e943d692060d5ad83bcaf407c31e30eeb71e9f581d7140eb4edc8f00f7baa47e6561a5457c0f10b25e5c581902aaca7906780a2b8dc69c DIST onionrouter-0.6.1.tar.gz 26584 BLAKE2B e1d722ba4e7ec617e39fda54299cd71d9d47bbd34fd44a19ffef8f2349f9b238251b47d01c369223393a9d7f2e0a05c5d8b7dc9f991c7d386ba800086b8cc226 SHA512 5d08e7a7310e69e29eaba2098a62cef4b5044c207f4a78b4cfebfd2a9d18bd812b485793ff7395186d4949ad9604b4e82dc0e9b1200abf03108466bf531a6d15 diff --git a/net-mail/onionrouter/onionrouter-0.6.0.ebuild b/net-mail/onionrouter/onionrouter-0.6.0.ebuild deleted file mode 100644 index 2efd032bc84..000 --- a/net-mail/onionrouter/onionrouter-0.6.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 systemd - -DESCRIPTION=".onion discovery via SRV DNS lookups for use with postfix" -HOMEPAGE="https://pypi.org/project/onionrouter/ https://github.com/ehloonion/onionrouter/; -if [[ ${PV} == * ]] ; then - SRC_URI="" - EGIT_REPO_URI="https://github.com/ehloonion/onionrouter.git; - inherit git-r3 -else - KEYWORDS="~amd64" - SRC_URI="https://pypi.io/packages/source/${PN::1}/${PN}/${P}.tar.gz; -fi -IUSE="test" -RESTRICT="!test? ( test )" - -LICENSE="GPL-3+" -SLOT="0" - -RDEPEND="$(python_gen_cond_dep ' - dev-python/dnspython[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] -')" -BDEPEND="$(python_gen_cond_dep ' - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - ) -')" - -distutils_enable_tests pytest - -src_prepare() { - distutils-r1_src_prepare -} - -src_install() { - distutils-r1_src_install - systemd_dounit "${FILESDIR}/${PN}.service" - insinto /etc/onionrouter - doins "${S}/onionrouter/configs/onionrouter.ini" -}
[gentoo-commits] repo/gentoo:master commit in: net-mail/onionrouter/
commit: bbc2cffec0c4d0674f8e5158e90c4c8dfb32079d Author: Craig Andrews gentoo org> AuthorDate: Fri Oct 30 13:56:21 2020 + Commit: Craig Andrews gentoo org> CommitDate: Fri Oct 30 13:57:12 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbc2cffe net-mail/onionrouter: 0.6.1 version bump Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Craig Andrews gentoo.org> net-mail/onionrouter/Manifest | 1 + net-mail/onionrouter/onionrouter-0.6.1.ebuild | 50 +++ 2 files changed, 51 insertions(+) diff --git a/net-mail/onionrouter/Manifest b/net-mail/onionrouter/Manifest index 5ed7784056b..1ecf64b1152 100644 --- a/net-mail/onionrouter/Manifest +++ b/net-mail/onionrouter/Manifest @@ -1 +1,2 @@ DIST onionrouter-0.6.0.tar.gz 26525 BLAKE2B 59d0709d3d0344422840b89908aedb97a0b869208d9f5e690bede317f0fe20a11ff1f2f2fac11a7827736ddc5e6d27ce6b12cd9395a82f31f7bb51ab4ca511c1 SHA512 251228e677ca1df182e943d692060d5ad83bcaf407c31e30eeb71e9f581d7140eb4edc8f00f7baa47e6561a5457c0f10b25e5c581902aaca7906780a2b8dc69c +DIST onionrouter-0.6.1.tar.gz 26584 BLAKE2B e1d722ba4e7ec617e39fda54299cd71d9d47bbd34fd44a19ffef8f2349f9b238251b47d01c369223393a9d7f2e0a05c5d8b7dc9f991c7d386ba800086b8cc226 SHA512 5d08e7a7310e69e29eaba2098a62cef4b5044c207f4a78b4cfebfd2a9d18bd812b485793ff7395186d4949ad9604b4e82dc0e9b1200abf03108466bf531a6d15 diff --git a/net-mail/onionrouter/onionrouter-0.6.1.ebuild b/net-mail/onionrouter/onionrouter-0.6.1.ebuild new file mode 100644 index 000..2efd032bc84 --- /dev/null +++ b/net-mail/onionrouter/onionrouter-0.6.1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 systemd + +DESCRIPTION=".onion discovery via SRV DNS lookups for use with postfix" +HOMEPAGE="https://pypi.org/project/onionrouter/ https://github.com/ehloonion/onionrouter/; +if [[ ${PV} == * ]] ; then + SRC_URI="" + EGIT_REPO_URI="https://github.com/ehloonion/onionrouter.git; + inherit git-r3 +else + KEYWORDS="~amd64" + SRC_URI="https://pypi.io/packages/source/${PN::1}/${PN}/${P}.tar.gz; +fi +IUSE="test" +RESTRICT="!test? ( test )" + +LICENSE="GPL-3+" +SLOT="0" + +RDEPEND="$(python_gen_cond_dep ' + dev-python/dnspython[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] +')" +BDEPEND="$(python_gen_cond_dep ' + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + ) +')" + +distutils_enable_tests pytest + +src_prepare() { + distutils-r1_src_prepare +} + +src_install() { + distutils-r1_src_install + systemd_dounit "${FILESDIR}/${PN}.service" + insinto /etc/onionrouter + doins "${S}/onionrouter/configs/onionrouter.ini" +}
[gentoo-commits] repo/gentoo:master commit in: net-mail/onionrouter/
commit: a7f7c88f6077947d72590bb935ac711f6fae4a7f Author: Craig Andrews gentoo org> AuthorDate: Thu Oct 29 20:11:49 2020 + Commit: Craig Andrews gentoo org> CommitDate: Thu Oct 29 20:17:58 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7f7c88f net-mail/onionrouter: 0.6.0 version bump Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Craig Andrews gentoo.org> net-mail/onionrouter/Manifest | 1 + .../onionrouter/{onionrouter-.ebuild => onionrouter-0.6.0.ebuild} | 3 --- net-mail/onionrouter/onionrouter-.ebuild | 3 --- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/net-mail/onionrouter/Manifest b/net-mail/onionrouter/Manifest index 3da56656540..a43c6b3bb62 100644 --- a/net-mail/onionrouter/Manifest +++ b/net-mail/onionrouter/Manifest @@ -1 +1,2 @@ DIST onionrouter-0.5.2.tar.gz 23497 BLAKE2B f025385323b182350e3481be62bbb9ed037d197d83ee19341f27ec04c391d6e1ee809b5db461437287485496ce139718f774d39de7ebd307ea92d5409220e135 SHA512 9c23a17401c0d56fc8d0b6bc3a0c899d604f6981457643b84040e9cf60626990bbd03fead66bba1c7d5723bd43d95c128bf457380e255f995951970b4788f126 +DIST onionrouter-0.6.0.tar.gz 26525 BLAKE2B 59d0709d3d0344422840b89908aedb97a0b869208d9f5e690bede317f0fe20a11ff1f2f2fac11a7827736ddc5e6d27ce6b12cd9395a82f31f7bb51ab4ca511c1 SHA512 251228e677ca1df182e943d692060d5ad83bcaf407c31e30eeb71e9f581d7140eb4edc8f00f7baa47e6561a5457c0f10b25e5c581902aaca7906780a2b8dc69c diff --git a/net-mail/onionrouter/onionrouter-.ebuild b/net-mail/onionrouter/onionrouter-0.6.0.ebuild similarity index 92% copy from net-mail/onionrouter/onionrouter-.ebuild copy to net-mail/onionrouter/onionrouter-0.6.0.ebuild index 35d74e96b3d..2efd032bc84 100644 --- a/net-mail/onionrouter/onionrouter-.ebuild +++ b/net-mail/onionrouter/onionrouter-0.6.0.ebuild @@ -39,9 +39,6 @@ BDEPEND="$(python_gen_cond_dep ' distutils_enable_tests pytest src_prepare() { - # https://github.com/ehloonion/onionrouter/pull/15 - cp "${FILESDIR}/conftest.py" "${S}" || die - distutils-r1_src_prepare } diff --git a/net-mail/onionrouter/onionrouter-.ebuild b/net-mail/onionrouter/onionrouter-.ebuild index 35d74e96b3d..2efd032bc84 100644 --- a/net-mail/onionrouter/onionrouter-.ebuild +++ b/net-mail/onionrouter/onionrouter-.ebuild @@ -39,9 +39,6 @@ BDEPEND="$(python_gen_cond_dep ' distutils_enable_tests pytest src_prepare() { - # https://github.com/ehloonion/onionrouter/pull/15 - cp "${FILESDIR}/conftest.py" "${S}" || die - distutils-r1_src_prepare }
[gentoo-commits] repo/gentoo:master commit in: net-mail/onionrouter/, net-mail/onionrouter/files/
commit: a27083677ffa4ff641b360100da5cafe74439b1c Author: Craig Andrews gentoo org> AuthorDate: Thu Oct 29 20:12:17 2020 + Commit: Craig Andrews gentoo org> CommitDate: Thu Oct 29 20:17:58 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2708367 net-mail/onionrouter: Cleanup old version Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Craig Andrews gentoo.org> net-mail/onionrouter/Manifest | 1 - net-mail/onionrouter/files/conftest.py | 46 -- .../files/onionrouter-0.5.2-entrypoint.patch | 25 -- .../files/onionrouter-0.5.2-newline.patch | 30 .../files/onionrouter-0.5.2-python3.patch | 42 - .../files/onionrouter-0.5.2-pyyaml-version.patch | 25 -- net-mail/onionrouter/onionrouter-0.5.2.ebuild | 54 -- 7 files changed, 223 deletions(-) diff --git a/net-mail/onionrouter/Manifest b/net-mail/onionrouter/Manifest index a43c6b3bb62..5ed7784056b 100644 --- a/net-mail/onionrouter/Manifest +++ b/net-mail/onionrouter/Manifest @@ -1,2 +1 @@ -DIST onionrouter-0.5.2.tar.gz 23497 BLAKE2B f025385323b182350e3481be62bbb9ed037d197d83ee19341f27ec04c391d6e1ee809b5db461437287485496ce139718f774d39de7ebd307ea92d5409220e135 SHA512 9c23a17401c0d56fc8d0b6bc3a0c899d604f6981457643b84040e9cf60626990bbd03fead66bba1c7d5723bd43d95c128bf457380e255f995951970b4788f126 DIST onionrouter-0.6.0.tar.gz 26525 BLAKE2B 59d0709d3d0344422840b89908aedb97a0b869208d9f5e690bede317f0fe20a11ff1f2f2fac11a7827736ddc5e6d27ce6b12cd9395a82f31f7bb51ab4ca511c1 SHA512 251228e677ca1df182e943d692060d5ad83bcaf407c31e30eeb71e9f581d7140eb4edc8f00f7baa47e6561a5457c0f10b25e5c581902aaca7906780a2b8dc69c diff --git a/net-mail/onionrouter/files/conftest.py b/net-mail/onionrouter/files/conftest.py deleted file mode 100644 index d08b5f3aabf..000 --- a/net-mail/onionrouter/files/conftest.py +++ /dev/null @@ -1,46 +0,0 @@ -from __future__ import unicode_literals -import pytest -import io -try: -import configparser -except ImportError: -import ConfigParser as configparser -from onionrouter import rerouter, config_handlers - - -config = """ -[RESOLVER] -resolver_ip: 127.0.0.1 -resolver_port: 53 -tcp: True - -[DOMAIN] -hostname: myself.net, myself2.net - -[DNS] -srv_record: _onion-mx._tcp. - -[REROUTE] -onion_transport: smtptor - -[IGNORED] -domains: ignore.me, ignore2.me -""" - - -@pytest.fixture(scope="session", name="dummy_config") -def fixture_config(): -return config - - -@pytest.fixture(scope="function", name="dummy_onionrouter") -def fixture_onionrouter(monkeypatch, dummy_config): -monkeypatch.setattr( -config_handlers, "get_conffile", -lambda *args, **kwargs: rerouter.OnionRouter.ref_config) -custom_config = configparser.ConfigParser() -custom_config._read(io.StringIO(dummy_config), None) -monkeypatch.setattr(config_handlers, "config_reader", -lambda *args: custom_config) -return rerouter.OnionRouter("nothing?") - diff --git a/net-mail/onionrouter/files/onionrouter-0.5.2-entrypoint.patch b/net-mail/onionrouter/files/onionrouter-0.5.2-entrypoint.patch deleted file mode 100644 index 397387483b6..000 --- a/net-mail/onionrouter/files/onionrouter-0.5.2-entrypoint.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://github.com/ehloonion/onionrouter/pull/16 - -From 06d5c15d61790c9444641de18b9ff23f1c104207 Mon Sep 17 00:00:00 2001 -From: Craig Andrews -Date: Mon, 19 Oct 2020 12:46:08 -0400 -Subject: [PATCH] Change the entry point to rerouter - -Aligns the entry point with the changes made in commit 2e8f7be "Rename onionrouter module to rerouter" - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index baf6041..e487614 100644 a/setup.py -+++ b/setup.py -@@ -40,7 +40,7 @@ - 'onionrouter', - ], - entry_points={ --"console_scripts": ['onionrouter = onionrouter.onionrouter:main'] -+"console_scripts": ['onionrouter = onionrouter.rerouter:main'] - }, - include_package_data=True, - install_requires=requirements, diff --git a/net-mail/onionrouter/files/onionrouter-0.5.2-newline.patch b/net-mail/onionrouter/files/onionrouter-0.5.2-newline.patch deleted file mode 100644 index d75e797f6ac..000 --- a/net-mail/onionrouter/files/onionrouter-0.5.2-newline.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://github.com/ehloonion/onionrouter/pull/21 - -From 670690f03fd700e2b06892e2231a8e078cfb41b3 Mon Sep 17 00:00:00 2001 -From: Craig Andrews -Date: Mon, 19 Oct 2020 15:47:41 -0400 -Subject: [PATCH] Send a newline when replying to postfix - -Postfix requires all replies to end in a newline. - -Without this change, postfix logs a warning: -`warning: read TCP map reply from localhost:23000: text longer than 4096` - -See http://www.postfix.org/tcp_table.5.html - onionrouter/msockets.py |
[gentoo-commits] repo/gentoo:master commit in: net-mail/onionrouter/
commit: ac1936e82ef20aa73d9ecd7bcb56f7f3ce0cb287 Author: Craig Andrews gentoo org> AuthorDate: Wed Oct 28 18:32:22 2020 + Commit: Craig Andrews gentoo org> CommitDate: Wed Oct 28 18:32:40 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac1936e8 net-mail/onionrouter: Add live version Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Craig Andrews gentoo.org> net-mail/onionrouter/onionrouter-.ebuild | 53 1 file changed, 53 insertions(+) diff --git a/net-mail/onionrouter/onionrouter-.ebuild b/net-mail/onionrouter/onionrouter-.ebuild new file mode 100644 index 000..35d74e96b3d --- /dev/null +++ b/net-mail/onionrouter/onionrouter-.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 systemd + +DESCRIPTION=".onion discovery via SRV DNS lookups for use with postfix" +HOMEPAGE="https://pypi.org/project/onionrouter/ https://github.com/ehloonion/onionrouter/; +if [[ ${PV} == * ]] ; then + SRC_URI="" + EGIT_REPO_URI="https://github.com/ehloonion/onionrouter.git; + inherit git-r3 +else + KEYWORDS="~amd64" + SRC_URI="https://pypi.io/packages/source/${PN::1}/${PN}/${P}.tar.gz; +fi +IUSE="test" +RESTRICT="!test? ( test )" + +LICENSE="GPL-3+" +SLOT="0" + +RDEPEND="$(python_gen_cond_dep ' + dev-python/dnspython[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] +')" +BDEPEND="$(python_gen_cond_dep ' + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + ) +')" + +distutils_enable_tests pytest + +src_prepare() { + # https://github.com/ehloonion/onionrouter/pull/15 + cp "${FILESDIR}/conftest.py" "${S}" || die + + distutils-r1_src_prepare +} + +src_install() { + distutils-r1_src_install + systemd_dounit "${FILESDIR}/${PN}.service" + insinto /etc/onionrouter + doins "${S}/onionrouter/configs/onionrouter.ini" +}
[gentoo-commits] repo/gentoo:master commit in: net-mail/onionrouter/, net-mail/onionrouter/files/
commit: 53473dca46f3a4e20d5f6998b0847a6dda4e Author: Craig Andrews gentoo org> AuthorDate: Mon Oct 19 17:13:20 2020 + Commit: Craig Andrews gentoo org> CommitDate: Mon Oct 19 20:07:09 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53473dca net-mail/onionrouter: .onion discovery via SRV DNS for postfix Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Craig Andrews gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/17974 Signed-off-by: Craig Andrews gentoo.org> net-mail/onionrouter/Manifest | 1 + net-mail/onionrouter/files/conftest.py | 46 ++ .../files/onionrouter-0.5.2-entrypoint.patch | 25 ++ .../files/onionrouter-0.5.2-newline.patch | 30 .../files/onionrouter-0.5.2-python3.patch | 42 + .../files/onionrouter-0.5.2-pyyaml-version.patch | 25 ++ net-mail/onionrouter/files/onionrouter.service | 25 ++ net-mail/onionrouter/metadata.xml | 8 net-mail/onionrouter/onionrouter-0.5.2.ebuild | 54 ++ 9 files changed, 256 insertions(+) diff --git a/net-mail/onionrouter/Manifest b/net-mail/onionrouter/Manifest new file mode 100644 index 000..3da56656540 --- /dev/null +++ b/net-mail/onionrouter/Manifest @@ -0,0 +1 @@ +DIST onionrouter-0.5.2.tar.gz 23497 BLAKE2B f025385323b182350e3481be62bbb9ed037d197d83ee19341f27ec04c391d6e1ee809b5db461437287485496ce139718f774d39de7ebd307ea92d5409220e135 SHA512 9c23a17401c0d56fc8d0b6bc3a0c899d604f6981457643b84040e9cf60626990bbd03fead66bba1c7d5723bd43d95c128bf457380e255f995951970b4788f126 diff --git a/net-mail/onionrouter/files/conftest.py b/net-mail/onionrouter/files/conftest.py new file mode 100644 index 000..d08b5f3aabf --- /dev/null +++ b/net-mail/onionrouter/files/conftest.py @@ -0,0 +1,46 @@ +from __future__ import unicode_literals +import pytest +import io +try: +import configparser +except ImportError: +import ConfigParser as configparser +from onionrouter import rerouter, config_handlers + + +config = """ +[RESOLVER] +resolver_ip: 127.0.0.1 +resolver_port: 53 +tcp: True + +[DOMAIN] +hostname: myself.net, myself2.net + +[DNS] +srv_record: _onion-mx._tcp. + +[REROUTE] +onion_transport: smtptor + +[IGNORED] +domains: ignore.me, ignore2.me +""" + + +@pytest.fixture(scope="session", name="dummy_config") +def fixture_config(): +return config + + +@pytest.fixture(scope="function", name="dummy_onionrouter") +def fixture_onionrouter(monkeypatch, dummy_config): +monkeypatch.setattr( +config_handlers, "get_conffile", +lambda *args, **kwargs: rerouter.OnionRouter.ref_config) +custom_config = configparser.ConfigParser() +custom_config._read(io.StringIO(dummy_config), None) +monkeypatch.setattr(config_handlers, "config_reader", +lambda *args: custom_config) +return rerouter.OnionRouter("nothing?") + diff --git a/net-mail/onionrouter/files/onionrouter-0.5.2-entrypoint.patch b/net-mail/onionrouter/files/onionrouter-0.5.2-entrypoint.patch new file mode 100644 index 000..397387483b6 --- /dev/null +++ b/net-mail/onionrouter/files/onionrouter-0.5.2-entrypoint.patch @@ -0,0 +1,25 @@ +https://github.com/ehloonion/onionrouter/pull/16 + +From 06d5c15d61790c9444641de18b9ff23f1c104207 Mon Sep 17 00:00:00 2001 +From: Craig Andrews +Date: Mon, 19 Oct 2020 12:46:08 -0400 +Subject: [PATCH] Change the entry point to rerouter + +Aligns the entry point with the changes made in commit 2e8f7be "Rename onionrouter module to rerouter" +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index baf6041..e487614 100644 +--- a/setup.py b/setup.py +@@ -40,7 +40,7 @@ + 'onionrouter', + ], + entry_points={ +-"console_scripts": ['onionrouter = onionrouter.onionrouter:main'] ++"console_scripts": ['onionrouter = onionrouter.rerouter:main'] + }, + include_package_data=True, + install_requires=requirements, diff --git a/net-mail/onionrouter/files/onionrouter-0.5.2-newline.patch b/net-mail/onionrouter/files/onionrouter-0.5.2-newline.patch new file mode 100644 index 000..d75e797f6ac --- /dev/null +++ b/net-mail/onionrouter/files/onionrouter-0.5.2-newline.patch @@ -0,0 +1,30 @@ +https://github.com/ehloonion/onionrouter/pull/21 + +From 670690f03fd700e2b06892e2231a8e078cfb41b3 Mon Sep 17 00:00:00 2001 +From: Craig Andrews +Date: Mon, 19 Oct 2020 15:47:41 -0400 +Subject: [PATCH] Send a newline when replying to postfix + +Postfix requires all replies to end in a newline. + +Without this change, postfix logs a warning: +`warning: read TCP map reply from localhost:23000: text longer than 4096` + +See http://www.postfix.org/tcp_table.5.html +--- + onionrouter/msockets.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git