Attachment #84182 for bug #120136

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




#

PORTNAME=		dnrd
PORTVERSION=		2.20.3
CATEGORIES=		dns
MASTER_SITES=		SF
MASTER_SITE_SUBDIR=	dnrd

MAINTAINER=		ncopa@users.sourceforge.net
COMMENT=		A proxy DNS daemon

GNU_CONFIGURE=		yes
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
CONFIGURE_ARGS+=	--disable-dependency-tracking

MAN8=		dnrd.8
DOCS=		AUTHORS COPYING ChangeLog INSTALL NEWS README
EXAMPLES=	README-cache README-cygwin README-master TODO \
		master.sample

PORTDOCS=	*
PLIST_FILES=	sbin/dnrd %%EXAMPLESDIR%%/master.sample
PLIST_DIRS=	%%EXAMPLESDIR%% etc/dnrd

OPTIONS=	TCP "Enable TCP support" off \
		MASTER "Enable master file support" on \
		DEBUG "Enable debugging" off \
		RANDOM "Enable random source port" off

DNRD_USER?=	dnrd
DNRD_GROUP?=	dnrd
DNRD_DIR?=	${ETCDIR}

SUB_FILES=	pkg-install
SUB_LIST+=	DNRD_USER=${DNRD_USER} \
		DNRD_GROUP=${DNRD_GROUP} \
		DNRD_DIR=${DNRD_DIR}

.include <bsd.port.pre.mk>


CONFIGURE_ARGS+=	--enable-tcp
.endif

.if !defined(WITH_MASTER)
CONFIGURE_ARGS+=	--disable-master
.endif

.if defined(WITH_DEBUG)
CONFIGURE_ARGS+=	--enable-debug
.endif

.if defined(WITH_RANDOM)
CONFIGURE_ARGS+=	--enable-random-src
.endif

pre-install:
	@${ECHO} "==>  Creating custom user to run dnrd..."
	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL

do-install:
	@${ECHO} "==>  Creating dnrd directory"
	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
	@${INSTALL_PROGRAM} ${WRKSRC}/src/dnrd ${PREFIX}/sbin
	@${INSTALL_MAN} ${WRKSRC}/doc/dnrd.8 ${MAN8PREFIX}/man/man8
	@${INSTALL_DATA} ${WRKSRC}/doc/master.sample ${ETCDIR}/
	${INSTALL_MAN} ${WRKSRC}/doc/dnrd.8 ${MAN8PREFIX}/man/man8
	@${MKDIR} ${EXAMPLESDIR}
	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
	@${MKDIR} ${EXAMPLESDIR}
	@${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/doc/,} ${EXAMPLESDIR}/
.endif

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (dnrd-2.20.1.tar.gz) = cbd3657617ecb92e0fd19c5c9f1ccfd7	1	MD5 (dnrd-2.20.3.tar.gz) = 41c9b070aae8ed403fc8c2aac7ab157c
2	SHA256 (dnrd-2.20.1.tar.gz) = 698acae5a0de7e6694dec441d63dbf68d1c9b83c6f43b1b086da11d270ffd40e	2	SHA256 (dnrd-2.20.3.tar.gz) = aa46e7f8736b88c1d752cf606b3990041221ce91d014e955c6b02eb2167db015
3	SIZE (dnrd-2.20.1.tar.gz) = 157804	3	SIZE (dnrd-2.20.3.tar.gz) = 161887




#!/bin/sh


USER=${DNRDUSER:-dnrd}
GROUP=${USER}
SYSCONF_DIR=${SYSCONF_DIR:-${PKG_PREFIX}/etc/dnrd}

case $2 in
	PRE-INSTALL)
		if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
			if pw groupadd ${GROUP}; then
				echo "Added group \"${GROUP}\"."
			else
				echo "Adding group \"${GROUP}\" failed..."
				exit 1
			fi
		fi

		if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
			if pw useradd ${USER} -g ${GROUP} -h - \
				-s "/sbin/nologin" -d "/var/empty" \
				-c "DNRD daemon"; \
			then
				echo "Added user \"${USER}\"."
			else
				echo "Adding user \"${USER}\" failed..."
				exit 1
			fi
		fi
		;;

	POST-INSTALL)
		if [ ! -d ${SYSCONF_DIR} ]; then
			mkdir -p ${SYSCONF_DIR}
			if [ ! -d ${SYSCONF_DIR} ]; then
				echo "Creating \"${SYSCONF_DIR}\" failed."
				exit 1
			fi
		fi
		;;
esac
exit 0




