gentoo auto-resync : 22:04:2024 - 23:59:31

4 files changed, 287 insertions, 0 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 0f4ef3aaecc2..39b9da77674c 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 9eb0a77fabda..5bd423282304 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -2,6 +2,7 @@ AUX opendkim-2.10.3-c-std.patch 3767 BLAKE2B e9999b0fad6a7cd72c471c7c87e5b191b76
 AUX opendkim-2.10.3-define-P-macro-in-libvbr.patch 1111 BLAKE2B ef21e6609a80eadfc3c493b088df6afe368d0ed833d04e7cde922e643b434a7033c888e1b7158d1085152b128a60d95fae722885f15be08c63bed898e4924127 SHA512 6cf0cb4e54814f661f9869bfdfda0ab44c67f237475ebc69b18c670de9f356bb5375740dc8e0a922f25a3215ad5a884725629c92eac1dbf8251364725d77c105
 AUX opendkim-2.10.3-fix-ldap-sasl-pc.patch 2483 BLAKE2B f2db327252044c1a04d0bea0b31b6917b4a8d7af66c6c36ec9952f710db6512236db80daf9816ebc0cb552ff27dd6ea5d9e03be6ff759417c0e3cdf36a4b2954 SHA512 818b00a7ec40ab9b63839be5555a2fe6c2dcfe1095867237d327188f143af0a03e95908122285bdc0d1323b32637f90d68679bfc7b03cd556423196d24489cdf
 AUX opendkim-2.10.3-fix-libmilter-search.patch 7465 BLAKE2B 9b6de6dd084437dd9fb2d905ba3addd3d39150b0cc36d7d62f8f10390acb3adb584dd23f8ee5b87c2b322cee34580e16725ce86b5967f14067d7ccae070ce7d4 SHA512 f8c675abed82f2058403b80162f83e6f44f7cc7502e32228f3127d332d17fd664dbb91a27a93717bd45cac875f356d9c6af1807ceec46ffe1d73e1a603615219
+AUX opendkim-2.10.3-incompatible-pointer-types.patch 1083 BLAKE2B 0d62ab64c6f325ecc46fbd6b4aab26bb19f21cd1577ccc63841ed14ac0b11bebf973a3770eab0a8eb0670fad73500da81400a054ff566134ad339118fe12fa57 SHA512 9bda900bc621404a1f7c448eec0b09dcf862e46050a820a1513fbbbc1711d50098b3b6fe34c79799d269711daa83ac7fad6e1910c41d9fdef842d7bbc1fc6341
 AUX opendkim-2.10.3-lua-pkgconfig-pt2.patch 1728 BLAKE2B b80f8a21dc19a0e8b37a02c3262698dd08da79d067fbff4ac04b1dfa39d133ee0a113984d4e35e7fc835c0d801d0485b3eccad76f93e9274106e166850a91cb5 SHA512 47fc79f46ae7e4178fc1062f342182b7b783274ac84d99dcb5155a12adb85b42ae597defb3a0da888a70d01e86b068647eb48d881aa107318a355cedd3a6cc4a
 AUX opendkim-2.10.3-lua-pkgconfig.patch 5688 BLAKE2B 57fd8b57d12af4d1351e8bfa2ad01a39e85a6f1e440e3754e497082f5f1098dfc8c31771b1f83ae59f1e53ef242af78093601b1348b62945deacf8afdc42fca0 SHA512 b9ee7e625d1a3f00dcda7e441a81749d773daa9cfad7f046dd03d775564f1c111648c883ef1dcc16a6b518239b6a66bee4ba59f59227d182fcf61b887594d1d7
 AUX opendkim-2.10.3-openrc.patch 10203 BLAKE2B e825ae1258c82607eb6d10d5acc3246908868fd3d5703ba0044f93bdf51e5a95dbc39a1e3060855073d14c31da5cb3985afe81c526f592f56463bf698ce4c317 SHA512 34499044cb768d54c0c1653a62fb34c9815990d815c98ccfba22afc1ad9c837c6689ff17a3d1da1221d698c91ce9d77a1964d99055527dfd797f8d428e1db615
