sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 09:19:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- rc.d scripts are changed to show error messages when some error

Browse source 
occurs. It didn't show error messages even if they are fatal.
- Each rc.d script now logs all messages got at starting a daemon.
- pkg-install is made to automatically make a user to execute dkfilter
  which is specified by Makefile. Register UIDs, GIDs.
- pkg-deinstall is made to notice that an admin should remove the
  user made at install-time if they don't need him or her
- Bump PORTREVISION for all these changes

PR:		ports/100978
Submitted by:	Yoshisato YANAGISAWA (maintainer)
This commit is contained in:
Rong-En Fan 2006-07-29 02:07:43 +00:00
parent 6bb04657c3
commit 003834a79b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=169022
7 changed files with 99 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
GIDs
View file

@ -66,6 +66,7 @@ smxc:*:262:
smxm:*:263:
smx:*:264:
mrtg:*:279:
dkfilter:*:325:
ldap:*:389:
drweb:*:426:
courier:*:465:

1
UIDs
View file

@ -78,6 +78,7 @@ smxc:*:262:262:Sendmail X SMTPC:/nonexistent:/sbin/nologin
smxm:*:263:263:Sendmail X misc:/nonexistent:/sbin/nologin
smx:*:264:264:Sendmail X other:/nonexistent:/sbin/nologin
mrtg:*:279:279:MRTG daemon:/nonexistent:/sbin/nologin
dkfilter:*:325:325:DK Filter Owner:/nonexistent:/sbin/nologin
ldap:*:389:389:OpenLDAP Server:/nonexistent:/sbin/nologin
drweb:*:426:426:Dr.Web Mail Scanner:/nonexistent:/sbin/nologin
courier:*:465:465:Courier Mail Server:/nonexistent:/sbin/nologin

15
mail/dkfilter/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= dkfilter
PORTVERSION= 0.10
PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://jason.long.name/dkfilter/
@ -24,7 +25,16 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
GNU_CONFIGURE= yes
USE_RC_SUBR= dkfilter_in dkfilter_out
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
DKFILTER_USERNAME?= dkfilter
DKFILTER_USERID?= 325
DKFILTER_GROUPNAME?= ${DKFILTER_USERNAME}
DKFILTER_GROUPID?= ${DKFILTER_USERID}
SUB_FILES= pkg-install pkg-deinstall
SUB_LIST= USER=${DKFILTER_USERNAME} \
UID=${DKFILTER_USERID} \
GROUP=${DKFILTER_GROUPNAME} \
GID=${DKFILTER_GROUPID}
.include <bsd.port.pre.mk>
@ -32,4 +42,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
IGNORE= require Perl 5.8 or newer. Install lang/perl5.8 and try again
.endif
pre-install:
${SH} ${PKGINSTALL} ${PREFIX} PRE-INSTALL
.include <bsd.port.post.mk>

23
mail/dkfilter/files/dkfilter_in.in
View file

@ -20,10 +20,10 @@ rcvar=`set_rcvar`
# set defaults
dkfilter_in_enable=${dkfilter_in_enable:-"NO"}
dkfilter_in_flags=${dkfilter_in_flags:-"127.0.0.1:10025 127.0.0.1:10026"}
dkfilter_in_pidfile=${dkfilter_in_pidfile:-"/var/run/dkfilter_in.pid"}
dkfilter_in_user=${dkfilter_in_user:-"dkfilter"}
: ${dkfilter_in_enable="NO"}
: ${dkfilter_in_flags="127.0.0.1:10025 127.0.0.1:10026"}
: ${dkfilter_in_pidfile="/var/run/dkfilter_in.pid"}
: ${dkfilter_in_user="dkfilter"}
start_cmd="dkfilter_in_start"
stop_cmd="dkfilter_in_stop"
@ -34,12 +34,23 @@ dkfilter_in_start()
echo "${name} already running?"
exit 1
fi
echo "Starting ${name}."
logger -t ${name} "Starting ${name}"
tmpfile=`mktemp /tmp/dkfilter.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX`
touch ${dkfilter_in_pidfile}
chown ${dkfilter_in_user} ${dkfilter_in_pidfile}
su -m ${dkfilter_in_user} -c "daemon -p ${dkfilter_in_pidfile} \
%%PREFIX%%/bin/dkfilter.in ${dkfilter_in_flags}" \
> /dev/null 2>&1
echo "Starting ${name}"
> /dev/null 2> ${tmpfile}
sleep 1 # XXX: wait until dkfilter start.
logger -t ${name} `cat ${tmpfile}`
err=`grep Error ${tmpfile}`
if [ "${err}" ]; then
echo "Failed to start ${name}."
echo "${err}"
rm -f ${dkfilter_in_pidfile}
fi
rm -f ${tmpfile}
}
dkfilter_in_stop()

