Attachment #52554 for bug #79599





PORTNAME=	dhcp
PORTVERSION=	3.0.2
PORTREVISION=	8
CATEGORIES=	net
MASTER_SITES=	${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR=	dhcp dhcp/dhcp-3.0-history

		DHCP_LDAP "add experimental LDAP backend support" off \
		DHCP_LDAP_SSL "support LDAP connection over SSL/TLS" on \
		OPENSSL_BASE "use the base system OpenSSL (required by TLS)" on \
		OPENSSL_PORT "use OpenSSL from ports (required by TLS)" off \
		DHCP_LQ "DHCPLEASEQUERY support used by Cisco uBR's" off
.endif

.include <bsd.port.pre.mk>

.endif
.endif

.if ${SUBSYS} == server && defined(WITH_DHCP_LQ)
# Based on patch from Dmitry Sukhodoev :
PATCH_SITES=	http://bingo.ru/~raven/FreeBSD/patches/ \
		ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/
PATCHFILES+=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}-dlq-patch
.endif

# Global variables
#


post-patch: patch-scripts patch-makefile-conf \
	    patch-makefiles-dist patch-man-pages \
	    patch-pkgmessage patch-site-conf \
	    patch-rc-scripts patch-dlq

patch-scripts:
	@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \

.endif
.endif

patch-dlq:
.if ${SUBSYS} == server && defined(WITH_DHCP_LQ)
.if defined(WITH_DHCP_LDAP)
	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-dlq-ldap
.else
	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-dlq
.endif
.endif

# Post-install
#


Lines 2-4 Link Here

(-)distinfo (+2 lines)
2	SIZE (dhcp-3.0.2.tar.gz) = 853313	2	SIZE (dhcp-3.0.2.tar.gz) = 853313
3	MD5 (dhcp-3.0.2-ldap-patch) = 08908b2f06b5e985d78d7c28797c5a37	3	MD5 (dhcp-3.0.2-ldap-patch) = 08908b2f06b5e985d78d7c28797c5a37
4	SIZE (dhcp-3.0.2-ldap-patch) = 229453	4	SIZE (dhcp-3.0.2-ldap-patch) = 229453
		5	MD5 (dhcp-3.0.2-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
		6	SIZE (dhcp-3.0.2-dlq-patch) = 7655




--- server/Makefile.dist.orig	Tue Jun 14 09:37:50 2005
+++ server/Makefile.dist	Tue Jun 14 09:37:50 2005
@@ -25,9 +25,9 @@
 CATMANPAGES = dhcpd.cat8 dhcpd.conf.cat5 dhcpd.leases.cat5
 SEDMANPAGES = dhcpd.man8 dhcpd.conf.man5 dhcpd.leases.man5
 SRCS   = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
-	 omapi.c mdb.c stables.c salloc.c ddns.c
+	 omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c
 OBJS   = dhcpd.o dhcp.o bootp.o confpars.o db.o class.o failover.o \
-	 omapi.o mdb.o stables.o salloc.o ddns.o
+	 omapi.o mdb.o stables.o salloc.o ddns.o dhcpleasequery.o
 PROG   = dhcpd
 MAN    = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
 




--- server/Makefile.dist.orig	Tue Jun 14 09:39:39 2005
+++ server/Makefile.dist	Tue Jun 14 09:39:39 2005
@@ -25,9 +25,9 @@
 CATMANPAGES = dhcpd.cat8 dhcpd.conf.cat5 dhcpd.leases.cat5
 SEDMANPAGES = dhcpd.man8 dhcpd.conf.man5 dhcpd.leases.man5
 SRCS   = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
-	 ldap.c omapi.c mdb.c stables.c salloc.c ddns.c
+	 ldap.c omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c
 OBJS   = dhcpd.o dhcp.o bootp.o confpars.o db.o class.o failover.o \
-	 ldap.o omapi.o mdb.o stables.o salloc.o ddns.o
+	 ldap.o omapi.o mdb.o stables.o salloc.o ddns.o dhcpleasequery.o
 PROG   = dhcpd
 MAN    = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
 

Return to bug 79599

Lines 8-14 Link Here

(-)Makefile (-3 / +20 lines)
8		8
9	PORTNAME= dhcp	9	PORTNAME= dhcp
10	PORTVERSION= 3.0.2	10	PORTVERSION= 3.0.2
11	PORTREVISION= 7	11	PORTREVISION= 8
12	CATEGORIES= net	12	CATEGORIES= net
13	MASTER_SITES= ${MASTER_SITE_ISC}	13	MASTER_SITES= ${MASTER_SITE_ISC}
14	MASTER_SITE_SUBDIR= dhcp dhcp/dhcp-3.0-history	14	MASTER_SITE_SUBDIR= dhcp dhcp/dhcp-3.0-history
Lines 34-40 Link Here
34	DHCP_LDAP "add experimental LDAP backend support" off \	34	DHCP_LDAP "add experimental LDAP backend support" off \
35	DHCP_LDAP_SSL "support LDAP connection over SSL/TLS" on \	35	DHCP_LDAP_SSL "support LDAP connection over SSL/TLS" on \
36	OPENSSL_BASE "use the base system OpenSSL (required by TLS)" on \	36	OPENSSL_BASE "use the base system OpenSSL (required by TLS)" on \
37	OPENSSL_PORT "use OpenSSL from ports (required by TLS)" off	37	OPENSSL_PORT "use OpenSSL from ports (required by TLS)" off \
		38	DHCP_LQ "DHCPLEASEQUERY support used by Cisco uBR's" off
38	.endif	39	.endif
39		40
40	.include <bsd.port.pre.mk>	41	.include <bsd.port.pre.mk>
Lines 56-61 Link Here
56	.endif	57	.endif
57	.endif	58	.endif
58		59
		60	.if ${SUBSYS} == server && defined(WITH_DHCP_LQ)
		61	# Based on patch from Dmitry Sukhodoev :
		62	PATCH_SITES= http://bingo.ru/~raven/FreeBSD/patches/ \
		63	ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/
		64	PATCHFILES+= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}-dlq-patch
		65	.endif
		66
