From ed94994ac1bdf0139b135e606244757d5ad0ef8d Mon Sep 17 00:00:00 2001 From: "Konstantin A. Lepikhov" Date: Tue, 7 Sep 2021 11:05:13 +0200 Subject: [PATCH] Apply -alt-makefiles --- courier-imap/Makefile.am | 14 +++++------ courier-imap/libs/imap/courierpop3d.8.in | 26 +++++++++---------- courier-imap/libs/imap/courierpop3d.html.in | 28 ++++++++++----------- 3 files changed, 33 insertions(+), 35 deletions(-) diff --git a/courier-imap/Makefile.am b/courier-imap/Makefile.am index f8e7ad3..a10867d 100644 --- a/courier-imap/Makefile.am +++ b/courier-imap/Makefile.am @@ -21,14 +21,12 @@ CLEANFILES=$(databin_SCRIPTS) $(man_MANS) $(sysconf_DATA) $(sbin_SCRIPTS) databindir=$(datadir) databin_SCRIPTS=mkimapdcert mkpop3dcert mkdhparams -binPROGRAMS=imapd pop3d maildirmake maildiracl deliverquota maildirkw \ - makeimapaccess makedat -sbinPROGRAMS=imaplogin pop3login -libexecPROGRAMS=makedatprog couriertcpd +binPROGRAMS=maildirmake maildiracl deliverquota maildirkw \ + makeimapaccess +sbinPROGRAMS=imapd pop3d imaplogin pop3login couriertcpd bin_PROGRAMS= @binPROGRAMS_exec@ sbin_PROGRAMS=@sbinPROGRAMS_exec@ -libexec_PROGRAMS=@libexecPROGRAMS_exec@ EXTRA_PROGRAMS= @@ -147,9 +145,9 @@ quotawarnmsg.example: libs/maildir/quotawarnmsg install-exec-local: $(mkinstalldirs) $(DESTDIR)$(databindir) $(mkinstalldirs) $(DESTDIR)$(bindir) - test ! -x libs/tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \ - libs/tcpd/couriertls $(DESTDIR)$(bindir)/couriertls $(mkinstalldirs) $(DESTDIR)$(sbindir) + test ! -x libs/tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \ + libs/tcpd/couriertls $(DESTDIR)$(sbindir)/couriertls for f in mkimapdcert mkpop3dcert mkdhparams; \ do rm -f $(DESTDIR)$(sbindir)/$$f ; \ $(LN_S) $(databindir)/$$f $(DESTDIR)$(sbindir)/$$f ; done @@ -179,7 +177,7 @@ install-data-local: install-man uninstall-local: for f in mkimapdcert mkpop3dcert mkdhparams; \ do rm -f $(DESTDIR)$(sbindir)/$$f ; done - rm -f $(DESTDIR)$(bindir)/couriertls + rm -f $(DESTDIR)$(sbindir)/couriertls INSTALL.txt: INSTALL.html $(HTML2TXT) INSTALL.html >INSTALL.txt diff --git a/courier-imap/libs/imap/courierpop3d.8.in b/courier-imap/libs/imap/courierpop3d.8.in index f34e5ac..9f33c8d 100644 --- a/courier-imap/libs/imap/courierpop3d.8.in +++ b/courier-imap/libs/imap/courierpop3d.8.in @@ -1,7 +1,7 @@ '\" t .\" .\" -.\" Title: courierpop3d +.\" Title: pop3d .\" Author: Sam Varshavchik .\" Generator: DocBook XSL Stylesheets vsnapshot .\" Date: 11/04/2020 @@ -30,10 +30,10 @@ .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- .SH "NAME" -courierpop3d \- The Courier POP3 server +pop3d \- The Courier POP3 server .SH "SYNOPSIS" .HP \w'\fB@sbindir@/couriertcpd\fR\ 'u -\fB@sbindir@/couriertcpd\fR {\-nodnslookup} {\-stderr=syslog} {110} {@libexecdir@/courier/courierpop3login} [\fImodules\fR...] {@libexecdir@/courier/courierpop3d} {\&./Maildir} +\fB@sbindir@/couriertcpd\fR {\-nodnslookup} {\-stderr=syslog} {110} {@sbindir@/pop3login} [\fImodules\fR...] {@sbindir@/pop3d} {\&./Maildir} .SH "DESCRIPTION" .PP This is a simple POP3 server for Maildirs\&. @@ -52,16 +52,16 @@ This is a simple POP3 server for Maildirs\&. .PP The \fBcouriertcpd\fR, -\fBcourierpop3login\fR, and -\fBcourierpop3d\fR +\fBpop3login\fR, and +\fBpop3d\fR modules may be installed elsewhere than indicated here\&. .sp .5v .RE .PP -\fBcourierpop3login\fR +\fBpop3login\fR is usually started by \fBcouriertcpd\fR\&. It already expects that a POP3 client is connected to standard input and output, presumably via a network socket\&. -\fBcourierpop3login\fR +\fBpop3login\fR reads the POP3 userid and password, then runs the authentication modules\&. The remaining arguments are passed along as arguments to modules\&. @@ -72,16 +72,16 @@ is one or more authentication modules (see the manual page)\&. .PP Each authentication modules runs the program specified by its first argument, allowing the authentication modules to be chained\&. The last program in the chain is -\fBcourierpop3d\fR +\fBpop3d\fR , which provides the actual POP3 service\&. In accordance with the authentication protocol, as described in \m[blue]\fB\fBauthlib\fR(7)\fR\m[]\&\s-2\u[1]\d\s+2 -\fBcourierpop3d\fR +\fBpop3d\fR reads file descriptor 3 to see if the userid/password has been succesfully validated\&. If not, -\fBcourierpop3d\fR +\fBpop3d\fR terminates\&. .PP Otherwise, -\fBcourierpop3d\fR +\fBpop3d\fR expects to be already running under the appropriate user and group id, with its current directory set to the account\*(Aqs home directory\&. .PP The first order of business is to find the account\*(Aqs Maildir\&. If the environment variable @@ -91,10 +91,10 @@ is set, that\*(Aqs where we go\&. That should be the pathname to the account\*(A may be set by the authentication module\&. If \fBMAILDIR\fR is not set, -\fBcourierpop3d\fR +\fBpop3d\fR uses its first argument\&. Usually, the default maildir is $HOME/Maildir, therefore the first argument to -\fBcourierpop3d\fR +\fBpop3d\fR is "\&./Maildir"\&. .SH "SEE ALSO" .PP diff --git a/courier-imap/libs/imap/courierpop3d.html.in b/courier-imap/libs/imap/courierpop3d.html.in index e7e3e12..8bb7df3 100644 --- a/courier-imap/libs/imap/courierpop3d.html.in +++ b/courier-imap/libs/imap/courierpop3d.html.in @@ -1,20 +1,20 @@ -courierpop3d

