masqmail: update to 0.2.21

masqmail/.footprint

@@ -12,7 +12,6 @@ drwxr-xr-x	root/root	etc/rc.d/
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 lrwxrwxrwx	root/root	usr/bin/mailq -> ../sbin/masqmail
-lrwxrwxrwx	root/root	usr/bin/mailrm -> ../sbin/masqmail
 -rwxr-xr-x	root/root	usr/bin/mservdetect
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man5/
@@ -21,11 +20,8 @@ drwxr-xr-x	root/root	usr/man/man5/
 -rw-r--r--	root/root	usr/man/man5/masqmail.get.5.gz
 -rw-r--r--	root/root	usr/man/man5/masqmail.route.5.gz
 drwxr-xr-x	root/root	usr/man/man8/
-lrwxrwxrwx	root/root	usr/man/man8/mailq.8.gz -> masqmail.8.gz
-lrwxrwxrwx	root/root	usr/man/man8/mailrm.8.gz -> masqmail.8.gz
 -rw-r--r--	root/root	usr/man/man8/masqmail.8.gz
 -rw-r--r--	root/root	usr/man/man8/mservdetect.8.gz
-lrwxrwxrwx	root/root	usr/man/man8/sendmail.8.gz -> masqmail.8.gz
 drwxr-xr-x	root/root	usr/sbin/
 -rwsr-xr-x	root/root	usr/sbin/masqmail
 lrwxrwxrwx	root/root	usr/sbin/sendmail -> masqmail
@@ -37,8 +33,10 @@ drwxr-xr-x	root/root	usr/share/masqmail/tpl/
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/log/
 drwxr-xr-x	mail/mail	var/log/masqmail/
--rw-r--r--	root/root	var/log/masqmail/debug.log (EMPTY)
--rw-r--r--	root/root	var/log/masqmail/masqmail.log (EMPTY)
+-rw-r--r--	mail/mail	var/log/masqmail/debug.log (EMPTY)
+-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/
 drwxr-xr-x	root/root	var/spool/
 drwxr-xr-x	mail/mail	var/spool/masqmail/
 drwxr-xr-x	mail/mail	var/spool/masqmail/input/

masqmail/.md5sum

@@ -1,6 +1,5 @@
-8a04744caa2093ec5bfa9c2084166336  connect_route
 3740a79250c65218a41e9591d3a20434  inet.route
 413f66f053693a10abc4c9c632fd0659  masqmail
-74540980ecde45783e888d1da80cb318  masqmail-0.2.20.tar.gz
 8440350c3f3a14de1ec5238f823ef834  masqmail.alias
 8000add5b6158ccd25601cc497b2f0e4  masqmail.conf
+7e989a8b0562054aea22c654507f2cb5  masqmail_0.2.21.orig.tar.gz

masqmail/Pkgfile

@@ -1,13 +1,13 @@
 # Description: Mail Transfer Agent for dialup networks 
 # URL:         http://innominate.org/kurth/masqmail/
 # Maintainer:  Jürgen Daubert, juergen dot daubert at t-online dot de
-# Depends on:  glib1
+# Depends on:  glib
 
 name=masqmail
-version=0.2.20
-release=3
-source=(http://innominate.org/kurth/$name/download/$name-$version.tar.gz \
-	masqmail masqmail.conf masqmail.alias inet.route connect_route)
+version=0.2.21
+release=1
+source=(http://ftp.debian.org/debian/pool/main/m/masqmail/${name}_$version.orig.tar.gz \
+	masqmail masqmail.conf masqmail.alias inet.route)
 
 build () {
     cd $name-$version
@@ -21,21 +21,20 @@ build () {
 
     ln -s masqmail $PKG/usr/sbin/sendmail
     ln -s ../sbin/masqmail $PKG/usr/bin/mailq
-    ln -s ../sbin/masqmail $PKG/usr/bin/mailrm
-    ln -s masqmail.8 $PKG/usr/man/man8/sendmail.8
-    ln -s masqmail.8 $PKG/usr/man/man8/mailq.8
-    ln -s masqmail.8 $PKG/usr/man/man8/mailrm.8
 
-    cp ../masqmail.{conf,alias} $PKG/etc/masqmail
-    cp ../{inet.route,connect_route} $PKG/etc/masqmail
-    cp examples/example.* $PKG/etc/masqmail
-    cp examples/masqmail.conf $PKG/etc/masqmail/example.conf
-    install -D -m 755 ../masqmail $PKG/etc/rc.d/masqmail
-    touch $PKG/var/log/masqmail/{masqmail,debug}.log
+    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 644 examples/masqmail.conf $PKG/etc/masqmail/example.conf
+    install -D -m 755 $SRC/masqmail $PKG/etc/rc.d/masqmail
     
-    sed -i -e "s/#host#/`hostname`/g" \
-           -e "s/#domain#/`hostname -d`/g" \
+    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    
 }

masqmail/README

@@ -14,6 +14,10 @@ POST-INSTALL
 3. In this configuration masqmail doesn't take care about
    your online status. See masqmail.conf(5) about online
    detection.
-  
+ 
 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/*
+   

masqmail/connect_route

@@ -1 +0,0 @@
-inet