Compare commits

...
10 Commits
5 changed files with 18 additions and 30 deletions
@@ -1,9 +1,9 @@
# Copyright 2020 Gentoo Authors # Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=8
PYTHON_COMPAT=( python3_{10..11} ) PYTHON_COMPAT=( python3_{13..14} )
DISTUTILS_USE_SETUPTOOLS=rdepend DISTUTILS_USE_PEP517=setuptools
SCM="" SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then if [ "${PV#9999}" != "${PV}" ] ; then
@@ -31,19 +31,21 @@ LICENSE="GPL-3"
SLOT="0" SLOT="0"
IUSE="+lxml systemd" IUSE="+lxml systemd"
RDEPEND=" RDEPEND="dev-python/beautifulsoup4[${PYTHON_USEDEP}]
dev-python/beautifulsoup4[${PYTHON_USEDEP}]
dev-python/jsonschema[${PYTHON_USEDEP}] dev-python/jsonschema[${PYTHON_USEDEP}]
lxml? ( dev-python/lxml[${PYTHON_USEDEP}] ) lxml? ( dev-python/lxml[${PYTHON_USEDEP}] )
dev-python/netaddr[${PYTHON_USEDEP}] dev-python/netaddr[${PYTHON_USEDEP}]
dev-python/peewee[${PYTHON_USEDEP}] dev-python/peewee[${PYTHON_USEDEP}]
>=dev-python/pymilter-1.5[${PYTHON_USEDEP}]" >=dev-python/pymilter-1.0.5[${PYTHON_USEDEP}]"
python_install_all() { python_install_all() {
distutils-r1_python_install_all
use systemd && systemd_dounit pyquarantine/misc/systemd/${PN}.service use systemd && systemd_dounit pyquarantine/misc/systemd/${PN}.service
newinitd pyquarantine/misc/openrc/${PN}.initd ${PN} newinitd pyquarantine/misc/openrc/${PN}.initd ${PN}
newconfd pyquarantine/misc/openrc/${PN}.confd ${PN} newconfd pyquarantine/misc/openrc/${PN}.confd ${PN}
insinto /etc/pyquarantine
doins pyquarantine/misc/pyquarantine.conf.default
doins -r pyquarantine/misc/templates
distutils-r1_python_install_all
} }
pkg_postinst() { pkg_postinst() {
+1 -1
View File
@@ -14,4 +14,4 @@ select version in $(find . -maxdepth 1 -type f -name "pyquarantine-*.*.*.tar.gz"
[ -n "${version}" ] && break [ -n "${version}" ] && break
echo -e "\ninvalid choice\n\n${msg}" echo -e "\ninvalid choice\n\n${msg}"
done done
${TWINE} upload "${version}"{.tar.gz,-*.whl} ${TWINE} upload -u __token__ "${version}"{.tar.gz,-*.whl}
+1 -1
View File
@@ -27,7 +27,7 @@ __all__ = [
"lists", "lists",
"QuarantineMilter"] "QuarantineMilter"]
__version__ = "2.1.0" __version__ = "2.1.2"
from pyquarantine import _runtime_patches from pyquarantine import _runtime_patches
+6 -4
View File
@@ -13,13 +13,14 @@
# #
import logging import logging
import multiprocessing as mp
import smtplib import smtplib
from multiprocessing import Process, Queue from queue import Full as QueueFull
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
queue = Queue(maxsize=50) queue = mp.Queue(maxsize=50)
process = None process = None
@@ -71,7 +72,8 @@ def sendmail(smtp_host, smtp_port, qid, mailfrom, recipients, mail,
# start mailprocess if it is not started yet # start mailprocess if it is not started yet
if process is None: if process is None:
process = Process(target=mailprocess) ctx = mp.get_context('fork')
process = ctx.Process(target=mailprocess)
process.daemon = True process.daemon = True
logger.debug("starting mailer process") logger.debug("starting mailer process")
process.start() process.start()
@@ -82,5 +84,5 @@ def sendmail(smtp_host, smtp_port, qid, mailfrom, recipients, mail,
(smtp_host, smtp_port, qid, mailfrom, recipient, mail, (smtp_host, smtp_port, qid, mailfrom, recipient, mail,
emailtype), emailtype),
timeout=30) timeout=30)
except Queue.Full: except QueueFull:
raise RuntimeError("email queue is full") raise RuntimeError("email queue is full")
+1 -17
View File
@@ -32,22 +32,6 @@ setup(name = "pyquarantine",
"pyquarantine=pyquarantine.cli:main", "pyquarantine=pyquarantine.cli:main",
] ]
}, },
data_files = [
(
"/etc/pyquarantine",
[
"pyquarantine/misc/pyquarantine.conf.default"
]
), (
"/etc/pyquarantine/templates",
[
"pyquarantine/misc/templates/disclaimer_html.template",
"pyquarantine/misc/templates/disclaimer_text.template",
"pyquarantine/misc/templates/notification.template",
"pyquarantine/misc/templates/removed.png"
]
)
],
install_requires = ["pymilter >= 1.5", "jsonschema", "netaddr", "beautifulsoup4[lxml]", "peewee"], install_requires = ["pymilter >= 1.5", "jsonschema", "netaddr", "beautifulsoup4[lxml]", "peewee"],
python_requires = ">=3.10" python_requires = ">=3.13"
) )