59	# Global variables	67	# Global variables
60	#	68	#
61		69
Lines 200-206 Link Here
200	post-patch: patch-scripts patch-makefile-conf \	208	post-patch: patch-scripts patch-makefile-conf \
201	patch-makefiles-dist patch-man-pages \	209	patch-makefiles-dist patch-man-pages \
202	patch-pkgmessage patch-site-conf \	210	patch-pkgmessage patch-site-conf \
203	patch-rc-scripts	211	patch-rc-scripts patch-dlq
204		212
205	patch-scripts:	213	patch-scripts:
206	@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \	214	@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
Lines 260-265 Link Here
260	.endif	268	.endif
261	.endif	269	.endif
262		270
		271	patch-dlq:
		272	.if ${SUBSYS} == server && defined(WITH_DHCP_LQ)
		273	.if defined(WITH_DHCP_LDAP)
		274	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-dlq-ldap
		275	.else
		276	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-dlq
		277	.endif
		278	.endif
		279
263	# Post-install	280	# Post-install
264	#	281	#
265		282

Added Link Here

(-)files/extra-patch-dlq (+14 lines)
1	--- server/Makefile.dist.orig Tue Jun 14 09:37:50 2005
2	+++ server/Makefile.dist Tue Jun 14 09:37:50 2005
3	@@ -25,9 +25,9 @@
4	CATMANPAGES = dhcpd.cat8 dhcpd.conf.cat5 dhcpd.leases.cat5
5	SEDMANPAGES = dhcpd.man8 dhcpd.conf.man5 dhcpd.leases.man5
6	SRCS = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
7	- omapi.c mdb.c stables.c salloc.c ddns.c
8	+ omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c
9	OBJS = dhcpd.o dhcp.o bootp.o confpars.o db.o class.o failover.o \
10	- omapi.o mdb.o stables.o salloc.o ddns.o
11	+ omapi.o mdb.o stables.o salloc.o ddns.o dhcpleasequery.o
12	PROG = dhcpd
13	MAN = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
14

Added Link Here

(-)files/extra-patch-dlq-ldap (+14 lines)
1	--- server/Makefile.dist.orig Tue Jun 14 09:39:39 2005
2	+++ server/Makefile.dist Tue Jun 14 09:39:39 2005
3	@@ -25,9 +25,9 @@
4	CATMANPAGES = dhcpd.cat8 dhcpd.conf.cat5 dhcpd.leases.cat5
5	SEDMANPAGES = dhcpd.man8 dhcpd.conf.man5 dhcpd.leases.man5
6	SRCS = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
7	- ldap.c omapi.c mdb.c stables.c salloc.c ddns.c
8	+ ldap.c omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c
9	OBJS = dhcpd.o dhcp.o bootp.o confpars.o db.o class.o failover.o \
10	- ldap.o omapi.o mdb.o stables.o salloc.o ddns.o
11	+ ldap.o omapi.o mdb.o stables.o salloc.o ddns.o dhcpleasequery.o
12	PROG = dhcpd
13	MAN = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
14