5 files changed, 61 insertions, 42 deletions

diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile
index 28324d6689c0..d9644634a182 100644
--- a/net/isc-dhcp31-server/Makefile
+++ b/net/isc-dhcp31-server/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.1.r12
-PORTREVISION=	3
+PORTVERSION=	3.0.1.r14
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	dhcp dhcp/dhcp-3.0-history
@@ -113,7 +112,9 @@ DATA_FILES=	dhcpd.leases
 BIN_FILES=	dhcrelay
 RC_FILES=	isc-dhcrelay
 .endif
-DOC_FILES=	ANONCVS CHANGES COPYRIGHT README RELNOTES
+.if !defined(NOPORTDOCS)
+PORTDOCS=	LICENSE README RELNOTES
+.endif
 
 SAMP_SUFX=	.sample
 
@@ -129,7 +130,7 @@ PKGMESSAGE_SUB=	PREFIX=${PREFIX} MAN1PREFIX=${MAN1PREFIX}
 # Post-extract
 #
 
-post-extract: extract-omshell
+post-extract: extract-omshell extract-script
 
 extract-omshell:
 	@${MKDIR} ${WRKSRC}/omshell
@@ -137,6 +138,9 @@ extract-omshell:
 	@${CP} ${FILESDIR}/omshell::Makefile.dist \
 		${WRKSRC}/omshell/Makefile.dist
 
+extract-script:
+	@${CP} ${FILESDIR}/client::scripts::freebsd ${WRKSRC}/client/scripts/freebsd
+
 # Post-patch
 #
 
@@ -215,7 +219,7 @@ install-startup-files:
 install-doc-files:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for f in ${DOC_FILES}
+.for f in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
diff --git a/net/isc-dhcp31-server/distinfo b/net/isc-dhcp31-server/distinfo
index a806bc46fa23..1ee059a05367 100644
--- a/net/isc-dhcp31-server/distinfo
+++ b/net/isc-dhcp31-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (dhcp-3.0.1rc12.tar.gz) = cf00193dcf349c888a62e4462ae1eb9c
-SIZE (dhcp-3.0.1rc12.tar.gz) = 857323
+MD5 (dhcp-3.0.1rc14.tar.gz) = a68074d9ebdeb355c293d9b3645b3c2c
+SIZE (dhcp-3.0.1rc14.tar.gz) = 842712
diff --git a/net/isc-dhcp31-server/files/patch-Makefile.dist b/net/isc-dhcp31-server/files/patch-Makefile.dist
index 9edab8fa4571..0c09997023cc 100644
--- a/net/isc-dhcp31-server/files/patch-Makefile.dist
+++ b/net/isc-dhcp31-server/files/patch-Makefile.dist
@@ -1,22 +1,5 @@
 --- Makefile.dist.orig	Fri Nov  8 00:10:08 2002
 +++ Makefile.dist	Tue Apr 29 00:07:43 2003
-@@ -3,13 +3,13 @@
- # Copyright (c) 1996-2002 Internet Software Consortium.
- # Use is subject to license terms which appear in the file named
- # ISC-LICENSE that should have accompanied this file when you
--# received it.   If a file named ISC-LICENSE did not accompany this
-+# received it.  If a file named ISC-LICENSE did not accompany this
- # file, or you are not sure the one you have is correct, you may
- # obtain an applicable copy of the license at:
- #
--#             http://www.isc.org/isc-license-1.0.html. 
-+#            http://www.isc.org/isc-license-1.0.html. 
- #
--# This file is part of the ISC DHCP distribution.   The documentation
-+# This file is part of the ISC DHCP distribution.  The documentation
- # associated with this file is listed in the file DOCUMENTATION,
- # included in the top-level directory of this release.
- #
 @@ -17,47 +17,200 @@
  # http://www.isc.org for more information.
  #
diff --git a/net/isc-dhcp31-server/files/patch-server::dhcpd.c b/net/isc-dhcp31-server/files/patch-server::dhcpd.c
index d77330b32ea8..e2e6e24e814e 100644
--- a/net/isc-dhcp31-server/files/patch-server::dhcpd.c
+++ b/net/isc-dhcp31-server/files/patch-server::dhcpd.c
@@ -1,6 +1,6 @@
---- server/dhcpd.c.orig	Wed Jan 15 00:15:24 2003
-+++ server/dhcpd.c	Sun May 30 23:14:42 2004
-@@ -56,6 +56,22 @@
+--- server/dhcpd.c.orig	Thu Jun 10 19:59:52 2004
++++ server/dhcpd.c	Fri Jun 25 15:49:09 2004
+@@ -47,6 +47,22 @@
  #include "version.h"
  #include <omapip/omapip_p.h>
  
@@ -23,7 +23,7 @@
  static void usage PROTO ((void));
  
  TIME cur_time;
-@@ -204,6 +220,35 @@
+@@ -195,6 +211,35 @@
  	omapi_object_dereference (&listener, MDL);
  }
  
@@ -59,7 +59,7 @@
  int main (argc, argv, envp)
  	int argc;
  	char **argv, **envp;
-@@ -236,6 +281,20 @@
+@@ -227,6 +272,25 @@
  	char *traceinfile = (char *)0;
  	char *traceoutfile = (char *)0;
  #endif
@@ -69,18 +69,23 @@
 +	uid_t set_uid = 0;
 +	gid_t set_gid = 0;
 +	int early_chroot = 0;
++	int no_dhcpd_user = 0;
++	int no_dhcpd_group = 0;
 +#endif /* PARANOIA */
 +#if defined (PARANOIA) || defined (JAIL)
 +	char *set_chroot = 0;
