mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-20 20:09:11 +00:00
Move adduser proccess from configure to pre-install time to prevent
problems to update using portupgrade. PR: ports/83100 Submitted by: self Approved by: portmgr (krion), Anton Karpov <toxa@toxahost.ru> (maintainer)
This commit is contained in:
parent
c7c416526e
commit
d06912e6ef
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=140822
@ -18,6 +18,7 @@ COMMENT= Fast Content/Anti-virus Scanner for qmail Written in C
|
||||
BUILD_DEPENDS= ${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_REINPLACE= yes
|
||||
|
||||
# A normal qmail installation puts everything into /var/qmail/.
|
||||
# Must match your qmail installation
|
||||
@ -42,7 +43,8 @@ OPTIONS= CLAMAV "Support for ClamAV Virus Scanning" on \
|
||||
CONFIGURE_ARGS=--enable-clamavdb-path=/var/db/clamav \
|
||||
--enable-qmaildir=${QMAIL_DIR} \
|
||||
--enable-spamc-user=n \
|
||||
--enable-workdir=${WORKDIR}
|
||||
--enable-workdir=${WORKDIR} \
|
||||
--enable-user=nobody
|
||||
|
||||
.if defined(WITHOUT_CLAMAV)
|
||||
CONFIGURE_ARGS+= --enable-clamav=n
|
||||
@ -130,9 +132,12 @@ pre-configure:
|
||||
@${ECHO_MSG} "=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~="
|
||||
@${ECHO_MSG} ""
|
||||
|
||||
pre-install:
|
||||
@${REINPLACE_CMD} -e 's|nobody|simscan|g' ${WRKSRC}/Makefile
|
||||
@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
|
||||
|
||||
post-install:
|
||||
@${CHMOD} 04711 ${QMAIL_DIR}/bin/simscan
|
||||
@${CHOWN} simscan:simscan ${QMAIL_DIR}/bin/simscan ${QMAIL_DIR}/bin/simscanmk
|
||||
@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
|
||||
.if !defined(NOPORTDOCS)
|
||||
@${MKDIR} ${DOCSDIR}
|
||||
.for i in ${PORTDOCS}
|
||||
|
@ -43,6 +43,8 @@ elif [ "$2" = "POST-INSTALL" ]; then
|
||||
/bin/mkdir -p "$SIMDIR" || exit 1
|
||||
/usr/sbin/chown "$USER:$GROUP" "$SIMDIR" || exit 1
|
||||
/bin/chmod 0750 "$SIMDIR" || exit 1
|
||||
/bin/chmod 04711 ${QMAIL_DIR}/bin/simscan
|
||||
/bin/chown $USER:$GROUP ${QMAIL_DIR}/bin/simscan ${QMAIL_DIR}/bin/simscanmk
|
||||
fi
|
||||
fi
|
||||
|
||||
|
36
mail/simscan/scripts/configure
vendored
36
mail/simscan/scripts/configure
vendored
@ -1,36 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $FreeBSD$
|
||||
|
||||
USER=simscan
|
||||
GROUP=${USER}
|
||||
UID=74
|
||||
GID=${UID}
|
||||
|
||||
echo adding simscan user
|
||||
|
||||
|
||||
if pw group show "${GROUP}" 2>/dev/null; then
|
||||
echo "You already have a group \"${GROUP}\", so I will use it."
|
||||
else
|
||||
if pw groupadd ${GROUP} -g ${GID}; then
|
||||
echo "Added group \"${GROUP}\"."
|
||||
else
|
||||
echo "Adding group \"${GROUP}\" failed..."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
if pw user show "${USER}" 2>/dev/null; then
|
||||
echo "You already have a user \"${USER}\", so I will use it."
|
||||
else
|
||||
if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
|
||||
-d /nonexistent -s /sbin/nologin -c "Simscan User"
|
||||
then
|
||||
echo "Added user \"${USER}\"."
|
||||
else
|
||||
echo "Adding user \"${USER}\" failed..."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
Loading…
Reference in New Issue
Block a user