ports/opt (2.8): [notify] masqmail: update to 0.3.4

crux at crux.nu crux at crux.nu
Mon Nov 19 17:36:03 UTC 2012


commit eb0797a241bed6d06f6330955e8049831566d521
Author: Juergen Daubert <jue at jue.li>
Date:   Mon Nov 19 18:06:34 2012 +0100

    [notify] masqmail: update to 0.3.4
    
    New major release with lots of incompatible changes. See
    NEWS [1] and ChangeLog [2].
    
    [1] http://hg.marmaro.de/masqmail/file/35c5239ebcc1/NEWS
    [2] http://hg.marmaro.de/masqmail/file/35c5239ebcc1/ChangeLog

diff --git a/masqmail/.footprint b/masqmail/.footprint
index dd91f19..0da18f5 100644
--- a/masqmail/.footprint
+++ b/masqmail/.footprint
@@ -1,11 +1,9 @@
 drwxr-xr-x	root/root	etc/
 drwxr-xr-x	root/root	etc/masqmail/
--rw-r--r--	root/root	etc/masqmail/example.conf
--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/example.route
+-rw-r--r--	root/root	etc/masqmail/localnet.route
 -rw-r--r--	root/root	etc/masqmail/masqmail.conf
+-rw-r--r--	root/root	etc/masqmail/openssl.route
 drwxr-xr-x	root/root	etc/rc.d/
 -rwxr-xr-x	root/root	etc/rc.d/masqmail
 drwxr-xr-x	root/root	usr/
@@ -18,7 +16,6 @@ drwxr-xr-x	root/root	usr/man/man1/
 drwxr-xr-x	root/root	usr/man/man5/
 -rw-r--r--	root/root	usr/man/man5/masqmail.aliases.5.gz
 -rw-r--r--	root/root	usr/man/man5/masqmail.conf.5.gz
--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/
 -rw-r--r--	root/root	usr/man/man8/masqmail.8.gz
@@ -33,15 +30,15 @@ drwxr-xr-x	root/root	usr/share/masqmail/tpl/
 -rw-r--r--	root/root	usr/share/masqmail/tpl/failmsg.tpl
 -rw-r--r--	root/root	usr/share/masqmail/tpl/warnmsg.tpl
 drwxr-xr-x	root/root	var/
+drwxr-xr-x	root/root	var/lock/
+drwxr-xr-x	mail/mail	var/lock/masqmail/
 drwxr-xr-x	root/root	var/log/
 drwxr-xr-x	mail/mail	var/log/masqmail/
 -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/
--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/
 drwxr-xr-x	mail/mail	var/spool/masqmail/lock/
-drwxr-xr-x	mail/mail	var/spool/masqmail/popuidl/
diff --git a/masqmail/.md5sum b/masqmail/.md5sum
index 335ae82..28e50e0 100644
--- a/masqmail/.md5sum
+++ b/masqmail/.md5sum
@@ -1,5 +1,2 @@
-3740a79250c65218a41e9591d3a20434  inet.route
 413f66f053693a10abc4c9c632fd0659  masqmail
-93d9d0e6e0421e0f6ac3b80cab99ce70  masqmail-0.2.30.tar.gz
-75ed683dec31e6712a4083b04e2e2a15  masqmail.alias
-1e617333b5268d7d2db9380418b60f3c  masqmail.conf
+551bd887c71d7b8f3bb149b617adb1b3  masqmail-0.3.4.tar.gz
diff --git a/masqmail/Pkgfile b/masqmail/Pkgfile
index fba32d2..d88d086 100644
--- a/masqmail/Pkgfile
+++ b/masqmail/Pkgfile
@@ -1,22 +1,19 @@
 # Description: Mail Transfer Agent for workstations and local networks 
 # URL:         http://marmaro.de/prog/masqmail/
-# Maintainer:  Juergen Daubert, jue at crux dot nu
+# Maintainer:  Juergen Daubert, juergen dot daubert at t-online dot de
 # Depends on:  glib
 
 name=masqmail
-version=0.2.30
+version=0.3.4
 release=1
 source=(http://marmaro.de/prog/masqmail/files/$name-$version.tar.gz
-        masqmail masqmail.conf masqmail.alias inet.route)
+        masqmail)
 
 build () {
     cd $name-$version
 
     ./configure --prefix=/usr \
                 --mandir=/usr/man \
-                --enable-auth \
-                --enable-maildir \
-                --enable-ident \
                 --with-user=mail \
                 --with-group=mail
     make
@@ -25,16 +22,13 @@ build () {
     ln -s masqmail $PKG/usr/sbin/sendmail
     ln -s ../sbin/masqmail $PKG/usr/bin/mailq
 
-    install -m 644 $SRC/masqmail.{conf,alias} $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 -m 644 examples/* $PKG/etc/masqmail
     install -D -m 755 $SRC/masqmail $PKG/etc/rc.d/masqmail
 
-    rm $PKG/usr/share/masqmail/tpl/*.tpl.*
-    rm -r $PKG/usr/share/doc
-    
+    install -d -o mail -g mail $PKG/var/{log,lock,spool}/masqmail
     touch $PKG/var/log/masqmail/{masqmail,debug}.log
     chown mail:mail $PKG/var/log/masqmail/*
+
+    rm $PKG/usr/share/masqmail/tpl/*.tpl.*
+    rm -r $PKG/usr/share/doc
 }
diff --git a/masqmail/README b/masqmail/README
deleted file mode 100644
index b8ac34b..0000000
--- a/masqmail/README
+++ /dev/null
@@ -1,24 +0,0 @@
-README for masqmail 0.2.x
-
-REQUIREMENTS
-
-PRE-INSTALL
-1. Remove exim. Masqmail and exim can not coexist.
-      
-POST-INSTALL
-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/inet.route b/masqmail/inet.route
deleted file mode 100644
index 6884968..0000000
--- a/masqmail/inet.route
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# /etc/masqmail/inet.route
-#
-
-# mail_host = "smpt.provider.com"
-# allowed_mail_locals = "user1;user2"
-
-# End of file
\ No newline at end of file
diff --git a/masqmail/masqmail.alias b/masqmail/masqmail.alias
deleted file mode 100644
index 953af15..0000000
--- a/masqmail/masqmail.alias
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# /etc/masqmail/masqmail.alias
-#
-
-postmaster:  root at localhost
-#postmaster:  <user>@locahost
-#root:        postmaster
-
-# End of file
diff --git a/masqmail/masqmail.conf b/masqmail/masqmail.conf
deleted file mode 100644
index 1fb0bfc..0000000
--- a/masqmail/masqmail.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# /etc/masqmail/masqmail.conf
-#
-
-debug_level = 4
-use_syslog=false
-
-host_name = "#host#.#domain#"
-local_hosts = "localhost;#host#;#host#.#domain#"
-local_nets = "*.#domain#"
-listen_addresses = "localhost:25;#host#.#domain#:25"
-
-spool_dir = "/var/spool/masqmail"
-mail_dir = "/var/spool/mail"
-log_dir = "/var/log/masqmail"
-alias_file = "/etc/masqmail/masqmail.alias"
-
-online_detect = file
-online_file = "/var/run/masqmail/masqmail-route"
-
-online_routes.inet = "/etc/masqmail/inet.route"
-
-# End of file



More information about the CRUX mailing list