masqmail: update to 0.2.23

6 files changed, 39 insertions, 37 deletions

diff --git a/masqmail/.footprint b/masqmail/.footprint
index c54a19d84..d6d0e5a8d 100644
--- a/masqmail/.footprint
+++ b/masqmail/.footprint
@@ -1,10 +1,9 @@
 drwxr-xr-x	root/root	etc/
 drwxr-xr-x	root/root	etc/masqmail/
--rw-r--r--	root/root	etc/masqmail/connect_route
 -rw-r--r--	root/root	etc/masqmail/example.conf
--rw-r--r--	root/root	etc/masqmail/example.get
--rw-r--r--	root/root	etc/masqmail/example.route
--rw-r--r--	root/root	etc/masqmail/inet.route
+-rw-------	root/root	etc/masqmail/example.get
+-rw-------	root/root	etc/masqmail/example.route
+-rw-------	root/root	etc/masqmail/inet.route
 -rw-r--r--	root/root	etc/masqmail/masqmail.alias
 -rw-r--r--	root/root	etc/masqmail/masqmail.conf
 drwxr-xr-x	root/root	etc/rc.d/
@@ -37,6 +36,7 @@ drwxr-xr-x	mail/mail	var/log/masqmail/
 -rw-r--r--	mail/mail	var/log/masqmail/masqmail.log (EMPTY)
 drwxr-xr-x	root/root	var/run/
 drwxr-xr-x	mail/mail	var/run/masqmail/
+-rw-r--r--	root/root	var/run/masqmail/masqmail-route
 drwxr-xr-x	root/root	var/spool/
 drwxr-xr-x	mail/mail	var/spool/masqmail/
 drwxr-xr-x	mail/mail	var/spool/masqmail/input/
diff --git a/masqmail/.md5sum b/masqmail/.md5sum
index 037236def..eb2474550 100644
--- a/masqmail/.md5sum
+++ b/masqmail/.md5sum
@@ -1,5 +1,5 @@
 3740a79250c65218a41e9591d3a20434  inet.route
 413f66f053693a10abc4c9c632fd0659  masqmail
-8440350c3f3a14de1ec5238f823ef834  masqmail.alias
-8000add5b6158ccd25601cc497b2f0e4  masqmail.conf
-7e989a8b0562054aea22c654507f2cb5  masqmail_0.2.21.orig.tar.gz
+8fb2d498b9a8db7c51d9261717386681  masqmail-0.2.23.tar.gz
+75ed683dec31e6712a4083b04e2e2a15  masqmail.alias
+1e617333b5268d7d2db9380418b60f3c  masqmail.conf
diff --git a/masqmail/Pkgfile b/masqmail/Pkgfile
index de6cd5cac..808e1678c 100644
--- a/masqmail/Pkgfile
+++ b/masqmail/Pkgfile
@@ -1,21 +1,23 @@
-# Description: Mail Transfer Agent for dialup networks 
-# URL:         http://www.sonic.net/~okurth/masqmail/
+# Description: Mail Transfer Agent for workstations and local networks 
+# URL:         http://marmaro.de/prog/masqmail/
 # Maintainer:  Juergen Daubert, juergen dot daubert at t-online dot de
 # Depends on:  glib
 
 name=masqmail
-version=0.2.21
+version=0.2.23
 release=1
