Bug 67407 - Maintainer update: net/isc-dhcp3-server (paranoia and jail patch)
Summary: Maintainer update: net/isc-dhcp3-server (paranoia and jail patch)
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-05-31 04:20 UTC by Cyrille Lefevre
Modified: 2004-06-01 14:34 UTC (History)
1 user (show)

See Also:

Attachments
file.diff (9.20 KB, patch)
2004-05-31 04:20 UTC, Cyrille Lefevre 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Cyrille Lefevre 2004-05-31 04:20:32 UTC 
	to the auhors patches (CC'ed), if you have no objection, I
	dissociated the paranoia patch from the jail one. you can
	now choose between both -DPARANOIA -DJAIL, -DPARANOIA only
	or -DJAIL only.

	Makefile
		PORTREVISION bumped
		WITHOUT_DHCP_PARANOIA and WITHOUT_DHCP_JAIL added.
	pkg-message
		updated to inform about the new options.
	files/patch-server::dhcpd.c
		new file

Fix: take care, this patch is in two parts, the first
	one againt /dev/null and the second one a cvs diff.
How-To-Repeat: 	n/a
Comment 1 Cyrille Lefevre 2004-05-31 11:21:23 UTC 
please, use the following Makefile instead of the provided one :

pre-everything -> OPTIONS

thanks in advance.

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/isc-dhcp3-server/Makefile,v
retrieving revision 1.94
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.94 Makefile
--- Makefile	22 Mar 2004 23:33:08 -0000	1.94
+++ Makefile	31 May 2004 00:37:55 -0000
@@ -8,7 +8,7 @@
 
 PORTNAME=	dhcp
 PORTVERSION=	3.0.1.r12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	dhcp dhcp/dhcp-3.0-history
@@ -117,15 +117,12 @@
 RCSCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 PKGMESSAGE_SUB=	PREFIX=${PREFIX} MAN1PREFIX=${MAN1PREFIX}
 
-# Pre-everything
-#
-
-.if ${SUBSYS} == client && !defined(WITHOUT_INTERFACE_POLLING)
-pre-everything::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want to compile without interface polling support."
-	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_INTERFACE_POLLING=yes\""
-	@${ECHO_MSG}
+.if ${SUBSYS} == client
+OPTIONS=	INTERFACE_POLLING "interface polling support" on
+.endif
+.if ${SUBSYS} == server
+OPTIONS=	DHCP_PARANOIA "add -user, -group and -chroot options" on \
+		DHCP_JAIL "add -chroot and -jail options" on
 .endif
 
 # Post-extract
@@ -156,6 +153,14 @@
 .if ${SUBSYS} == client && !defined(WITHOUT_INTERFACE_POLLING)
 	@${ECHO_CMD} CFLAGS += -DENABLE_POLLING_MODE >> ${WRKSRC}/site.conf
 .endif
+.if ${SUBSYS} == server
+.if !defined(WITHOUT_DHCP_PARANOIA)
+	@${ECHO_CMD} CFLAGS += -DPARANOIA >> ${WRKSRC}/site.conf
+.endif
+.if !defined(WITHOUT_DHCP_JAIL)
+	@${ECHO_CMD} CFLAGS += -DJAIL >> ${WRKSRC}/site.conf
+.endif
+.endif
 
 patch-makefile-conf:
 	@${REINPLACE_CMD} -e 's|^DEBUG[ 	]*=|# DEBUG ?=|g' \

Cyrille Lefevre
-- 
mailto:cyrille.lefevre@laposte.net
Comment 2 Pav Lucistnik freebsd_committer freebsd_triage 2004-06-01 14:34:37 UTC 
State Changed
From-To: open->closed

Committed, thanks! 

Please note that you have to define OPTIONS before bsd.port.pre.mk