Attachment #103600 for bug #143550

Lines 19-31 Link Here

(-)nsd/Makefile (-2 / +14 lines)
19	USE_RC_SUBR= nsd	19	USE_RC_SUBR= nsd
20		20
21	NSDUSER?= bind	21	NSDUSER?= bind
22	NSD_LSD= /var	22	NSDGROUP?= bind
		23	NSDLSDIR= /var
		24	NSDDBDIR= /var/db/nsd
		25	NSDRUNDIR= /var/run/nsd
23	NSDMAX_INT?= 512	26	NSDMAX_INT?= 512
24		27
25	GNU_CONFIGURE= yes	28	GNU_CONFIGURE= yes
26	CONFIGURE_ARGS= --with-user=${NSDUSER} \	29	CONFIGURE_ARGS= --with-user=${NSDUSER} \
27	--with-configdir=${PREFIX}/etc/nsd \	30	--with-configdir=${PREFIX}/etc/nsd \
28	--localstatedir=${NSD_LSD}	31	--localstatedir=${NSDLSDIR} \
		32	--with-dbfile=${NSDDBDIR}/nsd.db \
		33	--with-pidfile=${NSDRUNDIR}/nsd.pid
		34
		35	SUB_FILES= pkg-install pkg-deinstall
		36	SUB_LIST+= NSDUSER=${NSDUSER} \
		37	NSDGROUP=${NSDGROUP} \
		38	NSDDBDIR=${NSDDBDIR} \
		39	NSDRUNDIR=${NSDRUNDIR}
29		40
30	USE_OPENSSL= yes	41	USE_OPENSSL= yes
31		42
Lines 120-125 Link Here
120	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}/${f}	131	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}/${f}
121	.endfor	132	.endfor
122	.endif	133	.endif
		134	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
123	@${CAT} ${PKGMESSAGE}	135	@${CAT} ${PKGMESSAGE}
124		136
125	.include <bsd.port.post.mk>	137	.include <bsd.port.post.mk>

Lines 18-24 Link Here

(-)nsd/files/nsd.in (-1 / +1 lines)
18	required_files=%%PREFIX%%/etc/nsd/nsd.conf	18	required_files=%%PREFIX%%/etc/nsd/nsd.conf
19		19
20	command=%%PREFIX%%/sbin/${name}	20	command=%%PREFIX%%/sbin/${name}
21	pidfile=/var/run/${name}.pid	21	pidfile=`%%PREFIX%%/sbin/nsd-checkconf -o pidfile %%PREFIX%%/etc/nsd/nsd.conf`
22		22
23	load_rc_config ${name}	23	load_rc_config ${name}
24		24




#!/bin/sh
# $FreeBSD$

PATH="/bin:/sbin:/usr/bin:/usr/sbin"

NSDDBDIR=%%NSDDBDIR%%
NSDRUNDIR=%%NSDRUNDIR%%

if [ "$2" = "POST-DEINSTALL" ]; then
	echo "=> Deleting ${NSDDBDIR} if empty..."
	rm -d ${NSDDBDIR}  2>/dev/null || true
	echo "=> Deleting ${NSDRUNDIR} if empty..."
	rm -d ${NSDRUNDIR} 2>/dev/null || true
fi

exit 0





#!/bin/sh
# $FreeBSD$

PATH="/bin:/sbin:/usr/bin:/usr/sbin"

NSDUSER=%%NSDUSER%%
NSDGROUP=%%NSDGROUP%%
NSDDBDIR=%%NSDDBDIR%%
NSDRUNDIR=%%NSDRUNDIR%%

CHOWN="chown"
INSTALL_DIR="install -d -o ${NSDUSER} -g ${NSDGROUP} -m 0755"

if [ "$2" = "POST-INSTALL" ]; then
	${INSTALL_DIR} ${NSDDBDIR} ${NSDRUNDIR}
	${CHOWN} -R ${NSDUSER}:${NSDGROUP} ${NSDDBDIR} ${NSDRUNDIR}
fi

exit 0


Lines 2-5 Link Here

(-)nsd/pkg-message (+4 lines)
2	* *	2	* *
3	* To run nsd from startup, add nsd_enable="YES" to your /etc/rc.conf *	3	* To run nsd from startup, add nsd_enable="YES" to your /etc/rc.conf *
4	* *	4	* *
		5	* Take good care when using nsd commands, since they often need to *
		6	* be executed as user dedicated to nsd, in order for the files it *
		7	* touches or creates to have the proper permissions. *
		8	* *
5	**************************************************************************	9	**************************************************************************

Lines 6-9 Link Here

(-)nsd/pkg-plist (-1 / +1 lines)
6	sbin/nsd-xfer	6	sbin/nsd-xfer
7	sbin/nsdc	7	sbin/nsdc
8	sbin/zonec	8	sbin/zonec
9	@dirrm etc/nsd	9	@dirrmtry etc/nsd

Return to bug 143550

Line 0 Link Here

(-)nsd/files/pkg-deinstall.in (+17 lines)
	1	#!/bin/sh
	2	# $FreeBSD$
	3
	4	PATH="/bin:/sbin:/usr/bin:/usr/sbin"
	5
	6	NSDDBDIR=%%NSDDBDIR%%
	7	NSDRUNDIR=%%NSDRUNDIR%%
	8
	9	if [ "$2" = "POST-DEINSTALL" ]; then
	10	echo "=> Deleting ${NSDDBDIR} if empty..."
	11	rm -d ${NSDDBDIR} 2>/dev/null \|\| true
	12	echo "=> Deleting ${NSDRUNDIR} if empty..."
	13	rm -d ${NSDRUNDIR} 2>/dev/null \|\| true
	14	fi
	15
	16	exit 0
	17

Line 0 Link Here

(-)nsd/files/pkg-install.in (+20 lines)
	1	#!/bin/sh
	2	# $FreeBSD$
	3
	4	PATH="/bin:/sbin:/usr/bin:/usr/sbin"
	5
	6	NSDUSER=%%NSDUSER%%
	7	NSDGROUP=%%NSDGROUP%%
	8	NSDDBDIR=%%NSDDBDIR%%
	9	NSDRUNDIR=%%NSDRUNDIR%%
	10
	11	CHOWN="chown"
	12	INSTALL_DIR="install -d -o ${NSDUSER} -g ${NSDGROUP} -m 0755"
	13
	14	if [ "$2" = "POST-INSTALL" ]; then
	15	${INSTALL_DIR} ${NSDDBDIR} ${NSDRUNDIR}
	16	${CHOWN} -R ${NSDUSER}:${NSDGROUP} ${NSDDBDIR} ${NSDRUNDIR}
	17	fi
	18
	19	exit 0
	20