From 7fa8a1e3f149eea4c844c47cfe26136ed7614c58 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 15 Apr 2024 12:04:03 +0100 Subject: gentoo auto-resync : 15:04:2024 - 12:04:02 --- mail-filter/Manifest.gz | Bin 8213 -> 8208 bytes mail-filter/pyzor/Manifest | 2 +- mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild | 15 ++--- mail-filter/spf-engine/Manifest | 2 +- mail-filter/spf-engine/spf-engine-3.0.4-r1.ebuild | 74 ++++++++++++++++++++++ mail-filter/spf-engine/spf-engine-3.0.4.ebuild | 74 ---------------------- 6 files changed, 83 insertions(+), 84 deletions(-) create mode 100644 mail-filter/spf-engine/spf-engine-3.0.4-r1.ebuild delete mode 100644 mail-filter/spf-engine/spf-engine-3.0.4.ebuild (limited to 'mail-filter') diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz index 37f2faac2d41..f060da14ba52 100644 Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ diff --git a/mail-filter/pyzor/Manifest b/mail-filter/pyzor/Manifest index a3242795f159..e571d522c6bc 100644 --- a/mail-filter/pyzor/Manifest +++ b/mail-filter/pyzor/Manifest @@ -1,3 +1,3 @@ DIST pyzor-1.0.0_p20211223.tar.gz 138500 BLAKE2B 242a7b2df3451f659d820771454e685868792bd2275b6d69d4c4adfd6044c781abe2d72fe1500a6074851faf8e88e95d6578c546d4d95fda03e11609d1a0b436 SHA512 218bea40515a21b1e08b2bad5b7ba339ba84fff2da425dc58df72a967730ebe10e319944e1604ff56bb37f6a8ae7bc0cd974b54b18a4878ba103131b8ea47b67 -EBUILD pyzor-1.0.0_p20211223.ebuild 1495 BLAKE2B e2071003985e32dcdc191c84a01379d3c64395f9ebfcbbee57019e422303c18d0c843d2d07139a3108156d0438e2e56ca55d276257f51df5d0ebb71ffc7a8b1d SHA512 8045ac01f7676ad44771c52ced17a2f079228678b73c20b7b9ceb4983f0489fa10a892d97d7869e1a0603c475bb4a5de5c2a13d79c04e9fc8517a43c4fa73d08 +EBUILD pyzor-1.0.0_p20211223.ebuild 1399 BLAKE2B bce29ed690772100d3bfb512962077d1e007116f18bdefa05acba6ab2c422b1dc8b6689ac81cfee447ee5a7eaf4bf76d1136319bcf19179e73abe8a380e790eb SHA512 f13376784ff9b88bbde5488e84e4b50719bc8ce0d61821a051ebc758b439ea139e33b35f8978ba864f95d62ec68917b1645c6a454b620c39875b1de8eb5ca9d8 MISC metadata.xml 842 BLAKE2B f7041329b4babc35d93e5d3ab00b0bd54f2f6b2337037c713b692a25f5b5ab4ac6f318d6537e41ef8f07f8b5191b7a6dbffd29d063bc2548975febded51688ff SHA512 87362e92959650b365e83115c4d1ec2b328e4c8ab6144e94fa4e82c0009317f91e0fd7f77e9c58b6ca3450ec92dd6bc8194fbf25c30177c0ccfeeb9a8a5216a4 diff --git a/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild b/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild index 6c6ce3b2abe0..15fdf34856fb 100644 --- a/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild +++ b/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) + inherit distutils-r1 MY_COMMIT="2dbe627c1ec245db206cdc73bf1f9d785f1512d8" @@ -27,18 +28,16 @@ RDEPEND=" ) selinux? ( sec-policy/selinux-pyzor ) " -DEPEND=" +BDEPEND=" test? ( - gdbm? ( $(python_gen_impl_dep 'gdbm') ) - redis? ( dev-python/redis[${PYTHON_USEDEP}] ) + $(python_gen_impl_dep 'gdbm') + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/redis[${PYTHON_USEDEP}] ) " -# TODO: maybe upstream would support skipping tests for which the -# dependencies are missing? REQUIRED_USE=" pyzord? ( || ( gdbm redis ) ) - test? ( gdbm redis ) " distutils_enable_sphinx docs diff --git a/mail-filter/spf-engine/Manifest b/mail-filter/spf-engine/Manifest index 2febd572302b..9a802e2e3d99 100644 --- a/mail-filter/spf-engine/Manifest +++ b/mail-filter/spf-engine/Manifest @@ -1,5 +1,5 @@ DIST spf-engine-3.0.3.tar.gz 61350 BLAKE2B f28dfb10559bfd61be152a4b65a5653ec50b25718fcb63f8a2c9532fd9d52a51c131c99ba5408bd6aa424adc5ce6094da7eeb97dbacd7e60e8abb48c65c4f188 SHA512 08db392d2cce16651ba416fcd265e6606e1a8af3cb88721ed149a2286d11ac9ea6ed4d01572cea6950740890c3334e8e0d496d1d1e9edcc29d04833fec049ab0 DIST spf-engine-3.0.4.tar.gz 61428 BLAKE2B b4c1e920cdb6706650341a21abe21a3318649a3bd379aea2d16c30bb9d27d95b83b980dfb0f62c234627f3c87b4d82f6074b88eb0f4ccb878618f61f9d8b9827 SHA512 29a6cd4d2c94ef1d47ff6d6d03bd485961f8c01e838800dd8c1194a51fdfbf384ffb5f073e1262993cd2bb5cbf2eff645048d6f1f3ce57bdebfefe3d0425ee77 EBUILD spf-engine-3.0.3.ebuild 2522 BLAKE2B cfd61a17ce04cd22be187299939f2095ae655552fff7a810850d00780add32edd9ccbb1a359a5ddf8e92c5539e6db7d634f00ccd0d7541f23cb193cd089bb328 SHA512 0b89f41f6ac0bdb798f6133d9f057318f9120fecd325f4402bb3e5bc34ecdaf26b2e702d676d292054d6b0f114d6829a17c65a2ea9f6622164c321e9be2c08ec -EBUILD spf-engine-3.0.4.ebuild 2524 BLAKE2B fa76c63690c72bc33805ca7f401dd2ee288ee5b13551b17db0b8d3fd4b7c1bbe807efb6f3a446dc0bce25d3cba6a70ac324b028e03b971c968fefa8a39aaae9b SHA512 62efea6f4a88b39db00c3f6ca70f6b0ff4e0ffa25221631f4d63e8303c8f282b1b5fe60b93f1392dab93fc61260fae07de19fa803121def544e3b5de4019e242 +EBUILD spf-engine-3.0.4-r1.ebuild 2525 BLAKE2B 9499446f6eb75bcbecd96d6574e51f7d37f53f9c94a736e7d4c14ba04e295156de8c902bd44ffeb961b07c7610936d12ac5ba4380e4b7646af35a3fd565c1e54 SHA512 fed148f5af38a31b344dbfba52c3a773f4288864b4ad79849c4f449c6b4796748caaa69480c37c324b01e5aefdaa4bc8f3eba51b9869aee5f53a60e29c0e5816 MISC metadata.xml 351 BLAKE2B 896ff35eb02fb2dc7a81f61d7698c72566061e15a43773b24655f12840e47b9f84ab98778498da1418b74007309fff3257de8b5ea06f60b4d358633ebfec12cd SHA512 e592b10d44514d4f5ac34295b727a58659d82d41e100c97c96f7881d0e189311e30aa2527a32d92ae1cbefea55aa722d39c7c36c3d3b259fc3b1df04bd9b075f diff --git a/mail-filter/spf-engine/spf-engine-3.0.4-r1.ebuild b/mail-filter/spf-engine/spf-engine-3.0.4-r1.ebuild new file mode 100644 index 000000000000..cb36d22f03ce --- /dev/null +++ b/mail-filter/spf-engine/spf-engine-3.0.4-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_10 python3_11 python3_12 ) + +# The built-in ipaddress module handles the parsing of IP addresses. If +# python is built without ipv6 support, then ipaddress can't parse ipv6 +# addresses, and the daemon will crash if it sees an ipv6 SPF record. In +# other words, it's completely broken. +PYTHON_REQ_USE="ipv6(+)" +DISTUTILS_USE_PEP517=flit +PYPI_NO_NORMALIZE=1 +inherit distutils-r1 pypi + +DESCRIPTION="Policy daemon for Postfix SPF verification" +HOMEPAGE="https://launchpad.net/spf-engine" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="dev-python/pyspf[${PYTHON_USEDEP}] + dev-python/authres[${PYTHON_USEDEP}]" + +DOCS=( CHANGES ) + +python_prepare_all() { + distutils-r1_python_prepare_all + + # The tarball has a "data" directory containing a hierarchy that + # flit wants to insert right into /usr. Before it does that, we have + # to remove the parts we don't want, and fix some of the paths. + # + # Note that one of our patches already mangles a few of these + # before we even see them. + + einfo "removing milter files" + rm -v -r data/lib data/etc/init.d data/share/man/man8 || die + rm -v data/etc/pyspf-milter/pyspf-milter.conf || die + rm -v spf_engine/milter_spf.py || die + + # And don't create a python-exec wrapper for it. + sed -e '/^pyspf-milter = /d' -i pyproject.toml || die + + # The commented conf example is documentation, not configuration. + mv -v data/etc/python-policyd-spf/policyd-spf.conf.commented \ + data/share/doc/python-policyd-spf/ || die + + # The man page hard-codes /usr/local/etc, it should be /etc. + sed -e 's:/usr/local/etc:/etc:g' \ + -i data/share/man/man1/policyd-spf.1 || die + + # Fix the documentation path. + mv -v data/share/doc/python-policyd-spf "data/share/doc/${PF}" || die + + # The "real" config file mentions the commented one, so we point + # users in the right direction. Caveat: the documentation is + # compressed, so we're usually off by a ".bz2" suffix anyway. + local oldconf="policyd-spf.conf.commented" + local newconf="/usr/share/doc/${PF}/${oldconf}" + sed -e "1 s~ ${oldconf}~,\n# ${newconf}~" \ + -i "data/etc/python-policyd-spf/policyd-spf.conf" \ + || die 'failed to update commented config file path' +} + +src_install() { + distutils-r1_src_install + + # The "data" installation is relative to python's prefix, so + # data/etc gets installed to /usr/etc. Let's fix that. + mv -v "${ED}/usr/etc" "${ED}/" || die 'failed to relocate sysconfdir' +} diff --git a/mail-filter/spf-engine/spf-engine-3.0.4.ebuild b/mail-filter/spf-engine/spf-engine-3.0.4.ebuild deleted file mode 100644 index 2c680c53fd35..000000000000 --- a/mail-filter/spf-engine/spf-engine-3.0.4.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_9 python3_10 python3_11 ) - -# The built-in ipaddress module handles the parsing of IP addresses. If -# python is built without ipv6 support, then ipaddress can't parse ipv6 -# addresses, and the daemon will crash if it sees an ipv6 SPF record. In -# other words, it's completely broken. -PYTHON_REQ_USE="ipv6(+)" -DISTUTILS_USE_PEP517=flit -PYPI_NO_NORMALIZE=1 -inherit distutils-r1 pypi - -DESCRIPTION="Policy daemon for Postfix SPF verification" -HOMEPAGE="https://launchpad.net/spf-engine" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="dev-python/pyspf[${PYTHON_USEDEP}] - dev-python/authres[${PYTHON_USEDEP}]" - -DOCS=( CHANGES ) - -python_prepare_all() { - distutils-r1_python_prepare_all - - # The tarball has a "data" directory containing a hierarchy that - # flit wants to insert right into /usr. Before it does that, we have - # to remove the parts we don't want, and fix some of the paths. - # - # Note that one of our patches already mangles a few of these - # before we even see them. - - einfo "removing milter files" - rm -v -r data/lib data/etc/init.d data/share/man/man8 || die - rm -v data/etc/pyspf-milter/pyspf-milter.conf || die - rm -v spf_engine/milter_spf.py || die - - # And don't create a python-exec wrapper for it. - sed -e '/^pyspf-milter = /d' -i pyproject.toml || die - - # The commented conf example is documentation, not configuration. - mv -v data/etc/python-policyd-spf/policyd-spf.conf.commented \ - data/share/doc/python-policyd-spf/ || die - - # The man page hard-codes /usr/local/etc, it should be /etc. - sed -e 's:/usr/local/etc:/etc:g' \ - -i data/share/man/man1/policyd-spf.1 || die - - # Fix the documentation path. - mv -v data/share/doc/python-policyd-spf "data/share/doc/${PF}" || die - - # The "real" config file mentions the commented one, so we point - # users in the right direction. Caveat: the documentation is - # compressed, so we're usually off by a ".bz2" suffix anyway. - local oldconf="policyd-spf.conf.commented" - local newconf="/usr/share/doc/${PF}/${oldconf}" - sed -e "1 s~ ${oldconf}~,\n# ${newconf}~" \ - -i "data/etc/python-policyd-spf/policyd-spf.conf" \ - || die 'failed to update commented config file path' -} - -src_install() { - distutils-r1_src_install - - # The "data" installation is relative to python's prefix, so - # data/etc gets installed to /usr/etc. Let's fix that. - mv -v "${ED}/usr/etc" "${ED}/" || die 'failed to relocate sysconfdir' -} -- cgit v1.2.3