diff options
| author | Vlad Glagolev | 2021-07-10 18:51:56 +0000 |
|---|---|---|
| committer | Vlad Glagolev | 2021-07-10 19:20:30 +0000 |
| commit | f3b37c2740cad2fc359aff04d98d003b72acbb65 (patch) | |
| tree | 92087691615f1e01566ca5cd4a6339d120577401 /mail | |
| parent | 13abff236b8b34e706be608e3780ce744109327a (diff) | |
masqmail: correct spool dir location; conflicts with dma, qmail, ssmtp
Diffstat (limited to 'mail')
| -rwxr-xr-x | mail/masqmail/BUILD | 2 | ||||
| -rwxr-xr-x | mail/masqmail/CONFLICTS | 5 | ||||
| -rwxr-xr-x | mail/masqmail/DETAILS | 1 | ||||
| -rw-r--r-- | mail/masqmail/HISTORY | 5 | ||||
| -rwxr-xr-x | mail/masqmail/INSTALL | 15 |
5 files changed, 19 insertions, 9 deletions
diff --git a/mail/masqmail/BUILD b/mail/masqmail/BUILD index be4c244b30..5331bd1401 100755 --- a/mail/masqmail/BUILD +++ b/mail/masqmail/BUILD @@ -3,7 +3,7 @@ create_account mail && OPTS="--with-user=masqmail \ --with-group=masqmail \ - --with-spooldir=$INSTALL_ROOT/var/spool/mail \ + --with-spooldir=$INSTALL_ROOT/var/spool/masqmail \ $MASQMAIL_OPTS \ $OPTS" && diff --git a/mail/masqmail/CONFLICTS b/mail/masqmail/CONFLICTS index b51b43483a..6a9e863562 100755 --- a/mail/masqmail/CONFLICTS +++ b/mail/masqmail/CONFLICTS @@ -1,8 +1,11 @@ +conflicts qmail && conflicts exim && conflicts courier && conflicts esmtp && conflicts msmtp && +conflicts ssmtp && conflicts postfix && conflicts sendmail && conflicts opensmtpd && -conflicts netqmail +conflicts netqmail && +conflicts dma diff --git a/mail/masqmail/DETAILS b/mail/masqmail/DETAILS index 431635d878..a4aef7587c 100755 --- a/mail/masqmail/DETAILS +++ b/mail/masqmail/DETAILS @@ -1,5 +1,6 @@ SPELL=masqmail VERSION=0.3.5 + PATCHLEVEL=1 SOURCE=$SPELL-$VERSION.tar.gz SOURCE2=$SOURCE.asc SOURCE_URL[0]=http://marmaro.de/prog/$SPELL/files/$SOURCE diff --git a/mail/masqmail/HISTORY b/mail/masqmail/HISTORY index 4153e7b2a4..3d65964373 100644 --- a/mail/masqmail/HISTORY +++ b/mail/masqmail/HISTORY @@ -1,3 +1,8 @@ +2021-07-10 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: PATCHLEVEL=1 + * BUILD, INSTALL: correct spool dir location + * CONFLICTS: conflicts with dma, qmail, ssmtp + 2015-11-18 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 0.3.5 * log.patch: updated for new version diff --git a/mail/masqmail/INSTALL b/mail/masqmail/INSTALL index 14b41198b2..f06c583300 100755 --- a/mail/masqmail/INSTALL +++ b/mail/masqmail/INSTALL @@ -9,14 +9,15 @@ 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 2775 -d -o masqmail -g mail "$INSTALL_ROOT/var/spool/mail" && +local spool_dir="${INSTALL_ROOT}/var/spool/masqmail" && -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 && +install -vm 2775 -d -o masqmail -g masqmail "${spool_dir}" && + +for d in input lock; do + if [[ -e "${spool_dir}/${d}" ]]; then + chown -R masqmail:masqmail "${spool_dir}/${d}" || return 1 + fi +done && if [[ $INIT_INSTALLED ]]; then install_config_file "$SPELL_DIRECTORY/init.d/masqmail.conf" \ |