@@ -9,4 +10,5 @@ AUX opendkim-2.10.3-openssl-1.1.1.patch.r2 5966 BLAKE2B c0dcb757f1195e8a3fc055f5
 AUX opendkim-2.10.3-snprintf-include.patch 691 BLAKE2B eb2f0700f767e7b80ff7938634823e192299ec5941ad4e24003a62245fec7eff973b247fc99b0100d2f5a7454a36a096803bd1d82ba64c9bdb28ef56307b797f SHA512 24f67b9240bd360205f9af0510c8ddc62a3d34af7cb17ec98361c738b0a0e61829615eaeade7848b8042cf91ef2a2452d2d4610b9fd5c7ceb355a485470d666e
 DIST opendkim-2.10.3.tar.gz 1210224 BLAKE2B affd4526568431fa1afee93a167c5569912c9344ea4e6eee3281a035bd0c76d2be5d2e8e144bbebabd681a73388a37ac56d9a2e4daf00af9baadad14ffb42265 SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8
 EBUILD opendkim-2.10.3-r30.ebuild 8151 BLAKE2B 2b5eb7b5cdf5d14e77068c525921a5b3b26916623b5debacd1f8b745407a06eb3fc6dabcfed03fde03b3286aa577eb64ef16fb81cc830f19bf0d39a0f1605272 SHA512 4458f69024e9cae2bcedda38706100a12ba94fb9b15cf818d08ea3afaa2091cb7d08e0a079ff92b330a2fef764a0c503c0780afc1800becc8feb33cfd0c30e7d
+EBUILD opendkim-2.10.3-r31.ebuild 8206 BLAKE2B 25746fe66292eac1f3a4bae74fe6a44647da334bb42cf791471ed23e6b98c8f2cf61c76ef699031788f6f57d1d26f2ad39f9912f3244fff7323af99b87184e5f SHA512 c669a48ac045a2d6ab816aa376d363cb6333a14c12ab27fad09be9dd86af8f6a6a4b752c8bed12fad217c381259be6fb1fdb050bf7edec9947b80d5ddcbe7737
 MISC metadata.xml 1882 BLAKE2B 9017d8cc6f84eef113a5059689487c680592d7c983480190c3a02937bc9980f254db93267c74c43ea249acd169fa8f21b967679168def6844c95116bb3d70d0b SHA512 3a192a0e4b918fd56bb98cededf5b48726e5c97a38b1b8b54bb6022a3619e355a187ebe0a831402e84bf09cbb3cc25bcf6ad986d8feeade5aa0d5b42134a555f
