Attachment #68754 for bug #100978

View | Details | Raw Unified | Return to bug 100978
Collapse All | Expand All

Lines 24-35 Link Here

(-)dkfilter/Makefile (-1 / +13 lines)
24	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
25	USE_RC_SUBR= dkfilter_in dkfilter_out	25	USE_RC_SUBR= dkfilter_in dkfilter_out
26		26
27	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	27	DKFILTER_USERNAME?= dkfilter
		28	DKFILTER_USERID?= 325
		29	DKFILTER_GROUPNAME?= ${DKFILTER_USERNAME}
		30	DKFILTER_GROUPID?= ${DKFILTER_USERID}
		31
		32	SUB_FILES= pkg-install pkg-deinstall
		33	SUB_LIST= USER=${DKFILTER_USERNAME} \
		34	UID=${DKFILTER_USERID} \
		35	GROUP=${DKFILTER_GROUPNAME} \
		36	GID=${DKFILTER_GROUPID}
28		37
29	.include <bsd.port.pre.mk>	38	.include <bsd.port.pre.mk>
30		39
31	.if ${PERL_LEVEL} < 500600	40	.if ${PERL_LEVEL} < 500600
32	IGNORE= require Perl 5.8 or newer. Install lang/perl5.8 and try again	41	IGNORE= require Perl 5.8 or newer. Install lang/perl5.8 and try again
33	.endif	42	.endif
		43
		44	pre-install:
		45	${SH} ${PKGINSTALL} ${PREFIX} PRE-INSTALL
34		46
35	.include <bsd.port.post.mk>	47	.include <bsd.port.post.mk>

Lines 20-29 Link Here

(-)dkfilter/files/dkfilter_in.in (-6 / +17 lines)
20		20
21	# set defaults	21	# set defaults
22		22
23	dkfilter_in_enable=${dkfilter_in_enable:-"NO"}	23	: ${dkfilter_in_enable="NO"}
24	dkfilter_in_flags=${dkfilter_in_flags:-"127.0.0.1:10025 127.0.0.1:10026"}	24	: ${dkfilter_in_flags="127.0.0.1:10025 127.0.0.1:10026"}
25	dkfilter_in_pidfile=${dkfilter_in_pidfile:-"/var/run/dkfilter_in.pid"}	25	: ${dkfilter_in_pidfile="/var/run/dkfilter_in.pid"}
26	dkfilter_in_user=${dkfilter_in_user:-"dkfilter"}	26	: ${dkfilter_in_user="dkfilter"}
27		27
28	start_cmd="dkfilter_in_start"	28	start_cmd="dkfilter_in_start"
29	stop_cmd="dkfilter_in_stop"	29	stop_cmd="dkfilter_in_stop"
Lines 34-45 Link Here
34	echo "${name} already running?"	34	echo "${name} already running?"
35	exit 1	35	exit 1
36	fi	36	fi
		37	echo "Starting ${name}."
		38	logger -t ${name} "Starting ${name}"
		39	tmpfile=`mktemp /tmp/dkfilter.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX`
37	touch ${dkfilter_in_pidfile}	40	touch ${dkfilter_in_pidfile}
38	chown ${dkfilter_in_user} ${dkfilter_in_pidfile}	41	chown ${dkfilter_in_user} ${dkfilter_in_pidfile}
39	su -m ${dkfilter_in_user} -c "daemon -p ${dkfilter_in_pidfile} \	42	su -m ${dkfilter_in_user} -c "daemon -p ${dkfilter_in_pidfile} \
40	%%PREFIX%%/bin/dkfilter.in ${dkfilter_in_flags}" \	43	%%PREFIX%%/bin/dkfilter.in ${dkfilter_in_flags}" \
41	> /dev/null 2>&1	44	> /dev/null 2> ${tmpfile}
42	echo "Starting ${name}"	45	sleep 1 # XXX: wait until dkfilter start.
		46	logger -t ${name} `cat ${tmpfile}`
		47	err=`grep Error ${tmpfile}`
		48	if [ "${err}" ]; then
		49	echo "Failed to start ${name}."
		50	echo "${err}"
		51	rm -f ${dkfilter_in_pidfile}
		52	fi
		53	rm -f ${tmpfile}
43	}	54	}
44		55
45	dkfilter_in_stop()	56	dkfilter_in_stop()





# set defaults

: ${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="/var/run/dkfilter_out.pid"}
: ${dkfilter_out_user="dkfilter"}

