summaryrefslogtreecommitdiff
path: root/mail/maildrop
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2014-09-30 15:04:03 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2014-09-30 15:04:03 +0000
commit38b77f19bf0425225535cf884e560d9b7c11659d (patch)
treeb7abac05657ea867e8c102078c8f024e90618d73 /mail/maildrop
parent- Update to snapshot 10337 (diff)
- Modify comment and add UPDATING entry to explain that MAILDROP_SUID
and MAILDROP_SGID now need to be existing usernames on the destination system. numeric UIDs and GIDs, or non existent usernames, will cause a broken installation since pkgng will skip on the entries of files owned by unknown users. [1] - Fix MGID and MUID PLIST_SUB variables not being set when only one of the two above variables is deifined, again generating a broken package. [2] - While here, remove dirrm. Reported by: Lukas Maly <Iam@LukasMaly.NET> [1] Reported by: itetcu@ [1] [2]
Notes
Notes: svn path=/head/; revision=369614
Diffstat (limited to 'mail/maildrop')
-rw-r--r--mail/maildrop/Makefile16
-rw-r--r--mail/maildrop/pkg-plist1
2 files changed, 11 insertions, 6 deletions
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 0adcd00170bb..7715cc0316c9 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -3,14 +3,20 @@
# You can define the following to enable further compile time
# customizations:
-# MAILDROP_SUID=<uid>,
-# MAILDROP_SGID=<gid> Maildrop will be installed with suid permissions for
-# MAILDROP_SUID, and sgid permissions for MAILDROP_SGID.
+# MAILDROP_SUID=<username>,
+# MAILDROP_SGID=<groupname> Maildrop will be installed with suid
+# permissions for MAILDROP_SUID, and sgid
+# permissions for MAILDROP_SGID.
+# NOTE: must be a valid username/groupname
+# at installation time, numeric uids/gids
+# and non existing users will cause the
+# installed package to miss files.
# MAILDROP_TRUSTED_USERS=<user> Specify users allowed to use the -d option
# MAILDROP_LOG_COLUMNS lenght of 'File:' line in log - 8; default: 72
PORTNAME= maildrop
PORTVERSION= 2.7.2
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= SF/courier/${PORTNAME}/${PORTVERSION}
@@ -78,10 +84,10 @@ CONFIGURE_ARGS+= --enable-maildrop-uid="${MAILDROP_SUID}" --enable-maildrop-gid=
PLIST_SUB+= MMODE='6755' MUID='${MAILDROP_SUID}' MGID='${MAILDROP_SGID}'
.elif defined(MAILDROP_SUID)
CONFIGURE_ARGS+= --enable-maildrop-uid="${MAILDROP_SUID}"
-PLIST_SUB+= MMODE='4755' MUID='${MAILDROP_SUID}'
+PLIST_SUB+= MMODE='4755' MUID='${MAILDROP_SUID}' MGID='mail'
.elif defined(MAILDROP_SGID)
CONFIGURE_ARGS+= --enable-maildrop-gid="${MAILDROP_SGID}"
-PLIST_SUB+= MMODE='2755' MGID='${MAILDROP_SGID}'
+PLIST_SUB+= MMODE='2755' MGID='${MAILDROP_SGID}' MUID='root'
.else
PLIST_SUB+= MMODE='' MUID='root' MGID='mail'
.endif
diff --git a/mail/maildrop/pkg-plist b/mail/maildrop/pkg-plist
index ff64c102fe3d..93a98de08fec 100644
--- a/mail/maildrop/pkg-plist
+++ b/mail/maildrop/pkg-plist
@@ -63,4 +63,3 @@ man/man8/maildrop-deliverquota.8.gz
%%PORTDOCS%%%%DOCSDIR%%/reformime.html
%%PORTDOCS%%%%DOCSDIR%%/rfc2045.html
%%PORTDOCS%%%%DOCSDIR%%/rfc822.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%