gentoo auto-resync : 26:08:2023 - 21:58:11

4 files changed, 107 insertions, 5 deletions

diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index 2c741b7f33d3..1081173db8d7 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -1,11 +1,14 @@
 AUX opensmtpd-6.8.0_p2-ar.patch 1071 BLAKE2B ee4ff0e43e12ef15103400306a00640f8ea5624f9deb8143bedd0f9c17e16ba4c1e606649af587ec4c27f504fcc2141f09101ff41fe6c905b7fd473ae9d586f8 SHA512 f8a3622ecf298a3afe6ba7efe7a26492b389224c4b02b44fca1801cd8915b532bbbd69781749b44f6fabf28966653827e465bd214c61a13fe39096d55087e6c0
 AUX opensmtpd-6.8.0_p2-implicit-function-declaration.patch 8704 BLAKE2B 449e089ab5004ddf3f130b0e1da7b5b3c6778b3a9304ed7d1cab498a331aeeec6f1e5d33b86581938945b072d93bd3dfa976eb4f0fec2747811b933851d70767 SHA512 08e3386b0ed06ff71581fd973eef346369d7888da04eea24b6d5cd2d1b8291f2d8e67cfd9b0b7a0d973692e920bb283d78a65bd687a24dd90397ef0b8d385463
 AUX opensmtpd-6.8.0_p2-strict-prototypes.patch 1849 BLAKE2B ea25405b67e9cba989eb7f3ccf1c4658e942d4ca17f0645d83eef69456f769cfd1ea9194fbaa28010aac4037c7bb5008a29aa2e29f4337bca3a56c68de0c2ff4 SHA512 5539a340eb68f1dc68df0d762828e2624838fb1bfd8c34ddda484fef67ee70f938f74af2098a0b8aed63ffdf6c914712416de1e0a2c711195b70aeee7b960e5d
+AUX smtpd-r1.service 161 BLAKE2B a76a0ef782b55fe831300d231cf591d80977f0e0998a8e7c6d9d41ec296bac212e231e6754ceb76ca75fa20324d58e5af705a3d513d3998d3b371dd4f47bf374 SHA512 20a0ff7d10f96cf43e8e51866230a47ffc0748e4373227c78e3b7bdfc266570de25b87d4a48fce5ea3d257b24daf6d66b3dc23a3543af774f368a2562ca56bd1
 AUX smtpd.initd 231 BLAKE2B a4991c9226daa2289cb20238dcee0dad8b4ff83474327649b61c7394e46fc929c7792b885f58bf76769567ad2058134b97e5019b508e2edec108a4bafb9cc2b4 SHA512 e4c8386bd7e8d8171172aa181305a55ca67cba6d4c82d77d8846e1bd3301dd9d118bb39dad6c144677f050194de813e4d83e06ea6dd591d4f07da8c4a1edde37
 AUX smtpd.pam 147 BLAKE2B 1706fe27cf53621428f563af146d1197dfc59133dda79fe08141ec4ca9b240880ef63da3f27e4fb8b653af4ae413ca42cdeb343e1f4e737b7e6258c0d338223d SHA512 d0574cc732138fefffe3ca78da2d689f0849de70dfd65204c99a98a58b2165eb46b23a1c32b356ea2eaf8abd56a4929c7419b29cec1d6b284e344680bab24086
 AUX smtpd.service 138 BLAKE2B c76db1847110622621701cdf1fdb764d26bf28b86a25adf9ae8e0ba15838a2a9ddc677f54f5d5fe191591b2bd5c7f20067fc00b6679f448e25371e27f231589d SHA512 b70b173ac275b871d78bac0e55b2e0c8d8a6538c7f2c4dc86fe67fb37a1ee942e0442353b338b286759618299f51b144396251db13f82c9afa035dcaae11a258
 AUX smtpd.socket 114 BLAKE2B e684727be39592dce128cc0ab02f8e5bc4510591dcb2c170b49c120e84319b53e10eae275bc6a26ed8c9d51e53a21e41c551f18afd2441602cefc4e93344d50c SHA512 fbbccb4aab80a4a4612609e590965940642321119a65359cf2490530f81d55706a0105309d321a624d40348f12776724d2cf6b8bf29ea24391e60ef8b8bc8ba2
 DIST opensmtpd-6.8.0p2.tar.gz 860189 BLAKE2B 603e8516860eddefb1694ea4cb5631cec2df2a19fa3193b25388caf73c41e82d44e57847fc95b5187488cae629542e72ff2d5a17badc15cef1647bdb173d7827 SHA512 48f152b75575146fdd09bdf47123041ea62fefb6e5de33a69826bf91a2126a918f8db1caffadb2f142a1a21de8126d492de88cb65bdf169e61c0b22d3e78d290
+DIST opensmtpd-7.3.0p1.tar.gz 849026 BLAKE2B bdb83468df12af2a2b39664a4408acfaf0cd81551074fb3823f7eb1b0d30ce79d812876fcea2ff940ddaac8b1a96700e1f4d2c275beab106fed010b733cff5c2 SHA512 2106de43e4b7435e49df759570ec758672ca8271dc451e30a261c250b41908b6ffe28e571a5f52e2ac14f59af132d1df45b272f8fcafeab04fcfb6bd5db970bb
 EBUILD opensmtpd-6.8.0_p2-r2.ebuild 1994 BLAKE2B 07e446b197182c4701e64528daaf0a61e5411eadba9fec22c43b636c97a9ce715e0ab66777f7f492bc12aab57b8b8495f3646f3450de0301d9953d776f1002eb SHA512 18cbc2e958088f35c56be34eb24b68f720097462357363451b03b53e6efc19ce44e36a2ad0964f5c9f4b17286c5d9a74e45c63e8aac40ddf93c60c21705eca23
 EBUILD opensmtpd-6.8.0_p2-r3.ebuild 2323 BLAKE2B 7b6c280a245450a0971e7c6a50c333c44caa5c8bd2e43205c9ea668a11286ce69d7d950c92d9c6c6c576480364a359c55dc06748f928216b90c578b22889d948 SHA512 4081fb57f9154e754fa666464958187e4fbd10bff9dde6d7c59c1f05302c4d4db771cfda6bddd8b7da0366435b7b45f3fa63d8fd6d1d51d04a0d99fb9470525b
