From b5cd49315a250661926ca551cf02d03aec03fdca Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Sat, 21 Jul 2001 00:35:11 +0000
Subject: [PATCH] Dike out the IPX bits if RELEASE_CRUNCH is defined.

---
 sbin/ifconfig/Makefile   |  6 ++++++
 sbin/ifconfig/ifconfig.c | 19 +++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile
index 457564a792ef..fd60e0680f28 100644
--- a/sbin/ifconfig/Makefile
+++ b/sbin/ifconfig/Makefile
@@ -20,8 +20,14 @@ SRCS+=	ifieee80211.c
 CFLAGS+=-DUSE_IEEE80211
 
 MAN=	ifconfig.8
+
+.if defined(RELEASE_CRUNCH)
+CFLAGS+=-DNO_IPX
+.else
 DPADD=	${LIBIPX}
 LDADD=	-lipx
+.endif
+
 COPTS=	-DNS -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings \
 	-Wnested-externs -I..
 
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 131cf068cd3a..36f6595716bb 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -70,11 +70,13 @@ static const char rcsid[] =
 #include <netinet6/nd6.h>	/* Define ND6_INFINITE_LIFETIME */
 #endif
 
+#ifndef NO_IPX
 /* IPX */
 #define	IPXIP
 #define IPTUNNEL
 #include <netipx/ipx.h>
 #include <netipx/ipx_if.h>
+#endif
 
 /* Appletalk */
 #include <netatalk/at.h>
@@ -288,8 +290,13 @@ typedef	void af_status __P((int, struct rt_addrinfo *));
 typedef	void af_getaddr __P((const char *, int));
 typedef void af_getprefix __P((const char *, int));
 
-af_status	in_status, ipx_status, at_status, ether_status;
-af_getaddr	in_getaddr, ipx_getaddr, at_getaddr, ether_getaddr;
+af_status	in_status, at_status, ether_status;
+af_getaddr	in_getaddr, at_getaddr, ether_getaddr;
+
+#ifndef NO_IPX
+af_status	ipx_status;
+af_getaddr	ipx_getaddr;
+#endif
 
 #ifdef INET6
 af_status	in6_status;
@@ -322,8 +329,10 @@ struct	afswtch {
 	     SIOCDIFADDR_IN6, SIOCAIFADDR_IN6,
 	     C(in6_ridreq), C(in6_addreq) },
 #endif /*INET6*/
+#ifndef NO_IPX
 	{ "ipx", AF_IPX, ipx_status, ipx_getaddr, NULL,
 	     SIOCDIFADDR, SIOCAIFADDR, C(ridreq), C(addreq) },
+#endif
 	{ "atalk", AF_APPLETALK, at_status, at_getaddr, NULL,
 	     SIOCDIFADDR, SIOCAIFADDR, C(addreq), C(addreq) },
 #ifdef NS
@@ -683,6 +692,7 @@ ifconfig(argc, argv, afp)
 		/* in6_getprefix("64", MASK) if MASK is available here... */
 	}
 #endif
+#ifndef NO_IPX
 	if (setipdst && ifr.ifr_addr.sa_family == AF_IPX) {
 		struct ipxip_req rq;
 		int size = sizeof(rq);
@@ -693,6 +703,7 @@ ifconfig(argc, argv, afp)
 		if (setsockopt(s, 0, SO_IPXIP_ROUTE, &rq, size) < 0)
 			Perror("Encapsulation Routing");
 	}
+#endif
 	if (ifr.ifr_addr.sa_family == AF_APPLETALK)
 		checkatrange((struct sockaddr_at *) &addreq.ifra_addr);
 #ifdef NS
@@ -1429,6 +1440,7 @@ in6_status(s, info)
 }
 #endif /*INET6*/
 
+#ifndef NO_IPX
 void
 ipx_status(s, info)
 	int s __unused;
@@ -1449,6 +1461,7 @@ ipx_status(s, info)
 	}
 	putchar('\n');
 }
+#endif
 
 void
 at_status(s, info)
@@ -1701,6 +1714,7 @@ printb(s, v, bits)
 	}
 }
 
+#ifndef NO_IPX
 #define SIPX(x) ((struct sockaddr_ipx *) &(x))
 struct sockaddr_ipx *sipxtab[] = {
 SIPX(ridreq.ifr_addr), SIPX(addreq.ifra_addr),
@@ -1719,6 +1733,7 @@ ipx_getaddr(addr, which)
 	if (which == MASK)
 		printf("Attempt to set IPX netmask will be ineffectual\n");
 }
+#endif
 
 void
 at_getaddr(addr, which)