Date: Mon, 25 Jul 2005 15:52:06 +0200 (CEST) From: Joerg Pulz <Joerg.Pulz@frm2.tum.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Sergey Matveychuk <sem@FreeBSD.org> Subject: ports/84057: [maintainer] update net/isc-dhcp3-* ports to v3.0.3 Message-ID: <200507251352.j6PDq6sf038918@hades.admin.frm2> Resent-Message-ID: <200507251400.j6PE0PNS045613@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 84057
>Category: ports
>Synopsis: [maintainer] update net/isc-dhcp3-* ports to v3.0.3
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Jul 25 14:00:25 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Joerg Pulz
>Release: FreeBSD 5.4-RELEASE-p4 i386
>Organization:
TU-Munich / ZWE FRM-II
>Environment:
System: FreeBSD hades.admin.frm2 5.4-RELEASE-p4 FreeBSD 5.4-RELEASE-p4 #5: Fri Jul 8 01:37:16 CEST 2005 root@hades.admin.frm2:/usr/obj/usr/src/sys/HADES i386
>Description:
o update the net/isc-dhcp3-* ports to v3.0.3
- this is a maintenance release
- failover related bugs fixed
- BOOTP related bugs fixed
- DDNS related bugs fixed
- manpage updates
- small memory leak closed
o changes to the port itself
- better use of PATCH_SITES and PATCHFILES
- added new OPTION: DHCP_SOCKETS
+ this offers the possibility to prefer sockets over /dev/bpf
( only useful for jail(8)ed environments where the bpf device
is not available and therefore only utilized if DHCP_JAIL
is set )
this addresses the PR ports/76820 which could now be closed
I'm unsure about PR ports/76825, as it makes no sense to me to let
dhcpd listen to loopback devices. I've asked the submitter of this
PR but received no response. I think we should close this PR too.
I think, that the MAINTAINER line in all SLAVE ports should be
removed as it gets overridden by the MASTER port Makefile anyway.
The affected Makfiles are:
net/isc-dhcp3-client
net/isc-dhcp3-devel
net/isc-dhcp3-relay
>How-To-Repeat:
>Fix:
--- net_isc-dhcp3-server.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/isc-dhcp3-server/Makefile,v
retrieving revision 1.109
diff -u -r1.109 Makefile
--- Makefile 15 Jun 2005 07:19:56 -0000 1.109
+++ Makefile 25 Jul 2005 13:16:24 -0000
@@ -7,7 +7,7 @@
#
PORTNAME= dhcp
-PORTVERSION= 3.0.2
+PORTVERSION= 3.0.3
PORTREVISION= 8
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_ISC}
@@ -31,6 +31,7 @@
.if ${SUBSYS} == server
OPTIONS= DHCP_PARANOIA "add -user, -group and -chroot options" on \
DHCP_JAIL "add -chroot and -jail options" on \
+ DHCP_SOCKETS "use sockets instead of /dev/bpf (jail-only)" off \
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 \
@@ -42,9 +43,9 @@
.if ${SUBSYS} == server && defined(WITH_DHCP_LDAP)
# Based on patch from Brian Masney :
-PATCH_SITES= http://www.newwave.net/~masneyb/ \
- ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/
-PATCHFILES= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}-ldap-patch
+PATCH_SITES= http://www.newwave.net/~masneyb/:ldap \
+ ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/:ldap
+PATCHFILES= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}-ldap-patch:ldap
PATCH_DIST_STRIP= -p1
USE_PERL5_RUN= yes
@@ -59,9 +60,9 @@
.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
+PATCH_SITES+= http://bingo.ru/~raven/FreeBSD/patches/:dlq \
+ ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/:dlq
+PATCHFILES+= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}-dlq-patch:dlq
.endif
# Global variables
@@ -225,6 +226,9 @@
.endif
.if !defined(WITHOUT_DHCP_JAIL)
@${ECHO_CMD} CFLAGS += -DJAIL >> ${WRKSRC}/site.conf
+.if defined(WITH_DHCP_SOCKETS)
+ @${ECHO_CMD} CFLAGS += -DUSE_SOCKETS >> ${WRKSRC}/site.conf
+.endif
.endif
.if defined(WITH_DHCP_LDAP)
@${ECHO_CMD} CFLAGS += -I${LOCALBASE}/include >> ${WRKSRC}/site.conf
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/isc-dhcp3-server/distinfo,v
retrieving revision 1.50
diff -u -r1.50 distinfo
--- distinfo 15 Jun 2005 07:19:56 -0000 1.50
+++ distinfo 25 Jul 2005 13:16:24 -0000
@@ -1,6 +1,6 @@
-MD5 (dhcp-3.0.2.tar.gz) = 04800a111521e7442749b2ce883f962b
-SIZE (dhcp-3.0.2.tar.gz) = 853313
-MD5 (dhcp-3.0.2-ldap-patch) = 08908b2f06b5e985d78d7c28797c5a37
-SIZE (dhcp-3.0.2-ldap-patch) = 229453
-MD5 (dhcp-3.0.2-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
-SIZE (dhcp-3.0.2-dlq-patch) = 7655
+MD5 (dhcp-3.0.3.tar.gz) = f91416a0b8ed3fd0601688cf0b7df58f
+SIZE (dhcp-3.0.3.tar.gz) = 870240
+MD5 (dhcp-3.0.3-ldap-patch) = c0d51532696222f3258ff19e91a39ce4
+SIZE (dhcp-3.0.3-ldap-patch) = 153377
+MD5 (dhcp-3.0.3-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
+SIZE (dhcp-3.0.3-dlq-patch) = 7655
Index: files/patch-dhcpctl::Makefile.dist
===================================================================
RCS file: /home/ncvs/ports/net/isc-dhcp3-server/files/patch-dhcpctl::Makefile.dist,v
retrieving revision 1.1
diff -u -r1.1 patch-dhcpctl::Makefile.dist
--- files/patch-dhcpctl::Makefile.dist 17 Jan 2004 23:09:02 -0000 1.1
+++ files/patch-dhcpctl::Makefile.dist 25 Jul 2005 13:16:24 -0000
@@ -1,7 +1,7 @@
---- dhcpctl/Makefile.dist.orig Mon Apr 28 16:31:57 2003
-+++ dhcpctl/Makefile.dist Mon Apr 28 16:24:20 2003
-@@ -17,11 +17,11 @@
- # http://www.isc.org for more information.
+--- dhcpctl/Makefile.dist.orig Thu Mar 3 17:55:23 2005
++++ dhcpctl/Makefile.dist Mon Jul 25 08:33:33 2005
+@@ -22,11 +22,11 @@
+ # http://www.isc.org/
#
-CATMANPAGES = dhcpctl.cat3 omshell.cat1
@@ -15,7 +15,7 @@
HDRS = dhcpctl.h
INCLUDES = $(BINDINC) -I$(TOP)/includes
-@@ -29,10 +29,7 @@
+@@ -34,10 +34,7 @@
DHCPCTLLIBS = libdhcpctl.a ../common/libdhcp.a $(BINDLIB) \
../omapip/libomapi.a ../dst/libdst.a
@@ -27,7 +27,7 @@
cltest: cltest.o $(DHCPCTLLIBS)
$(CC) $(DEBUG) $(LFLAGS) -o cltest cltest.o $(DHCPCTLLIBS) $(LIBS)
-@@ -43,8 +40,7 @@
+@@ -48,8 +45,7 @@
$(RANLIB) libdhcpctl.a
install: all $(CATMANPAGES)
@@ -37,7 +37,7 @@
foo=""; \
for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
foo=$${foo}/$$bar; \
-@@ -64,16 +60,12 @@
+@@ -69,16 +65,12 @@
$(MANINSTALL) $(MANFROM) $${prefix}.$(MANCAT)$${suffix} $(MANTO) \
$(DESTDIR)$(LIBMANDIR)/$${prefix}$(LIBMANEXT); \
done
@@ -50,12 +50,12 @@
$(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRC)
clean:
-- -rm -f $(OBJ) test.o svtest cltest.o cltest
+- -rm -f $(OBJ) omshell.o omshell cltest.o cltest
+ -rm -f $(OBJ) cltest.o cltest
realclean: clean
-rm -f libdhcpctl.a *~ $(CATMANPAGES) $(SEDMANPAGES)
-@@ -82,7 +74,7 @@
+@@ -87,7 +79,7 @@
-rm -f Makefile
links:
@@ -64,7 +64,7 @@
if [ ! -b $$foo ]; then \
rm -f $$foo; \
fi; \
-@@ -95,12 +87,5 @@
+@@ -100,12 +92,5 @@
dhcpctl.man3: dhcpctl.3
sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
-e "s#RUNDIR#$(VARRUN)#g" < dhcpctl.3 >dhcpctl.man3
--- net_isc-dhcp3-server.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507251352.j6PDq6sf038918>