23
mail/dkfilter/files/dkfilter_out.in
View file

@ -23,13 +23,13 @@ rcvar=`set_rcvar`
# set defaults
dkfilter_out_enable=${dkfilter_out_enable:-"NO"}
dkfilter_out_flags=${dkfilter_out_flags:-" --header \
: ${dkfilter_out_enable="NO"}
: ${dkfilter_out_flags=" --header \
--keyfile=%%PREFIX%%/etc/dkfilter/private.key \
--selector=selector1 --domain=example.org --method=nofws \
127.0.0.1:10027 127.0.0.1:10028"}
dkfilter_out_pidfile=${dkfilter_out_pidfile:-"/var/run/dkfilter_out.pid"}
dkfilter_out_user=${dkfilter_out_user:-"dkfilter"}
: ${dkfilter_out_pidfile="/var/run/dkfilter_out.pid"}
: ${dkfilter_out_user="dkfilter"}
start_cmd="dkfilter_out_start"
stop_cmd="dkfilter_out_stop"
@ -40,12 +40,23 @@ dkfilter_out_start()
echo "${name} already running?"
exit 1
fi
echo "Starting ${name}."
logger -t ${name} "Starting ${name}."
tmpfile=`mktemp /tmp/dkfilter.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX`
touch ${dkfilter_out_pidfile}
chown ${dkfilter_out_user} ${dkfilter_out_pidfile}
su -m ${dkfilter_out_user} -c "daemon -p ${dkfilter_out_pidfile} \
%%PREFIX%%/bin/dkfilter.out ${dkfilter_out_flags}" \
> /dev/null 2>&1
echo "Starting ${name}."
> /dev/null 2> ${tmpfile}
sleep 1 # XXX: wait until dkfilter start.
logger -t ${name} `cat ${tmpfile}`
err=`grep Error ${tmpfile}`
if [ "${err}" ]; then
echo "Failed to start ${name}."
echo "${err}"
rm -f ${dkfilter_out_pidfile}
fi
rm -f ${tmpfile}
}
dkfilter_out_stop()

13
mail/dkfilter/files/pkg-deinstall.in Normal file
View file

@ -0,0 +1,13 @@
#!/bin/sh
# $FreeBSD$
if [ "$2" != "POST-DEINSTALL" ]; then
exit 0
fi
USERNAME=%%USER%%
if pw usershow "${USERNAME}" 2>/dev/null 1>&2; then
echo "To delete ${USERNAME} user permanently, use 'pw userdel \"${USERNAME}\"'"
fi
exit 0

36
mail/dkfilter/files/pkg-install.in Normal file
View file

@ -0,0 +1,36 @@
#! /bin/sh
#
# $FreeBSD$
PATH=/bin:/usr/bin:/usr/sbin
case $2 in
PRE-INSTALL)
echo "---> Starting install script:"
if [ -z "%%USER%%" -o -z "%%GROUP%%" -o \
-z "%%UID%%" -o -z "%%GID%%" ]; then
echo "ERROR: A required pragma was empty"
exit 1
fi
# Create group if required
if pw group show "%%GROUP%%" >/dev/null 2>&1; then
echo "---> Using existing group \"%%GROUP%%\""
else
echo "---> Adding group \"%%GROUP%%\" (%%GID%%)"
/usr/sbin/pw groupadd %%GROUP%% -g %%GID%% || exit 1
fi
# Create user if required
if pw user show "%%USER%%" >/dev/null 2>&1; then
echo "---> Using existing user \"%%USER%%\""
else
echo "---> Adding user \"%%USER%%\" (%%UID%%)"
pw useradd "%%USER%%" -u "%%UID%%" -g "%%GROUP%%" -h - \
-d "/nonexistent" -s "/sbin/nologin" -c "DK Filter Owner" || exit 1
fi
;;
esac