diff --git a/mail-filter/opendkim/files/opendkim-2.10.3-incompatible-pointer-types.patch b/mail-filter/opendkim/files/opendkim-2.10.3-incompatible-pointer-types.patch
new file mode 100644
index 000000000000..638d2b8b22bd
--- /dev/null
+++ b/mail-filter/opendkim/files/opendkim-2.10.3-incompatible-pointer-types.patch
@@ -0,0 +1,32 @@
+From 514ed1085d7399f7fe3bb53e6ae4693168dd0ab9 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Mon, 22 Apr 2024 07:37:40 -0400
+Subject: [PATCH] opendkim/opendkim.c: add two missing dkimf_dstring_get()
+ calls
+
+This fixes the build with CFLAGS="-Werror=incompatible-pointer-types",
+which some newer compilers are planning to make default.
+
+Gentoo-Bug: https://bugs.gentoo.org/919366
+---
+ opendkim/opendkim.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/opendkim/opendkim.c b/opendkim/opendkim.c
+index d4229e8f..93d05a1e 100644
+--- a/opendkim/opendkim.c
++++ b/opendkim/opendkim.c
+@@ -11656,8 +11656,8 @@ mlfi_eoh(SMFICTX *ctx)
+ 	    (status != 0 || user == NULL || domain == NULL ||
+ 	     user[0] == '\0' || domain[0] == '\0'))
+ 	{
+-		strlcpy(addr, conf->conf_defsender, sizeof addr);
+-		status = dkim_mail_parse(addr, &user, &domain);
++		strlcpy(dkimf_dstring_get(addr), conf->conf_defsender, sizeof addr);
++		status = dkim_mail_parse(dkimf_dstring_get(addr), &user, &domain);
+ 	}
+ #endif /* _FFR_DEFAULT_SENDER */
+ 
+-- 
+2.43.2
+
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r31.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r31.ebuild
new file mode 100644
index 000000000000..ce9242be5dfb
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.10.3-r31.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 lua5-2 )
+
+inherit autotools db-use systemd tmpfiles lua-single
+
+DESCRIPTION="A milter providing DKIM signing and verification"
+HOMEPAGE="http://opendkim.org/"
+SRC_URI="https://downloads.sourceforge.net/project/opendkim/${P}.tar.gz"
+
+# The GPL-2 is for the init script, bug 425960.
+LICENSE="BSD GPL-2 Sendmail-Open-Source"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="berkdb ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
+
+BDEPEND="acct-user/opendkim
+	test? ( ${LUA_DEPS} )"
+
+COMMON_DEPEND="mail-filter/libmilter:=
+	dev-libs/libbsd
+	sys-apps/grep
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	berkdb? ( >=sys-libs/db-3.2:* )
+	opendbx? ( >=dev-db/opendbx-1.4.0 )
+	lua? ( ${LUA_DEPS} )
+	ldap? ( net-nds/openldap:= )
+	lmdb? ( dev-db/lmdb:= )
+	memcached? ( dev-libs/libmemcached )
+	sasl? ( dev-libs/cyrus-sasl )
+	unbound? ( >=net-dns/unbound-1.4.1:= net-dns/dnssec-root )"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-user/opendkim
+	sys-process/psmisc
+	selinux? ( sec-policy/selinux-dkim )"
+
+REQUIRED_USE="sasl? ( ldap )
+	stats? ( opendbx )
+	querycache? ( berkdb )
+	lua? ( ${LUA_REQUIRED_USE} )
+	test? ( ${LUA_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-openrc.patch"
+	"${FILESDIR}/${P}-openssl-1.1.1.patch.r2"
+	"${FILESDIR}/${P}-lua-pkgconfig.patch"
+	"${FILESDIR}/${P}-lua-pkgconfig-pt2.patch"
+	"${FILESDIR}/${P}-define-P-macro-in-libvbr.patch"
+	"${FILESDIR}/${P}-fix-libmilter-search.patch"
+	"${FILESDIR}/${P}-snprintf-include.patch"
+	"${FILESDIR}/${P}-c-std.patch"
+	"${FILESDIR}/${P}-fix-ldap-sasl-pc.patch"
+	"${FILESDIR}/${P}-incompatible-pointer-types.patch"
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -e 's:/var/db/dkim:/var/lib/opendkim:g' \
+		-i opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
+		|| die
+	sed -e 's:dist_doc_DATA:dist_html_DATA:' \
+		-i libopendkim/docs/Makefile.am \
+		|| die
+
+	# The existing hard-coded path under /tmp is vulnerable to exploits
+	# since (for example) a user can create a symlink there to a file
+	# that portage will clobber. Reported upstream at,
+	#
+	#   https://github.com/trusteddomainproject/OpenDKIM/issues/113
+	#
+	sed -e "s:/tmp:${T}:" -i libopendkim/tests/t-testdata.h || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+	if use berkdb ; then
+		myconf+=( --with-db-incdir=$(db_includedir) )
+	fi
+	if use ldap; then
+		myconf+=( $(use_with sasl) )
+	fi
+
+	# We install the our configuration filed under e.g. /etc/opendkim,
+	# so the next line is necessary to point the daemon and all of its
+	# documentation to the right location by default.
+	myconf+=( --sysconfdir="${EPREFIX}/etc/${PN}" )
+
+	econf \
+		$(use_with berkdb db) \
+		$(use_with opendbx odbx) \
+		$(use_with lua) \
+		$(use_enable lua rbl) \
+		$(use_with ldap openldap) \
+		$(use_with lmdb) \
+		$(use_enable poll) \
+		$(use_enable querycache query_cache) \
+		$(use_enable static-libs static) \
+		$(use_enable stats) \
+		$(use_with memcached libmemcached) \
+		$(use_with unbound) \
+		"${myconf[@]}" \
+		--enable-filter \
+		--with-milter \
+		--enable-atps \
+		--enable-identity_header \
+		--enable-rate_limit \
+		--enable-resign \
+		--enable-replace_rules \
+		--enable-default_sender \
+		--enable-sender_macro \
+		--enable-vbr \
+		--disable-live-testing \
+		--with-test-socket="${T}/opendkim.sock"
+}
+
+src_compile() {
+	emake runstatedir=/run
+}
+
+src_test() {
+	# Needed for now due to the expected sequencing of the setup/cleanup
+	# tests, https://github.com/trusteddomainproject/OpenDKIM/issues/110
+	emake -j1 check
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+
+	dosbin stats/opendkim-reportstats
+
+	newinitd "${S}/contrib/OpenRC/opendkim.openrc" "${PN}"
+	newtmpfiles "${S}/contrib/systemd/opendkim.tmpfiles" "${PN}.conf"
+	systemd_newunit "contrib/systemd/opendkim.service" "${PN}.service"
+
+	dodir /etc/opendkim
+	keepdir /var/lib/opendkim
+
+	# The OpenDKIM data (particularly, your keys) should be read-only to
+	# the UserID that the daemon runs as.
+	fowners root:opendkim /var/lib/opendkim
+	fperms 750 /var/lib/opendkim
+
+	# Tweak the "simple" example configuration a bit before installing
+	# it unconditionally.
+	local cf="${T}/opendkim.conf"
+	# Some MTAs are known to break DKIM signatures with "simple"
+	# canonicalization [1], so we choose the "relaxed" policy
+	# over OpenDKIM's current default settings.
+	# [1] https://wordtothewise.com/2016/12/dkim-canonicalization-or-why-microsoft-breaks-your-mail/
+	sed -E -e 's:^(Canonicalization)[[:space:]]+.*:\1\trelaxed/relaxed:' \
+		"${S}/opendkim/opendkim.conf.simple" >"${cf}" || die
+	cat >>"${cf}" <<EOT || die
+
+# The UMask is really only used for the PID file (root:root) and the
+# local UNIX socket, if you're using one. It should be 0117 for the
+# socket.
+UMask			0117
+UserID			opendkim
+
+# For use with unbound
+#TrustAnchorFile	/etc/dnssec/root-anchors.txt
+EOT
+	insinto /etc/opendkim
+	doins "${cf}"
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+	if [[ -z ${REPLACING_VERSION} ]]; then
+		elog "If you want to sign your mail messages and need some help"
+		elog "please run:"
+		elog "	emerge --config ${CATEGORY}/${PN}"
+		elog "It will help you create your key and give you hints on how"
+		elog "to configure your DNS and MTA."
+
+		elog "If you are using a local (UNIX) socket, then you will"
+		elog "need to make sure that your MTA has read/write access"
+		elog "to the socket file. This is best accomplished by creating"
+		elog "a completely-new group with only your MTA user and the"
+		elog "\"opendkim\" user in it. Step-by-step instructions can be"
+		elog "found on our Wiki, at https://wiki.gentoo.org/wiki/OpenDKIM ."
+	else
+		ewarn "The user account for the OpenDKIM daemon has changed"
+		ewarn "from \"milter\" to \"opendkim\" to prevent unrelated services"
+		ewarn "from being able to read your private keys. You should"
+		ewarn "adjust your existing configuration to use the \"opendkim\""
+		ewarn "user and group, and change the permissions on"
+		ewarn "${ROOT}/var/lib/opendkim to root:opendkim with mode 0750."
+		ewarn "The owner and group of the files within that directory"
+		ewarn "will likely need to be adjusted as well."
+	fi
+}
+
+pkg_config() {
+	local selector keysize pubkey
+
+	read -p "Enter the selector name (default ${HOSTNAME}): " selector
+	[[ -n "${selector}" ]] || selector="${HOSTNAME}"
+	if [[ -z "${selector}" ]]; then
+		eerror "Oddly enough, you don't have a HOSTNAME."
+		return 1
+	fi
+	if [[ -f "${ROOT}/var/lib/opendkim/${selector}.private" ]]; then
+		ewarn "The private key for this selector already exists."
+	else
+		keysize=1024
+		# Generate the private and public keys. Note that opendkim-genkeys
+		# sets umask=077 on its own to keep these safe. However, we want
+		# them to be readable (only!) to the opendkim user, and we manage
+		# that by changing their groups and making everything group-readable.
+		opendkim-genkey -b ${keysize} -D "${ROOT}/var/lib/opendkim/" \
+			-s "${selector}" -d '(your domain)' && \
+			chgrp --no-dereference opendkim \
+				"${ROOT}/var/lib/opendkim/${selector}".{private,txt} || \
+				{ eerror "Failed to create private and public keys."; return 1; }
+		chmod g+r "${ROOT}/var/lib/opendkim/${selector}".{private,txt}
+	fi
+
+	# opendkim selector configuration
+	echo
+	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
+	einfo "  Keyfile /var/lib/opendkim/${selector}.private"
+	einfo "  Selector ${selector}"
+
+	# MTA configuration
+	echo
+	einfo "If you are using Postfix, add following lines to your main.cf:"
+	einfo "  smtpd_milters	   = unix:/run/opendkim/opendkim.sock"
+	einfo "  non_smtpd_milters = unix:/run/opendkim/opendkim.sock"
+	einfo "  and read http://www.postfix.org/MILTER_README.html"
+
+	# DNS configuration
+	einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
+	cat "${ROOT}/var/lib/opendkim/${selector}.txt"
+	einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:"
+	einfo "  http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text"
+}