[gentoo-commits] repo/gentoo:master commit in: net-mail/mailbase/, net-mail/mailbase/files/

[Mike Frysinger]

commit:     882f0d776b44270540a4477c0622b72f9cf261a9
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 15 15:24:45 2021 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 15 15:32:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=882f0d77

net-mail/mailbase: document mailcap better

Also fix quoting of %s, and add %{charset} support to html.

Clean up the mailcap man page to generalize and remove mention of the
"metamail" package since this file is not specific to it.

Closes: https://bugs.gentoo.org/521134
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 net-mail/mailbase/files/mailcap-r2    | 36 ++++++++++++++++++++++
 net-mail/mailbase/files/mailcap.5     | 58 +++++++++++++++++------------------
 net-mail/mailbase/mailbase-1.7.ebuild | 46 +++++++++++++++++++++++++++
 3 files changed, 111 insertions(+), 29 deletions(-)

diff --git a/net-mail/mailbase/files/mailcap-r2 b/net-mail/mailbase/files/mailcap-r2
new file mode 100644
index 00000000000..5ecd40a4201
--- /dev/null
+++ b/net-mail/mailbase/files/mailcap-r2
@@ -0,0 +1,36 @@
+# Database binding MIME types to programs that can process them.
+# This file is generally used by mail clients to view attachments.
+#
+# Users should add their own rules to their ~/.mailcap file.  That file will be
+# processed first before falling back to this one.
+#
+# For more information, see the mailcap(5) man page.
+
+# NB: Do not quote %s.  Clients will handle expanding it with proper quoting,
+# so adding quotes ourselves just confuses things.
+
+application/pdf; xdg-open %s; needsterminal
+application/postscript; xdg-open %s; needsterminal
+application/x-info; info --subnodes -o /dev/stdout -f %s 2>/dev/null; copiousoutput; description=GNU Info document
+application/x-gtar; tar tvzf -; print=tar tvzf - | print text/plain:-; copiousoutput
+application/x-tar; tar tvf -; print=tar tvf - | print text/plain:-; copiousoutput
+application/x-troff-man; nroff -mandoc -Tutf8; copiousoutput; print=nroff -mandoc -Tutf8 | print text/plain:-
+# It'd be nice to limit this to compressed formats (e.g. x-*), but the file
+# format doesn't support that, and less has good fallbacks already.
+application/*; less %s; copiousoutput; needsterminal
+
+audio/*; xdg-open %s; needsterminal
+image/*; xdg-open %s; needsterminal
+
+text/html; lynx -dump -assume_charset=%{charset} %s; copiousoutput; description=HTML Text; nametemplate=%s.html
+text/troff; man -l %s; needsterminal; description=Man page
+text/*; less %s; needsterminal
+text/*; gview %s; edit=gvim -f %s; compose=gvim -f %s; test=test "$DISPLAY" != ""
+text/*; view %s; edit=vim %s; compose=vim %s; needsterminal
+text/*; more %s; needsterminal
+
+# NB: This is an extension in the hope that it might be useful to some programs.
+# RFC1524 does not support * for the type (the string before the /), only for
+# the subtype (the string after the /).
+*/*; less %s; needsterminal
+*/*; false; print=lpr %s

diff --git a/net-mail/mailbase/files/mailcap.5 b/net-mail/mailbase/files/mailcap.5
index eec92103f88..438c6e2fa6d 100644
--- a/net-mail/mailbase/files/mailcap.5
+++ b/net-mail/mailbase/files/mailcap.5
@@ -1,17 +1,15 @@
 .\" Hey, Emacs!  This is an -*- nroff -*- source file.
 .TH MAILCAP 5 "Release 2" "Bellcore Prototype"
 .SH NAME
-mailcap - metamail capabilities file
+mailcap - mail capabilities file
 .SH DESCRIPTION
 The
 .I mailcap
-file is read by the 
-.I metamail
-program to determine how to display non-text at the local site.
+file is read by e-mail clients to determine how to display non-text at the local site.
 
 The syntax of a mailcap file is quite simple, at least compared to termcap files.  Any line that starts with "#" is a comment.  Blank lines are ignored.  Otherwise, each line defines a single mailcap entry for a single content type.  Long lines may be continued by ending them with a backslash character, \\.
 
-Each individual mailcap entry consists of a content-type specification, a command to execute, and (possibly) a set of optional "flag" values.  For example, a very simple mailcap entry (which is actually a built-in default behavior for metamail) would look like this:
+Each individual mailcap entry consists of a content-type specification, a command to execute, and (possibly) a set of optional "flag" values.  For example, a very simple mailcap entry would look like this:
 
 text/plain; cat %s
 
@@ -21,55 +19,57 @@ text/plain; cat %s; copiousoutput
 
 can be used to indicate that the output of the 'cat' command may be voluminous, requiring either a scrolling window, a pager, or some other appropriate coping mechanism.
 
-The "type" field (text/plain, in the above example) is simply any legal content type name, as defined by informational RFC 1524.  In practice, this is almost any string.  It is the string that will be matched against the "Content\-type" header (or the value passed in with \-c) to decide if this is the mailcap entry that matches the current message.  Additionally, the type field may specify a subtype (e.g. "text/ISO\-8859\-1") or a wildcard to match all subtypes (e.g. "image/*").
+The "type" field (text/plain, in the above example) is simply any legal content type name, as defined by informational RFC 1524.  In practice, this is almost any string.  It is the string that will be matched against the "Content\-type" header (or the value passed in with \-c) to decide if this is the mailcap entry that matches the current message.  Additionally, the type field may specify a subtype (e.g. "text/ISO\-8859\-1") or a wildcard to match all subtypes (e.g. "image/*").  Note that wildcards may only be specified in the subtype (e.g. "*" or "*/*" do not work), and as the entire subtype (e.g. "application/x-*" does not work).
 
