masqmail

changeset 148:1db6e1b91ead

find changesets by author, revision, files, or words in the commit message
moved rmail from bin (man1) to sbin (man8) Debian demands rmail to be in /usr/sbin therefore it is surely no bad idea to have ich this way
author meillo@marmaro.de
date Thu, 08 Jul 2010 00:40:19 +0200
parents cb42157b3520
children 115d3c92493b
files Makefile.am Makefile.in man/Makefile.am man/Makefile.in man/rmail.1 man/rmail.8
diffstat 6 files changed, 61 insertions(+), 61 deletions(-) [+]
line diff
     1.1 --- a/Makefile.am	Thu Jul 08 00:26:55 2010 +0200
     1.2 +++ b/Makefile.am	Thu Jul 08 00:40:19 2010 +0200
     1.3 @@ -66,13 +66,13 @@
     1.4  	rmdir $(DESTDIR)@with_spooldir@
     1.5  
     1.6  rmail:
     1.7 -	[ -d "$(DESTDIR)@prefix@/bin" ] || mkdir -p "$(DESTDIR)@prefix@/bin"
     1.8 +	[ -d "$(DESTDIR)@prefix@/sbin" ] || mkdir -p "$(DESTDIR)@prefix@/sbin"
     1.9  	sed '/^SENDMAIL/s,/usr/sbin/sendmail,$(DESTDIR)@prefix@/sbin/masqmail,'\
    1.10 -	    contrib/rmail >$(DESTDIR)@prefix@/bin/rmail
    1.11 -	chmod 755 $(DESTDIR)@prefix@/bin/rmail
    1.12 +	    contrib/rmail >$(DESTDIR)@prefix@/sbin/rmail
    1.13 +	chmod 755 $(DESTDIR)@prefix@/sbin/rmail
    1.14  
    1.15  rm-rmail:
    1.16 -	rm -f $(DESTDIR)@prefix@/bin/rmail
    1.17 +	rm -f $(DESTDIR)@prefix@/sbin/rmail
    1.18  
    1.19  
    1.20  uid_bit: $(DESTDIR)@prefix@/sbin/masqmail

     2.1 --- a/Makefile.in	Thu Jul 08 00:26:55 2010 +0200
     2.2 +++ b/Makefile.in	Thu Jul 08 00:40:19 2010 +0200
     2.3 @@ -749,13 +749,13 @@
     2.4  	rmdir $(DESTDIR)@with_spooldir@
     2.5  
     2.6  rmail:
     2.7 -	[ -d "$(DESTDIR)@prefix@/bin" ] || mkdir -p "$(DESTDIR)@prefix@/bin"
     2.8 +	[ -d "$(DESTDIR)@prefix@/sbin" ] || mkdir -p "$(DESTDIR)@prefix@/sbin"
     2.9  	sed '/^SENDMAIL/s,/usr/sbin/sendmail,$(DESTDIR)@prefix@/sbin/masqmail,'\
    2.10 -	    contrib/rmail >$(DESTDIR)@prefix@/bin/rmail
    2.11 -	chmod 755 $(DESTDIR)@prefix@/bin/rmail
    2.12 +	    contrib/rmail >$(DESTDIR)@prefix@/sbin/rmail
    2.13 +	chmod 755 $(DESTDIR)@prefix@/sbin/rmail
    2.14  
    2.15  rm-rmail:
    2.16 -	rm -f $(DESTDIR)@prefix@/bin/rmail
    2.17 +	rm -f $(DESTDIR)@prefix@/sbin/rmail
    2.18  
    2.19  uid_bit: $(DESTDIR)@prefix@/sbin/masqmail
    2.20  	chmod u+s $(DESTDIR)@prefix@/sbin/masqmail

     3.1 --- a/man/Makefile.am	Thu Jul 08 00:26:55 2010 +0200
     3.2 +++ b/man/Makefile.am	Thu Jul 08 00:40:19 2010 +0200
     3.3 @@ -1,1 +1,1 @@
     3.4 -man_MANS=masqmail.8 mservdetect.1 masqmail.conf.5 masqmail.route.5 masqmail.get.5 masqmail.aliases.5 rmail.1
     3.5 +man_MANS=masqmail.8 mservdetect.1 masqmail.conf.5 masqmail.route.5 masqmail.get.5 masqmail.aliases.5 rmail.8

     4.1 --- a/man/Makefile.in	Thu Jul 08 00:26:55 2010 +0200
     4.2 +++ b/man/Makefile.in	Thu Jul 08 00:40:19 2010 +0200
     4.3 @@ -176,7 +176,7 @@
     4.4  with_logdir = @with_logdir@
     4.5  with_spooldir = @with_spooldir@
     4.6  with_user = @with_user@
     4.7 -man_MANS = masqmail.8 mservdetect.1 masqmail.conf.5 masqmail.route.5 masqmail.get.5 masqmail.aliases.5 rmail.1
     4.8 +man_MANS = masqmail.8 mservdetect.1 masqmail.conf.5 masqmail.route.5 masqmail.get.5 masqmail.aliases.5 rmail.8
     4.9  all: all-am
    4.10  
    4.11  .SUFFIXES:

     5.1 --- a/man/rmail.1	Thu Jul 08 00:26:55 2010 +0200
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,51 +0,0 @@
     5.4 -.TH rmail 1 2010-06-21 masqmail-0.2.25 "User Commands"
     5.5 -
     5.6 -.SH NAME
     5.7 -rmail \- handle remote mail received via uucp
     5.8 -
     5.9 -
    5.10 -.SH SYNOPSIS
    5.11 -\fB/usr/bin/rmail \fIrecipient ...\fR
    5.12 -
    5.13 -
    5.14 -.SH DESCRIPTION
    5.15 -
    5.16 -Rmail is a wrapper around masqmail.
    5.17 -It reads a mail message on standard input and passes it to masqmail's standard input.
    5.18 -Rmail only removes the first line from the input and constructs the return path from it.
    5.19 -
    5.20 -Such a first line:
    5.21 -
    5.22 -From user Wed Jan  9 12:43:35 1985 remote from host Date: 9 Jan 1985   8:39 EST
    5.23 -
    5.24 -would generate this call to masqmail:
    5.25 -
    5.26 -masqmail \-i \-f user@host \-\- bob@example.org
    5.27 -
    5.28 -(If ``bob@example.org'' was the argument to the rmail call.))
    5.29 -
    5.30 -
    5.31 -.SH AUTHOR
    5.32 -
    5.33 -Masqmail was written by Oliver Kurth.
    5.34 -It is now maintained by Markus Schnalke <meillo@marmaro.de>.
    5.35 -
    5.36 -You will find the newest version of masqmail at \fBhttp://marmaro.de/prog/masqmail/\fR.
    5.37 -There is also a mailing list, you will find information about it at masqmail's main site.
    5.38 -
    5.39 -This man page was written by markus schnalke <meillo@marmaro.de>
    5.40 -
    5.41 -
    5.42 -.SH BUGS
    5.43 -
    5.44 -Address translations from domain!user to user@domain is not done.
    5.45 -This rmail program is only very basic.
    5.46 -See sendmail for a more sophisticated rmail implementation.
    5.47 -
    5.48 -
    5.49 -Please report bugs to the mailing list.
    5.50 -
    5.51 -
    5.52 -.SH SEE ALSO
    5.53 -
    5.54 -\fBmasqmail(8)\fR

     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/man/rmail.8	Thu Jul 08 00:40:19 2010 +0200
     6.3 @@ -0,0 +1,51 @@
     6.4 +.TH rmail 8 2010-07-08 masqmail-0.2.25 "Maintenance Commands"
     6.5 +
     6.6 +.SH NAME
     6.7 +rmail \- handle remote mail received via uucp
     6.8 +
     6.9 +
    6.10 +.SH SYNOPSIS
    6.11 +\fB/usr/sbin/rmail \fIrecipient ...\fR
    6.12 +
    6.13 +
    6.14 +.SH DESCRIPTION
    6.15 +
    6.16 +Rmail is a wrapper around masqmail.
    6.17 +It reads a mail message on standard input and passes it to masqmail's standard input.
    6.18 +Rmail only removes the first line from the input and constructs the return path from it.
    6.19 +
    6.20 +Such a first line:
    6.21 +
    6.22 +From user Wed Jan  9 12:43:35 1985 remote from host Date: 9 Jan 1985   8:39 EST
    6.23 +
    6.24 +would generate this call to masqmail:
    6.25 +
    6.26 +masqmail \-i \-f user@host \-\- bob@example.org
    6.27 +
    6.28 +(If ``bob@example.org'' was the argument to the rmail call.))
    6.29 +
    6.30 +
    6.31 +.SH AUTHOR
    6.32 +
    6.33 +Masqmail was written by Oliver Kurth.
    6.34 +It is now maintained by Markus Schnalke <meillo@marmaro.de>.
    6.35 +
    6.36 +You will find the newest version of masqmail at \fBhttp://marmaro.de/prog/masqmail/\fR.
    6.37 +There is also a mailing list, you will find information about it at masqmail's main site.
    6.38 +
    6.39 +This man page was written by markus schnalke <meillo@marmaro.de>
    6.40 +
    6.41 +
    6.42 +.SH BUGS
    6.43 +
    6.44 +Address translations from domain!user to user@domain is not done.
    6.45 +This rmail program is only very basic.
    6.46 +See sendmail for a more sophisticated rmail implementation.
    6.47 +
    6.48 +
    6.49 +Please report bugs to the mailing list.
    6.50 +
    6.51 +
    6.52 +.SH SEE ALSO
    6.53 +
    6.54 +\fBmasqmail(8)\fR