mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00
Code Issues Releases Activity

Upgrade to 1.4.0p5

Browse Source
This commit is contained in:
David E. O'Brien 1999-02-07 19:46:13 +00:00
parent ac5a30c3b6
commit 26737b5d1a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=16555
20 changed files with 218 additions and 370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net-mgmt/wide-dhcp/Makefile
View File

@ -3,13 +3,16 @@
# Date created: 21 November 1995
# Whom: Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
#
# $Id: Makefile,v 1.13 1998/08/10 09:07:55 obrien Exp $
# $Id: Makefile,v 1.14 1998/12/05 11:24:05 obrien Exp $
#
DISTNAME= dhcp-1.4.0p3
PKGNAME= wide-dhcp-1.4.0p3
DISTNAME= dhcp-1.4.0p5
PKGNAME= wide-dhcp-1.4.0p5
CATEGORIES= net
MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/dhcp/
MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/dhcp/ \
ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/wide-dhcp/ \
ftp://ftp.st.ryukoku.ac.jp/pub/network/dhcp/wide/ \
ftp://ftp.sage-au.org.au/pub/network/boot/wide-dhcp/
MAINTAINER= hideyuki@sat.t.u-tokyo.ac.jp

2
net-mgmt/wide-dhcp/distinfo
View File

@ -1 +1 @@
MD5 (dhcp-1.4.0p3.tar.gz) = 3ee14159e6337348b1bbd3aa2f25ea6c
MD5 (dhcp-1.4.0p5.tar.gz) = f0e6ea0a22b249c85a44b5ab836fde58

21
net-mgmt/wide-dhcp/files/patch-aa
View File

@ -1,21 +1,18 @@
--- client/Makefile.FreeBSD.orig Wed Sep 9 17:08:15 1998
+++ client/Makefile.FreeBSD Sat Dec 5 13:47:04 1998
@@ -2,15 +2,16 @@
--- client/Makefile.FreeBSD.orig Fri Jan 1 06:21:32 1999
+++ client/Makefile.FreeBSD Sun Feb 7 10:38:40 1999
@@ -2,16 +2,16 @@
OBJ = dhcpc_subr.o flushroute.o getmac.o common_subr.o dhcpc.o
CC = cc
-CFLAGS += -O -I. -I../server -DRETRY_FOREVER #-DMOBILE_IP -DDEBUG
-LDFLAGS = -lkvm
-CFLAGS = -O2 -I. -I../server -DRETRY_FOREVER #-DMOBILE_IP -DDEBUG
+CFLAGS += -O2 -I. -I../server -DRETRY_FOREVER #-DMOBILE_IP -DDEBUG
+#LDFLAGS = -lkvm
LDFLAGS =
-SBIN = /usr/local/sbin
-LIBEXEC = /usr/local/libexec
-MAN = /usr/local/man
-PREFIX = /usr/local
+#PREFIX = /usr/local
+SBIN = $(PREFIX)/sbin
+LIBEXEC = $(PREFIX)/libexec
+MAN = $(PREFIX)/man
SBIN = $(PREFIX)/sbin
LIBEXEC = $(PREFIX)/libexec
MAN = $(PREFIX)/man
CP = /bin/cp
RM = /bin/rm
-GZIP = /usr/bin/gzip

65
net-mgmt/wide-dhcp/files/patch-ac
View File

