Add support for Crossbow style NICs on SunOS.

Fix default paths for inet6 files.

7 files changed, 58 insertions, 6 deletions

diff --git a/net/isc-dhclient4/Makefile b/net/isc-dhclient4/Makefile
index c21b17e22ef..60f3dd18d65 100644
--- a/net/isc-dhclient4/Makefile
+++ b/net/isc-dhclient4/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2013/01/11 13:35:57 taca Exp $
+# $NetBSD: Makefile,v 1.8 2013/04/10 11:31:26 fhajny Exp $
 #
 
 PKGNAME=	isc-dhclient-${DHVER}
+PKGREVISION=	1
 COMMENT=	ISC Dynamic Host Configuration Protocol (DHCP) Client
 BUILD_SUBDIR=	bind includes tests common omapip client
 SUBDIR=		client
diff --git a/net/isc-dhcp4/Makefile b/net/isc-dhcp4/Makefile
index d2f895a3079..0e110beaafd 100644
--- a/net/isc-dhcp4/Makefile
+++ b/net/isc-dhcp4/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2013/03/26 16:25:06 taca Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/10 11:31:26 fhajny Exp $
 #
 
 PKGNAME=	isc-dhcp-${DHVER}
+PKGREVISION=	1
 COMMENT=	ISC Dynamic Host Configuration Protocol (DHCP) Base
 BUILD_SUBDIR=	bind includes tests common # dst
 SUBDIR=		includes common # dst
diff --git a/net/isc-dhcp4/Makefile.common b/net/isc-dhcp4/Makefile.common
index 5267e0fb9b1..c90371833b1 100644
--- a/net/isc-dhcp4/Makefile.common
+++ b/net/isc-dhcp4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2013/03/26 16:25:06 taca Exp $
+# $NetBSD: Makefile.common,v 1.20 2013/04/10 11:31:27 fhajny Exp $
 #
 # used by net/isc-dhcp4/Makefile
 # used by net/isc-dhcpd4/Makefile
@@ -41,6 +41,11 @@ CONFIGURE_ARGS+=	--with-cli-lease-file=${DHCP_HOME}/dhclient.leases
 CONFIGURE_ARGS+=	--with-srv-pid-file=${DHCP_PID}/isc-dhcpd.pid
 CONFIGURE_ARGS+=	--with-cli-pid-file=${DHCP_PID}/isc-dhclient.pid
 CONFIGURE_ARGS+=	--with-relay-pid-file=${DHCP_PID}/isc-dhcrelay.pid
+CONFIGURE_ARGS+=	--with-srv6-lease-file=${DHCP_HOME}/dhcpd6.leases
+CONFIGURE_ARGS+=	--with-cli6-lease-file=${DHCP_HOME}/dhclient6.leases
+CONFIGURE_ARGS+=	--with-srv6-pid-file=${DHCP_PID}/isc-dhcpd6.pid
+CONFIGURE_ARGS+=	--with-cli6-pid-file=${DHCP_PID}/isc-dhclient6.pid
+CONFIGURE_ARGS+=	--with-relay6-pid-file=${DHCP_PID}/isc-dhcrelay6.pid
 
 SUBST_CLASSES+=		config
 SUBST_STAGE.config=	post-patch
diff --git a/net/isc-dhcp4/distinfo b/net/isc-dhcp4/distinfo
index f12872a910a..80d91fe6a59 100644
--- a/net/isc-dhcp4/distinfo
+++ b/net/isc-dhcp4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2013/03/26 16:25:06 taca Exp $
+$NetBSD: distinfo,v 1.16 2013/04/10 11:31:27 fhajny Exp $
 
 SHA1 (dhcp-4.2.5-P1.tar.gz) = 120b6e476b2ac0d35e1dc8dee53752c42449b925
 RMD160 (dhcp-4.2.5-P1.tar.gz) = 8633cea4a2e5a1900c8a6dac3ebcbd6ff53c2fa9
