Mercurial > masqmail

changeset 154:fc1e5aa286ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author meillo@marmaro.de
date Thu, 08 Jul 2010 09:20:34 +0200
parents 0025a7677d16 (diff) 51d8eadf3c79 (current diff)
children b5ab9cb2f18a
files
diffstat 10 files changed, 148 insertions(+), 124 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Jul 07 13:38:33 2010 +0200
+++ b/.hgtags	Thu Jul 08 09:20:34 2010 +0200
@@ -3,3 +3,4 @@
 f3bdb5b382ec81aeed5c35a14e90cd9e7e154593 0.2.22
 c343f501255151471b05c52732946f89f8457505 0.2.23
 e01fed4846e496225d57f8c43c66b58e3b121299 0.2.24
+115d3c92493b73a65bf67ecdfca194d88853776d 0.2.25
--- a/ChangeLog	Wed Jul 07 13:38:33 2010 +0200
+++ b/ChangeLog	Thu Jul 08 09:20:34 2010 +0200
@@ -7,23 +7,30 @@
 technical speach and with focus on compatibility.
 
 
-0.2.25  Thu, 01 Jul 2010 13:40:31 +0200
+0.2.25  Thu, 08 Jul 2010 00:49:36 +0200
 	* added server-side SMTP SIZE support. Thanks to Paolo.
 	* always remove Bcc: headers from now on
 	* never create headers from envelope recipients from now on
 	* add ``To: undisclosed-recipients:;'' if no recipient header
 	  is present