@ -1,28 +1,6 @@
--- client/dhcpc_subr.c.orig Wed Sep 9 17:06:39 1998
+++ client/dhcpc_subr.c Sat Dec 5 02:52:57 1998
@@ -64,6 +64,12 @@
#ifdef __osf__
#include <net/pfilt.h>
#endif
+#ifdef __FreeBSD__
+#include <osreldate.h>
+#if (__FreeBSD_version == 199702) || (__FreeBSD_version >= 300000)
+#include <net/if_var.h>
+#endif
+#endif
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/if_ether.h>
@@ -71,6 +77,8 @@
#include <netinet/ip.h>
#include <netinet/udp.h>
#include <arpa/inet.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
#ifdef VIP
#include <netinet/vip.h>
#endif
@@ -165,6 +173,8 @@
--- client/dhcpc_subr.c.orig Fri Jan 1 06:21:08 1999
+++ client/dhcpc_subr.c Sun Feb 7 10:46:25 1999
@@ -170,6 +170,8 @@
int config_if();
void set_route();
@ -31,21 +9,12 @@
void make_decline();
void make_release();
Long generate_xid();
@@ -1856,6 +1866,10 @@
register char *cp = m_rtmsg.m_space;
register int l;
@@ -3221,4 +3223,41 @@
+ if (!ISSET(param->got_option, ROUTER) ||
+ param->router == NULL || param->router->addr == NULL)
+ return;
buf += OPTLEN(buf) + 1;
return(0);
+}
+
bzero(&so_dst, sizeof(struct sockaddr));
bzero(&so_mask, sizeof(struct sockaddr));
bzero(&so_gate, sizeof(struct sockaddr));
@@ -1898,6 +1912,45 @@
#endif
+void
+set_resolv(param)
+struct dhcp_param *param;
@ -53,14 +22,10 @@
+ FILE *fp;
+ int i;
+
+ if (param == NULL) {
+ return;
+ }
+
+ /*
+ * set resolv.conf
+ */
+ if (param->dns_server != NULL) {
+ if (param && param->dns_server != NULL) {
+ if (param->dns_server->num && param->dns_server->addr != NULL) {
+ unlink(_PATH_RESCONF);
+ if ((fp = fopen(_PATH_RESCONF, "w")) == NULL) {
@ -68,9 +33,10 @@
+ }
+ if (param->dns_domain != NULL)
+ fprintf(fp, "domain %s\n", param->dns_domain);
+ for (i = 0; i < param->dns_server->num; i++) {
+ fprintf(fp,"nameserver %s\n",inet_ntoa(param->dns_server->addr[i]));
+ }
+ if (param->dns_server->addr)
+ for (i = 0; i < param->dns_server->num; i++) {
+ fprintf(fp,"nameserver %s\n",inet_ntoa(param->dns_server->addr[i]));
+ }
+ fclose(fp);
+ }
+ }
@ -80,11 +46,8 @@
+set_hostname(param)
+struct dhcp_param *param;
+{
+ if (param->hostname != NULL) {
+ if (param && param->hostname != NULL) {
+ sethostname(param->hostname,strlen(param->hostname));
+ }
+ return;
+}
void
make_decline(lsbuf, reqspecp)
}

22
net-mgmt/wide-dhcp/files/patch-ae
View File

@ -1,16 +1,14 @@
--- server/Makefile.FreeBSD.orig Fri Jan 30 01:03:57 1998
+++ server/Makefile.FreeBSD Sat Dec 5 03:04:13 1998
@@ -4,12 +4,13 @@
CC = cc
CFLAGS += -O -I. #-DMAC_FILTER #-DCOMPAT_RFC1541 #-DNOICMPCHK
LDFLAGS = -lkvm
-SBIN = /usr/local/sbin
-LIBEXEC = /usr/local/libexec
-MAN = /usr/local/man
--- server/Makefile.FreeBSD.orig Tue Jan 26 02:13:13 1999
+++ server/Makefile.FreeBSD Sun Feb 7 10:54:41 1999
@@ -5,13 +5,13 @@
CFLAGS = -O2 -I. #-DMAC_FILTER #-DCOMPAT_RFC1541 #-DNOICMPCHK
LDFLAGS =
-PREFIX = /usr/local
+#PREFIX = /usr/local
+SBIN = ${PREFIX}/sbin
+LIBEXEC = ${PREFIX}/libexec
+MAN = ${PREFIX}/man
SBIN = ${PREFIX}/sbin
LIBEXEC = ${PREFIX}/libexec
MAN = ${PREFIX}/man
CP = /bin/cp
RM = /bin/rm
-GZIP = /usr/bin/gzip

22
net-mgmt/wide-dhcp/files/patch-ag
View File

@ -1,18 +1,14 @@
--- relay/Makefile.FreeBSD.orig Wed Sep 10 18:10:42 1997
+++ relay/Makefile.FreeBSD Sat Dec 5 03:08:30 1998
@@ -2,13 +2,14 @@
--- relay/Makefile.FreeBSD.orig Fri Jan 1 02:25:43 1999
+++ relay/Makefile.FreeBSD Sun Feb 7 10:56:47 1999
@@ -4,13 +4,13 @@
CFLAGS = -O2 -I. -I../server
LDFLAGS =
CC = cc
CFLAGS += -O -I. -I../server
-LDFLAGS = -lkvm
-SBIN = /usr/local/sbin
-LIBEXEC = /usr/local/libexec
-MAN = /usr/local/man
+#LDFLAGS = -lkvm
-PREFIX = /usr/local
+#PREFIX = /usr/local
+SBIN = ${PREFIX}/sbin
+LIBEXEC = ${PREFIX}/libexec
+MAN = ${PREFIX}/man
SBIN = ${PREFIX}/sbin
LIBEXEC = ${PREFIX}/libexec
MAN = ${PREFIX}/man
CP = /bin/cp
RM = /bin/rm
-GZIP = /usr/bin/gzip

34
net-mgmt/wide-dhcp/files/patch-aq
View File

@ -1,23 +1,19 @@
--- tools/Makefile.FreeBSD.orig Wed Sep 10 17:08:04 1997
+++ tools/Makefile.FreeBSD Sat Dec 5 03:09:52 1998
@@ -1,8 +1,9 @@
CC = gcc
CFLAGS = -O -I. -I../server
-SBIN = /usr/local/sbin
-LIBEXEC = /usr/local/libexec
-MAN = /usr/local/man
--- tools/Makefile.FreeBSD.orig Fri Jan 1 02:31:45 1999
+++ tools/Makefile.FreeBSD Sun Feb 7 11:00:20 1999
@@ -1,14 +1,14 @@
CC = cc
CFLAGS = -O2 -I. -I../server
-PREFIX = /usr/local
+#PREFIX = /usr/local
+SBIN = ${PREFIX}/sbin
+LIBEXEC = ${PREFIX}/libexec
+MAN = ${PREFIX}/man
SBIN = ${PREFIX}/sbin
LIBEXEC = ${PREFIX}/libexec
MAN = ${PREFIX}/man
CP = /bin/cp
RM = /bin/rm
-GZIP = /usr/bin/gzip
+GZIP = /usr/bin/touch # don't `gzip' anything for FreeBSD
dhcpm: dhcpm.c ../server/dhcp.h
$(CC) $(CFLAGS) dhcpm.c -o dhcpm
@@ -10,7 +11,6 @@
install: dhcpm
${INSTALL} -m 755 -s dhcpm ${SBIN}/dhcpm
cp dhcpm.8 ${MAN}/man8/dhcpm.8
- gzip ${MAN}/man8/dhcpm.8
clean:
rm -rf *~ *.o *core* dhcpm

75
net-mgmt/wide-dhcp/files/patch-as
View File

@ -1,29 +1,16 @@
--- client/dhcpc.c.orig Mon Jul 7 17:08:35 1997
+++ client/dhcpc.c Wed Apr 22 01:34:39 1998
@@ -53,6 +53,12 @@
#ifndef sun
#include <net/bpf.h>
#endif
+#ifdef __FreeBSD__
+#include <osreldate.h>
+#if (__FreeBSD_version == 199702) || (__FreeBSD_version >= 300000)
+#include <net/if_var.h>
+#endif
+#endif
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/if_ether.h>
@@ -82,6 +88,7 @@
--- client/dhcpc.c.orig Fri Jan 1 05:20:08 1999
+++ client/dhcpc.c Sun Feb 7 11:17:59 1999
@@ -88,6 +88,7 @@
struct dhcp_reqspec reqspec;
struct if_info intface;
struct dhcp_param *param_list;
+int f_resolv, f_hostname;
char pid_filename[MAXPATHLEN];
char cache_filename[MAXPATHLEN];
int (*fsm[MAX_STATES])();
@@ -227,6 +234,14 @@
(void) sndcamt();
#endif
@@ -256,6 +257,14 @@
if (config_if(&intface, &addr, &mask, &brdaddr) == 0) {
set_route(paramp);
}
+#ifdef __FreeBSD__
+ if (f_resolv) {
@ -36,39 +23,25 @@
#endif
return;
@@ -264,15 +279,8 @@
@@ -293,7 +302,7 @@
/*
* split conditions into pieces for debugging
*/
-#ifndef sun
- if (ntohs(rcv.ip->ip_len) < MINDHCPLEN + UDPHL + IPHL)
- return(0);
- if (ntohs(rcv.udp->uh_ulen) < MINDHCPLEN + UDPHL)
- return(0);
-#else
if (rcv.udp->uh_dport != dhcpc_port)
+#if !defined(sun) && !defined(__FreeBSD__)
if (ntohs(rcv.ip->ip_len) < MINDHCPLEN + UDPHL + IPHL)
return(0);
-#endif
if (ripcksum != cksum((u_short *) rcv.ip, rcv.ip->ip_hl * 2))
return(0);
if (rcv.udp->uh_sum != 0 &&
@@ -321,15 +329,8 @@
if (ntohs(rcv.udp->uh_ulen) < MINDHCPLEN + UDPHL)
@@ -350,7 +359,7 @@
/*
* split conditions into pieces for debugging
*/
-#ifndef sun
- if (ntohs(rcv.ip->ip_len) < MINDHCPLEN + UDPHL + IPHL)
- return(0);
- if (ntohs(rcv.udp->uh_ulen) < MINDHCPLEN + UDPHL)
- return(0);
-#else
if (rcv.udp->uh_dport != dhcpc_port)
+#if !defined(sun) && !defined(__FreeBSD__)
if (ntohs(rcv.ip->ip_len) < MINDHCPLEN + UDPHL + IPHL)
return(0);
-#endif
if (ripcksum != cksum((u_short *) rcv.ip, rcv.ip->ip_hl * 2))
return(0);
if (rcv.udp->uh_sum != 0 &&
@@ -1761,7 +1762,11 @@
if (ntohs(rcv.udp->uh_ulen) < MINDHCPLEN + UDPHL)
@@ -1789,7 +1798,11 @@
void
usage()
{
@ -81,7 +54,7 @@
exit(1);
}
@@ -1781,26 +1786,38 @@
@@ -1809,26 +1822,39 @@
{
int debug = 0;
int n = 0;
@ -90,11 +63,6 @@
bzero(&reqspec, sizeof(reqspec));
bzero(&ifinfo, sizeof(ifinfo));
+#ifdef __FreeBSD__
+#define COM_OPTS "vdrn"
+#else
+#define COM_OPTS "vd"
+#endif
- while (*++argv && argv[0][0] == '-') {
- switch (argv[0][1]) {
@ -110,7 +78,12 @@
- }
- }
- if (argv[0] == NULL) usage();
-
+#ifdef __FreeBSD__
+#define COM_OPTS "vdrn"
+#else
+#define COM_OPTS "vd"
+#endif
+ while ((count = getopt(argc, argv, COM_OPTS)) != EOF) {
+ switch (count) {
+ case 'v':
@ -135,7 +108,7 @@
strcpy(ifinfo.name, argv[0]);
/*
@@ -1831,6 +1848,11 @@
@@ -1859,6 +1885,11 @@
reqspec.reqlist.list[reqspec.reqlist.len++] = SUBNET_MASK;
reqspec.reqlist.list[reqspec.reqlist.len++] = ROUTER;
reqspec.reqlist.list[reqspec.reqlist.len++] = BRDCAST_ADDR;

28
net-mgmt/wide-dhcp/files/patch-az
View File

@ -1,5 +1,5 @@
--- client/dhcpc.8.orig Mon Sep 11 21:54:16 1995
+++ client/dhcpc.8 Sun Oct 5 21:59:07 1997
--- client/dhcpc.8.orig Sat Jan 9 20:54:01 1999
+++ client/dhcpc.8 Sun Feb 7 11:27:29 1999
@@ -5,7 +5,7 @@
.SH SYNOPSIS
.B dhcpc
@ -13,12 +13,12 @@
requests server to assign the same address as before.
To get the same address,
.B dhcpc
-creates file named "/etc/dhcp_cache". This file name could be
+creates file named "/var/db/dhcp_cache". This file name could be
configured when it is compiled. But it is required that the file must
remains after the host reboot. For example, the /tmp directory is not
appropriate for this purpose.
@@ -37,6 +37,21 @@
-creates file named /etc/dhcpc_cache.interface
+creates file named /var/db/dhcpc_cache.interface
(or /var/db/dhcpc_cache.interface for BSD/OS and FreeBSD). This
file name could be configured when it is compiled. But it is required
that the file must remains after the host reboot. For example, the
@@ -38,6 +38,21 @@
.B dhcpc
runs in foreground and debugging mode.
.LP
@ -40,16 +40,14 @@
The DHCP client can verify whether its assigned information is still
valid at any time.
.B dhcpc
@@ -64,8 +79,11 @@
.SH FILES
.PD 0
.TP 20
-.B /etc/dhcp_cache
+.B /var/db/dhcp_cache
The file to record previously assigned informations
@@ -70,6 +85,10 @@
.TP
.B /etc/dhcpc_cache.interface
The file to record previously assigned informations (for others)
+.TP
+.B /var/run/dhcpc.[interface name].pid
+File which includes process ID
+.PD
.PD
.SH SEE ALSO
R. Droms,

14
net-mgmt/wide-dhcp/files/patch-ba
View File

@ -1,11 +1,11 @@
--- server/dhcps.8.orig Mon Apr 21 11:44:13 1997
+++ server/dhcps.8 Mon Apr 21 11:44:49 1997
@@ -36,7 +36,7 @@
"binding".
--- server/dhcps.8.orig Fri Jan 1 05:28:25 1999
+++ server/dhcps.8 Sun Feb 7 11:30:56 1999
@@ -37,7 +37,7 @@
.B dhcps
manages these with files, /etc/dhcpdb.pool and /etc/dhcpdb.bind
-(/var/db/dhcpdb.bind for BSD/OS). It is possible to change these path
+(/var/db/dhcpdb.bind for BSD/OS and FreeBSD). It is possible to change these path
with command line option.
(/var/db/dhcpdb.bind for BSD/OS and FreeBSD). It is possible to change
-these path with command line option.
+this path with command line options.
.LP
Also
.B dhcps

11
net/wide-dhcp/Makefile
View File

@ -3,13 +3,16 @@
# Date created: 21 November 1995
# Whom: Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
#
# $Id: Makefile,v 1.13 1998/08/10 09:07:55 obrien Exp $
# $Id: Makefile,v 1.14 1998/12/05 11:24:05 obrien Exp $
#
DISTNAME= dhcp-1.4.0p3
PKGNAME= wide-dhcp-1.4.0p3
DISTNAME= dhcp-1.4.0p5
PKGNAME= wide-dhcp-1.4.0p5
CATEGORIES= net
MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/dhcp/
MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/dhcp/ \
ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/wide-dhcp/ \
ftp://ftp.st.ryukoku.ac.jp/pub/network/dhcp/wide/ \
ftp://ftp.sage-au.org.au/pub/network/boot/wide-dhcp/
MAINTAINER= hideyuki@sat.t.u-tokyo.ac.jp

2
net/wide-dhcp/distinfo
View File

@ -1 +1 @@
MD5 (dhcp-1.4.0p3.tar.gz) = 3ee14159e6337348b1bbd3aa2f25ea6c
MD5 (dhcp-1.4.0p5.tar.gz) = f0e6ea0a22b249c85a44b5ab836fde58

21
net/wide-dhcp/files/patch-aa
View File

@ -1,21 +1,18 @@
--- client/Makefile.FreeBSD.orig Wed Sep 9 17:08:15 1998
+++ client/Makefile.FreeBSD Sat Dec 5 13:47:04 1998
@@ -2,15 +2,16 @@
--- client/Makefile.FreeBSD.orig Fri Jan 1 06:21:32 1999
+++ client/Makefile.FreeBSD Sun Feb 7 10:38:40 1999
@@ -2,16 +2,16 @@
OBJ = dhcpc_subr.o flushroute.o getmac.o common_subr.o dhcpc.o
CC = cc
-CFLAGS += -O -I. -I../server -DRETRY_FOREVER #-DMOBILE_IP -DDEBUG
-LDFLAGS = -lkvm
-CFLAGS = -O2 -I. -I../server -DRETRY_FOREVER #-DMOBILE_IP -DDEBUG
+CFLAGS += -O2 -I. -I../server -DRETRY_FOREVER #-DMOBILE_IP -DDEBUG
+#LDFLAGS = -lkvm
LDFLAGS =
-SBIN = /usr/local/sbin
-LIBEXEC = /usr/local/libexec
-MAN = /usr/local/man
-PREFIX = /usr/local
+#PREFIX = /usr/local
+SBIN = $(PREFIX)/sbin
+LIBEXEC = $(PREFIX)/libexec
+MAN = $(PREFIX)/man
SBIN = $(PREFIX)/sbin
LIBEXEC = $(PREFIX)/libexec
MAN = $(PREFIX)/man
CP = /bin/cp
RM = /bin/rm
-GZIP = /usr/bin/gzip

65
net/wide-dhcp/files/patch-ac
View File

@ -1,28 +1,6 @@
--- client/dhcpc_subr.c.orig Wed Sep 9 17:06:39 1998
+++ client/dhcpc_subr.c Sat Dec 5 02:52:57 1998
@@ -64,6 +64,12 @@
#ifdef __osf__
#include <net/pfilt.h>
#endif
+#ifdef __FreeBSD__
+#include <osreldate.h>
+#if (__FreeBSD_version == 199702) || (__FreeBSD_version >= 300000)
+#include <net/if_var.h>
+#endif
+#endif
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/if_ether.h>
@@ -71,6 +77,8 @@
#include <netinet/ip.h>
#include <netinet/udp.h>
#include <arpa/inet.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
#ifdef VIP
#include <netinet/vip.h>
#endif
@@ -165,6 +173,8 @@
--- client/dhcpc_subr.c.orig Fri Jan 1 06:21:08 1999
+++ client/dhcpc_subr.c Sun Feb 7 10:46:25 1999
@@ -170,6 +170,8 @@
int config_if();
void set_route();
@ -31,21 +9,12 @@
void make_decline();
void make_release();
Long generate_xid();
@@ -1856,6 +1866,10 @@
register char *cp = m_rtmsg.m_space;
register int l;
@@ -3221,4 +3223,41 @@
+ if (!ISSET(param->got_option, ROUTER) ||
+ param->router == NULL || param->router->addr == NULL)
+ return;
buf += OPTLEN(buf) + 1;
return(0);
+}
+
bzero(&so_dst, sizeof(struct sockaddr));
bzero(&so_mask, sizeof(struct sockaddr));
bzero(&so_gate, sizeof(struct sockaddr));
@@ -1898,6 +1912,45 @@
#endif
+void
+set_resolv(param)
+struct dhcp_param *param;
@ -53,14 +22,10 @@
+ FILE *fp;
+ int i;
+
+ if (param == NULL) {
+ return;
+ }
+
+ /*
+ * set resolv.conf
+ */
+ if (param->dns_server != NULL) {
+ if (param && param->dns_server != NULL) {
+ if (param->dns_server->num && param->dns_server->addr != NULL) {
+ unlink(_PATH_RESCONF);
+ if ((fp = fopen(_PATH_RESCONF, "w")) == NULL) {
@ -68,9 +33,10 @@
+ }
+ if (param->dns_domain != NULL)
+ fprintf(fp, "domain %s\n", param->dns_domain);
+ for (i = 0; i < param->dns_server->num; i++) {
+ fprintf(fp,"nameserver %s\n",inet_ntoa(param->dns_server->addr[i]));
+ }
+ if (param->dns_server->addr)
+ for (i = 0; i < param->dns_server->num; i++) {
+ fprintf(fp,"nameserver %s\n",inet_ntoa(param->dns_server->addr[i]));
+ }
+ fclose(fp);
+ }
+ }
@ -80,11 +46,8 @@
+set_hostname(param)
+struct dhcp_param *param;
+{
+ if (param->hostname != NULL) {
+ if (param && param->hostname != NULL) {
+ sethostname(param->hostname,strlen(param->hostname));
+ }
+ return;
+}
void
make_decline(lsbuf, reqspecp)
}

22
net/wide-dhcp/files/patch-ae
View File

@ -1,16 +1,14 @@
--- server/Makefile.FreeBSD.orig Fri Jan 30 01:03:57 1998
+++ server/Makefile.FreeBSD Sat Dec 5 03:04:13 1998
@@ -4,12 +4,13 @@
CC = cc
CFLAGS += -O -I. #-DMAC_FILTER #-DCOMPAT_RFC1541 #-DNOICMPCHK
LDFLAGS = -lkvm
-SBIN = /usr/local/sbin
-LIBEXEC = /usr/local/libexec
-MAN = /usr/local/man
--- server/Makefile.FreeBSD.orig Tue Jan 26 02:13:13 1999
+++ server/Makefile.FreeBSD Sun Feb 7 10:54:41 1999
@@ -5,13 +5,13 @@
CFLAGS = -O2 -I. #-DMAC_FILTER #-DCOMPAT_RFC1541 #-DNOICMPCHK
LDFLAGS =
-PREFIX = /usr/local
+#PREFIX = /usr/local
+SBIN = ${PREFIX}/sbin
+LIBEXEC = ${PREFIX}/libexec
+MAN = ${PREFIX}/man
SBIN = ${PREFIX}/sbin
LIBEXEC = ${PREFIX}/libexec
MAN = ${PREFIX}/man
CP = /bin/cp
RM = /bin/rm
-GZIP = /usr/bin/gzip

22
net/wide-dhcp/files/patch-ag
View File

@ -1,18 +1,14 @@
--- relay/Makefile.FreeBSD.orig Wed Sep 10 18:10:42 1997
+++ relay/Makefile.FreeBSD Sat Dec 5 03:08:30 1998
@@ -2,13 +2,14 @@
--- relay/Makefile.FreeBSD.orig Fri Jan 1 02:25:43 1999
+++ relay/Makefile.FreeBSD Sun Feb 7 10:56:47 1999
@@ -4,13 +4,13 @@
CFLAGS = -O2 -I. -I../server
LDFLAGS =
CC = cc
CFLAGS += -O -I. -I../server
-LDFLAGS = -lkvm
-SBIN = /usr/local/sbin
-LIBEXEC = /usr/local/libexec
-MAN = /usr/local/man
+#LDFLAGS = -lkvm
-PREFIX = /usr/local
+#PREFIX = /usr/local
+SBIN = ${PREFIX}/sbin
+LIBEXEC = ${PREFIX}/libexec
+MAN = ${PREFIX}/man
SBIN = ${PREFIX}/sbin
LIBEXEC = ${PREFIX}/libexec
MAN = ${PREFIX}/man
CP = /bin/cp
RM = /bin/rm
-GZIP = /usr/bin/gzip

34
net/wide-dhcp/files/patch-aq
View File

@ -1,23 +1,19 @@
--- tools/Makefile.FreeBSD.orig Wed Sep 10 17:08:04 1997
+++ tools/Makefile.FreeBSD Sat Dec 5 03:09:52 1998
@@ -1,8 +1,9 @@
CC = gcc
CFLAGS = -O -I. -I../server
-SBIN = /usr/local/sbin
-LIBEXEC = /usr/local/libexec
-MAN = /usr/local/man
--- tools/Makefile.FreeBSD.orig Fri Jan 1 02:31:45 1999
+++ tools/Makefile.FreeBSD Sun Feb 7 11:00:20 1999
@@ -1,14 +1,14 @@
CC = cc
CFLAGS = -O2 -I. -I../server
-PREFIX = /usr/local
+#PREFIX = /usr/local
+SBIN = ${PREFIX}/sbin
+LIBEXEC = ${PREFIX}/libexec
+MAN = ${PREFIX}/man
SBIN = ${PREFIX}/sbin
LIBEXEC = ${PREFIX}/libexec
MAN = ${PREFIX}/man
CP = /bin/cp
RM = /bin/rm
-GZIP = /usr/bin/gzip
+GZIP = /usr/bin/touch # don't `gzip' anything for FreeBSD
dhcpm: dhcpm.c ../server/dhcp.h
$(CC) $(CFLAGS) dhcpm.c -o dhcpm
@@ -10,7 +11,6 @@
install: dhcpm
${INSTALL} -m 755 -s dhcpm ${SBIN}/dhcpm
cp dhcpm.8 ${MAN}/man8/dhcpm.8
- gzip ${MAN}/man8/dhcpm.8
clean:
rm -rf *~ *.o *core* dhcpm

75
net/wide-dhcp/files/patch-as
View File

@ -1,29 +1,16 @@
--- client/dhcpc.c.orig Mon Jul 7 17:08:35 1997
+++ client/dhcpc.c Wed Apr 22 01:34:39 1998
@@ -53,6 +53,12 @@
#ifndef sun
#include <net/bpf.h>
#endif
+#ifdef __FreeBSD__
+#include <osreldate.h>
+#if (__FreeBSD_version == 199702) || (__FreeBSD_version >= 300000)
+#include <net/if_var.h>
+#endif
+#endif
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/if_ether.h>
@@ -82,6 +88,7 @@
--- client/dhcpc.c.orig Fri Jan 1 05:20:08 1999
+++ client/dhcpc.c Sun Feb 7 11:17:59 1999
@@ -88,6 +88,7 @@
struct dhcp_reqspec reqspec;
struct if_info intface;
struct dhcp_param *param_list;
+int f_resolv, f_hostname;
char pid_filename[MAXPATHLEN];
char cache_filename[MAXPATHLEN];
int (*fsm[MAX_STATES])();
@@ -227,6 +234,14 @@
(void) sndcamt();
#endif
@@ -256,6 +257,14 @@
if (config_if(&intface, &addr, &mask, &brdaddr) == 0) {
set_route(paramp);
}
+#ifdef __FreeBSD__
+ if (f_resolv) {
@ -36,39 +23,25 @@
#endif
return;
@@ -264,15 +279,8 @@
@@ -293,7 +302,7 @@
/*
* split conditions into pieces for debugging
*/
-#ifndef sun
- if (ntohs(rcv.ip->ip_len) < MINDHCPLEN + UDPHL + IPHL)
- return(0);
- if (ntohs(rcv.udp->uh_ulen) < MINDHCPLEN + UDPHL)
- return(0);
-#else
if (rcv.udp->uh_dport != dhcpc_port)
+#if !defined(sun) && !defined(__FreeBSD__)
if (ntohs(rcv.ip->ip_len) < MINDHCPLEN + UDPHL + IPHL)
return(0);
-#endif
if (ripcksum != cksum((u_short *) rcv.ip, rcv.ip->ip_hl * 2))
return(0);
if (rcv.udp->uh_sum != 0 &&
@@ -321,15 +329,8 @@
if (ntohs(rcv.udp->uh_ulen) < MINDHCPLEN + UDPHL)
@@ -350,7 +359,7 @@
/*
* split conditions into pieces for debugging
*/
-#ifndef sun
- if (ntohs(rcv.ip->ip_len) < MINDHCPLEN + UDPHL + IPHL)
- return(0);
- if (ntohs(rcv.udp->uh_ulen) < MINDHCPLEN + UDPHL)
- return(0);
-#else
if (rcv.udp->uh_dport != dhcpc_port)
+#if !defined(sun) && !defined(__FreeBSD__)
if (ntohs(rcv.ip->ip_len) < MINDHCPLEN + UDPHL + IPHL)
return(0);
-#endif
if (ripcksum != cksum((u_short *) rcv.ip, rcv.ip->ip_hl * 2))
return(0);
if (rcv.udp->uh_sum != 0 &&
@@ -1761,7 +1762,11 @@
if (ntohs(rcv.udp->uh_ulen) < MINDHCPLEN + UDPHL)
@@ -1789,7 +1798,11 @@
void
usage()
{
@ -81,7 +54,7 @@
exit(1);
}
@@ -1781,26 +1786,38 @@
@@ -1809,26 +1822,39 @@
{
int debug = 0;
int n = 0;
@ -90,11 +63,6 @@
bzero(&reqspec, sizeof(reqspec));
bzero(&ifinfo, sizeof(ifinfo));
+#ifdef __FreeBSD__
+#define COM_OPTS "vdrn"
+#else
+#define COM_OPTS "vd"
+#endif
- while (*++argv && argv[0][0] == '-') {
- switch (argv[0][1]) {
@ -110,7 +78,12 @@
- }
- }
- if (argv[0] == NULL) usage();
-
+#ifdef __FreeBSD__
+#define COM_OPTS "vdrn"
+#else
+#define COM_OPTS "vd"
+#endif
+ while ((count = getopt(argc, argv, COM_OPTS)) != EOF) {
+ switch (count) {
+ case 'v':
@ -135,7 +108,7 @@
strcpy(ifinfo.name, argv[0]);
/*
@@ -1831,6 +1848,11 @@
@@ -1859,6 +1885,11 @@
reqspec.reqlist.list[reqspec.reqlist.len++] = SUBNET_MASK;
reqspec.reqlist.list[reqspec.reqlist.len++] = ROUTER;
reqspec.reqlist.list[reqspec.reqlist.len++] = BRDCAST_ADDR;

28
net/wide-dhcp/files/patch-az
View File

@ -1,5 +1,5 @@
--- client/dhcpc.8.orig Mon Sep 11 21:54:16 1995
+++ client/dhcpc.8 Sun Oct 5 21:59:07 1997
--- client/dhcpc.8.orig Sat Jan 9 20:54:01 1999
+++ client/dhcpc.8 Sun Feb 7 11:27:29 1999
@@ -5,7 +5,7 @@
.SH SYNOPSIS
.B dhcpc
@ -13,12 +13,12 @@
requests server to assign the same address as before.
To get the same address,
.B dhcpc
-creates file named "/etc/dhcp_cache". This file name could be
+creates file named "/var/db/dhcp_cache". This file name could be
configured when it is compiled. But it is required that the file must
remains after the host reboot. For example, the /tmp directory is not
appropriate for this purpose.
@@ -37,6 +37,21 @@
-creates file named /etc/dhcpc_cache.interface
+creates file named /var/db/dhcpc_cache.interface
(or /var/db/dhcpc_cache.interface for BSD/OS and FreeBSD). This
file name could be configured when it is compiled. But it is required
that the file must remains after the host reboot. For example, the
@@ -38,6 +38,21 @@
.B dhcpc
runs in foreground and debugging mode.
.LP
@ -40,16 +40,14 @@
The DHCP client can verify whether its assigned information is still
valid at any time.
.B dhcpc
@@ -64,8 +79,11 @@
.SH FILES
.PD 0
.TP 20
-.B /etc/dhcp_cache
+.B /var/db/dhcp_cache
The file to record previously assigned informations
@@ -70,6 +85,10 @@
.TP
.B /etc/dhcpc_cache.interface
The file to record previously assigned informations (for others)
+.TP
+.B /var/run/dhcpc.[interface name].pid
+File which includes process ID
+.PD
.PD
.SH SEE ALSO
R. Droms,

14
net/wide-dhcp/files/patch-ba
View File

@ -1,11 +1,11 @@
--- server/dhcps.8.orig Mon Apr 21 11:44:13 1997
+++ server/dhcps.8 Mon Apr 21 11:44:49 1997
@@ -36,7 +36,7 @@
"binding".
--- server/dhcps.8.orig Fri Jan 1 05:28:25 1999
+++ server/dhcps.8 Sun Feb 7 11:30:56 1999
@@ -37,7 +37,7 @@
.B dhcps
manages these with files, /etc/dhcpdb.pool and /etc/dhcpdb.bind
-(/var/db/dhcpdb.bind for BSD/OS). It is possible to change these path
+(/var/db/dhcpdb.bind for BSD/OS and FreeBSD). It is possible to change these path
with command line option.
(/var/db/dhcpdb.bind for BSD/OS and FreeBSD). It is possible to change
-these path with command line option.
+this path with command line options.
.LP
Also
.B dhcps