sbin/dnrd
%%ETCDIR%%/master.sample
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%EXAMPLESDIR%%/README-cache
%%PORTDOCS%%%%EXAMPLESDIR%%/README-cygwin
%%PORTDOCS%%%%EXAMPLESDIR%%/README-master
%%PORTDOCS%%%%EXAMPLESDIR%%/TODO
%%PORTDOCS%%%%EXAMPLESDIR%%/master.sample
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
@dirrm %%ETCDIR%%
@unexec echo ""
@unexec echo "If you are permanently removing dnrd, remove user/group 'dnrd'" | /usr/bin/fmt
@unexec echo ""




#!/bin/sh

PW="/usr/sbin/pw"
CHOWN="/usr/sbin/chown"
CHMOD="/bin/chmod"
MKDIR="/bin/mkdir -p"
NOLOGIN="/usr/sbin/nologin"

DNRD_USER=%%DNRD_USER%%
DNRD_GROUP=%%DNRD_GROUP%%
DNRD_DIR=%%DNRD_DIR%%

case "$2" in
PRE-INSTALL)
	${PW} groupshow -n ${DNRD_USER} >/dev/null 2>&1 \
	|| ${PW} groupadd -n ${DNRD_USER}
	${PW} usershow -n ${DNRD_USER} >/dev/null 2>&1 \
	|| ${PW} useradd ${DNRD_USER} -g ${DNRD_GROUP} -s ${NOLOGIN}
  ;;
POST-INSTALL)
	if [ ! -d ${DNRD_DIR} ]; then
		${MKDIR} ${DNRD_DIR}
	fi
  ;;
esac

Return to bug 120136

Lines 6-15 Link Here

(-)Makefile (-21 / +33 lines)
6	#	6	#
7		7
8	PORTNAME= dnrd	8	PORTNAME= dnrd
9	PORTVERSION= 2.20.1	9	PORTVERSION= 2.20.3
10	CATEGORIES= dns	10	CATEGORIES= dns
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= SF
12	MASTER_SITE_SUBDIR= dnrd
13		12
14	MAINTAINER= ncopa@users.sourceforge.net	13	MAINTAINER= ncopa@users.sourceforge.net
15	COMMENT= A proxy DNS daemon	14	COMMENT= A proxy DNS daemon
Lines 19-37 Link Here
19	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
20	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	19	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
21	CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}	20	CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
22	CONFIGURE_ARGS+= --disable-dependency-tracking
23		21
24	MAN8= dnrd.8	22	MAN8= dnrd.8
25	DOCS= AUTHORS ChangeLog INSTALL README \	23	DOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README
26	doc/README-cache doc/README-master doc/TODO	24	EXAMPLES= README-cache README-cygwin README-master TODO \
27	EXAMPLES= doc/master.sample	25	master.sample
28
29	PORTDOCS= *
30	PLIST_FILES= sbin/dnrd %%EXAMPLESDIR%%/master.sample
31	PLIST_DIRS= %%EXAMPLESDIR%% etc/dnrd
32		26
33	OPTIONS= TCP "Enable TCP support" off \	27	OPTIONS= TCP "Enable TCP support" off \
34	MASTER "Enable master file support" on	28	MASTER "Enable master file support" on \
		29	DEBUG "Enable debugging" off \
		30	RANDOM "Enable random source port" off
		31
		32	DNRD_USER?= dnrd
		33	DNRD_GROUP?= dnrd
		34	DNRD_DIR?= ${ETCDIR}
		35
		36	SUB_FILES= pkg-install
		37	SUB_LIST+= DNRD_USER=${DNRD_USER} \
		38	DNRD_GROUP=${DNRD_GROUP} \
		39	DNRD_DIR=${DNRD_DIR}
35		40
36	.include <bsd.port.pre.mk>	41	.include <bsd.port.pre.mk>
37		42
Lines 39-64 Link Here
39	CONFIGURE_ARGS+= --enable-tcp	44	CONFIGURE_ARGS+= --enable-tcp
40	.endif	45	.endif
41		46
42	.if defined(WITHOUT_MASTER)	47	.if !defined(WITH_MASTER)
43	CONFIGURE_ARGS+= --disable-master	48	CONFIGURE_ARGS+= --disable-master
44	.endif	49	.endif
45		50
		51	.if defined(WITH_DEBUG)
		52	CONFIGURE_ARGS+= --enable-debug
		53	.endif
		54
		55	.if defined(WITH_RANDOM)
		56	CONFIGURE_ARGS+= --enable-random-src
		57	.endif
		58