-The "command" field is any UNIX command ("cat %s" in the above example), and is used to specify the interpreter for the given type of message.  It will be passed to the shell via the system(3) facility.  Semicolons and backslashes within the command must be quoted with backslashes.  If the command contains "%s", those two characters will be replaced by the name of a file that contains the body of the message. If it contains "%t", those two characters will be replaced by the content-type field, including the subtype, if any.  (That is, if the content-type was "image/pbm; opt1=something-else", then "%t" would be replaced by "image/pbm".)   If the command field contains  "%{" followed by a parameter name and a closing "}", then all those characters will be replaced by the value of the named parameter, if any, from the Content-type header.   Thus, in the previous example, "%{opt1}" will be replaced by "something-else".  Finally, if the command contains "\\%", those two characters will b
 e replaced by a single % character.  (In fact, the backslash can be used to quote any character, including itself.)
+The "command" field is any UNIX command ("cat %s" in the above example), and is used to specify the interpreter for the given type of message.  It will be passed to the shell via the
+.BR system (3)
+facility.  Semicolons and backslashes within the command must be quoted with backslashes.  If the command contains "%s", those two characters will be replaced by the name of a file that contains the body of the message. If it contains "%t", those two characters will be replaced by the content-type field, including the subtype, if any.  (That is, if the content-type was "image/pbm; opt1=something-else", then "%t" would be replaced by "image/pbm".)   If the command field contains  "%{" followed by a parameter name and a closing "}", then all those characters will be replaced by the value of the named parameter, if any, from the Content-type header.   Thus, in the previous example, "%{opt1}" will be replaced by "something-else".  Finally, if the command contains "\\%", those two characters will be replaced by a single % character.  (In fact, the backslash can be used to quote any character, including itself.)
 
-If no "%s" appears in the command field, then instead of placing the message body in a temporary file, metamail will pass the body to the command on the standard input.  This is helpful in saving /tmp file space, but can be problematic for window-oriented applications under some window systems such as MGR.
+If no "%s" appears in the command field, then instead of placing the message body in a temporary file, clients will pass the body to the command on the standard input.  This is helpful in saving /tmp file space, but can be problematic for window-oriented applications under some window systems such as MGR.
 
-Two special codes can appear in the viewing command for objects of type multipart (any subtype).  These are "%n" and "%F".  %n will be replaced by the number of parts within the multipart object.  %F will be replaced by a series of arguments, two for each part, giving first the content-type and then the name of the temporary file where the decoded part has been stored.  In addition, for each file created by %F, a second file is created, with the same name followed by "H", which contains the header information for that body part.  This will not be needed by most multipart handlers, but it is there if you ever need it.  
+Two special codes can appear in the viewing command for objects of type multipart (any subtype).  These are "%n" and "%F".  %n will be replaced by the number of parts within the multipart object.  %F will be replaced by a series of arguments, two for each part, giving first the content-type and then the name of the temporary file where the decoded part has been stored.  In addition, for each file created by %F, a second file is created, with the same name followed by "H", which contains the header information for that body part.  This will not be needed by most multipart handlers, but it is there if you ever need it.
 
 The "notes=xxx" field is an uninterpreted string that is used to specify the name of the person who installed this entry in the mailcap file.  (The "xxx" may be replaced by any text string.)
 
 The "test=xxx" field is a command that is executed to determine whether or not the mailcap line actually applies.  That is, if the content-type field matches the content-type on the message, but a "test=" field is present, then the test must succeed before the mailcap line is considered to "match" the message being viewed.  The command may be any UNIX command, using the same syntax and the same %-escapes as for the viewing command, as described above.  A command is considered to succeed if it exits with a zero exit status, and to fail otherwise.
 
