[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (1608ad694e6ef9ea400a99bad444401097859345)

Vlad Glagolev scm at sourcemage.org
Wed Jan 18 22:21:17 EST 2012


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 ChangeLog                          |    5 +++
 accounts                           |    1 
 groups                             |    1 
 mail/courier/CONFLICTS             |    1 
 mail/courier/HISTORY               |    3 ++
 mail/esmtp/CONFLICTS               |    1 
 mail/esmtp/HISTORY                 |    3 ++
 mail/exim/CONFLICTS                |    1 
 mail/exim/HISTORY                  |    3 ++
 mail/masqmail/BUILD                |   10 +++++++
 mail/masqmail/CONFIGURE            |   11 ++++++++
 mail/masqmail/CONFLICTS            |    6 ++++
 mail/masqmail/DEPENDS              |    6 ++++
 mail/masqmail/DETAILS              |   47 +++++++++++++++++++++++++++++++++++++
 mail/masqmail/HISTORY              |    3 ++
 mail/masqmail/INSTALL              |   24 ++++++++++++++++++
 mail/masqmail/PROVIDES             |    2 +
 mail/masqmail/SECURITY             |    3 ++
 mail/masqmail/init.d/masqmail      |   11 ++++++++
 mail/masqmail/init.d/masqmail.conf |   10 +++++++
 mail/masqmail/masqmail.gpg         |binary
 mail/postfix/CONFLICTS             |    1 
 mail/postfix/HISTORY               |    3 ++
 mail/qmail/CONFLICTS               |    1 
 mail/qmail/HISTORY                 |    3 ++
 mail/sendmail/CONFLICTS            |    1 
 mail/sendmail/HISTORY              |    3 ++
 mail/ssmtp/CONFLICTS               |    1 
 mail/ssmtp/HISTORY                 |    3 ++
 29 files changed, 168 insertions(+)

New commits:
commit 1608ad694e6ef9ea400a99bad444401097859345
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    ssmtp: conflicts masqmail

commit e3cfcc56db91b6f2ff30a6ed6e3904a7e8ac1d63
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    qmail: conflicts masqmail

commit 4794c3e84c753796cd563da17e52ea44c0d6b684
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    sendmail: conflicts masqmail

commit a9a159c50097a720f50f27c0f69410d04c5d8b79
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    postfix: conflicts masqmail

commit 34d632e64a5c405d5baed2f159d1e10738628aeb
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    esmtp: conflicts masqmail

commit 4440ece4400d634bc02e4232160e2dbd039abfe3
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    courier: conflicts masqmail

commit a99a956b335571f7bdc4a0e3c4cc07e302f86b76
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    exim: conflicts masqmail

commit 18b3fbeff8684bf622b2ec65703d535ac1049fa3
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    masqmail: new spell, MTA for workstations and for servers in small networks

commit 60f485da08c9bb2dc0403d92b47df41f017034da
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    added account data for masqmai

diff --git a/ChangeLog b/ChangeLog
index 2b92d79..4f071b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-19 Vlad Glagolev <stealth at sourcemage.org>
+	* accounts, groups: added account data for masqmail
+	* mail/masqmail: new spell, MTA for workstations and for servers in
+	  small networks
+
 2012-01-16 Ladislav Hagara <hgr at vabo.cz>
 	* archive-libs/snappy: new, fast compression/decompression library
 
diff --git a/accounts b/accounts
index 45531bf..7cc238f 100755
--- a/accounts
+++ b/accounts
@@ -96,4 +96,5 @@ dspam:187:188
 nslcd:188:189
 redis:189:190
 lightdm:191:191
+masqmail:192:192
 nobody:65534:65534
diff --git a/groups b/groups
index d65f43d..2546446 100755
--- a/groups
+++ b/groups
@@ -116,5 +116,6 @@ dspam:188:
 nslcd:189:
 redis:190:
 lightdm:191:
+masqmail:192:
 users:1000:
 nogroup:65534:
diff --git a/mail/courier/CONFLICTS b/mail/courier/CONFLICTS
index d60101b..36fa790 100755
--- a/mail/courier/CONFLICTS
+++ b/mail/courier/CONFLICTS
@@ -1,4 +1,5 @@
 conflicts courier-imap &&
+conflicts masqmail &&
 conflicts esmtp &&
 conflicts exim &&
 conflicts postfix &&
diff --git a/mail/courier/HISTORY b/mail/courier/HISTORY
index 8bbee30..496ca4e 100644
--- a/mail/courier/HISTORY
+++ b/mail/courier/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth at sourcemage.org>
+	* CONFLICTS: added masqmail
+
 2011-03-27 Remko van der Vossen <wich at sourcemage.org>
 	* DETAILS: version 0.65.3
 	* init.d/*: simplified and use smgl_init (working NEEDS)
diff --git a/mail/esmtp/CONFLICTS b/mail/esmtp/CONFLICTS
index 3ae5540..6482df0 100755
--- a/mail/esmtp/CONFLICTS
+++ b/mail/esmtp/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts  masqmail  &&
 conflicts  courier   &&
 conflicts  exim      &&
 conflicts  postfix   &&
diff --git a/mail/esmtp/HISTORY b/mail/esmtp/HISTORY
index 3060a7c..7862f87 100644
--- a/mail/esmtp/HISTORY
+++ b/mail/esmtp/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth at sourcemage.org>
+	* CONFLICTS: added masqmail
+
 2011-10-23 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.2
 
diff --git a/mail/exim/CONFLICTS b/mail/exim/CONFLICTS
index 91e224b..d8f360d 100755
--- a/mail/exim/CONFLICTS
+++ b/mail/exim/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts  masqmail  &&
 conflicts  courier   &&
 conflicts  esmtp     &&
 conflicts  postfix   &&
diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY
index 9022940..3d9d4dd 100644
--- a/mail/exim/HISTORY
+++ b/mail/exim/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth at sourcemage.org>
+	* CONFLICTS: added masqmail
+
 2011-10-10 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 4.77; SECURITY_PATCH++
 
diff --git a/mail/masqmail/BUILD b/mail/masqmail/BUILD
new file mode 100755
index 0000000..be4c244
--- /dev/null
+++ b/mail/masqmail/BUILD
@@ -0,0 +1,10 @@
+create_account masqmail &&
+create_account mail &&
+
+OPTS="--with-user=masqmail \
+      --with-group=masqmail \
+      --with-spooldir=$INSTALL_ROOT/var/spool/mail \
+      $MASQMAIL_OPTS \
+      $OPTS" &&
+
+default_build
diff --git a/mail/masqmail/CONFIGURE b/mail/masqmail/CONFIGURE
new file mode 100755
index 0000000..e203269
--- /dev/null
+++ b/mail/masqmail/CONFIGURE
@@ -0,0 +1,11 @@
+config_query_option MASQMAIL_OPTS "Enable resolver support?" y \
+                                  "--enable-resolver" \
+                                  "--disable-resolver" &&
+
+config_query_option MASQMAIL_OPTS "Enable AUTH (RFC 2554) client support?" y \
+                                  "--enable-auth" \
+                                  "--disable-auth" &&
+
+config_query_option MASQMAIL_OPTS "Enable debugging?" n \
+                                  "--enable-debug" \
+                                  "--disable-debug"
diff --git a/mail/masqmail/CONFLICTS b/mail/masqmail/CONFLICTS
new file mode 100755
index 0000000..a1641aa
--- /dev/null
+++ b/mail/masqmail/CONFLICTS
@@ -0,0 +1,6 @@
+conflicts  exim      &&
+conflicts  courier   &&
+conflicts  esmtp     &&
+conflicts  postfix   &&
+conflicts  sendmail  &&
+conflicts  netqmail
diff --git a/mail/masqmail/DEPENDS b/mail/masqmail/DEPENDS
new file mode 100755
index 0000000..dad78f0
--- /dev/null
+++ b/mail/masqmail/DEPENDS
@@ -0,0 +1,6 @@
+depends glib2 &&
+
+optional_depends liblockfile \
+                 "--with-liblockfile" \
+                 "--without-liblockfile" \
+                 "to use liblock"
diff --git a/mail/masqmail/DETAILS b/mail/masqmail/DETAILS
new file mode 100755
index 0000000..aab8643
--- /dev/null
+++ b/mail/masqmail/DETAILS
@@ -0,0 +1,47 @@
+           SPELL=masqmail
+         VERSION=0.3.4
+          SOURCE=$SPELL-$VERSION.tar.gz
+         SOURCE2=$SOURCE.asc
+   SOURCE_URL[0]=http://marmaro.de/prog/$SPELL/files/$SOURCE
+  SOURCE2_URL[0]=$SOURCE_URL.asc
+      SOURCE_GPG=masqmail.gpg:$SOURCE2:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+      LICENSE[0]=GPL
+        WEB_SITE=http://marmaro.de/prog/masqmail/
+         ENTERED=20120119
+           SHORT="MTA for workstations and for servers in small networks"
+cat << EOF
+Masqmail is a mail server designed for hosts that are not permanently connected
+to the Internet. It handles outgoing messages, i.e. those that are to be sent
+over the non-permanent link (usually a ppp or slip connection over a modem or
+ISDN adapter) specially and delivers them only when explicitely told to do so.
+There is support for multiple providers, it is possible to write different
+configurations for each one. The configuration chosen is selected at delivery
+time, so that if for example a delivery of a message failed while connected with
+provider 1, it may be delivered when connected to provider 2. For each provider
+another mail host (or none) can be specified.
+
+Masqmail provides (a yet simple) mechanism to rewrite headers, also depending on
+the current connection. This makes it possible to deliver messages with a return
+address on the local network which will be rewitten at delivery time.
+
+The purpose of this is:
+
+- to allow delivery failure messages that are produced on the local network to
+be delivered immediately, while those that are produced outside can be delivered
+to a mailbox on the internet, to be retrieved later.
+
+- to give mail servers a return address which they can accept if they check for
+spam mail. Many mail servers require a return address which has the same domain
+as the server it is getting the message from. If you normally connect to only
+one provider, this is usually not a problem as you can configure your mailer to
+a fixed address (but then there is still the problem with the failure messages),
+but it is a problem if you use different ones from time to time.
+
+Masqmail shall once be a complete replacement for sendmail (or other MTAs such
+as exim, qmail or smail) on a local network, but it is NOT supposed to be
+installed in a network with a permanent internet connection (at least if it is
+not behind a secure firewall) because it has no ability to check for undesired
+relaying or spam filtering.
+EOF
diff --git a/mail/masqmail/HISTORY b/mail/masqmail/HISTORY
new file mode 100644
index 0000000..80df95c
--- /dev/null
+++ b/mail/masqmail/HISTORY
@@ -0,0 +1,3 @@
+2012-01-19 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS, DEPENDS, CONFIGURE, BUILD, CONFLICTS, PROVIDES, SECURITY,
+	  INSTALL, init.d/masqmail{,.conf}, masqmail.gpg: spell created
diff --git a/mail/masqmail/INSTALL b/mail/masqmail/INSTALL
new file mode 100755
index 0000000..2fb052b
--- /dev/null
+++ b/mail/masqmail/INSTALL
@@ -0,0 +1,24 @@
+default_install &&
+
+install_config_file examples/masqmail.conf "$INSTALL_ROOT/etc/masqmail" &&
+
+ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/lib/sendmail" &&
+ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/sbin/sendmail" &&
+
+ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/sbin/mailq" &&
+ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/sbin/runq" &&
+ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/sbin/mailrm" &&
+
+install -vm 1777 -d -o masqmail -g masqmail "$INSTALL_ROOT/var/spool/mail" &&
+
+if [[ -e $INSTALL_ROOT/var/spool/mail/input ]]; then
+  chown -R masqmail:masqmail "$INSTALL_ROOT/var/spool/mail/input"
+fi &&
+if [[ -e $INSTALL_ROOT/var/spool/mail/lock ]]; then
+  chown -R masqmail:masqmail "$INSTALL_ROOT/var/spool/mail/lock"
+fi &&
+
+if [[ $INIT_INSTALLED ]]; then
+  install_config_file "$SPELL_DIRECTORY/init.d/masqmail.conf" \
+                      "$INSTALL_ROOT/etc/sysconfig/masqmail"
+fi
diff --git a/mail/masqmail/PROVIDES b/mail/masqmail/PROVIDES
new file mode 100755
index 0000000..bebbaa4
--- /dev/null
+++ b/mail/masqmail/PROVIDES
@@ -0,0 +1,2 @@
+MAIL-TRANSPORT-AGENT
+SENDMAIL
diff --git a/mail/masqmail/SECURITY b/mail/masqmail/SECURITY
new file mode 100755
index 0000000..e1979f3
--- /dev/null
+++ b/mail/masqmail/SECURITY
@@ -0,0 +1,3 @@
+The use of MasqMail is *strongly* discouraged if you have a permanent connection
+to the internet without a firewall. Mainly because it does not have the ability
+to block relaying (it relays every mail). --FAQ
diff --git a/mail/masqmail/init.d/masqmail b/mail/masqmail/init.d/masqmail
new file mode 100755
index 0000000..478438c
--- /dev/null
+++ b/mail/masqmail/init.d/masqmail
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+. /etc/sysconfig/masqmail
+
+PROGRAM=/usr/sbin/masqmail
+ARGS="-bd -q${QUEUE_DELAY}"
+PIDFILE="/var/run/masqmail/masqmail.pid"
+RUNLEVEL=3
+NEEDS="+network"
+
+. /etc/init.d/smgl_init
diff --git a/mail/masqmail/init.d/masqmail.conf b/mail/masqmail/init.d/masqmail.conf
new file mode 100644
index 0000000..0e16086
--- /dev/null
+++ b/mail/masqmail/init.d/masqmail.conf
@@ -0,0 +1,10 @@
+#
+# Configuration file for masqmail's init.d script
+#
+
+#
+# Accumulated message queue process time
+# e.g. every 10 minutes
+#
+QUEUE_DELAY=10m
+
diff --git a/mail/masqmail/masqmail.gpg b/mail/masqmail/masqmail.gpg
new file mode 100644
index 0000000..b489034
Binary files /dev/null and b/mail/masqmail/masqmail.gpg differ
diff --git a/mail/postfix/CONFLICTS b/mail/postfix/CONFLICTS
index ef52ac0..b94f6db 100755
--- a/mail/postfix/CONFLICTS
+++ b/mail/postfix/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts masqmail &&
 conflicts exim &&
 conflicts qmail &&
 conflicts sendmail
diff --git a/mail/postfix/HISTORY b/mail/postfix/HISTORY
index 79e1a02..a795e42 100644
--- a/mail/postfix/HISTORY
+++ b/mail/postfix/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth at sourcemage.org>
+	* CONFLICTS: added masqmail
+
 2011-06-25 Elisamuel Resto <ryuji at sourcemage.org>
 	* DEPENDS: updated stable to 2.8.3; experimental to 2.9-20110615
 
diff --git a/mail/qmail/CONFLICTS b/mail/qmail/CONFLICTS
index 6496d05..3c0a6f0 100755
--- a/mail/qmail/CONFLICTS
+++ b/mail/qmail/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts  masqmail   &&
 conflicts  exim       &&
 conflicts  netqmail   &&
 conflicts  sendmail   &&
diff --git a/mail/qmail/HISTORY b/mail/qmail/HISTORY
index b05ddd1..287eff9 100644
--- a/mail/qmail/HISTORY
+++ b/mail/qmail/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth at sourcemage.org>
+	* CONFLICTS: added masqmail
+
 2010-04-20 Dave Josephsen <dave at sourcemage.org>
 	* CONFIGURE, PRE_BUILD, patches/qmail-tls-patch: Add TLS patch
 
diff --git a/mail/sendmail/CONFLICTS b/mail/sendmail/CONFLICTS
index ecde466..38cde47 100755
--- a/mail/sendmail/CONFLICTS
+++ b/mail/sendmail/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts  masqmail     &&
 conflicts  courier      &&
 conflicts  esmtp        &&
 conflicts  exim         &&
diff --git a/mail/sendmail/HISTORY b/mail/sendmail/HISTORY
index 41219d9..98ec9e1 100644
--- a/mail/sendmail/HISTORY
+++ b/mail/sendmail/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth at sourcemage.org>
+	* CONFLICTS: added masqmail
+
 2011-10-14 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: fixed long description wrap (scripted)
 
diff --git a/mail/ssmtp/CONFLICTS b/mail/ssmtp/CONFLICTS
index de2ee92..f55db76 100755
--- a/mail/ssmtp/CONFLICTS
+++ b/mail/ssmtp/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts  masqmail
 conflicts  esmtp
 conflicts  exim
 conflicts  qmail
diff --git a/mail/ssmtp/HISTORY b/mail/ssmtp/HISTORY
index e91b691..1ed69d3 100644
--- a/mail/ssmtp/HISTORY
+++ b/mail/ssmtp/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth at sourcemage.org>
+	* CONFLICTS: added masqmail
+
 2010-02-05 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: changed SOURCE .gz => .bz2
 


More information about the SM-Commit mailing list