aboutsummaryrefslogtreecommitdiffstats
path: root/mail/cyrus
diff options
context:
space:
mode:
authordwcjr <dwcjr@FreeBSD.org>2002-05-24 10:03:34 +0800
committerdwcjr <dwcjr@FreeBSD.org>2002-05-24 10:03:34 +0800
commitd3c9c872a010a0f2c812c7784e9384d428314f6f (patch)
tree70c403b9f0c802eedfe8200f483045be5723dd8a /mail/cyrus
parent4e231b0dd95acf10b85e4df583b16532daca8931 (diff)
downloadfreebsd-ports-graphics-d3c9c872a010a0f2c812c7784e9384d428314f6f.tar.gz
freebsd-ports-graphics-d3c9c872a010a0f2c812c7784e9384d428314f6f.tar.zst
freebsd-ports-graphics-d3c9c872a010a0f2c812c7784e9384d428314f6f.zip
Make this port add shell to cyrus user
PR: 38435 Submitted by: Scot W. Hetzel <hetzels@westbend.net>
Diffstat (limited to 'mail/cyrus')
-rw-r--r--mail/cyrus/Makefile1
-rw-r--r--mail/cyrus/pkg-deinstall23
-rw-r--r--mail/cyrus/pkg-install60
3 files changed, 33 insertions, 51 deletions
diff --git a/mail/cyrus/Makefile b/mail/cyrus/Makefile
index 379a6ff825e..61e0cbdd2fc 100644
--- a/mail/cyrus/Makefile
+++ b/mail/cyrus/Makefile
@@ -39,7 +39,6 @@ post-configure:
pre-install:
@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
- @${PKGINSTALL} ${PKGNAME} PRE-INSTALL
DOCS= README acl-extension anoncvs bugs changes copyrights install \
mailing-list overview quota-extension server-design
diff --git a/mail/cyrus/pkg-deinstall b/mail/cyrus/pkg-deinstall
index db951d39131..73dcce32e5b 100644
--- a/mail/cyrus/pkg-deinstall
+++ b/mail/cyrus/pkg-deinstall
@@ -35,6 +35,28 @@ cyrus_conf() {
fi
}
+#
+# Modify the 'cyrus' user created from the cyrus-sasl port
+#
+
+modify_cyrus_user() {
+ USER=cyrus
+ PW=/usr/sbin/pw
+ if [ -x /sbin/nologin ]; then
+ shell=/sbin/nologin
+ else
+ shell=/nonexistent
+ fi
+ uhome=/nonexistent
+
+ if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
+ e=$?
+ echo "*** Failed to update user \`${USER}'."
+ exit ${e}
+ fi
+ echo "*** Updated user \`${USER}'."
+}
+
case $2 in
DEINSTALL)
cd ${PKG_PREFIX}
@@ -42,6 +64,7 @@ case $2 in
checkfile ${PKG_PREFIX}/etc/imapd.conf
;;
POST-DEINSTALL)
+ modify_cyrus_user
;;
esac
diff --git a/mail/cyrus/pkg-install b/mail/cyrus/pkg-install
index 8f935faef8d..160094d7920 100644
--- a/mail/cyrus/pkg-install
+++ b/mail/cyrus/pkg-install
@@ -7,61 +7,21 @@ PKG_BATCH=${BATCH:=NO}
PKG_PREFIX=${PKG_PREFIX:=/usr/local}
#
-# create 'cyrus' user and group before installing
+# Modify the 'cyrus' user created from the cyrus-sasl port
#
-create() {
- if [ ! -x /usr/sbin/pw ]; then
- echo "*** Please add a user and a group named \`cyrus' before installing this package."
- exit 69
- fi
-
- if ! pw show group cyrus -q >/dev/null; then
- gid=60
- while pw show group -g ${gid} -q >/dev/null; do
- gid=`expr ${gid} + 1`
- done
- if ! pw add group cyrus -g ${gid}; then
- e=$?
- echo "*** Failed to add group \`cyrus'. Please add it manually."
- exit ${e}
- fi
- echo "*** Added group \`cyrus' (id ${gid})"
- else
- gid=`pw show group cyrus 2>/dev/null | cut -d: -f3`
- fi
+modify_cyrus_user() {
+ USER=cyrus
+ PW=/usr/sbin/pw
+ shell=/bin/csh
+ uhome=${PKG_PREFIX}/cyrus
- if [ -x /sbin/nologin ]; then
- shell=/sbin/nologin
- else
- shell=/nonexistent
- fi
- if ! pw show user cyrus -q >/dev/null; then
- uid=60
- while pw show user -u ${uid} -q >/dev/null; do
- uid=`expr ${uid} + 1`
- done
- if ! pw add user cyrus -u ${uid} -g ${gid} -d "/nonexistent" \
- -c "the cyrus mail server" -s "${shell}" -p "*" \
- ; then
- e=$?
- echo "*** Failed to add user \`cyrus'. Please add it manually."
- exit ${e}
- fi
- echo "*** Added user \`cyrus' (id ${uid})"
- else
- if ! pw mod user cyrus -g ${gid} -d "/nonexistent" \
- -c "the cyrus mail server" -s "${shell}" -p "*" \
- ; then
+ if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
e=$?
- echo "*** Failed to update user \`cyrus'."
+ echo "*** Failed to update user \`${USER}'."
exit ${e}
- fi
- echo "*** Updated user \`cyrus'."
- fi
- if ! pw group mod cyrus -m daemon; then
- echo "*** can't add user \`daemon' to group \`cyrus'"
fi
+ echo "*** Updated user \`${USER}'."
}
@@ -90,10 +50,10 @@ cyrus_conf() {
case $2 in
PRE-INSTALL)
- create
;;
POST-INSTALL)
+ modify_cyrus_user
cd ${PKG_PREFIX}
cyrus_conf
checkfile ${PKG_PREFIX}/etc/imapd.conf