-The "print=xxx" field is a command that is executed to print the data instead of display it interactively.  This behavior is usually a consequence of invoking metamail with the "\-h" switch.
+The "print=xxx" field is a command that is executed to print the data instead of display it interactively.
 
-The "textualnewlines" field can be used in the rather obscure case where metamail's default rules for treating newlines in base64-encoded data are unsatisfactory.  By default, metamail will translate CRLF to the local newline character in decoded base64 output if the content-type is "text" (any subtype), but will not do so otherwise.  A mailcap entry with a field of "textualnewlines=1" will force such translation for the specified content-type, while "textualnewlines=0" will guarantee that the translation does not take place even for textual content-types.
+The "textualnewlines" field can be used in the rather obscure case where default rules for treating newlines in base64-encoded data are unsatisfactory.  By default, clients will translate CRLF to the local newline character in decoded base64 output if the content-type is "text" (any subtype), but will not do so otherwise.  A mailcap entry with a field of "textualnewlines=1" will force such translation for the specified content-type, while "textualnewlines=0" will guarantee that the translation does not take place even for textual content-types.
 
-The "compose" field may be used to specify a program that can be used to compose a new body or body part in the given format.  Its intended use is to support mail composing agents that support the composition of multiple types of mail using external composing agents. As with the view-command, the compose command will be executed after replacing certain escape sequences starting with "%".  In particular, %s should be replaced by the name of a file to which the composed data is to be written by the specified composing program, thus allowing the calling program (e.g. metamail) to tell the called program where to store the composed data.  If %s does not appear, then the composed data will be assumed to be written by the composing programs to standard output.   The result of the composing program may be data that is NOT yet suitable for mail transport -- that is, a Content-Transfer-Encoding may still need to be applied to the data.
+The "compose" field may be used to specify a program that can be used to compose a new body or body part in the given format.  Its intended use is to support mail composing agents that support the composition of multiple types of mail using external composing agents. As with the view-command, the compose command will be executed after replacing certain escape sequences starting with "%".  In particular, %s should be replaced by the name of a file to which the composed data is to be written by the specified composing program, thus allowing the calling program to tell the called program where to store the composed data.  If %s does not appear, then the composed data will be assumed to be written by the composing programs to standard output.   The result of the composing program may be data that is NOT yet suitable for mail transport -- that is, a Content-Transfer-Encoding may still need to be applied to the data.
 
 The "composetyped" field is similar to the "compose" field, but is to be used when the composing program needs to specify the Content-type header field to be applied to the composed data.  The "compose" field is simpler, and is preferred for use with existing (non-mail-oriented) programs for composing data in a given format.  The "composetyped" field is necessary when the Content-type information must include auxiliary parameters, and the composition program must then know enough about mail formats to produce output that includes the mail type information, and to apply any necessary Content-Transfer-Encoding.   Conceptually, "compose" specifies a program that simply outputs the specified type of data in its raw form, while "composetyped" specifies a program that outputs the data as a MIME object, with all necessary Content-* headers already in place.
 
 .TP 8
 .B needsterminal
-If this flag is given, the named interpreter needs to interact with the user on a terminal.  In some environments (e.g. a window-oriented mail reader under X11) this will require the creation of a new terminal emulation window, while in most environments it will not.  If the mailcap entry specifies "needsterminal" and metamail is not running on a terminal (as determined by isatty(3), the \-x option, and the MM_NOTTTY environment variable) then metamail will try to run the command in a new terminal emulation window.  Currently, metamail knows how to create new windows under the X11, SunTools, and WM window systems.
+If this flag is given, the named interpreter needs to interact with the user on a terminal.  In some environments (e.g. a window-oriented mail reader under X11) this will require the creation of a new terminal emulation window, while in most environments it will not.  If the mailcap entry specifies "needsterminal" and the mail client is not running on a terminal (as determined by
+.BR isatty (3),
+the \-x option, and the MM_NOTTTY environment variable) then the client will try to run the command in a new terminal emulation window.
 .TP 8
 .B copiousoutput