Name

courierpop3d — The Courier - POP3 server

Synopsis

@sbindir@/couriertcpd {-nodnslookup} {-stderr=syslog} {110} {@libexecdir@/courier/courierpop3login} [modules...] {@libexecdir@/courier/courierpop3d} {./Maildir}

DESCRIPTION

+-->

Name

pop3d — The Courier + POP3 server

Synopsis

@sbindir@/couriertcpd {-nodnslookup} {-stderr=syslog} {110} {@libexecdir@/courier/pop3login} [modules...] {@sbindir@/pop3d} {./Maildir}

DESCRIPTION

This is a simple POP3 server for Maildirs.

Note

-The couriertcpd, courierpop3login, -and courierpop3d modules may be installed elsewhere than +The couriertcpd, pop3login, +and pop3d modules may be installed elsewhere than indicated here.

-courierpop3login is usually started by +pop3login is usually started by couriertcpd. It already expects that a POP3 client is connected to standard input and output, presumably via a network socket. -courierpop3login reads the POP3 +pop3login reads the POP3 userid and password, then runs the authentication modules. The remaining arguments are passed along as arguments to modules.

@@ -26,15 +26,15 @@ manual page).

Each authentication modules runs the program specified by its first argument, allowing the authentication modules to be chained. The last program in the chain is -courierpop3d +pop3d , which provides the actual POP3 service. In accordance with the authentication protocol, as described in authlib(7) -courierpop3d reads +pop3d reads file descriptor 3 to see if the userid/password has been succesfully -validated. If not, courierpop3d terminates.

-Otherwise, courierpop3d expects to be already running +validated. If not, pop3d terminates.

+Otherwise, pop3d expects to be already running under the appropriate user and group id, with its current directory set to the account's home directory.

@@ -45,11 +45,11 @@ pathname to the account's Maildir. The environment variable MAILDIR may be set by the authentication module. If MAILDIR is not set, -courierpop3d uses its first argument. +pop3d uses its first argument. Usually, the default maildir is $HOME/Maildir, therefore the first argument to -courierpop3d is -"./Maildir".

SEE ALSO

+pop3d is +"./Maildir".

SEE ALSO

authlib(7) , userdb(8) -- 2.33.0