1.1 --- a/INSTALL	Sat May 29 22:33:10 2010 +0200
     1.2 +++ b/INSTALL	Sat May 29 22:53:42 2010 +0200
     1.3 @@ -1,46 +1,40 @@
     1.4 -simple installation instructions, see docs/install.html for more.
     1.5 +Additional information may be available in docs/ or on the website.
     1.6 +For installing on GNU/Linux distributions read docs/linux-distris.
     1.7  
     1.8 -To compile MasqMail you need glib 1.2 (http://www.gtk.org).
     1.9 +
    1.10 +Installation instructions
    1.11 +-------------------------
    1.12 +
    1.13 +To compile masqmail you need glib 1.2 (http://www.gtk.org).
    1.14  
    1.15  You need a user and a group for masqmail to run, I suggest user
    1.16  'mail' and group 'trusted'. Say:
    1.17  
    1.18 -groupadd -g 42 trusted
    1.19 -useradd -u 42 -g 42 -d / -s /bin/sh -c "Mail Transfer Agent" mail
    1.20 +	groupadd -g 42 trusted
    1.21 +	useradd -u 42 -g 42 -d / -s /bin/sh -c "Mail Transfer Agent" mail
    1.22  
    1.23  If you use other names than 'mail' and 'trusted' use the options
    1.24  described below for configure. The 42 is just a suggestion, you can
    1.25  use any number you like, but preferably one < 100. It does not have
    1.26  to be the same for the user 'mail' and the group 'trusted'.
    1.27  
    1.28 -Then do:
    1.29 +Compliling is a matter of the usual procedure. In the source directory,
    1.30 +after unpacking do:
    1.31  
    1.32 -./configure
    1.33 -make
    1.34 -make install
    1.35 +	./configure
    1.36 +	make
    1.37 +	make install
    1.38  
    1.39 -Debian:
    1.40 -If you compile for Debian, do the configure with at least these options,
    1.41 -this makes it compatible with the official debian package:
    1.42 -./configure --with-liblockfile --with-group=mail
    1.43 -you do not need the group 'trusted', use 'mail' instead.
    1.44  
    1.45 -You can also build your own Debian package with
    1.46 -dpkg-buildpackage -rfakeroot
    1.47 -You need to have fakeroot installed to do this. Or, as root, do:
    1.48 -dpkg-buildpackage
    1.49  
    1.50 -SuSE/Redhat:
    1.51 -There are spec files for rpm creation in suse/ or redhat/. You may have to adjust these files.
    1.52 +Additional options for configure
    1.53 +--------------------------------
    1.54  
    1.55 +See the output of
    1.56  
    1.57 -Sorry, but after that you are not yet finished. For instruction on how
    1.58 -to deliver mail using a connection to your ISP see
    1.59 -docs/install.html. It is probably a good idea to copy the files
    1.60 -docs/*.html to a directory where you can access them with a browser.
    1.61 +	./configure -h
    1.62  
    1.63 -additional options for configure:
    1.64 ----------------------------------
    1.65 +Here is additional, but maybe obsolete, explanation:
    1.66  
    1.67  --with-user=USER sets the user as which MasqMail will run. Default is
    1.68  'mail'. USER has to exist before you 'make install'.
    1.69 @@ -98,6 +92,8 @@
    1.70  BTW, to get 3K of space, call
    1.71  strip --remove-section=.comment --remove-section=.note --strip-unneeded src/masqmail
    1.72  
    1.73 +
    1.74 +
    1.75  after make install:
    1.76  -------------------
    1.77  
    1.78 @@ -106,30 +102,95 @@
    1.79  
    1.80  Check that 'make install' worked correctly. The following command:
    1.81  
    1.82 -ls -ld /usr/sbin/masqmail /var/masqmail/ /var/spool/masqmail /var/spool/masqmail/input
    1.83 +	ls -ld /usr/sbin/masqmail /etc/masqmail /var/log/masqmail/ \
    1.84 +	       /var/run/masqmail /var/spool/masqmail/ /var/spool/masqmail/* 
    1.85  
    1.86  should give output similar to
    1.87  
    1.88 --rwsr-xr-x   1 root     root        86955 Oct 14 14:27 /usr/sbin/masqmail
    1.89 -drwxr-xr-x   2 mail     trusted      1024 Oct 14 14:29 /var/masqmail/
    1.90 -drwxr-xr-x   3 mail     trusted      1024 Oct 14 14:27 /var/spool/masqmail
    1.91 -drwxr-xr-x   2 mail     trusted      1024 Oct 14 18:32 /var/spool/masqmail/input
    1.92 -drwxr-xr-x   2 mail     trusted      1024 Oct 14 18:32 /var/spool/masqmail/lock
    1.93 -drwxr-xr-x   2 mail     trusted      1024 Oct 14 18:32 /var/spool/masqmail/popuidl
    1.94 +	-rwsr-xr-x 1 root root    399356 May 10 12:34 /usr/sbin/masqmail
    1.95 +	drwxr-xr-x 2 root root      4096 May 10 12:34 /etc/masqmail
    1.96 +	drwxr-xr-x 2 mail trusted   4096 May 10 12:34 /var/log/masqmail
    1.97 +	drwxr-xr-x 2 mail trusted   4096 May 10 12:34 /var/run/masqmail
    1.98 +	drwxr-xr-x 5 mail trusted   4096 May 10 12:34 /var/spool/masqmail
    1.99 +	drwxr-xr-x 2 mail trusted   4096 May 10 12:34 /var/spool/masqmail/input
   1.100 +	drwxr-xr-x 2 mail trusted   4096 May 10 12:34 /var/spool/masqmail/lock
   1.101 +	drwxr-xr-x 2 mail trusted   4096 May 10 12:34 /var/spool/masqmail/popuidl
   1.102  
   1.103  (important is the set-user-id bit for /usr/sbin/masqmail and the
   1.104  ownership of all items).
   1.105  
   1.106  Use the example configuration files in examples/ to edit your own. The
   1.107 -main configuration should go to /etc/masqmail.conf. I recommend to
   1.108 -make a directory /etc/masqmail for the *.route amd *.get files.
   1.109 +main configuration file `masqmail.conf' and the *.route and *.get files
   1.110 +should go into /etc/masqmail.
   1.111  
   1.112 -The default destination for the executable 'masqmail' is
   1.113 -/usr/sbin. Check that it has the set user id bit set. (chmod u+s
   1.114 -/usr/sbin/masqmail does no harm in any case).
   1.115 +The default destination for the executable `masqmail' is /usr/sbin.
   1.116 +Check that it has the set-uid bit set. You can set it with:
   1.117 +
   1.118 +	chmod u+s /usr/sbin/masqmail
   1.119  
   1.120  If you want to replace sendmail, move your old sendmail binary to
   1.121 -another name and make a symbolic link /usr/sbin/sendmail ->
   1.122 -/usr/sbin/masqmail.
   1.123 +another name and make a symbolic link:
   1.124  
   1.125 +	ln -s /usr/sbin/masqmail /usr/sbin/sendmail
   1.126  
   1.127 +Now every mailer that used to call sendmail will now call masqmail. You
   1.128 +can now kill your old sendmail if it is running and start masqmail.
   1.129 +
   1.130 +	/sbin/init.d/sendmail restart
   1.131 +
   1.132 +should do that. You can also start masqmail with:
   1.133 +
   1.134 +	/usr/sbin/masqmail -bd -q30m
   1.135 +
   1.136 +
   1.137 +
   1.138 +Configuring for online delivery
   1.139 +-------------------------------
   1.140 +
   1.141 +(This section covers dial-up internet connections.)
   1.142 +
   1.143 +Now you have to set up the online configuration. The trick is to tell
   1.144 +your ip-up script the connection name. You could use the IP number of
   1.145 +the far side of the ppp link, but this is a pain and may change each
   1.146 +time. But you can give it an additional argument via pppd with ipparam.
   1.147 +Somewhere in your dial up script you have a line similar to:
   1.148 +
   1.149 +	/usr/sbin/pppd /dev/ttyS1 connect "/usr/sbin/chat -t 90 -f $CHATFILE" \
   1.150 +	-d -d -d user user@somewhere file "$OPTIONS"
   1.151 +
   1.152 +Just add 'ipparam FastNet' in the command line for pppd if your ISP has
   1.153 +the name FastNet. The ip-up script will then get 'FastNet' as a sixth
   1.154 +parameter. In your ip-up script you can then call masqmail with
   1.155 +
   1.156 +	/usr/sbin/masqmail -qo "$6"
   1.157 +
   1.158 +instead of 'sendmail -q', if you had that in the script before.
   1.159 +Masqmail will then read the route configuration specified for the
   1.160 +connection name 'FastNet' and deliver the mail destined to the internet.
   1.161 +See the configuration manual on how to write a route configuration or
   1.162 +use one of the examples as a template.
   1.163 +
   1.164 +I do not know how do configure that for an ISDN adapter, but I am sure
   1.165 +you will find something similar in the man pages.
   1.166 +
   1.167 +If you want mail that is received by masqmail from your local net to be
   1.168 +delivered immediately using the route configuration, you have two
   1.169 +possibilities:
   1.170 +
   1.171 +* if you are using the masqdialer system, you just have to set the
   1.172 +  variables online_detect to mserver and mserver_iface to the interface
   1.173 +  mserver is listening to.
   1.174 +* otherwise you have to add two commands in your ip-up script:
   1.175 +	echo -n $6 > /tmp/connect_route
   1.176 +	chmod 644 /tmp/connect_route
   1.177 +  and you have to remove the file /tmp/connect_route in your ip-down script:
   1.178 +	rm /tmp/connect_route.
   1.179 +  Then you have to set online_detect to file and online_file to
   1.180 +  /tmp/connect_route.
   1.181 +
   1.182 +See the route documentation for more.
   1.183 +
   1.184 +
   1.185 +
   1.186 +Written by oku.
   1.187 +Updated by meillo.

     2.1 --- a/INSTALL.agenda	Sat May 29 22:33:10 2010 +0200
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,37 +0,0 @@
     2.4 -
     2.5 -prerequesites:
     2.6 ---------------
     2.7 -cp /usr/lib/glib-config /usr/mipsel-linux/bin
     2.8 -and apply this patch:
     2.9 -
    2.10 -3c3
    2.11 -< prefix=/usr
    2.12 ----
    2.13 -> prefix=/usr/mipsel-linux/
    2.14 -
    2.15 -
    2.16 -compile
    2.17 --------
    2.18 -export CONFIG_SITE=./agenda-config.site
    2.19 -
    2.20 -./configure --prefix=/usr/local/ --with-spooldir=/flash/spool/masqmail/ --with-glib-prefix=/usr/mipsel-linux/ --disable-smtp-server --disable-resolver --with-group=mail --disable-debug --enable-auth
    2.21 -make
    2.22 -
    2.23 -mipsel-linux-strip --remove-section=.comment --remove-section=.note --strip-unneeded src/masqmail
    2.24 -
    2.25 -install
    2.26 --------
    2.27 -
    2.28 -# Become root and do:
    2.29 -make DESTDIR=/tmp/agenda-masqmail/ install
    2.30 -
    2.31 -# make the configuration directory writable for user mail
    2.32 -# (this is needed for sqilconf)
    2.33 -chown mail.mail /tmp/agenda-masqmail/etc/masqmail/
    2.34 -chmod g+rw /tmp/agenda-masqmail/etc/masqmail/
    2.35 -
    2.36 -# delete man pages and unneeded binaries:
    2.37 -rm -rf /tmp/agenda-masqmail/usr/local/man/ /tmp/agenda-masqmail/usr/local/bin/
    2.38 -
    2.39 -You can now rsync the files you need to your agenda from DESTDIR.
    2.40 -

     3.1 --- a/INSTALL.ipaq	Sat May 29 22:33:10 2010 +0200
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,15 +0,0 @@
     3.4 -For a cross compiler:
     3.5 -
     3.6 -Download ipaq-config.site from http://masqmail.cx/ipaq/cross/. There
     3.7 -are also some more instructions.
     3.8 -
     3.9 -export CONFIG_SITE=./ipaq-config.site
    3.10 -
    3.11 -./configure --with-glib-prefix=/skiff/local/ \
    3.12 -	--disable-smtp-server --disable-resolver \
    3.13 -	--with-group=mail --disable-debug --enable-auth
    3.14 -make
    3.15 -
    3.16 -su
    3.17 -make DESTDIR=/tmp/masqmail install
    3.18 -

     4.1 --- a/agenda-config.site	Sat May 29 22:33:10 2010 +0200
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,71 +0,0 @@
     4.4 -# config.site for configure
     4.5 -# Agenda Vr3 TARGET
     4.6 -
     4.7 -# You could put this file to /usr/local/mipsel-linux/etc/agenda-config.site
     4.8 -
     4.9 -# run with
    4.10 -#   CONFIG_SITE=/wherever/you/store/it/agenda-config.site ./configure
    4.11 -# or
    4.12 -#   export CONFIG_SITE=/wherever/you/store/it/agenda-config.site
    4.13 -# if this is going to be a whole compilation orgy
    4.14 -
    4.15 -# Modified from the one provided by Bradley D. LaRonde
    4.16 -
    4.17 -# Edited by Andrej Cedilnik <acedil1@csee.umbc.edu>
    4.18 -
    4.19 -# Used some of solutions by Tilman Vogel <Tilman.Vogel@web.de>
    4.20 -
    4.21 -HOSTCC=gcc
    4.22 -
    4.23 -# Names of the cross-compilers
    4.24 -CC=mipsel-linux-gcc
    4.25 -CXX=mipsel-linux-gcc
    4.26 -
    4.27 -# The cross compiler specific options
    4.28 -CFLAGS="-s -mips2 -O2 -fno-exceptions"
    4.29 -CXXFLAGS="-s -mips2 -O2 -fno-exceptions -I/usr/mipsel-linux/include/g++"
    4.30 -CPPFLAGS="-s -mips2 -O2 -fno-exceptions -I/usr/mipsel-linux/include/g++"
    4.31 -LDFLAGS="-s -mips2"
    4.32 -
    4.33 -# Some other programs
    4.34 -AR=mipsel-linux-ar
    4.35 -RANLIB=mipsel-linux-ranlib
    4.36 -NM=mipsel-linux-nm
    4.37 -ac_cv_path_NM=mipsel-linux-nm
    4.38 -ac_cv_func_setpgrp_void=yes
    4.39 -host=mipsel-linux
    4.40 -#prefix=/usr/mipsel-linux
    4.41 -x_includes=/usr/mipsel-linux/include
    4.42 -x_libraries=/usr/mipsel-linux/X11R6/lib
    4.43 -
    4.44 -# These are for GNU shellutils
    4.45 -jm_cv_have_proc_uptime=yes
    4.46 -jm_cv_func_working_gnu_strftime=yes
    4.47 -
    4.48 -# Some options for ease of compiling python 
    4.49 -ac_cv_sizeof_int=4
    4.50 -ac_cv_sizeof_char=1
    4.51 -ac_cv_sizeof_short=2
    4.52 -ac_cv_sizeof_float=4
    4.53 -ac_cv_sizeof_double=8
    4.54 -ac_cv_sizeof_pthread_t=4
    4.55 -ac_cv_sizeof_long=4
    4.56 -ac_cv_sizeof_void_p=4
    4.57 -ac_cv_sizeof_long_long=8
    4.58 -ac_cv_sizeof_off_t=4
    4.59 -ac_cv_sizeof_fpos_t=4
    4.60 -ac_cv_sizeof_time_t=4
    4.61 -
    4.62 -# Some other stuff nobody knows why
    4.63 -bad_forward=no
    4.64 -LDSHARED='mipsel-linux-gcc -msoft-float -shared'
    4.65 -ac_cv_malloc_zero=nonnull
    4.66 -
    4.67 -# squeak wants this
    4.68 -# can't do misaligned access to doubles
    4.69 -ac_cv_double_align=no
    4.70 -# dunno what order doubles are in
    4.71 -ac_cv_double_order=no
    4.72 -
    4.73 -ac_cv_header_wchar_h=no
    4.74 -

     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/docs/INSTALL.agenda	Sat May 29 22:53:42 2010 +0200
     5.3 @@ -0,0 +1,37 @@
     5.4 +
     5.5 +prerequesites:
     5.6 +--------------
     5.7 +cp /usr/lib/glib-config /usr/mipsel-linux/bin
     5.8 +and apply this patch:
     5.9 +
    5.10 +3c3
    5.11 +< prefix=/usr
    5.12 +---
    5.13 +> prefix=/usr/mipsel-linux/
    5.14 +
    5.15 +
    5.16 +compile
    5.17 +-------
    5.18 +export CONFIG_SITE=./agenda-config.site
    5.19 +
    5.20 +./configure --prefix=/usr/local/ --with-spooldir=/flash/spool/masqmail/ --with-glib-prefix=/usr/mipsel-linux/ --disable-smtp-server --disable-resolver --with-group=mail --disable-debug --enable-auth
    5.21 +make
    5.22 +
    5.23 +mipsel-linux-strip --remove-section=.comment --remove-section=.note --strip-unneeded src/masqmail
    5.24 +
    5.25 +install
    5.26 +-------
    5.27 +
    5.28 +# Become root and do:
    5.29 +make DESTDIR=/tmp/agenda-masqmail/ install
    5.30 +
    5.31 +# make the configuration directory writable for user mail
    5.32 +# (this is needed for sqilconf)
    5.33 +chown mail.mail /tmp/agenda-masqmail/etc/masqmail/
    5.34 +chmod g+rw /tmp/agenda-masqmail/etc/masqmail/
    5.35 +
    5.36 +# delete man pages and unneeded binaries:
    5.37 +rm -rf /tmp/agenda-masqmail/usr/local/man/ /tmp/agenda-masqmail/usr/local/bin/
    5.38 +
    5.39 +You can now rsync the files you need to your agenda from DESTDIR.
    5.40 +

     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/docs/INSTALL.ipaq	Sat May 29 22:53:42 2010 +0200
     6.3 @@ -0,0 +1,15 @@
     6.4 +For a cross compiler:
     6.5 +
     6.6 +Download ipaq-config.site from http://masqmail.cx/ipaq/cross/. There
     6.7 +are also some more instructions.
     6.8 +
     6.9 +export CONFIG_SITE=./ipaq-config.site
    6.10 +
    6.11 +./configure --with-glib-prefix=/skiff/local/ \
    6.12 +	--disable-smtp-server --disable-resolver \
    6.13 +	--with-group=mail --disable-debug --enable-auth
    6.14 +make
    6.15 +
    6.16 +su
    6.17 +make DESTDIR=/tmp/masqmail install
    6.18 +

     7.1 --- a/docs/README	Sat May 29 22:33:10 2010 +0200
     7.2 +++ b/docs/README	Sat May 29 22:53:42 2010 +0200
     7.3 @@ -1,2 +1,12 @@
     7.4  Since masqmail-0.2.22, documentation is maintained in troff (man page)
     7.5  format directly. The old XML sources are no longer used.
     7.6 +
     7.7 +The `old-manual' directory contains the old manual (as expected) and
     7.8 +html versions of man pages from that time (May/July 2000). The files
     7.9 +have been copied from the old project website.
    7.10 +
    7.11 +There are installation instructions for various systems available. Some
    7.12 +of them are outdated and may not work anymore.
    7.13 +
    7.14 +
    7.15 +meillo

     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/docs/agenda-config.site	Sat May 29 22:53:42 2010 +0200
     8.3 @@ -0,0 +1,71 @@
     8.4 +# config.site for configure
     8.5 +# Agenda Vr3 TARGET
     8.6 +
     8.7 +# You could put this file to /usr/local/mipsel-linux/etc/agenda-config.site
     8.8 +
     8.9 +# run with
    8.10 +#   CONFIG_SITE=/wherever/you/store/it/agenda-config.site ./configure
    8.11 +# or
    8.12 +#   export CONFIG_SITE=/wherever/you/store/it/agenda-config.site
    8.13 +# if this is going to be a whole compilation orgy
    8.14 +
    8.15 +# Modified from the one provided by Bradley D. LaRonde
    8.16 +
    8.17 +# Edited by Andrej Cedilnik <acedil1@csee.umbc.edu>
    8.18 +
    8.19 +# Used some of solutions by Tilman Vogel <Tilman.Vogel@web.de>
    8.20 +
    8.21 +HOSTCC=gcc
    8.22 +
    8.23 +# Names of the cross-compilers
    8.24 +CC=mipsel-linux-gcc
    8.25 +CXX=mipsel-linux-gcc
    8.26 +
    8.27 +# The cross compiler specific options
    8.28 +CFLAGS="-s -mips2 -O2 -fno-exceptions"
    8.29 +CXXFLAGS="-s -mips2 -O2 -fno-exceptions -I/usr/mipsel-linux/include/g++"
    8.30 +CPPFLAGS="-s -mips2 -O2 -fno-exceptions -I/usr/mipsel-linux/include/g++"
    8.31 +LDFLAGS="-s -mips2"
    8.32 +
    8.33 +# Some other programs
    8.34 +AR=mipsel-linux-ar
    8.35 +RANLIB=mipsel-linux-ranlib
    8.36 +NM=mipsel-linux-nm
    8.37 +ac_cv_path_NM=mipsel-linux-nm
    8.38 +ac_cv_func_setpgrp_void=yes
    8.39 +host=mipsel-linux
    8.40 +#prefix=/usr/mipsel-linux
    8.41 +x_includes=/usr/mipsel-linux/include
    8.42 +x_libraries=/usr/mipsel-linux/X11R6/lib
    8.43 +
    8.44 +# These are for GNU shellutils
    8.45 +jm_cv_have_proc_uptime=yes
    8.46 +jm_cv_func_working_gnu_strftime=yes
    8.47 +
    8.48 +# Some options for ease of compiling python 
    8.49 +ac_cv_sizeof_int=4
    8.50 +ac_cv_sizeof_char=1
    8.51 +ac_cv_sizeof_short=2
    8.52 +ac_cv_sizeof_float=4
    8.53 +ac_cv_sizeof_double=8
    8.54 +ac_cv_sizeof_pthread_t=4
    8.55 +ac_cv_sizeof_long=4
    8.56 +ac_cv_sizeof_void_p=4
    8.57 +ac_cv_sizeof_long_long=8
    8.58 +ac_cv_sizeof_off_t=4
    8.59 +ac_cv_sizeof_fpos_t=4
    8.60 +ac_cv_sizeof_time_t=4
    8.61 +
    8.62 +# Some other stuff nobody knows why
    8.63 +bad_forward=no
    8.64 +LDSHARED='mipsel-linux-gcc -msoft-float -shared'
    8.65 +ac_cv_malloc_zero=nonnull
    8.66 +
    8.67 +# squeak wants this
    8.68 +# can't do misaligned access to doubles
    8.69 +ac_cv_double_align=no
    8.70 +# dunno what order doubles are in
    8.71 +ac_cv_double_order=no
    8.72 +
    8.73 +ac_cv_header_wchar_h=no
    8.74 +

     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/docs/linux-distris	Sat May 29 22:53:42 2010 +0200
     9.3 @@ -0,0 +1,34 @@
     9.4 +Distribution specific stuff
     9.5 +===========================
     9.6 +
     9.7 +Debian
     9.8 +------
     9.9 +
    9.10 +If you compile for Debian, do the configure with at least these options:
    9.11 +
    9.12 +	./configure --with-liblockfile --with-group=mail
    9.13 +
    9.14 +Use the group `mail' instead of the group `trusted'.
    9.15 +
    9.16 +You can also build your own Debian package with
    9.17 +
    9.18 +	dpkg-buildpackage -rfakeroot
    9.19 +
    9.20 +You need to have fakeroot installed to do this. Or, as root, do:
    9.21 +
    9.22 +	dpkg-buildpackage
    9.23 +
    9.24 +However, you better have a look at the official masqmail package in
    9.25 +Debian.
    9.26 +
    9.27 +	apt-get source masqmail
    9.28 +
    9.29 +is your friend.
    9.30 +
    9.31 +
    9.32 +
    9.33 +SuSE/Redhat
    9.34 +-----------
    9.35 +
    9.36 +There are spec files for rpm creation on the website. You may have to
    9.37 +adjust these files.