Date: Wed, 30 Jan 2008 01:48:06 GMT From: Felippe de Meirelles Motta <lippemail@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/120136: [UPDATE] dns/dnrd Message-ID: <200801300148.m0U1m5FI065450@www.freebsd.org> Resent-Message-ID: <200801300150.m0U1o1dS008527@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 120136
>Category: ports
>Synopsis: [UPDATE] dns/dnrd
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Jan 30 01:50:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Felippe de Meirelles Motta
>Release: FreeBSD 7.0-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD 7.0-PRERELEASE #0: Thu Jan 10 01:55:37 BRST 2008
lippe@shire.freebsd.org:/usr/obj/usr/src/sys/GENERIC
>Description:
- Updated to 2.20.3;
- Use SF macro;
- New OPTIONS added;
- Fix and change pkg-install to FILESDIR
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/dns/dnrd/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- Makefile 4 May 2006 21:41:11 -0000 1.28
+++ Makefile 30 Jan 2008 01:48:30 -0000
@@ -6,10 +6,9 @@
#
PORTNAME= dnrd
-PORTVERSION= 2.20.1
+PORTVERSION= 2.20.3
CATEGORIES= dns
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= dnrd
+MASTER_SITES= SF
MAINTAINER= ncopa@users.sourceforge.net
COMMENT= A proxy DNS daemon
@@ -19,19 +18,25 @@
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 ChangeLog INSTALL README \
- doc/README-cache doc/README-master doc/TODO
-EXAMPLES= doc/master.sample
-
-PORTDOCS= *
-PLIST_FILES= sbin/dnrd %%EXAMPLESDIR%%/master.sample
-PLIST_DIRS= %%EXAMPLESDIR%% etc/dnrd
+DOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README
+EXAMPLES= README-cache README-cygwin README-master TODO \
+ master.sample
OPTIONS= TCP "Enable TCP support" off \
- MASTER "Enable master file support" on
+ 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>
@@ -39,26 +44,33 @@
CONFIGURE_ARGS+= --enable-tcp
.endif
-.if defined(WITHOUT_MASTER)
+.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
-post-install:
+do-install:
@${ECHO} "==> Creating dnrd directory"
@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/src/dnrd ${PREFIX}/sbin
- ${INSTALL_MAN} ${WRKSRC}/doc/dnrd.8 ${MAN8PREFIX}/man/man8
- @${MKDIR} ${EXAMPLESDIR}
- cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
+ @${INSTALL_PROGRAM} ${WRKSRC}/src/dnrd ${PREFIX}/sbin
+ @${INSTALL_MAN} ${WRKSRC}/doc/dnrd.8 ${MAN8PREFIX}/man/man8
+ @${INSTALL_DATA} ${WRKSRC}/doc/master.sample ${ETCDIR}/
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
- cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+ @${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
+ @${MKDIR} ${EXAMPLESDIR}
+ @${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/doc/,} ${EXAMPLESDIR}/
.endif
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/dns/dnrd/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- distinfo 30 Nov 2005 21:37:53 -0000 1.15
+++ distinfo 30 Jan 2008 01:48:30 -0000
@@ -1,3 +1,3 @@
-MD5 (dnrd-2.20.1.tar.gz) = cbd3657617ecb92e0fd19c5c9f1ccfd7
-SHA256 (dnrd-2.20.1.tar.gz) = 698acae5a0de7e6694dec441d63dbf68d1c9b83c6f43b1b086da11d270ffd40e
-SIZE (dnrd-2.20.1.tar.gz) = 157804
+MD5 (dnrd-2.20.3.tar.gz) = 41c9b070aae8ed403fc8c2aac7ab157c
+SHA256 (dnrd-2.20.3.tar.gz) = aa46e7f8736b88c1d752cf606b3990041221ce91d014e955c6b02eb2167db015
+SIZE (dnrd-2.20.3.tar.gz) = 161887
Index: pkg-install
===================================================================
RCS file: pkg-install
diff -N pkg-install
--- pkg-install 6 Sep 2005 12:10:46 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-#!/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
Index: pkg-plist
===================================================================
RCS file: pkg-plist
diff -N pkg-plist
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg-plist 30 Jan 2008 01:48:30 -0000
@@ -0,0 +1,19 @@
+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 ""
Index: files/pkg-install.in
===================================================================
RCS file: files/pkg-install.in
diff -N files/pkg-install.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/pkg-install.in 30 Jan 2008 01:48:30 -0000
@@ -0,0 +1,25 @@
+#!/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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801300148.m0U1m5FI065450>