46	pre-install:	59	pre-install:
47	@${ECHO} "==> Creating custom user to run dnrd..."	60	@${ECHO} "==> Creating custom user to run dnrd..."
48	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL	61	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
49		62
50	post-install:	63	do-install:
51	@${ECHO} "==> Creating dnrd directory"	64	@${ECHO} "==> Creating dnrd directory"
52	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL	65	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
53		66	@${INSTALL_PROGRAM} ${WRKSRC}/src/dnrd ${PREFIX}/sbin
54	do-install:	67	@${INSTALL_MAN} ${WRKSRC}/doc/dnrd.8 ${MAN8PREFIX}/man/man8
55	${INSTALL_PROGRAM} ${WRKSRC}/src/dnrd ${PREFIX}/sbin	68	@${INSTALL_DATA} ${WRKSRC}/doc/master.sample ${ETCDIR}/
56	${INSTALL_MAN} ${WRKSRC}/doc/dnrd.8 ${MAN8PREFIX}/man/man8
57	@${MKDIR} ${EXAMPLESDIR}
58	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
59	.if !defined(NOPORTDOCS)	69	.if !defined(NOPORTDOCS)
60	@${MKDIR} ${DOCSDIR}	70	@${MKDIR} ${DOCSDIR}
61	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}	71	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
		72	@${MKDIR} ${EXAMPLESDIR}
		73	@${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/doc/,} ${EXAMPLESDIR}/
62	.endif	74	.endif
63		75
64	.include <bsd.port.post.mk>	76	.include <bsd.port.post.mk>

Removed Link Here

(-)pkg-install (-42 lines)
1	#!/bin/sh
2
3
4	USER=${DNRDUSER:-dnrd}
5	GROUP=${USER}
6	SYSCONF_DIR=${SYSCONF_DIR:-${PKG_PREFIX}/etc/dnrd}
7
8	case $2 in
9	PRE-INSTALL)
10	if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
11	if pw groupadd ${GROUP}; then
12	echo "Added group \"${GROUP}\"."
13	else
14	echo "Adding group \"${GROUP}\" failed..."
15	exit 1
16	fi
17	fi
18
19	if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
20	if pw useradd ${USER} -g ${GROUP} -h - \
21	-s "/sbin/nologin" -d "/var/empty" \
22	-c "DNRD daemon"; \
23	then
24	echo "Added user \"${USER}\"."
25	else
26	echo "Adding user \"${USER}\" failed..."
27	exit 1
28	fi
29	fi
30	;;
31
32	POST-INSTALL)
33	if [ ! -d ${SYSCONF_DIR} ]; then
34	mkdir -p ${SYSCONF_DIR}
35	if [ ! -d ${SYSCONF_DIR} ]; then
36	echo "Creating \"${SYSCONF_DIR}\" failed."
37	exit 1
38	fi
39	fi
40	;;
41	esac
42	exit 0

Added Link Here

(-)pkg-plist (+19 lines)
1	sbin/dnrd
2	%%ETCDIR%%/master.sample
3	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
4	%%PORTDOCS%%%%DOCSDIR%%/COPYING
5	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
6	%%PORTDOCS%%%%DOCSDIR%%/INSTALL
7	%%PORTDOCS%%%%DOCSDIR%%/NEWS
8	%%PORTDOCS%%%%DOCSDIR%%/README
9	%%PORTDOCS%%%%EXAMPLESDIR%%/README-cache
10	%%PORTDOCS%%%%EXAMPLESDIR%%/README-cygwin
11	%%PORTDOCS%%%%EXAMPLESDIR%%/README-master
12	%%PORTDOCS%%%%EXAMPLESDIR%%/TODO
13	%%PORTDOCS%%%%EXAMPLESDIR%%/master.sample
14	%%PORTDOCS%%@dirrm %%DOCSDIR%%
15	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
16	@dirrm %%ETCDIR%%
17	@unexec echo ""
18	@unexec echo "If you are permanently removing dnrd, remove user/group 'dnrd'" \| /usr/bin/fmt
19	@unexec echo ""

Added Link Here

(-)files/pkg-install.in (+25 lines)
1	#!/bin/sh
2
3	PW="/usr/sbin/pw"
4	CHOWN="/usr/sbin/chown"
5	CHMOD="/bin/chmod"
6	MKDIR="/bin/mkdir -p"
7	NOLOGIN="/usr/sbin/nologin"
8
9	DNRD_USER=%%DNRD_USER%%
10	DNRD_GROUP=%%DNRD_GROUP%%
11	DNRD_DIR=%%DNRD_DIR%%
12
13	case "$2" in
14	PRE-INSTALL)
15	${PW} groupshow -n ${DNRD_USER} >/dev/null 2>&1 \
16	\|\| ${PW} groupadd -n ${DNRD_USER}
17	${PW} usershow -n ${DNRD_USER} >/dev/null 2>&1 \
18	\|\| ${PW} useradd ${DNRD_USER} -g ${DNRD_GROUP} -s ${NOLOGIN}
19	;;
20	POST-INSTALL)
21	if [ ! -d ${DNRD_DIR} ]; then
22	${MKDIR} ${DNRD_DIR}
23	fi
24	;;
25	esac