start_cmd="dkfilter_out_start"
stop_cmd="dkfilter_out_stop"

		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> ${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()




#!/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




#! /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

Return to bug 100978

Lines 23-35 Link Here

(-)dkfilter/files/dkfilter_out.in (-6 / +17 lines)
23		23
24	# set defaults	24	# set defaults
25		25
26	dkfilter_out_enable=${dkfilter_out_enable:-"NO"}	26	: ${dkfilter_out_enable="NO"}
27	dkfilter_out_flags=${dkfilter_out_flags:-" --header \	27	: ${dkfilter_out_flags=" --header \
28	--keyfile=%%PREFIX%%/etc/dkfilter/private.key \	28	--keyfile=%%PREFIX%%/etc/dkfilter/private.key \
29	--selector=selector1 --domain=example.org --method=nofws \	29	--selector=selector1 --domain=example.org --method=nofws \
30	127.0.0.1:10027 127.0.0.1:10028"}	30	127.0.0.1:10027 127.0.0.1:10028"}
31	dkfilter_out_pidfile=${dkfilter_out_pidfile:-"/var/run/dkfilter_out.pid"}	31	: ${dkfilter_out_pidfile="/var/run/dkfilter_out.pid"}
32	dkfilter_out_user=${dkfilter_out_user:-"dkfilter"}	32	: ${dkfilter_out_user="dkfilter"}
33		33
34	start_cmd="dkfilter_out_start"	34	start_cmd="dkfilter_out_start"
35	stop_cmd="dkfilter_out_stop"	35	stop_cmd="dkfilter_out_stop"
Lines 40-51 Link Here
40	echo "${name} already running?"	40	echo "${name} already running?"
41	exit 1	41	exit 1
42	fi	42	fi
		43	echo "Starting ${name}."
		44	logger -t ${name} "Starting ${name}."
		45	tmpfile=`mktemp /tmp/dkfilter.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX`
43	touch ${dkfilter_out_pidfile}	46	touch ${dkfilter_out_pidfile}
44	chown ${dkfilter_out_user} ${dkfilter_out_pidfile}	47	chown ${dkfilter_out_user} ${dkfilter_out_pidfile}
45	su -m ${dkfilter_out_user} -c "daemon -p ${dkfilter_out_pidfile} \	48	su -m ${dkfilter_out_user} -c "daemon -p ${dkfilter_out_pidfile} \
46	%%PREFIX%%/bin/dkfilter.out ${dkfilter_out_flags}" \	49	%%PREFIX%%/bin/dkfilter.out ${dkfilter_out_flags}" \
47	> /dev/null 2>&1	50	> /dev/null 2> ${tmpfile}
48	echo "Starting ${name}."	51	sleep 1 # XXX: wait until dkfilter start.
		52	logger -t ${name} `cat ${tmpfile}`
		53	err=`grep Error ${tmpfile}`
		54	if [ "${err}" ]; then
		55	echo "Failed to start ${name}."
		56	echo "${err}"
		57	rm -f ${dkfilter_out_pidfile}
		58	fi
		59	rm -f ${tmpfile}
49	}	60	}
50		61
51	dkfilter_out_stop()	62	dkfilter_out_stop()

Line 0 Link Here

(-)dkfilter/files/pkg-deinstall.in (+13 lines)
	1	#!/bin/sh
	2	# $FreeBSD$
	3
	4	if [ "$2" != "POST-DEINSTALL" ]; then
	5	exit 0
	6	fi
	7
	8	USERNAME=%%USER%%
	9
	10	if pw usershow "${USERNAME}" 2>/dev/null 1>&2; then
	11	echo "To delete ${USERNAME} user permanently, use 'pw userdel \"${USERNAME}\"'"
	12	fi
	13	exit 0

Line 0 Link Here

(-)dkfilter/files/pkg-install.in (+36 lines)
	1	#! /bin/sh
	2	#
	3	# $FreeBSD$
	4
	5	PATH=/bin:/usr/bin:/usr/sbin
	6
	7	case $2 in
	8
	9	PRE-INSTALL)
	10	echo "---> Starting install script:"
	11
	12	if [ -z "%%USER%%" -o -z "%%GROUP%%" -o \
	13	-z "%%UID%%" -o -z "%%GID%%" ]; then
	14	echo "ERROR: A required pragma was empty"
	15	exit 1
	16	fi
	17
	18	# Create group if required
	19	if pw group show "%%GROUP%%" >/dev/null 2>&1; then
	20	echo "---> Using existing group \"%%GROUP%%\""
	21	else
	22	echo "---> Adding group \"%%GROUP%%\" (%%GID%%)"
	23	/usr/sbin/pw groupadd %%GROUP%% -g %%GID%% \|\| exit 1
	24	fi
	25
	26	# Create user if required
	27	if pw user show "%%USER%%" >/dev/null 2>&1; then
	28	echo "---> Using existing user \"%%USER%%\""
	29	else
	30	echo "---> Adding user \"%%USER%%\" (%%UID%%)"
	31	pw useradd "%%USER%%" -u "%%UID%%" -g "%%GROUP%%" -h - \
	32	-d "/nonexistent" -s "/sbin/nologin" -c "DK Filter Owner" \|\| exit 1
	33	fi
	34	;;
	35
	36	esac