-source=(http://ftp.debian.org/debian/pool/main/m/masqmail/${name}_$version.orig.tar.gz \
-	masqmail masqmail.conf masqmail.alias inet.route)
+source=(http://marmaro.de/prog/masqmail/$name-$version.tar.gz
+        masqmail masqmail.conf masqmail.alias inet.route)
 
 build () {
     cd $name-$version
+
     ./configure --prefix=/usr \
+                --mandir=/usr/man \
                 --enable-auth \
                 --enable-maildir \
                 --with-user=mail \
-                --with-group=mail 
+                --with-group=mail
     make
     make DESTDIR=$PKG install
 
@@ -23,18 +25,15 @@ build () {
     ln -s ../sbin/masqmail $PKG/usr/bin/mailq
 
     install -m 644 $SRC/masqmail.{conf,alias} $PKG/etc/masqmail
-    install -m 644 $SRC/inet.route $PKG/etc/masqmail
-    echo -n "inet" > $PKG/etc/masqmail/connect_route
-    install -m 644 examples/example.* $PKG/etc/masqmail
+    install -m 600 $SRC/inet.route $PKG/etc/masqmail
+    echo -n "inet" > $PKG/var/run/masqmail/masqmail-route
+    install -m 600 examples/example.* $PKG/etc/masqmail
     install -m 644 examples/masqmail.conf $PKG/etc/masqmail/example.conf
     install -D -m 755 $SRC/masqmail $PKG/etc/rc.d/masqmail
+
+    rm $PKG/usr/share/masqmail/tpl/*.tpl.*
+    rm -r $PKG/usr/share/doc
     
-    sed -i -e "s/#host#/$(hostname)/g" \
-           -e "s/#domain#/$(hostname -d)/g" \
-           $PKG/etc/masqmail/masqmail.conf
-    
-   rm $PKG/usr/share/masqmail/tpl/*.tpl.*
-   touch $PKG/var/log/masqmail/{masqmail,debug}.log
-   chown mail:mail $PKG/var/log/masqmail/*
-   chown root:root $PKG/var/run    
+    touch $PKG/var/log/masqmail/{masqmail,debug}.log
+    chown mail:mail $PKG/var/log/masqmail/*
 }
diff --git a/masqmail/README b/masqmail/README
index a69c9f078..b8ac34b4b 100644
--- a/masqmail/README
+++ b/masqmail/README
@@ -3,21 +3,22 @@ README for masqmail 0.2.x
 REQUIREMENTS
 
 PRE-INSTALL
-1. Remove sendmail. Masqmail and sendmail can not coexist.
+1. Remove exim. Masqmail and exim can not coexist.
       
 POST-INSTALL
-1. Check /etc/masqmail/masqmail.conf for correct values for
-   your host/domain. 
-2. Now masqmail delivers all non-local mail directly to the 
-   mail server of the recipient. To use the mail server of
-   your provider for delivering mail, edit inet.route.
-3. In this configuration masqmail doesn't take care about
-   your online status. See masqmail.conf(5) about online
-   detection.
- 
+1. Edit /etc/masqmail/masqmail.conf and change the placeholders
+   for host and domain into correct values.
+2. Now masqmail delivers all non-local mail directly to the mail 
+   server of the recipient. This will not work for the usual
+   dialup connections. To use the mail server of your provider 
+   for delivering mail, edit inet.route.
+3. In this configuration masqmail doesn't take care about your 
+   online status. See masqmail.conf(5) about online detection.
+4. Create a alias for postmaster and root in masqmail.alias
+
 PRECAUTION
    As of version 0.2.21 the masqmail log files must be 
    writeable by the system-user 'mail'. 
    
      chown mail:mail /var/log/masqmail/*
-   
+
diff --git a/masqmail/masqmail.alias b/masqmail/masqmail.alias
index 6e3dacae5..953af15fe 100644
--- a/masqmail/masqmail.alias
+++ b/masqmail/masqmail.alias
@@ -3,5 +3,7 @@
 #
 
 postmaster:  root@localhost
+#postmaster:  <user>@locahost
+#root:        postmaster
 
 # End of file
diff --git a/masqmail/masqmail.conf b/masqmail/masqmail.conf
index de1d9a746..1fb0bfcd5 100644
--- a/masqmail/masqmail.conf
+++ b/masqmail/masqmail.conf
@@ -16,8 +16,8 @@ log_dir = "/var/log/masqmail"
 alias_file = "/etc/masqmail/masqmail.alias"
 
 online_detect = file
-online_file = "/etc/masqmail/connect_route"
+online_file = "/var/run/masqmail/masqmail-route"
 
 online_routes.inet = "/etc/masqmail/inet.route"
 
-# End of file
\ No newline at end of file
+# End of file