New commits:
commit f3e740f597aeee7abfab45a68041166f6d64564e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
winusb: a few fixes, related to parted and ntfs-3g
commit e2e86056e5b8762f16349a2d124e56ae316686f7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
winusb: added missing dep
commit bf6ca496232f751a9fe92c0ac207ebc2ffb7d375
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libgksu: fixed compilation with recent gtk+2 and compatibility with
recent sudo
commit 29b5a7cf49baf83880bf6be6b59fd3b2f1313a33
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
winusb: new spell, program to create Windows USB stick installer from
CD/DVD
commit 0a6632da3ec527c275fdc9b9a517b48c7bfc21f9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
grub2: deprecated lzo dependency
commit 71b01ca70dc0d0018147c104ff0a3b49929d331f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ntfs-3g: renewed dependencies and options
commit 0caeecc5ef77a8864f66a6afca3479e15f4ffcee
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
iproute2 3.2.0
commit 9893a0d93945e221b729f1f78bffd932daaaa229
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
shared-mime-info 1.0
commit 6fa9717d706c6b1f3203afb7d461dade690eb0ca
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
sg3_utils 1.33
commit df5d465788cbb5543e63d5a637b09081232f374f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
guvcview: berlios -> sourceforge
commit fb53a259a0efa3b0dc6d5f594e418402489c4759
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
binutils: install libiberty.h (some code wants to use it, LFS recommends
installing, too)
commit 1c38e0661cf5a7583aef8f1821f818c547466cf2
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
git 1.7.8.4
commit 7e7b8745fb0b9f8c9eb9a19fe254c6df4b1f763e
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
gnome-shell 3.2.2.1
commit c744df346f819996057a08f494240257bb2c3292
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
python-ldap: => 2.4.7
commit b3ed764234da32f4018aa374f457834cd604f4de
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
vinagre: Requires gtk-vnc built with gtk+3 bindings
commit 16c59ecbbda74f05ca93bfa7f27f3aeb4ba61aa5
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
gtk-vnc: Cleanup formatting
commit 8586480f19f46304df48a47945ee3ef9259c3edb
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
gtk-vnc: Allow choice between gtk+2 (default) and gtk+3
Some apps require pythong bindings (e.g. virt-manager) which
do not build with gtk+3 selected.
commit e1ab319715de4e38fe58f4e3074ad843fea70db9
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
libzip 0.10
commit 9116ea03148ba3f2793654df6823535250e65d2e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
webkitgtk: depends on stable branch of libsoup now
commit a9acbdca8ee21d3b127ee7f7e7a2f7994f3234a6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
cyrus-sasl: use section key
commit 292901c38559c523f9e6e24593057f465ac0965a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
crypto/6581B5F1.gpg: moved from libsasl spell
commit 41bb5f7fff1de17acaca4b50a0180a24e2c1d7d4
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
editors/focuswriter: new spell, simple, distraction-free writing
environment
commit 2d8027a02f5532201738a465d37c33f1edf79f72
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
spine: => 0.8.7i
commit 8954c73b2da81d8d3c0f2daa44a2361a9647388d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
cacti: => 0.8.7i (security)
commit f2bd3172a2e552ef230c6ddc6fa639fdbad5891e
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
pcsc-lite 1.8.2
commit 3020b288d7ce3c855c1c7e4fcf66149a4b1b815b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
cifs-utils 5.2
commit f674f12bdba3af28e1a04da585de96a6dc4dfdcd
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
lives 1.6.0
commit b40af708f5d4ed6d0a8238ead8376ee865795e74
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
youtube-dl 2012.01.08b
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
commit 4de703d6c7721e0cca5c6b19895835b96d3d1465
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
libsoup: Devel libsoup requires devel glib2
$ gaze version glib2 libsoup
Grimoire Section Spell Grimoire Version Installed Version
-------- ------- ----- ---------------- -----------------
test gnome2-libs glib2 2.30.2 2.30.2
test gnome2-libs libsoup 2.37.3 2.36.1
checking for GLIB - version >= 2.31.0... no
*** Could not run GLIB test program, checking why...
*** The test program failed to compile or link. See the file config.log
for the
*** exact error that occured. This usually means GLIB is incorrectly
installed.
configure: error: GLIB 2.31.0 or later is required to build libsoup
commit 7b5e7625cbca36628554e0fe5c928f8caefd30c1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
io-socket-ssl: => 1.54
commit 2fcb067a132f833bd1bb8eae4b9601fcd0fb3aed
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
net-ssleay: => 1.42
commit 88af8c761372984e3d2bfb5b6181bd2b4572e673
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
mutter 3.2.2
commit c940b26f0c7580c7d72334869b5e6f5858a068b7
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
gnome-shell 3.2.2
commit 4aaec186408d348e6c7a90f25299ea48e37ba638
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
openssl 0.9.8t, 1.0.0g, SECURITY_PATCH=15
commit 67e9f75bf34dac0b056f3bdc85e537cb34f330e2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
cyrus-sasl: => 2.1.25
commit 83ad18cb5754b59a89979b6f673e8b9f4287212c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
unrar: => 4.1.4
commit 4de90a9a6d1cbe4b127d5bf8776207ed74b3ef2c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
docx2txt: => 1.2
commit d068cbbd7f918503dbc847d9cbb5122317304aa5
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
ntp: added a missing optional dep on net-snmp
commit 4edfbe2be060c596d5a7485a2ef629998d3c1dc5
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
libidn 1.24
commit b9d4b53e4d778643d76780845f61feb52ecbd58d
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
upstart: version 1.4
commit 21545d62223454d370f663e16ab9b0774921e0a3
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
libnih: version 1.0.3
commit f2285732dd0c01d0b2b7c6cbad2c42ffdd62c476
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
sqlite: => 3.7.10
commit 5b79cb80dd5396bb0a1ba0395ae9504a3967a270
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
awesome: missing PRE_BUILD
commit 095d216e4b5b4bd56ee4c0df6f3f78545742132c
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
libsoup: devel version 2.37.3
commit 6f7b8afaf0c7796e89c68fcb347a7bb4b0a72b13
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
awesome: added PRE_BUILD to fix glib2 include in spawn.c
diff --git a/ChangeLog b/ChangeLog
index 2b92d79..ee1f851 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2012-01-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * utils/winusb: new spell, program to create Windows USB stick
installer
+ from CD/DVD
+
+2012-01-19 Ladislav Hagara <hgr AT vabo.cz>
+ * editors/focuswriter: new, simple, distraction-free writing
environment
+
+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
+ * crypto/6581B5F1.gpg: moved from libsasl spell
+
2012-01-16 Ladislav Hagara <hgr AT vabo.cz>
* archive-libs/snappy: new, fast compression/decompression library
diff --git a/archive-libs/libzip/UP_TRIGGERS b/archive-libs/libzip/UP_TRIGGERS
new file mode 100755
index 0000000..abfbe0e
--- /dev/null
+++ b/archive-libs/libzip/UP_TRIGGERS
@@ -0,0 +1,9 @@
+local OLD_SPELL_VERSION=""
+spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
+if [ "${VERSION:0:4}" != "${OLD_SPELL_VERSION:0:4}" ]; then
+ message "This is an incompatible update of $SPELL..."
+ message "Figuring out what spells need to be recast, this may take a
while."
+ for each in $(show_up_depends $SPELL 1); do
+ up_trigger $each cast_self
+ done
+fi
diff --git a/archive/unrar/DETAILS b/archive/unrar/DETAILS
index 175fba7..11fb095 100755
--- a/archive/unrar/DETAILS
+++ b/archive/unrar/DETAILS
@@ -1,11 +1,11 @@
SPELL=unrar
- VERSION=4.1.3
+ VERSION=4.1.4
SOURCE=${SPELL}src-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
SOURCE_URL[0]=http://www.rarlab.com/rar/$SOURCE
WEB_SITE=http://www.rarlab.com
ENTERED=20011117
-
SOURCE_HASH=sha512:fd853a844bdd5ba40049c7be569a443bb927f3a324dfdb981d9ccaebe6768e8b695e5f84aa10052f3b559ebb60a59a559f64f721d792dc0500d16a6b69a0f607
+
SOURCE_HASH=sha512:585e817d3246a4b5cc960298a40ae07c25d54becef680b67e59a441a279de3305a764ec455924eff09e8869dcceac2242e5657e8a3a9b741ca29e848e5f9c8e2
LICENSE[0]=freeware
KEYWORDS="archive"
SHORT="unRAR is a utility to extract, view, and test the contents
of an RAR archive, version 1.50 and above."
diff --git a/archive/unrar/HISTORY b/archive/unrar/HISTORY
index d22bb99..a980988 100644
--- a/archive/unrar/HISTORY
+++ b/archive/unrar/HISTORY
@@ -1,3 +1,6 @@
+2012-01-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.1.4
+
2012-01-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 4.1.3
diff --git a/crypto/6581B5F1.gpg b/crypto/6581B5F1.gpg
new file mode 100644
index 0000000..eda7920
Binary files /dev/null and b/crypto/6581B5F1.gpg differ
diff --git a/crypto/cyrus-sasl/6581B5F1.gpg b/crypto/cyrus-sasl/6581B5F1.gpg
deleted file mode 100644
index eda7920..0000000
Binary files a/crypto/cyrus-sasl/6581B5F1.gpg and /dev/null differ
diff --git a/crypto/cyrus-sasl/DETAILS b/crypto/cyrus-sasl/DETAILS
index 7ec8500..d1d1c7a 100755
--- a/crypto/cyrus-sasl/DETAILS
+++ b/crypto/cyrus-sasl/DETAILS
@@ -1,9 +1,9 @@
SPELL=cyrus-sasl
- VERSION=2.1.23
+ VERSION=2.1.25
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/$SOURCE
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