-MISC metadata.xml 694 BLAKE2B b72e021afca63807b8139e3e69f8ec8acbc37f2e0abaae0bef0a5afc5fa1b7978dc7e64ecb8aae85251c66d697ad7ef8df214884e60ceb9ed5519a64d551e6e2 SHA512 d5b86e34dcdf22a313869dcae3a1e7a05a05a9e67e701642281e4e174974c3edb7007dc5ac45f666c8bdf0d35014f6f58e72eed527e8dab2c80aa87c09cc3d18
+EBUILD opensmtpd-7.3.0_p1.ebuild 2186 BLAKE2B ee296c7f760b4740c43c2fe55957f174a0861cd5199d6fe50715a2d04d22ce2c710914742ac66a388577478d9eea05184404562792028dc7a415c33880f67b6c SHA512 11d6d6e353d9102a16551515df85ca35506859735b32612f0a1b3b2ce499daaf3143c9593f954b2eaf040e0535cbc9e012d86aa3b70667f409ebca5eb12f1b60
+MISC metadata.xml 611 BLAKE2B e258a3369a4edbc89459a79fd1f0fe4ed041674b9755c89fe4caf626d4d6bdc1576c5ec87d934f1d4b7c984383fad545d3515514f1c67f63ea5f9a663fe9ec3e SHA512 98eb88e71040b555e67d51a3ac46b66dfefd1b11d5206d687b3aab7d65143ca3e285446da419bde37657780cda238cc6162927b941811ef15b77cdfa8f16b832
diff --git a/mail-mta/opensmtpd/files/smtpd-r1.service b/mail-mta/opensmtpd/files/smtpd-r1.service
new file mode 100644
index 000000000000..fccd88f31472
--- /dev/null
+++ b/mail-mta/opensmtpd/files/smtpd-r1.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=OpenSMTPD
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/smtpd
+PIDFile=/run/smtpd.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/mail-mta/opensmtpd/metadata.xml b/mail-mta/opensmtpd/metadata.xml
index 12887d412204..d784c6148ce9 100644
--- a/mail-mta/opensmtpd/metadata.xml
+++ b/mail-mta/opensmtpd/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		OpenSMTPD is an implementation of the server-side SMTP protocol as defined by RFC 5321, with some additional standard extensions. It allows ordinary machines to exchange e-mails with other systems speaking the SMTP protocol.
 	</longdescription>
-	<maintainer type="person">
-		<email>zx2c4@gentoo.org</email>
-		<name>Jason A. Donenfeld</name>
-	</maintainer>
 	<use>
 		<flag name="mta">Enable this to install as system-wide MTA</flag>
 	</use>
diff --git a/mail-mta/opensmtpd/opensmtpd-7.3.0_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-7.3.0_p1.ebuild
new file mode 100644
index 000000000000..25cf7cb2f25c
--- /dev/null
+++ b/mail-mta/opensmtpd/opensmtpd-7.3.0_p1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools pam systemd
+
+DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
+HOMEPAGE="https://www.opensmtpd.org"
+SRC_URI="https://www.opensmtpd.org/archives/${P/_}.tar.gz"
+S="${WORKDIR}/${P/_}"
+
+LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="berkdb +mta pam split-usr"
+
+RDEPEND="
+	acct-user/smtpd
+	acct-user/smtpq
+	app-misc/ca-certificates
+	dev-libs/libbsd
+	dev-libs/libevent:=
+	dev-libs/openssl:=
+	net-libs/libasr
+	net-mail/mailbase
+	sys-libs/zlib
+	virtual/libcrypt:=
+	berkdb? ( sys-libs/db:= )
+	elibc_musl? ( sys-libs/fts-standalone )
+	pam? ( sys-libs/pam )
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/sendmail
+	!mail-mta/ssmtp[mta]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-alternatives/yacc"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# LibreSSL link check
+	SSLeay_add_all_algorithms
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/smtpd \
+		--with-path-mbox="${EPREFIX}"/var/spool/mail \
+		--with-path-empty="${EPREFIX}"/var/empty \
+		--with-path-socket=/run \
+		--with-path-CAfile="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
+		--with-user-smtpd=smtpd \
+		--with-user-queue=smtpq \
+		--with-group-queue=smtpq \
+		--with-libevent="${EPREFIX}"/usr/$(get_libdir) \
+		--with-libssl="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_with pam auth-pam) \
+		$(use_with berkdb table-db)
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/smtpd.initd smtpd
+	systemd_newunit "${FILESDIR}"/smtpd-r1.service smtpd.service
+
+	use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd
+
+	dosym smtpctl /usr/sbin/makemap
+	dosym smtpctl /usr/sbin/newaliases
+
+	if use mta ; then
+		dodir /usr/sbin
+		dosym smtpctl /usr/sbin/sendmail
+		# on USE="-split-usr" system sbin and bin are merged
+		# so symlink made above will collide with one below
+		use split-usr && dosym ../sbin/smtpctl /usr/bin/sendmail
+		dodir /usr/$(get_libdir)
+		dosym -r /usr/sbin/smtpctl /usr/$(get_libdir)/sendmail
+	fi
+}