gentoo auto-resync : 04:05:2023 - 17:28:36

4 files changed, 76 insertions, 79 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 1b4a85378a2b..32344ae5f9da 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/spf-engine/Manifest b/mail-filter/spf-engine/Manifest
index 596740dbb719..2febd572302b 100644
--- a/mail-filter/spf-engine/Manifest
+++ b/mail-filter/spf-engine/Manifest
@@ -1,5 +1,5 @@
-DIST spf-engine-2.9.3.tar.gz 52974 BLAKE2B 9e6c47af7d523e1486d9bbfee2b0e53a4a97dbfc93e1cd14f70d4676542defaf6fede397d33e21c00e9bb2cdd1016c98981b6c0e735bdfd225b226920b9470b1 SHA512 adde80eca38f372ad00ed7355951007b9c02ef8a52a5a4edcbf2fa9959220f1083e3e313668e9c7ad2c26144148ae8ff62ec468d79936d96b43897598254f528
 DIST spf-engine-3.0.3.tar.gz 61350 BLAKE2B f28dfb10559bfd61be152a4b65a5653ec50b25718fcb63f8a2c9532fd9d52a51c131c99ba5408bd6aa424adc5ce6094da7eeb97dbacd7e60e8abb48c65c4f188 SHA512 08db392d2cce16651ba416fcd265e6606e1a8af3cb88721ed149a2286d11ac9ea6ed4d01572cea6950740890c3334e8e0d496d1d1e9edcc29d04833fec049ab0
-EBUILD spf-engine-2.9.3.ebuild 2682 BLAKE2B eacf66fea86b7bf6170554da6772a8320f7895bb4b1765b71145934f89bd8215cddcfdfe73029d1a9687c15742e4868cee3a58c085fbdafb91523bfae9529a03 SHA512 9ed7d77956022b3eb53ef00989ad13c40d547e805f74d03a7d8042f69d1e7994899c9654bb329c995a392a2b5ba1c001fafd59388e05fd520c5054a0d6960a66
+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
 MISC metadata.xml 351 BLAKE2B 896ff35eb02fb2dc7a81f61d7698c72566061e15a43773b24655f12840e47b9f84ab98778498da1418b74007309fff3257de8b5ea06f60b4d358633ebfec12cd SHA512 e592b10d44514d4f5ac34295b727a58659d82d41e100c97c96f7881d0e189311e30aa2527a32d92ae1cbefea55aa722d39c7c36c3d3b259fc3b1df04bd9b075f
diff --git a/mail-filter/spf-engine/spf-engine-2.9.3.ebuild b/mail-filter/spf-engine/spf-engine-2.9.3.ebuild
deleted file mode 100644
index bc923ece8954..000000000000
--- a/mail-filter/spf-engine/spf-engine-2.9.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_9 python3_10 )
-
-# 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(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Policy daemon and milter for Postfix SPF verification"
-HOMEPAGE="https://launchpad.net/spf-engine"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/pyspf[${PYTHON_USEDEP}]"
-
-RDEPEND="${DEPEND}
-	dev-python/authres[${PYTHON_USEDEP}]"
-
-DOCS=( CHANGES policyd-spf.conf.commented README README.per_user_whitelisting )
-
-python_prepare_all() {
-	# The "real" config file mentions the commented one, so we point
-	# users in the right direction.
-	local oldconf="policyd-spf.conf.commented"
-	local newconf="/usr/share/doc/${PF}/${oldconf}"
-
-	sed -e "1 s~ ${oldconf}~,\n#  ${newconf}~" -i policyd-spf.conf \
-		|| die 'failed to update commented config file path'
-
-	distutils-r1_python_prepare_all
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Remove the milter files that are installed by default. The milter
-	# isn't quite ready:
-	#
-	#   * The README says it's experimental not well-tested.
-	#   * There's no documentation for its configuration parameters
-	#     (expecially the UserID).
-	#   * The configuration file is hard-coded to /usr/local.
-	#   * The paths in the systemd service file are hard-coded to /usr/local.
-	#   * We need to write an OpenRC service script for it.
-	#
-	# These are all eventually doable, but I'm not willing to commit to
-	# making the milter work before upstream is.
-	#
-	rm "${ED}/usr/bin/pyspf-milter" \
-		|| die "failed to remove ${ED}/usr/bin/pyspf-milter"
-	rm -r "${ED}/usr/lib/systemd" \
-		|| die "failed to remove ${ED}/usr/lib/systemd"
-	rm -r "${ED}/usr/etc/init.d" \
-		|| die "failed to remove ${ED}/usr/etc/init.d"
-	einfo "The milter component of spf-engine is still deemed experimental"
-	einfo "and not well-tested by upstream. It's missing configuration"
-	einfo "files, service scripts, and documentation. In other words, it"
-	einfo "doesn't work yet."
-
-	# The setuptools installation routing always works relative to
-	# python's prefix, so that when installing locally you wind up
-	# with paths like /usr/local/etc. However for system installs
-	# that does the wrong thing and puts the sysconfdir at /usr/etc.
-	# Here we move it to the right place.
-	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
new file mode 100644
index 000000000000..2c680c53fd35
--- /dev/null
+++ b/mail-filter/spf-engine/spf-engine-3.0.4.ebuild
@@ -0,0 +1,74 @@
+# 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'
+}