Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ef648d2d77
|
||
|
|
057cc4843d
|
||
|
|
cc94a5c1cf
|
||
|
|
856634040e
|
||
|
|
1e14b189dc
|
||
|
|
5a8808c7d0
|
||
|
|
b345487052
|
||
|
|
5e717f562a
|
||
|
|
4b3bec365f
|
||
|
|
50a513b8ac
|
@@ -1,9 +1,9 @@
|
||||
# Copyright 2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_{10..11} )
|
||||
DISTUTILS_USE_SETUPTOOLS=rdepend
|
||||
EAPI=8
|
||||
PYTHON_COMPAT=( python3_{13..14} )
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
|
||||
SCM=""
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
@@ -31,19 +31,21 @@ LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
IUSE="+lxml systemd"
|
||||
|
||||
RDEPEND="
|
||||
dev-python/beautifulsoup4[${PYTHON_USEDEP}]
|
||||
RDEPEND="dev-python/beautifulsoup4[${PYTHON_USEDEP}]
|
||||
dev-python/jsonschema[${PYTHON_USEDEP}]
|
||||
lxml? ( dev-python/lxml[${PYTHON_USEDEP}] )
|
||||
dev-python/netaddr[${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() {
|
||||
distutils-r1_python_install_all
|
||||
use systemd && systemd_dounit pyquarantine/misc/systemd/${PN}.service
|
||||
newinitd pyquarantine/misc/openrc/${PN}.initd ${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() {
|
||||
|
||||
@@ -14,4 +14,4 @@ select version in $(find . -maxdepth 1 -type f -name "pyquarantine-*.*.*.tar.gz"
|
||||
[ -n "${version}" ] && break
|
||||
echo -e "\ninvalid choice\n\n${msg}"
|
||||
done
|
||||
${TWINE} upload "${version}"{.tar.gz,-*.whl}
|
||||
${TWINE} upload -u __token__ "${version}"{.tar.gz,-*.whl}
|
||||
|
||||
@@ -27,7 +27,7 @@ __all__ = [
|
||||
"lists",
|
||||
"QuarantineMilter"]
|
||||
|
||||
__version__ = "2.1.0"
|
||||
__version__ = "2.1.2"
|
||||
|
||||
from pyquarantine import _runtime_patches
|
||||
|
||||
|
||||
@@ -13,13 +13,14 @@
|
||||
#
|
||||
|
||||
import logging
|
||||
import multiprocessing as mp
|
||||
import smtplib
|
||||
|
||||
from multiprocessing import Process, Queue
|
||||
from queue import Full as QueueFull
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
queue = Queue(maxsize=50)
|
||||
queue = mp.Queue(maxsize=50)
|
||||
process = None
|
||||
|
||||
|
||||
@@ -71,7 +72,8 @@ def sendmail(smtp_host, smtp_port, qid, mailfrom, recipients, mail,
|
||||
|
||||
# start mailprocess if it is not started yet
|
||||
if process is None:
|
||||
process = Process(target=mailprocess)
|
||||
ctx = mp.get_context('fork')
|
||||
process = ctx.Process(target=mailprocess)
|
||||
process.daemon = True
|
||||
logger.debug("starting mailer process")
|
||||
process.start()
|
||||
@@ -82,5 +84,5 @@ def sendmail(smtp_host, smtp_port, qid, mailfrom, recipients, mail,
|
||||
(smtp_host, smtp_port, qid, mailfrom, recipient, mail,
|
||||
emailtype),
|
||||
timeout=30)
|
||||
except Queue.Full:
|
||||
except QueueFull:
|
||||
raise RuntimeError("email queue is full")
|
||||
|
||||
@@ -32,22 +32,6 @@ setup(name = "pyquarantine",
|
||||
"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"],
|
||||
python_requires = ">=3.10"
|
||||
python_requires = ">=3.13"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user