++	int no_dhcpd_chroot = 0;
 +#endif /* PARANOIA || JAIL */
 +#if defined (JAIL)
 +	char *set_jail = 0;
 +	u_int32_t jail_ip_address = 0; /* Good as long as it's IPv4 ... */
++	int no_dhcpd_jail = 0;
++	char *s2;
 +#endif /* JAIL */
  
  	/* Make sure we have stdin, stdout and stderr. */
  	status = open ("/dev/null", O_RDWR);
-@@ -298,6 +357,35 @@
+@@ -289,6 +353,39 @@
  			if (++i == argc)
  				usage ();
  			server = argv [i];
@@ -89,10 +94,12 @@
 +			if (++i == argc)
 +				usage ();
 +			set_user = argv [i];
++			no_dhcpd_user = 1;
 +		} else if (!strcmp (argv [i], "-group")) {
 +			if (++i == argc)
 +				usage ();
 +			set_group = argv [i];
++			no_dhcpd_group = 1;
 +		} else if (!strcmp (argv [i], "-early_chroot")) {
 +			early_chroot = 1;
 +#endif /* PARANOIA */
@@ -101,6 +108,7 @@
 +			if (++i == argc)
 +				usage ();
 +			set_chroot = argv [i];
++			no_dhcpd_chroot = 1;
 +#endif /* PARANOIA || JAIL */
 +#if defined (JAIL)
 +		} else if (!strcmp (argv [i], "-jail")) {
@@ -110,13 +118,43 @@
 +			if (++i == argc)
 +				usage ();
 +			if (ascii2addr (AF_INET, argv[i], &jail_ip_address) < 0)
-+				usage();
++				log_fatal ("invalid ip address: %s", argv[i]);
 +			jail_ip_address = ntohl (jail_ip_address);
++			no_dhcpd_jail = 1;
 +#endif /* JAIL */
  		} else if (!strcmp (argv [i], "-cf")) {
  			if (++i == argc)
  				usage ();
-@@ -397,6 +485,57 @@
+@@ -366,6 +463,28 @@
+ 	if (!no_dhcpd_pid && (s = getenv ("PATH_DHCPD_PID"))) {
+ 		path_dhcpd_pid = s;
+ 	}
++#if defined (PARANOIA)
++	if (!no_dhcpd_user && (s = getenv ("DHCPD_USER"))) {
++		set_user = s;
++	}
++	if (!no_dhcpd_group && (s = getenv ("DHCPD_GROUP"))) {
++		set_group = s;
++	}
++#endif /* PARANOIA */
++#if defined (PARANOIA) || defined (JAIL)
++	if (!no_dhcpd_chroot && (s = getenv ("PATH_DHCPD_CHROOT"))) {
++		set_chroot = s;
++	}
++#endif /* PARANOIA || JAIL */
++#if defined (JAIL)
++	if (!no_dhcpd_jail && (s = getenv ("DHCPD_JAIL_HOSTNAME")) &&
++	    (s2 = getenv ("DHCPD_JAIL_IPADDRESS"))) {
++		set_jail = s;
++		if (ascii2addr (AF_INET, s2, &jail_ip_address) < 0)
++			log_fatal ("invalid ip address: %s", s2);
++		jail_ip_address = ntohl (jail_ip_address);
++	}
++#endif /* JAIL */
+ 
+ 	if (!quiet) {
+ 		log_info ("%s %s", message, DHCP_VERSION);
+@@ -388,6 +507,57 @@
  					     trace_seed_stop, MDL);
  #endif
  
@@ -174,7 +212,7 @@
  	/* Default to the DHCP/BOOTP port. */
  	if (!local_port)
  	{
-@@ -471,6 +610,9 @@
+@@ -462,6 +632,9 @@
  #endif
  
  	/* Initialize icmp support... */
@@ -184,7 +222,7 @@
  	if (!cftest && !lftest)
  		icmp_startup (1, lease_pinged);
  
-@@ -500,6 +642,14 @@
+@@ -491,6 +664,14 @@
  
  	postconf_initialization (quiet);
  
@@ -199,7 +237,7 @@
          /* test option should cause an early exit */
   	if (cftest && !lftest) 
   		exit(0);
-@@ -542,7 +692,22 @@
+@@ -533,7 +714,22 @@
  		else if (pid)
  			exit (0);
  	}
@@ -222,7 +260,7 @@
  	/* Read previous pid file. */
  	if ((i = open (path_dhcpd_pid, O_RDONLY)) >= 0) {
  		status = read (i, pbuf, (sizeof pbuf) - 1);
-@@ -886,8 +1051,24 @@
+@@ -877,8 +1073,24 @@
  	log_info (copyright);
  	log_info (arr);
  
diff --git a/net/isc-dhcp31-server/pkg-plist b/net/isc-dhcp31-server/pkg-plist
index 3212362358fa..78107bb2a1a7 100644
--- a/net/isc-dhcp31-server/pkg-plist
+++ b/net/isc-dhcp31-server/pkg-plist
@@ -3,11 +3,5 @@ bin/omshell
 etc/dhcpd.conf.sample
 etc/rc.d/isc-dhcpd.sh
 sbin/dhcpd
-%%PORTDOCS%%%%DOCSDIR%%/ANONCVS
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @exec [ -f /var/db/dhcpd.leases ] || touch /var/db/dhcpd.leases
 @unexec [ -s /var/db/dhcpd.leases ] || rm -f /var/db/dhcpd.leases