-This flag should be given whenever the interpreter is capable of producing more than a few lines of output on stdout, and does no interaction with the user.  If the mailcap entry specifies copiousoutput, and pagination has been requested via the "\-p" command, then the output of the command being executed will be piped through a pagination program ("more" by default, but this can be overridden with the METAMAIL_PAGER environment variable).
-.SH BUILT-IN CONTENT-TYPE SUPPORT
-The metamail program has built-in support for a few key content-types.  In particular, it supports the text type, the multipart and multipart/alternative type, and the message/rfc822 types.  This support is incomplete for many subtypes -- for example, it only supports US-ASCII text in general.  This kind of built-in support can be OVERRIDDEN by an entry in any mailcap file on the user's search path.  Metamail also has rudimentary built-in support for types that are totally unrecognized -- i.e. for which no mailcap entry or built-in handler exists.  For such unrecognized types, metamail will write a file with a "clean" copy of the data -- i.e. a copy in which all mail headers have been removed, and in which any 7-bit transport encoding has been decoded.
+This flag should be given whenever the interpreter is capable of producing more than a few lines of output on stdout, and does no interaction with the user.  If the mailcap entry specifies copiousoutput, and pagination has been requested via the "\-p" command, then the output of the command being executed will be piped through a pagination program ("more" by default, but this can be overridden with the PAGER environment variable).
 .SH FILES
 $HOME/.mailcap:/etc/mailcap:/usr/share/etc/mailcap:/usr/local/etc/mailcap -- default path for mailcap files.
 .SH SEE ALSO
-.BR run-mailcap "(1)",
-.BR mailcap.order "(5)",
-.BR update-mime "(8)"
+.BR run-mailcap (1),
+.BR mailcap.order (5),
+.BR update-mime (8)
 
-RFC 1524 (<http://tools.ietf.org/html/rfc1524>)
+RFC 1524 (<https://tools.ietf.org/html/rfc1524>)
 
 .SH COPYRIGHT
 Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
 
-Permission to use, copy, modify, and distribute this material 
-for any purpose and without fee is hereby granted, provided 
-that the above copyright notice and this permission notice 
-appear in all copies, and that the name of Bellcore not be 
-used in advertising or publicity pertaining to this 
-material without the specific, prior written permission 
-of an authorized representative of Bellcore.  BELLCORE 
-MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
+Permission to use, copy, modify, and distribute this material
+for any purpose and without fee is hereby granted, provided
+that the above copyright notice and this permission notice
+appear in all copies, and that the name of Bellcore not be
+used in advertising or publicity pertaining to this
+material without the specific, prior written permission
+of an authorized representative of Bellcore.  BELLCORE
+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
 WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
 .SH AUTHOR
 Nathaniel S. Borenstein

diff --git a/net-mail/mailbase/mailbase-1.7.ebuild b/net-mail/mailbase/mailbase-1.7.ebuild
new file mode 100644
index 00000000000..3dd86a87fa2
--- /dev/null
+++ b/net-mail/mailbase/mailbase-1.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit pam
+
+DESCRIPTION="MTA layout package"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="pam"
+
+RDEPEND="
+	acct-group/mail
+	acct-user/mail
+	acct-user/postmaster
+	pam? ( sys-libs/pam )
+	!<net-mail/metamail-2.7.53.3-r2"
+
+S=${WORKDIR}
+
+src_install() {
+	dodir /etc/mail
+	insinto /etc/mail
+	doins "${FILESDIR}"/aliases
+	insinto /etc
+	newins "${FILESDIR}"/mailcap-r2 mailcap
+	doman "${FILESDIR}"/mailcap.5
+
+	dosym spool/mail /var/mail
+
+	if use pam ; then
+		newpamd "${FILESDIR}"/common-pamd-include pop
+		newpamd "${FILESDIR}"/common-pamd-include imap
+		local p
+		for p in pop3 pop3s pops ; do
+			dosym pop /etc/pam.d/${p}
+		done
+		for p in imap4 imap4s imaps ; do
+			dosym imap /etc/pam.d/${p}
+		done
+	fi
+}