From 2045785e424b288a2beb3d308ad3991f3b64cfa4 Mon Sep 17 00:00:00 2001 From: Ralph Seichter Date: Thu, 19 Mar 2020 10:55:24 +0100 Subject: www-servers/automx2: Change category to net-mail Move existing Gentoo package www-servers/automx2 to net-mail/automx2. Reasons for this change are as follows: * Package automx2 replaces package net-mail/automx, which has already been last-rited. * Some developers raised objections against using www-servers/automx2. While automx2 is a web service and hence uses web server technology, it is not a web server in the way www-servers is understood. As per https://devmanual.gentoo.org/ebuild-maintenance/package-moves/index.html all changes are deliberately combined into a single commit to ensure atomicity during the update. Signed-off-by: Ralph Seichter Closes: https://github.com/gentoo/gentoo/pull/15011 Signed-off-by: Marc Schiffbauer --- acct-group/automx2/automx2-0.ebuild | 4 +-- acct-user/automx2/automx2-0.ebuild | 4 +-- net-mail/automx2/Manifest | 2 ++ net-mail/automx2/automx2-2019.0.ebuild | 43 +++++++++++++++++++++++++++++++ net-mail/automx2/automx2-2020.1.ebuild | 43 +++++++++++++++++++++++++++++++ net-mail/automx2/files/conf | 20 ++++++++++++++ net-mail/automx2/files/confd | 8 ++++++ net-mail/automx2/files/init | 26 +++++++++++++++++++ net-mail/automx2/metadata.xml | 27 +++++++++++++++++++ profiles/updates/1Q-2020 | 1 + www-servers/automx2/Manifest | 2 -- www-servers/automx2/automx2-2019.0.ebuild | 43 ------------------------------- www-servers/automx2/automx2-2020.1.ebuild | 43 ------------------------------- www-servers/automx2/files/conf | 20 -------------- www-servers/automx2/files/confd | 8 ------ www-servers/automx2/files/init | 26 ------------------- www-servers/automx2/metadata.xml | 27 ------------------- 17 files changed, 174 insertions(+), 173 deletions(-) create mode 100644 net-mail/automx2/Manifest create mode 100644 net-mail/automx2/automx2-2019.0.ebuild create mode 100644 net-mail/automx2/automx2-2020.1.ebuild create mode 100644 net-mail/automx2/files/conf create mode 100644 net-mail/automx2/files/confd create mode 100644 net-mail/automx2/files/init create mode 100644 net-mail/automx2/metadata.xml delete mode 100644 www-servers/automx2/Manifest delete mode 100644 www-servers/automx2/automx2-2019.0.ebuild delete mode 100644 www-servers/automx2/automx2-2020.1.ebuild delete mode 100644 www-servers/automx2/files/conf delete mode 100644 www-servers/automx2/files/confd delete mode 100644 www-servers/automx2/files/init delete mode 100644 www-servers/automx2/metadata.xml diff --git a/acct-group/automx2/automx2-0.ebuild b/acct-group/automx2/automx2-0.ebuild index 05fcfe5a4d4f..59c8977b5fe7 100644 --- a/acct-group/automx2/automx2-0.ebuild +++ b/acct-group/automx2/automx2-0.ebuild @@ -1,9 +1,9 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit acct-group -DESCRIPTION="Group for www-servers/automx2" +DESCRIPTION="Group for net-mail/automx2" ACCT_GROUP_ID=437 diff --git a/acct-user/automx2/automx2-0.ebuild b/acct-user/automx2/automx2-0.ebuild index f500e034e987..c4effe2e71e2 100644 --- a/acct-user/automx2/automx2-0.ebuild +++ b/acct-user/automx2/automx2-0.ebuild @@ -1,11 +1,11 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit acct-user -DESCRIPTION="User for www-servers/automx2" +DESCRIPTION="User for net-mail/automx2" ACCT_USER_ID=437 ACCT_USER_GROUPS=( automx2 ) diff --git a/net-mail/automx2/Manifest b/net-mail/automx2/Manifest new file mode 100644 index 000000000000..a8ac298f32c7 --- /dev/null +++ b/net-mail/automx2/Manifest @@ -0,0 +1,2 @@ +DIST automx2-2019.0.tar.bz2 46670 BLAKE2B 6f62b4429be8046fce18ccba6827879a99627d8fbe9cf7973d8059e87b4968a280b62d5d005aaed3b0e1074053f4a6355c34f2cdce2f06a9afb14c52b4504fb7 SHA512 e494a48ffd3e6d133a89db5afd1dc75116a8efcc41f0571a24271bcbe6074c86d62184ce00bae9ced888a70be7d20f2a3614f28007d4481537d42c680dca4daa +DIST automx2-2020.1.tar.bz2 49405 BLAKE2B 2c9b26300e32e613f622e0b3a39b7f408d22e22638d61da3c93f5d448fe3ebb325e9a0004e3351abed2c9e427373c42637e3539831c04cda8e65a4d1bba1773e SHA512 823e569eacedcf49d53f8ed623a75455e715e3d49186179927a0e10d3efe9823c336912789bbf3d7d2f9aba3053b601352c99bda4ffcc9a7b78e412c938cd91f diff --git a/net-mail/automx2/automx2-2019.0.ebuild b/net-mail/automx2/automx2-2019.0.ebuild new file mode 100644 index 000000000000..62c3980bd7bf --- /dev/null +++ b/net-mail/automx2/automx2-2019.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_7 ) + +inherit distutils-r1 + +DESCRIPTION="Email client autoconfiguration service" +HOMEPAGE="https://automx.org/" +SRC_URI="https://gitlab.com/automx/automx2/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc" + +BDEPEND="acct-user/automx2 + >=dev-python/flask-migrate-2.5.2[${PYTHON_USEDEP}]" +RDEPEND="${BDEPEND}" + +python_prepare_all() { + sed -i -e "/('scripts'/d" setup.py || die + distutils-r1_python_prepare_all +} + +python_test() { + export AUTOMX2_CONF="tests/unittest.conf" + ${EPYTHON} -m unittest discover tests/ || die +} + +python_install_all() { + if use doc; then + DOCS="*.adoc doc/*.adoc contrib/*sample.conf" + HTML_DOCS="doc/*.html doc/*.svg" + fi + sed -e "s/@EPYTHON@/${EPYTHON}/" "${FILESDIR}/init" | newinitd - "${PN}" + newconfd "${FILESDIR}/confd" "${PN}" + insinto /etc + newins "${FILESDIR}/conf" "${PN}.conf" + distutils-r1_python_install_all +} diff --git a/net-mail/automx2/automx2-2020.1.ebuild b/net-mail/automx2/automx2-2020.1.ebuild new file mode 100644 index 000000000000..cce12b5bc749 --- /dev/null +++ b/net-mail/automx2/automx2-2020.1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8} ) + +inherit distutils-r1 + +DESCRIPTION="Email client autoconfiguration service" +HOMEPAGE="https://automx.org/" +SRC_URI="https://gitlab.com/automx/automx2/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc" + +BDEPEND="acct-user/automx2 + >=dev-python/flask-migrate-2.5.2[${PYTHON_USEDEP}]" +RDEPEND="${BDEPEND}" + +python_prepare_all() { + sed -i -e "/('scripts'/d" setup.py || die + distutils-r1_python_prepare_all +} + +python_test() { + export AUTOMX2_CONF="tests/unittest.conf" + ${EPYTHON} -m unittest discover tests/ || die +} + +python_install_all() { + if use doc; then + DOCS="*.adoc doc/*.adoc contrib/*sample.conf" + HTML_DOCS="doc/*.html doc/*.svg" + fi + sed -e "s/@EPYTHON@/${EPYTHON}/" "${FILESDIR}/init" | newinitd - "${PN}" + newconfd "${FILESDIR}/confd" "${PN}" + insinto /etc + newins "${FILESDIR}/conf" "${PN}.conf" + distutils-r1_python_install_all +} diff --git a/net-mail/automx2/files/conf b/net-mail/automx2/files/conf new file mode 100644 index 000000000000..ca19e0eebb68 --- /dev/null +++ b/net-mail/automx2/files/conf @@ -0,0 +1,20 @@ +[automx2] +# A typical production setup would use loglevel = WARNING +loglevel = WARNING +# Echo SQL commands into log? Used for debugging. +db_echo = no + +# In-memory SQLite database +#db_uri = sqlite:///:memory: + +# SQLite database in a UNIX-like file system +db_uri = sqlite:////var/lib/automx2/db.sqlite + +# MySQL database on a remote server. This example does not use an encrypted +# connection and is therefore *not* recommended for production use. +#db_uri = mysql://username:password@server.example.com/db + +# Number of proxy servers between automx2 and the client (default: 0). +# If your logs only show 127.0.0.1 or ::1 as the source IP for incoming +# connections, proxy_count probably needs to be changed. +#proxy_count = 1 diff --git a/net-mail/automx2/files/confd b/net-mail/automx2/files/confd new file mode 100644 index 000000000000..5a58d946aa23 --- /dev/null +++ b/net-mail/automx2/files/confd @@ -0,0 +1,8 @@ +# Additional parameters passed to Flask +#AUTOMX2_ARGS="--host 127.0.0.1 --port 4243" + +# Configuration file +#AUTOMX2_CONF="/etc/automx2.conf" + +# Process owner (choose a non-privileged user) +#AUTOMX2_USER="automx2" diff --git a/net-mail/automx2/files/init b/net-mail/automx2/files/init new file mode 100644 index 000000000000..466461a6cd93 --- /dev/null +++ b/net-mail/automx2/files/init @@ -0,0 +1,26 @@ +#!/sbin/openrc-run +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +: ${AUTOMX2_CONF:="/etc/${RC_SVCNAME}.conf"} +: ${AUTOMX2_USER:="automx2"} +: ${AUTOMX2_ARGS:="--port 4243"} + +command="/usr/bin/python" +command_args="/usr/bin/flask run ${AUTOMX2_ARGS}" +command_background="true" +command_user="${AUTOMX2_USER}" +pidfile="/run/${RC_SVCNAME}.pid" +required_files="${AUTOMX2_CONF}" + +depend() { + use logger net + before nginx +} + +start_pre() { + export AUTOMX2_CONF + export EPYTHON="@EPYTHON@" + export FLASK_APP="automx2.server:app" + export FLASK_ENV="production" +} diff --git a/net-mail/automx2/metadata.xml b/net-mail/automx2/metadata.xml new file mode 100644 index 000000000000..acba6de8fdfb --- /dev/null +++ b/net-mail/automx2/metadata.xml @@ -0,0 +1,27 @@ + + + + + gentoo@seichter.de + Ralph Seichter + + + mschiff@gentoo.org + Marc Schiffbauer + Proxy + + + automx2 makes configuring a mail account easy. It unites + methods for automated mailbox configuration from Apple + (mobileconfig), Microsoft (autodiscover) and Mozilla + (autoconfig) in one tool. + + + https://gitlab.com/automx/automx2/blob/master/doc/automx2.adoc + + automx2@seichter.de + Ralph Seichter + + automx/automx2 + + diff --git a/profiles/updates/1Q-2020 b/profiles/updates/1Q-2020 index b1f7fe244b9a..37651b4e14e7 100644 --- a/profiles/updates/1Q-2020 +++ b/profiles/updates/1Q-2020 @@ -8,3 +8,4 @@ move dev-python/python-sqlparse dev-python/sqlparse move dev-python/ghp-import dev-vcs/ghp-import move app-doc/ghp-import dev-vcs/ghp-import move dev-python/git-python dev-python/GitPython +move www-servers/automx2 net-mail/automx2 diff --git a/www-servers/automx2/Manifest b/www-servers/automx2/Manifest deleted file mode 100644 index a8ac298f32c7..000000000000 --- a/www-servers/automx2/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST automx2-2019.0.tar.bz2 46670 BLAKE2B 6f62b4429be8046fce18ccba6827879a99627d8fbe9cf7973d8059e87b4968a280b62d5d005aaed3b0e1074053f4a6355c34f2cdce2f06a9afb14c52b4504fb7 SHA512 e494a48ffd3e6d133a89db5afd1dc75116a8efcc41f0571a24271bcbe6074c86d62184ce00bae9ced888a70be7d20f2a3614f28007d4481537d42c680dca4daa -DIST automx2-2020.1.tar.bz2 49405 BLAKE2B 2c9b26300e32e613f622e0b3a39b7f408d22e22638d61da3c93f5d448fe3ebb325e9a0004e3351abed2c9e427373c42637e3539831c04cda8e65a4d1bba1773e SHA512 823e569eacedcf49d53f8ed623a75455e715e3d49186179927a0e10d3efe9823c336912789bbf3d7d2f9aba3053b601352c99bda4ffcc9a7b78e412c938cd91f diff --git a/www-servers/automx2/automx2-2019.0.ebuild b/www-servers/automx2/automx2-2019.0.ebuild deleted file mode 100644 index 62c3980bd7bf..000000000000 --- a/www-servers/automx2/automx2-2019.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_7 ) - -inherit distutils-r1 - -DESCRIPTION="Email client autoconfiguration service" -HOMEPAGE="https://automx.org/" -SRC_URI="https://gitlab.com/automx/automx2/-/archive/${PV}/${P}.tar.bz2" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="doc" - -BDEPEND="acct-user/automx2 - >=dev-python/flask-migrate-2.5.2[${PYTHON_USEDEP}]" -RDEPEND="${BDEPEND}" - -python_prepare_all() { - sed -i -e "/('scripts'/d" setup.py || die - distutils-r1_python_prepare_all -} - -python_test() { - export AUTOMX2_CONF="tests/unittest.conf" - ${EPYTHON} -m unittest discover tests/ || die -} - -python_install_all() { - if use doc; then - DOCS="*.adoc doc/*.adoc contrib/*sample.conf" - HTML_DOCS="doc/*.html doc/*.svg" - fi - sed -e "s/@EPYTHON@/${EPYTHON}/" "${FILESDIR}/init" | newinitd - "${PN}" - newconfd "${FILESDIR}/confd" "${PN}" - insinto /etc - newins "${FILESDIR}/conf" "${PN}.conf" - distutils-r1_python_install_all -} diff --git a/www-servers/automx2/automx2-2020.1.ebuild b/www-servers/automx2/automx2-2020.1.ebuild deleted file mode 100644 index cce12b5bc749..000000000000 --- a/www-servers/automx2/automx2-2020.1.ebuild +++ /dev/null @@ -1,43 +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} ) - -inherit distutils-r1 - -DESCRIPTION="Email client autoconfiguration service" -HOMEPAGE="https://automx.org/" -SRC_URI="https://gitlab.com/automx/automx2/-/archive/${PV}/${P}.tar.bz2" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="doc" - -BDEPEND="acct-user/automx2 - >=dev-python/flask-migrate-2.5.2[${PYTHON_USEDEP}]" -RDEPEND="${BDEPEND}" - -python_prepare_all() { - sed -i -e "/('scripts'/d" setup.py || die - distutils-r1_python_prepare_all -} - -python_test() { - export AUTOMX2_CONF="tests/unittest.conf" - ${EPYTHON} -m unittest discover tests/ || die -} - -python_install_all() { - if use doc; then - DOCS="*.adoc doc/*.adoc contrib/*sample.conf" - HTML_DOCS="doc/*.html doc/*.svg" - fi - sed -e "s/@EPYTHON@/${EPYTHON}/" "${FILESDIR}/init" | newinitd - "${PN}" - newconfd "${FILESDIR}/confd" "${PN}" - insinto /etc - newins "${FILESDIR}/conf" "${PN}.conf" - distutils-r1_python_install_all -} diff --git a/www-servers/automx2/files/conf b/www-servers/automx2/files/conf deleted file mode 100644 index ca19e0eebb68..000000000000 --- a/www-servers/automx2/files/conf +++ /dev/null @@ -1,20 +0,0 @@ -[automx2] -# A typical production setup would use loglevel = WARNING -loglevel = WARNING -# Echo SQL commands into log? Used for debugging. -db_echo = no - -# In-memory SQLite database -#db_uri = sqlite:///:memory: - -# SQLite database in a UNIX-like file system -db_uri = sqlite:////var/lib/automx2/db.sqlite - -# MySQL database on a remote server. This example does not use an encrypted -# connection and is therefore *not* recommended for production use. -#db_uri = mysql://username:password@server.example.com/db - -# Number of proxy servers between automx2 and the client (default: 0). -# If your logs only show 127.0.0.1 or ::1 as the source IP for incoming -# connections, proxy_count probably needs to be changed. -#proxy_count = 1 diff --git a/www-servers/automx2/files/confd b/www-servers/automx2/files/confd deleted file mode 100644 index 5a58d946aa23..000000000000 --- a/www-servers/automx2/files/confd +++ /dev/null @@ -1,8 +0,0 @@ -# Additional parameters passed to Flask -#AUTOMX2_ARGS="--host 127.0.0.1 --port 4243" - -# Configuration file -#AUTOMX2_CONF="/etc/automx2.conf" - -# Process owner (choose a non-privileged user) -#AUTOMX2_USER="automx2" diff --git a/www-servers/automx2/files/init b/www-servers/automx2/files/init deleted file mode 100644 index 466461a6cd93..000000000000 --- a/www-servers/automx2/files/init +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -: ${AUTOMX2_CONF:="/etc/${RC_SVCNAME}.conf"} -: ${AUTOMX2_USER:="automx2"} -: ${AUTOMX2_ARGS:="--port 4243"} - -command="/usr/bin/python" -command_args="/usr/bin/flask run ${AUTOMX2_ARGS}" -command_background="true" -command_user="${AUTOMX2_USER}" -pidfile="/run/${RC_SVCNAME}.pid" -required_files="${AUTOMX2_CONF}" - -depend() { - use logger net - before nginx -} - -start_pre() { - export AUTOMX2_CONF - export EPYTHON="@EPYTHON@" - export FLASK_APP="automx2.server:app" - export FLASK_ENV="production" -} diff --git a/www-servers/automx2/metadata.xml b/www-servers/automx2/metadata.xml deleted file mode 100644 index acba6de8fdfb..000000000000 --- a/www-servers/automx2/metadata.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - gentoo@seichter.de - Ralph Seichter - - - mschiff@gentoo.org - Marc Schiffbauer - Proxy - - - automx2 makes configuring a mail account easy. It unites - methods for automated mailbox configuration from Apple - (mobileconfig), Microsoft (autodiscover) and Mozilla - (autoconfig) in one tool. - - - https://gitlab.com/automx/automx2/blob/master/doc/automx2.adoc - - automx2@seichter.de - Ralph Seichter - - automx/automx2 - - -- cgit v1.2.3-65-gdbad