Date: Fri, 6 May 2011 11:40:49 GMT From: Alex Deiter <alex.deiter@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/156846: net/isc-dhcp41-server without IPv6 Message-ID: <201105061140.p46Ben9H062792@red.freebsd.org> Resent-Message-ID: <201105061150.p46Bo90O000611@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 156846
>Category: ports
>Synopsis: net/isc-dhcp41-server without IPv6
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri May 06 11:50:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Alex Deiter
>Release: 9.0-CURRENT-r221271
>Organization:
N/A
>Environment:
FreeBSD blackbox.deiter.ru 9.0-CURRENT-r221271 FreeBSD 9.0-CURRENT-r221271 #0: Sun May 1 11:01:45 MSD 2011 root@blackbox.deiter.net.ru:/usr/obj/usr/src/sys/BLACKBOX i386
>Description:
Port net/isc-dhcp41-server does not have config options for building without IPv6 support. Please review attached patch.
>How-To-Repeat:
cd /usr/ports/net/isc-dhcp41-server && make config install
>Fix:
cd /usr/ports/net
patch -p0 < patch-isc-dhcp41-server.txt
cd isc-dhcp41-server
make config install
Patch attached with submission follows:
diff -ur isc-dhcp41-server.orig/Makefile isc-dhcp41-server/Makefile
--- isc-dhcp41-server.orig/Makefile 2011-04-11 01:40:52.000000000 +0400
+++ isc-dhcp41-server/Makefile 2011-05-06 15:10:17.056815717 +0400
@@ -33,6 +33,7 @@
.if ${SUBSYS} == server
OPTIONS= DHCP_PARANOIA "Enable support for chroot" on \
+ DHCP_IPV6 "Enable support for IPv6" on \
DHCP_LDAP "Experimental LDAP backend support" off \
DHCP_LDAP_SSL "Support LDAP connection over SSL/TLS" on
.endif
@@ -72,7 +73,10 @@
MAN1= omshell.1
MAN3= dhcpctl.3 omapi.3
CFLAGS+= -fPIC
-CONF_FILE= dhcpd.conf dhcpd6.conf
+CONF_FILE= dhcpd.conf
+.if defined(WITH_DHCP_IPV6)
+CONF_FILE+= dhcpd6.conf
+.endif
.else
MAN8+= dhcrelay.8
.endif
@@ -135,6 +139,14 @@
SUB_LIST+= PARANOIA=no
.endif
+.if defined(WITH_DHCP_IPV6)
+CONFIGURE_ARGS+= --enable-dhcpv6
+PLIST_SUB+= IPV6=""
+.else
+CONFIGURE_ARGS+= --disable-dhcpv6
+PLIST_SUB+= IPV6="@comment "
+.endif
+
pre-patch:
.if ${SUBSYS} == server && defined(WITH_DHCP_LDAP)
@cd ${WRKSRC} && ${PATCH} -p1 < ${WRKDIR}/${LDAPPATCHDIST}/${LDAPPATCHFILE}
@@ -155,9 +167,11 @@
${MAKE} -C ${WRKSRC}/includes install
${MAKE} -C ${WRKSRC}/common install
${INSTALL_DATA} ${WRKSRC}/dhcpctl/dhcpctl.h ${PREFIX}/include
+.if defined(WITH_DHCP_IPV6)
${INSTALL_DATA} ${WRKSRC}/doc/examples/dhcpd-dhcpv6.conf \
${PREFIX}/etc/dhcpd6.conf.sample
.endif
+.endif
.if defined(WITH_DHCP_LDAP)
@${MKDIR} ${SCHEMA_DIR}
${INSTALL_DATA} ${LDAP_SCHEMA} ${SCHEMA_DIR}
@@ -180,8 +194,10 @@
.if ${SUBSYS} == client
${INSTALL_SCRIPT} ${WRKSRC}/client/scripts/freebsd ${PREFIX}/sbin/dhclient-script
.elif ${SUBSYS} == server
+.if defined(WITH_DHCP_IPV6)
@${LN} -sf isc-dhcpd ${PREFIX}/etc/rc.d/isc-dhcpd6
.endif
+.endif
@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${MSG_FILE} > ${PKGMESSAGE}
.if defined(WITH_DHCP_LDAP)
diff -ur isc-dhcp41-server.orig/pkg-plist isc-dhcp41-server/pkg-plist
--- isc-dhcp41-server.orig/pkg-plist 2011-02-14 05:21:27.000000000 +0300
+++ isc-dhcp41-server/pkg-plist 2011-05-06 15:02:19.378804406 +0400
@@ -1,13 +1,13 @@
@comment $FreeBSD: ports/net/isc-dhcp41-server/pkg-plist,v 1.4 2011/02/14 02:21:27 wxs Exp $
@unexec %D/etc/rc.d/isc-dhcpd forcestop 2>/dev/null || true
-@unexec %D/etc/rc.d/isc-dhcpd6 forcestop 2>/dev/null || true
+%%IPV6%%@unexec %D/etc/rc.d/isc-dhcpd6 forcestop 2>/dev/null || true
@unexec if cmp -s %D/etc/dhcpd.conf.sample %D/etc/dhcpd.conf; then rm -f %D/etc/dhcpd.conf; fi
etc/dhcpd.conf.sample
@exec if [ ! -f %D/etc/dhcpd.conf ] ; then cp -p %D/%F %B/dhcpd.conf; fi
-@unexec if cmp -s %D/etc/dhcpd6.conf.sample %D/etc/dhcpd6.conf; then rm -f %D/etc/dhcpd6.conf; fi
-etc/dhcpd6.conf.sample
-@exec if [ ! -f %D/etc/dhcpd6.conf ] ; then cp -p %D/%F %B/dhcpd6.conf; fi
-etc/rc.d/isc-dhcpd6
+%%IPV6%%@unexec if cmp -s %D/etc/dhcpd6.conf.sample %D/etc/dhcpd6.conf; then rm -f %D/etc/dhcpd6.conf; fi
+%%IPV6%%etc/dhcpd6.conf.sample
+%%IPV6%%@exec if [ ! -f %D/etc/dhcpd6.conf ] ; then cp -p %D/%F %B/dhcpd6.conf; fi
+%%IPV6%%etc/rc.d/isc-dhcpd6
sbin/dhcpd
bin/omshell
%%LDAP%%bin/dhcpd-conf-to-ldap
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105061140.p46Ben9H062792>