+	* added checks for too long addresses in SMTP dialog. Thanks
+	  to Paolo.
 	* allow colons (`:') unquoted in config file. Thanks to Paolo.
 	* new warnmsg.tpl.it. Thanks to Paolo.
 	* don't install the tests any longer
+	* remove all installed dirs but no generated data (logs,
+	  spooled files, config)
 	* removed the ACC_NO_RECVD_HDR because it is never used
 	* changed name ACC_NODOT_TERM to ACC_DOT_IGNORE for better
 	  understanding
+	* fixed max_size_delete
+	* added Paolo's mailq.wmbiffrc
 	* better debugging output. Thanks to Paolo.
+	* documented some, yet undocumented, config options
 	* improved documentation of -t option
-	* added man page for rmail(1)
+	* moved rmail to sbin and added man page for rmail(8)
 	* several typo fixes in man pages and code comments
-	* don't distribute mercurial files (in gen-dist)
+	* gen-dist: don't distribute mercurial files
 
 0.2.24  Mon, 21 Jun 2010 10:07:32 +0200
 	* removed dead code in child.c
--- a/Makefile.am	Wed Jul 07 13:38:33 2010 +0200
+++ b/Makefile.am	Thu Jul 08 09:20:34 2010 +0200
@@ -4,22 +4,24 @@
 
 install-data-local: log_dir spool_dir uid_bit conf_dir tpl_dir run_dir doc_dir rmail
 
-uninstall-local: rm-rmail rm-doc_dir rm-tpl_dir
+uninstall-local: rm-rmail rm-doc_dir rm-tpl_dir rm-conf_dir rm-run_dir rm-spool_dir rm-log_dir
 
 
-conf_dir: $(DESTDIR)@with_confdir@
-
-$(DESTDIR)@with_confdir@:
+conf_dir:
 	install -d $(DESTDIR)@with_confdir@
 
+rm-conf_dir:
+	rmdir $(DESTDIR)@with_confdir@  # removes only if empty
 
-tpl_dir: $(DESTDIR)@datadir@/tpl
 
-$(DESTDIR)@datadir@/tpl: conf_dir
+tpl_dir:
 	install -d $(DESTDIR)@datadir@/masqmail/tpl
 	cp tpl/* $(DESTDIR)@datadir@/masqmail/tpl
 	chmod 644 $(DESTDIR)@datadir@/masqmail/tpl/*
 
+rm-tpl_dir:
+	rm -rf $(DESTDIR)@datadir@/masqmail/
+
 
 doc_dir:
 	install -d $(DESTDIR)@docdir@
@@ -27,51 +29,51 @@
 	cp -r examples $(DESTDIR)@docdir@
 	cp ChangeLog NEWS AUTHORS COPYING README TODO $(DESTDIR)@docdir@
 
-
-uid_bit: $(DESTDIR)@prefix@/sbin/masqmail
-	chmod u+s $(DESTDIR)@prefix@/sbin/masqmail
+rm-doc_dir:
+	cd $(DESTDIR)@docdir@ && ( \
+	    rm -rf docs examples ; \
+	    rm -f ChangeLog NEWS AUTHORS COPYING README TODO ; \
+	)
+	rmdir $(DESTDIR)@docdir@
 
 
 run_dir:
 	install -d -o @with_user@ -g @with_group@ $(DESTDIR)/var/run/masqmail
 
+rm-run_dir:
+	rm -rf $(DESTDIR)/var/run/masqmail
 
 
-log_dir: $(DESTDIR)@with_logdir@
-
-$(DESTDIR)@with_logdir@:
-	[ -d `dirname $(DESTDIR)@with_logdir@` ] || \
-		install -d `dirname $(DESTDIR)@with_logdir@`
+log_dir:
 	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_logdir@
 
+rm-log_dir:
+	rmdir $(DESTDIR)@with_logdir@  # removes only if empty
 
 
-spool_dir: $(DESTDIR)@with_spooldir@
-
-$(DESTDIR)@with_spooldir@:
-	[ -d `dirname $(DESTDIR)@with_spooldir@` ] || \
-		install -d `dirname $(DESTDIR)@with_spooldir@`
+spool_dir:
 	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_spooldir@
 	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_spooldir@/lock
 	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_spooldir@/input
 	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_spooldir@/popuidl
 
+rm-spool_dir:
+	: # removal fails if the dirs are non-empty
+	: # this prevents losing spooled files
+	rmdir $(DESTDIR)@with_spooldir@/lock
+	rmdir $(DESTDIR)@with_spooldir@/input
+	rmdir $(DESTDIR)@with_spooldir@/popuidl
+	rmdir $(DESTDIR)@with_spooldir@
 
 rmail:
-	[ -d "$(DESTDIR)@prefix@/bin" ] || mkdir -p "$(DESTDIR)@prefix@/bin"
+	[ -d "$(DESTDIR)@prefix@/sbin" ] || mkdir -p "$(DESTDIR)@prefix@/sbin"
 	sed '/^SENDMAIL/s,/usr/sbin/sendmail,$(DESTDIR)@prefix@/sbin/masqmail,'\
-	    contrib/rmail >$(DESTDIR)@prefix@/bin/rmail
-	chmod 755 $(DESTDIR)@prefix@/bin/rmail
+	    contrib/rmail >$(DESTDIR)@prefix@/sbin/rmail
+	chmod 755 $(DESTDIR)@prefix@/sbin/rmail
 
 rm-rmail:
-	rm -f $(DESTDIR)@prefix@/bin/rmail
+	rm -f $(DESTDIR)@prefix@/sbin/rmail
+
 
-rm-doc_dir:
-	cd $(DESTDIR)@docdir@ ;\
-	rm -rf docs examples ;\
-	rm -f ChangeLog NEWS AUTHORS COPYING README TODO
-	rmdir $(DESTDIR)@docdir@
-
-rm-tpl_dir:
-	cd $(DESTDIR)@datadir@ ;\
-	rm -rf masqmail
+uid_bit: $(DESTDIR)@prefix@/sbin/masqmail
+	chmod u+s $(DESTDIR)@prefix@/sbin/masqmail
--- a/Makefile.in	Wed Jul 07 13:38:33 2010 +0200
+++ b/Makefile.in	Thu Jul 08 09:20:34 2010 +0200
@@ -693,67 +693,72 @@
 
 install-data-local: log_dir spool_dir uid_bit conf_dir tpl_dir run_dir doc_dir rmail
 
-uninstall-local: rm-rmail rm-doc_dir rm-tpl_dir
+uninstall-local: rm-rmail rm-doc_dir rm-tpl_dir rm-conf_dir rm-run_dir rm-spool_dir rm-log_dir
 
-conf_dir: $(DESTDIR)@with_confdir@
-
-$(DESTDIR)@with_confdir@:
+conf_dir:
 	install -d $(DESTDIR)@with_confdir@
 
-tpl_dir: $(DESTDIR)@datadir@/tpl
+rm-conf_dir:
+	rmdir $(DESTDIR)@with_confdir@  # removes only if empty
 
-$(DESTDIR)@datadir@/tpl: conf_dir
+tpl_dir:
 	install -d $(DESTDIR)@datadir@/masqmail/tpl
 	cp tpl/* $(DESTDIR)@datadir@/masqmail/tpl
 	chmod 644 $(DESTDIR)@datadir@/masqmail/tpl/*
 
+rm-tpl_dir:
+	rm -rf $(DESTDIR)@datadir@/masqmail/
+
 doc_dir:
 	install -d $(DESTDIR)@docdir@
 	cp -r docs $(DESTDIR)@docdir@
 	cp -r examples $(DESTDIR)@docdir@
 	cp ChangeLog NEWS AUTHORS COPYING README TODO $(DESTDIR)@docdir@
 
-uid_bit: $(DESTDIR)@prefix@/sbin/masqmail
-	chmod u+s $(DESTDIR)@prefix@/sbin/masqmail
+rm-doc_dir:
+	cd $(DESTDIR)@docdir@ && ( \
+	    rm -rf docs examples ; \
+	    rm -f ChangeLog NEWS AUTHORS COPYING README TODO ; \
+	)
+	rmdir $(DESTDIR)@docdir@
 
 run_dir:
 	install -d -o @with_user@ -g @with_group@ $(DESTDIR)/var/run/masqmail
 
-log_dir: $(DESTDIR)@with_logdir@
+rm-run_dir:
+	rm -rf $(DESTDIR)/var/run/masqmail
 
-$(DESTDIR)@with_logdir@:
-	[ -d `dirname $(DESTDIR)@with_logdir@` ] || \
-		install -d `dirname $(DESTDIR)@with_logdir@`
+log_dir:
 	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_logdir@
 
-spool_dir: $(DESTDIR)@with_spooldir@
+rm-log_dir:
+	rmdir $(DESTDIR)@with_logdir@  # removes only if empty
 
-$(DESTDIR)@with_spooldir@:
-	[ -d `dirname $(DESTDIR)@with_spooldir@` ] || \
-		install -d `dirname $(DESTDIR)@with_spooldir@`
+spool_dir:
 	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_spooldir@
 	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_spooldir@/lock
 	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_spooldir@/input
 	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_spooldir@/popuidl
 
+rm-spool_dir:
+	: # removal fails if the dirs are non-empty
+	: # this prevents losing spooled files
+	rmdir $(DESTDIR)@with_spooldir@/lock
+	rmdir $(DESTDIR)@with_spooldir@/input
+	rmdir $(DESTDIR)@with_spooldir@/popuidl
+	rmdir $(DESTDIR)@with_spooldir@
+
 rmail:
-	[ -d "$(DESTDIR)@prefix@/bin" ] || mkdir -p "$(DESTDIR)@prefix@/bin"
+	[ -d "$(DESTDIR)@prefix@/sbin" ] || mkdir -p "$(DESTDIR)@prefix@/sbin"
 	sed '/^SENDMAIL/s,/usr/sbin/sendmail,$(DESTDIR)@prefix@/sbin/masqmail,'\
-	    contrib/rmail >$(DESTDIR)@prefix@/bin/rmail
-	chmod 755 $(DESTDIR)@prefix@/bin/rmail
+	    contrib/rmail >$(DESTDIR)@prefix@/sbin/rmail
+	chmod 755 $(DESTDIR)@prefix@/sbin/rmail
 
 rm-rmail:
-	rm -f $(DESTDIR)@prefix@/bin/rmail
+	rm -f $(DESTDIR)@prefix@/sbin/rmail
 
-rm-doc_dir:
-	cd $(DESTDIR)@docdir@ ;\
-	rm -rf docs examples ;\
-	rm -f ChangeLog NEWS AUTHORS COPYING README TODO
-	rmdir $(DESTDIR)@docdir@
-
-rm-tpl_dir:
-	cd $(DESTDIR)@datadir@ ;\
-	rm -rf masqmail
+uid_bit: $(DESTDIR)@prefix@/sbin/masqmail
+	chmod u+s $(DESTDIR)@prefix@/sbin/masqmail
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/NEWS	Wed Jul 07 13:38:33 2010 +0200
+++ b/NEWS	Thu Jul 08 09:20:34 2010 +0200
@@ -12,20 +12,26 @@
 - Added server-side SMTP SIZE support. Thanks to Paolo.
 
 - Masqmail will from now on:
-  * always remove Bcc: headers
-  * never create headers from envelope recipients
-  * add ``To: undisclosed-recipients:;'' if no recipient header (To:
+  o always remove Bcc: headers
+  o never create headers from envelope recipients
+  o add ``To: undisclosed-recipients:;'' if no recipient header (To:
     or Cc:) is present in the mail
 
 - Colons (`:') don't need to be quoted in the config file anymore.
 Thanks to Paolo.
 
-- Added warnmsg.tpl.it. Thanks to Paolo. Added a man page for
-rmail(1).
+- Added checks for too long addresses in SMTP dialog. Thanks to Paolo.
+
+- Moved rmail to sbin and added a man page for it.
+
+- Added warnmsg.tpl.it. Thanks to Paolo.
 
-- The tests do not get installed any longer.
+- The tests do not get installed any longer. All on install created
+dirs are removed on uninstall, except they contain generated data like
+logs, spooled files, or configuration.
 
-- Several typo fixes in man pages and code comments.
+- Documented some, yet undocumented, config options. Several typo
+fixes in man pages and code comments.
 
 
 0.2.24
--- a/README	Wed Jul 07 13:38:33 2010 +0200
+++ b/README	Thu Jul 08 09:20:34 2010 +0200
@@ -90,6 +90,9 @@
 Juergen Daubert for excellent bug reports including patches and various
 feedback.
 
+Paolo for a large patch improving several parts of masqmail, especially
+server-side SMTP SIZE support.
+
 ... and many others.
 See ChangeLog, the code repository log, and the mailing list for more.
 Feel free to tell me if you think you are missing on this list.
--- a/man/Makefile.am	Wed Jul 07 13:38:33 2010 +0200
+++ b/man/Makefile.am	Thu Jul 08 09:20:34 2010 +0200
@@ -1,1 +1,1 @@
-man_MANS=masqmail.8 mservdetect.1 masqmail.conf.5 masqmail.route.5 masqmail.get.5 masqmail.aliases.5 rmail.1
+man_MANS=masqmail.8 mservdetect.1 masqmail.conf.5 masqmail.route.5 masqmail.get.5 masqmail.aliases.5 rmail.8
--- a/man/Makefile.in	Wed Jul 07 13:38:33 2010 +0200
+++ b/man/Makefile.in	Thu Jul 08 09:20:34 2010 +0200
@@ -176,7 +176,7 @@
 with_logdir = @with_logdir@
 with_spooldir = @with_spooldir@
 with_user = @with_user@
-man_MANS = masqmail.8 mservdetect.1 masqmail.conf.5 masqmail.route.5 masqmail.get.5 masqmail.aliases.5 rmail.1
+man_MANS = masqmail.8 mservdetect.1 masqmail.conf.5 masqmail.route.5 masqmail.get.5 masqmail.aliases.5 rmail.8
 all: all-am
 
 .SUFFIXES:
--- a/man/rmail.1	Wed Jul 07 13:38:33 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-.TH rmail 1 2010-06-21 masqmail-0.2.25 "User Commands"
-
-.SH NAME
-rmail \- handle remote mail received via uucp
-
-
-.SH SYNOPSIS
-\fB/usr/bin/rmail \fIrecipient ...\fR
-
-
-.SH DESCRIPTION
-
-Rmail is a wrapper around masqmail.
-It reads a mail message on standard input and passes it to masqmail's standard input.
-Rmail only removes the first line from the input and constructs the return path from it.
-
-Such a first line:
-
-From user Wed Jan  9 12:43:35 1985 remote from host Date: 9 Jan 1985   8:39 EST
-
-would generate this call to masqmail:
-
-masqmail \-i \-f user@host \-\- bob@example.org
-
-(If ``bob@example.org'' was the argument to the rmail call.))
-
-
-.SH AUTHOR
-
-Masqmail was written by Oliver Kurth.
-It is now maintained by Markus Schnalke <meillo@marmaro.de>.
-
-You will find the newest version of masqmail at \fBhttp://marmaro.de/prog/masqmail/\fR.
-There is also a mailing list, you will find information about it at masqmail's main site.
-
-This man page was written by markus schnalke <meillo@marmaro.de>
-
-
-.SH BUGS
-
-Address translations from domain!user to user@domain is not done.
-This rmail program is only very basic.
-See sendmail for a more sophisticated rmail implementation.
-
-
-Please report bugs to the mailing list.
-
-
-.SH SEE ALSO
-
-\fBmasqmail(8)\fR
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/man/rmail.8	Thu Jul 08 09:20:34 2010 +0200
@@ -0,0 +1,51 @@
+.TH rmail 8 2010-07-08 masqmail-0.2.25 "Maintenance Commands"
+
+.SH NAME
+rmail \- handle remote mail received via uucp
+
+
+.SH SYNOPSIS
+\fB/usr/sbin/rmail \fIrecipient ...\fR
+
+
+.SH DESCRIPTION
+
+Rmail is a wrapper around masqmail.
+It reads a mail message on standard input and passes it to masqmail's standard input.
+Rmail only removes the first line from the input and constructs the return path from it.
+
+Such a first line:
+
+From user Wed Jan  9 12:43:35 1985 remote from host Date: 9 Jan 1985   8:39 EST
+
+would generate this call to masqmail:
+
+masqmail \-i \-f user@host \-\- bob@example.org
+
+(If ``bob@example.org'' was the argument to the rmail call.))
+
+
+.SH AUTHOR
+
+Masqmail was written by Oliver Kurth.
+It is now maintained by Markus Schnalke <meillo@marmaro.de>.
+
+You will find the newest version of masqmail at \fBhttp://marmaro.de/prog/masqmail/\fR.
+There is also a mailing list, you will find information about it at masqmail's main site.
+
+This man page was written by markus schnalke <meillo@marmaro.de>
+
+
+.SH BUGS
+
+Address translations from domain!user to user@domain is not done.
+This rmail program is only very basic.
+See sendmail for a more sophisticated rmail implementation.
+
+
+Please report bugs to the mailing list.
+
+
+.SH SEE ALSO
+
+\fBmasqmail(8)\fR