@@ -6,4 +6,5 @@ Size (dhcp-4.2.5-P1.tar.gz) = 8255960 bytes
 SHA1 (patch-aa) = cdb64616f16ee79bf14f496518a2958352ce1fc9
 SHA1 (patch-ab) = 3a36eb65c6b0a865f2d8a350fa083fa2fe549efd
 SHA1 (patch-ac) = 97af5dd9e787c63ca387fb05df20f42d90b985fb
+SHA1 (patch-common_dlpi.c) = e58c1b8d7a6badc62e59677e093c4d01f75b9379
 SHA1 (patch-includes_Makefile.in) = 6004f66e28cd53c0acd09746a284eefe70a3aef2
diff --git a/net/isc-dhcp4/patches/patch-common_dlpi.c b/net/isc-dhcp4/patches/patch-common_dlpi.c
new file mode 100644
index 00000000000..691cbec801d
--- /dev/null
+++ b/net/isc-dhcp4/patches/patch-common_dlpi.c
@@ -0,0 +1,42 @@
+$NetBSD: patch-common_dlpi.c,v 1.1 2013/04/10 11:31:27 fhajny Exp $
+
+Add support for Crossbow style NICs (SunOS).
+
+--- common/dlpi.c.orig	2013-01-03 00:02:24.000000000 +0000
++++ common/dlpi.c
+@@ -131,6 +131,7 @@ static int strioctl (int fd, int cmd, in
+ #define DLPI_MAXDLBUF		8192	/* Buffer size */
+ #define DLPI_MAXDLADDR		1024	/* Max address size */
+ #define DLPI_DEVDIR		"/dev/"	/* Device directory */
++#define DLPI_DEVDIR_NEW		"/dev/net/"	/* Crossbow Device directory */
+ 
+ static int dlpiopen(const char *ifname);
+ static int dlpiunit (char *ifname);
+@@ -775,14 +776,26 @@ static int dlpiunit (ifname)
+  */
+ static int
+ dlpiopen(const char *ifname) {
+-	char devname [50];
++	char devname [MAXPATHLEN];
+ 	char *dp;
+ 	const char *cp, *ep;
++	int fd;
+ 	
+ 	if (!ifname) {
+ 		return -1;
+ 	}
+ 	
++	/* Try Crossbow Device Path */
++	if (ifname[0] == '/') {
++		fd = open (ifname, O_RDWR, 0);
++	} else {
++		snprintf(devname, MAXPATHLEN, "%s%s", DLPI_DEVDIR_NEW, ifname);
++		fd = open (devname, O_RDWR, 0);
++	}
++	if (fd != -1 || errno != ENOENT) {
++		return fd;
++	}
++
+ 	/* Open a DLPI device */
+ 	if (*ifname == '/') {
+ 		dp = devname;
diff --git a/net/isc-dhcpd4/Makefile b/net/isc-dhcpd4/Makefile
index 1fadb10fc52..10959491972 100644
--- a/net/isc-dhcpd4/Makefile
+++ b/net/isc-dhcpd4/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2013/01/11 13:35:58 taca Exp $
+# $NetBSD: Makefile,v 1.8 2013/04/10 11:31:27 fhajny Exp $
 #
 
 PKGNAME=	isc-dhcpd-${DHVER}
+PKGREVISION=	1
 COMMENT=	ISC Dynamic Host Configuration Protocol (DHCP) Server
 BUILD_SUBDIR=	bind includes tests common omapip dhcpctl server
 SUBDIR=		omapip dhcpctl server
diff --git a/net/isc-dhcrelay4/Makefile b/net/isc-dhcrelay4/Makefile
index 3d4d964e74e..a3773c3a5a2 100644
--- a/net/isc-dhcrelay4/Makefile
+++ b/net/isc-dhcrelay4/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2012/10/23 17:18:29 asau Exp $
+# $NetBSD: Makefile,v 1.7 2013/04/10 11:31:27 fhajny Exp $
 #
 
 PKGNAME=	isc-dhcrelay-${DHVER}
+PKGREVISION=	1
 COMMENT=	ISC Dynamic Host Configuration Protocol (DHCP) Relay
 BUILD_SUBDIR=	bind includes tests common omapip relay
 SUBDIR=		relay