commit: 701a0b6193e1b78b4d7859511ad310755f6c9d37 Author: Cristian Othón Martínez Vera <cfuga <AT> cfuga <DOT> mx> AuthorDate: Sun Aug 17 02:42:14 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Sep 6 15:26:28 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=701a0b61
mail-filter/libmilter: add systemd socket activation support Closes: https://bugs.gentoo.org/511428 Signed-off-by: Cristian Othón Martínez Vera <cfuga <AT> cfuga.mx> Part-of: https://github.com/gentoo/gentoo/pull/43481 Signed-off-by: Sam James <sam <AT> gentoo.org> ...milter-1.0.2_p4-systemd-socket-activation.patch | 76 ++++++++++++++++++++++ mail-filter/libmilter/libmilter-1.0.2_p4-r1.ebuild | 1 + 2 files changed, 77 insertions(+) diff --git a/mail-filter/libmilter/files/libmilter-1.0.2_p4-systemd-socket-activation.patch b/mail-filter/libmilter/files/libmilter-1.0.2_p4-systemd-socket-activation.patch new file mode 100644 index 000000000000..0014cb4a66fd --- /dev/null +++ b/mail-filter/libmilter/files/libmilter-1.0.2_p4-systemd-socket-activation.patch @@ -0,0 +1,76 @@ +Description: systemd-like socket activation support for libmilter +Author: Mikhail Gusarov <[email protected]> +--- a/libmilter/docs/smfi_setconn.html ++++ b/libmilter/docs/smfi_setconn.html +@@ -44,6 +44,7 @@ Set the socket through which this filter + <LI><CODE>{unix|local}:/path/to/file</CODE> -- A named pipe. + <LI><CODE>inet:port@{hostname|ip-address}</CODE> -- An IPV4 socket. + <LI><CODE>inet6:port@{hostname|ip-address}</CODE> -- An IPV6 socket. ++ <LI><CODE>fd:number</CODE> -- Pre-opened file descriptor. + </UL> + </TD></TR> + </TABLE> +--- a/libmilter/listener.c ++++ b/libmilter/listener.c +@@ -197,6 +197,11 @@ mi_milteropen(conn, backlog, rmsocket, n + L_socksize = sizeof addr.sin6; + } + #endif /* NETINET6 */ ++ else if (strcasecmp(p, "fd") == 0) ++ { ++ addr.sa.sa_family = AF_UNSPEC; ++ L_socksize = sizeof (_SOCK_ADDR); ++ } + else + { + smi_log(SMI_LOG_ERR, "%s: unknown socket type %s", +@@ -443,7 +448,21 @@ mi_milteropen(conn, backlog, rmsocket, n + } + #endif /* NETINET || NETINET6 */ + +- sock = socket(addr.sa.sa_family, SOCK_STREAM, 0); ++ if (addr.sa.sa_family == AF_UNSPEC) ++ { ++ char *end; ++ sock = strtol(colon, &end, 10); ++ if (*end != '\0' || sock < 0) ++ { ++ smi_log(SMI_LOG_ERR, "%s: expected positive integer as fd, got %s", name, colon); ++ return INVALID_SOCKET; ++ } ++ } ++ else ++ { ++ sock = socket(addr.sa.sa_family, SOCK_STREAM, 0); ++ } ++ + if (!ValidSocket(sock)) + { + smi_log(SMI_LOG_ERR, +@@ -466,6 +485,7 @@ mi_milteropen(conn, backlog, rmsocket, n + #if NETUNIX + addr.sa.sa_family != AF_UNIX && + #endif ++ addr.sa.sa_family != AF_UNSPEC && + setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *) &sockopt, + sizeof(sockopt)) == -1) + { +@@ -511,7 +531,8 @@ mi_milteropen(conn, backlog, rmsocket, n + } + #endif /* NETUNIX */ + +- if (bind(sock, &addr.sa, L_socksize) < 0) ++ if (addr.sa.sa_family != AF_UNSPEC && ++ bind(sock, &addr.sa, L_socksize) < 0) + { + smi_log(SMI_LOG_ERR, + "%s: Unable to bind to port %s: %s", +@@ -818,7 +839,7 @@ mi_listener(conn, dbg, smfi, timeout, ba + #ifdef BSD4_4_SOCKADDR + cliaddr.sa.sa_len == 0 || + #endif +- cliaddr.sa.sa_family != L_family)) ++ (L_family != AF_UNSPEC && cliaddr.sa.sa_family != L_family))) + { + (void) closesocket(connfd); + connfd = INVALID_SOCKET; diff --git a/mail-filter/libmilter/libmilter-1.0.2_p4-r1.ebuild b/mail-filter/libmilter/libmilter-1.0.2_p4-r1.ebuild index 69a357a48fbf..a39c4d98a2bd 100644 --- a/mail-filter/libmilter/libmilter-1.0.2_p4-r1.ebuild +++ b/mail-filter/libmilter/libmilter-1.0.2_p4-r1.ebuild @@ -42,6 +42,7 @@ PATCHES=( "${FILESDIR}"/sendmail-8.16.1-build-system.patch "${FILESDIR}"/${PN}-sharedlib.patch "${FILESDIR}"/${PN}-1.0.2_p3-c23-bool.patch + "${FILESDIR}"/${PN}-1.0.2_p4-systemd-socket-activation.patch ) src_prepare() {
