mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-21 20:38:45 +00:00
Code Issues Releases Activity

Upgrade to version 1.4.0p3.

Browse Source
This commit is contained in:
David E. O'Brien 1998-12-05 11:24:05 +00:00
parent 469a5ba0fb
commit 804e7f5248
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=15129
14 changed files with 106 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,11 +3,11 @@
# Date created: 21 November 1995
# Whom: Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
#
# $Id: Makefile,v 1.12 1998/05/02 15:14:30 max Exp $
# $Id: Makefile,v 1.13 1998/08/10 09:07:55 obrien Exp $
#
DISTNAME= dhcp-1.4.0p1
PKGNAME= wide-dhcp-1.4.0p1
DISTNAME= dhcp-1.4.0p3
PKGNAME= wide-dhcp-1.4.0p3
CATEGORIES= net
MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/dhcp/

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

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

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

@ -1,34 +1,20 @@
--- client/Makefile.FreeBSD.orig Fri Apr 11 03:50:34 1997
+++ client/Makefile.FreeBSD Wed Apr 22 01:46:22 1998
@@ -1,15 +1,15 @@
INCLUDE = ../server/dhcp.h dhcpc.h common.h ../server/common_subr.h dhcpc_subr.h
OBJ = dhcpc_subr.o flushroute.o getmac.o common_subr.o dhcpc.o
--- client/Makefile.FreeBSD.orig Wed Sep 9 17:08:15 1998
+++ client/Makefile.FreeBSD Sat Dec 5 02:52:18 1998
@@ -5,12 +5,13 @@
CFLAGS += -O -I. -I../server -DRETRY_FOREVER #-DMOBILE_IP -DDEBUG
LDFLAGS = -lkvm
-CC = gcc
-CFLAGS = -Wall -g -I. -I../server -DRETRY_FOREVER #-DDEBUG
-#CC = cc
-#CFLAGS = -g -I. -I../server -DRETRY_FOREVER #-DDEBUG
-LDFLAGS = -lkvm
+#CC = gcc
+#CFLAGS = -Wall -g -I. -I../server -DRETRY_FOREVER #-DDEBUG
+CC = cc
+CFLAGS += -Wall -I. -I../server -DRETRY_FOREVER #-DDEBUG
+LDFLAGS =
-BIN = /usr/local/sbin
-SBIN = /usr/local/sbin
-LIBEXEC = /usr/local/libexec
-MAN = /usr/local/man
+SBIN = ${PREFIX}/sbin
+LIBEXEC = ${PREFIX}/libexec
+MAN = ${PREFIX}/man
+#PREFIX = /usr/local
+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
dhcpc: ${OBJ}
${CC} ${CFLAGS} -o dhcpc ${OBJ} ${LDFLAGS}
@@ -17,7 +17,6 @@
install: dhcpc
${INSTALL} -m 755 -s dhcpc ${SBIN}/dhcpc
cp dhcpc.8 ${MAN}/man8/dhcpc.8
- gzip ${MAN}/man8/dhcpc.8
clean:
rm -f *~ *.o *core* dhcpc

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

@ -1,5 +1,5 @@
--- client/dhcpc_subr.c.orig Thu Jul 3 05:19:01 1997
+++ client/dhcpc_subr.c Sat Jun 27 19:30:56 1998
--- 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>
@ -22,7 +22,7 @@
#ifdef VIP
#include <netinet/vip.h>
#endif
@@ -164,6 +172,8 @@
@@ -165,6 +173,8 @@
int config_if();
void set_route();
@ -31,7 +31,7 @@
void make_decline();
void make_release();
Long generate_xid();
@@ -1853,6 +1863,10 @@
@@ -1856,6 +1866,10 @@
register char *cp = m_rtmsg.m_space;
register int l;
@ -42,7 +42,7 @@
bzero(&so_dst, sizeof(struct sockaddr));
bzero(&so_mask, sizeof(struct sockaddr));
bzero(&so_gate, sizeof(struct sockaddr));
@@ -1895,6 +1909,45 @@
@@ -1898,6 +1912,45 @@
#endif
@ -88,24 +88,3 @@
void
make_decline(lsbuf, reqspecp)
@@ -2528,11 +2581,9 @@
struct msghdr msg;
struct iovec bufvec[1];
int bufsize = DFLTDHCPLEN;
-#if 0
#if defined(__bsdi__) || defined(__FreeBSD__)
int on;
#endif
-#endif
if (sockfd == -1) {
struct sockaddr_in myaddr;
@@ -2556,7 +2607,7 @@
return(-1);
}
-#if 0
+#if defined(__bsdi__) || defined(__FreeBSD__)
on = 1;
if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEPORT, &on, sizeof(on)) < 0) {
close(sockfd);

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

@ -1,36 +1,20 @@
--- server/Makefile.FreeBSD.orig Tue Jun 11 13:05:48 1996
+++ server/Makefile.FreeBSD Wed Apr 22 01:46:55 1998
@@ -1,13 +1,13 @@
OBJ = dhcps.o database.o hash.o getmac.o common_subr.o \
interface.o delarp.o
-LDFLAGS = -lkvm
-CC = gcc
-CFLAGS = -g -Wall -I. #-DCOMPAT_RFC1541 #-DNOICMPCHK
-#CC = cc
-#CFLAGS = -g -I. #-DCOMPAT_RFC1541 #-DNOICMPCHK
--- 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
+LDFLAGS =
+#CC = gcc
+#CFLAGS = -g -Wall -I. #-DCOMPAT_RFC1541 #-DNOICMPCHK
+CC = cc
+CFLAGS += -Wall -I. #-DCOMPAT_RFC1541 #-DNOICMPCHK
+#PREFIX = /usr/local
+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
dhcps: ${OBJ}
${CC} ${CFLAGS} -o dhcps ${OBJ} ${LDFLAGS}
@@ -15,11 +15,8 @@
install: dhcps
${INSTALL} -m 755 -s dhcps ${SBIN}/dhcps
cp dhcpdb.pool.5 ${MAN}/man5/dhcpdb.pool.5
- gzip ${MAN}/man5/dhcpdb.pool.5
cp dhcpdb.relay.5 ${MAN}/man5/dhcpdb.relay.5
- gzip ${MAN}/man5/dhcpdb.relay.5
cp dhcps.8 ${MAN}/man8/dhcps.8
- gzip ${MAN}/man8/dhcps.8
clean:
rm -f *~ *.o *core* dhcps

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

@ -1,33 +1,22 @@
--- relay/Makefile.FreeBSD.orig Tue Feb 25 17:48:32 1997
+++ relay/Makefile.FreeBSD Wed Apr 22 01:46:06 1998
@@ -1,12 +1,12 @@
OBJ = relay.o getmac.o common_subr.o interface.o
-CC = gcc
-CFLAGS = -g -Wall -I. -I../server
-#CC = cc
-#CFLAGS = -g -I. -I../server
--- 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 @@
CC = cc
CFLAGS += -O -I. -I../server
-LDFLAGS = -lkvm
-SBIN = /usr/local/sbin
-LIBEXEC = /usr/local/libexec
-MAN = /usr/local/man
+#CC = gcc
+#CFLAGS = -g -Wall -I. -I../server
+CC = cc
+CFLAGS += -Wall -I. -I../server
+LDFLAGS =
+#LDFLAGS = -lkvm
+#PREFIX = /usr/local
+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
relay: ${OBJ}
${CC} ${CFLAGS} -o relay ${OBJ} ${LDFLAGS}
@@ -14,9 +14,7 @@
install: relay
${INSTALL} -m 755 -s relay ${SBIN}/relay
cp relay.8 ${MAN}/man8/relay.8
- gzip ${MAN}/man8/relay.8
cp dhcpdb.server.5 ${MAN}/man5/dhcpdb.server.5
- gzip ${MAN}/man5/dhcpdb.server.5
relay.o: relay.c common.h ../server/dhcp.h ../server/common_subr.h
common_subr.o: ../server/common_subr.c ../server/dhcp.h common.h ../server/common_subr.h

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

@ -1,24 +1,19 @@
--- tools/Makefile.FreeBSD.orig Tue Jun 4 12:30:49 1996
+++ tools/Makefile.FreeBSD Wed Apr 22 01:47:54 1998
@@ -1,10 +1,10 @@
-CC = gcc
-CFLAGS = -g -Wall -I. -I../server
-#CC = cc
-#CFLAGS = -g -I. -I../server
--- 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
+#CC = gcc
+#CFLAGS = -g -Wall -I. -I../server
+CC = cc
+CFLAGS += -Wall -I. -I../server
+#PREFIX = /usr/local
+SBIN = ${PREFIX}/sbin
+LIBEXEC = ${PREFIX}/libexec
+MAN = ${PREFIX}/man
dhcpm: dhcpm.c ../server/dhcp.h
$(CC) $(CFLAGS) dhcpm.c -o dhcpm
@@ -12,7 +12,6 @@
@@ -10,7 +11,6 @@
install: dhcpm
${INSTALL} -m 755 -s dhcpm ${SBIN}/dhcpm
cp dhcpm.8 ${MAN}/man8/dhcpm.8

6
net/wide-dhcp/Makefile
View File

@ -3,11 +3,11 @@
# Date created: 21 November 1995
# Whom: Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
#
# $Id: Makefile,v 1.12 1998/05/02 15:14:30 max Exp $
# $Id: Makefile,v 1.13 1998/08/10 09:07:55 obrien Exp $
#
DISTNAME= dhcp-1.4.0p1
PKGNAME= wide-dhcp-1.4.0p1
DISTNAME= dhcp-1.4.0p3
PKGNAME= wide-dhcp-1.4.0p3
CATEGORIES= net
MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/dhcp/

2
net/wide-dhcp/distinfo
View File

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

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

@ -1,34 +1,20 @@
--- client/Makefile.FreeBSD.orig Fri Apr 11 03:50:34 1997
+++ client/Makefile.FreeBSD Wed Apr 22 01:46:22 1998
@@ -1,15 +1,15 @@
INCLUDE = ../server/dhcp.h dhcpc.h common.h ../server/common_subr.h dhcpc_subr.h
OBJ = dhcpc_subr.o flushroute.o getmac.o common_subr.o dhcpc.o
--- client/Makefile.FreeBSD.orig Wed Sep 9 17:08:15 1998
+++ client/Makefile.FreeBSD Sat Dec 5 02:52:18 1998
@@ -5,12 +5,13 @@
CFLAGS += -O -I. -I../server -DRETRY_FOREVER #-DMOBILE_IP -DDEBUG
LDFLAGS = -lkvm
-CC = gcc
-CFLAGS = -Wall -g -I. -I../server -DRETRY_FOREVER #-DDEBUG
-#CC = cc
-#CFLAGS = -g -I. -I../server -DRETRY_FOREVER #-DDEBUG
-LDFLAGS = -lkvm
+#CC = gcc
+#CFLAGS = -Wall -g -I. -I../server -DRETRY_FOREVER #-DDEBUG
+CC = cc
+CFLAGS += -Wall -I. -I../server -DRETRY_FOREVER #-DDEBUG
+LDFLAGS =
-BIN = /usr/local/sbin
-SBIN = /usr/local/sbin
-LIBEXEC = /usr/local/libexec
-MAN = /usr/local/man
+SBIN = ${PREFIX}/sbin
+LIBEXEC = ${PREFIX}/libexec
+MAN = ${PREFIX}/man
+#PREFIX = /usr/local
+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
dhcpc: ${OBJ}
${CC} ${CFLAGS} -o dhcpc ${OBJ} ${LDFLAGS}
@@ -17,7 +17,6 @@
install: dhcpc
${INSTALL} -m 755 -s dhcpc ${SBIN}/dhcpc
cp dhcpc.8 ${MAN}/man8/dhcpc.8
- gzip ${MAN}/man8/dhcpc.8
clean:
rm -f *~ *.o *core* dhcpc

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

@ -1,5 +1,5 @@
--- client/dhcpc_subr.c.orig Thu Jul 3 05:19:01 1997
+++ client/dhcpc_subr.c Sat Jun 27 19:30:56 1998
--- 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>
@ -22,7 +22,7 @@
#ifdef VIP
#include <netinet/vip.h>
#endif
@@ -164,6 +172,8 @@
@@ -165,6 +173,8 @@
int config_if();
void set_route();
@ -31,7 +31,7 @@
void make_decline();
void make_release();
Long generate_xid();
@@ -1853,6 +1863,10 @@
@@ -1856,6 +1866,10 @@
register char *cp = m_rtmsg.m_space;
register int l;
@ -42,7 +42,7 @@
bzero(&so_dst, sizeof(struct sockaddr));
bzero(&so_mask, sizeof(struct sockaddr));
bzero(&so_gate, sizeof(struct sockaddr));
@@ -1895,6 +1909,45 @@
@@ -1898,6 +1912,45 @@
#endif
@ -88,24 +88,3 @@
void
make_decline(lsbuf, reqspecp)
@@ -2528,11 +2581,9 @@
struct msghdr msg;
struct iovec bufvec[1];
int bufsize = DFLTDHCPLEN;
-#if 0
#if defined(__bsdi__) || defined(__FreeBSD__)
int on;
#endif
-#endif
if (sockfd == -1) {
struct sockaddr_in myaddr;
@@ -2556,7 +2607,7 @@
return(-1);
}
-#if 0
+#if defined(__bsdi__) || defined(__FreeBSD__)
on = 1;
if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEPORT, &on, sizeof(on)) < 0) {
close(sockfd);

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

@ -1,36 +1,20 @@
--- server/Makefile.FreeBSD.orig Tue Jun 11 13:05:48 1996
+++ server/Makefile.FreeBSD Wed Apr 22 01:46:55 1998
@@ -1,13 +1,13 @@
OBJ = dhcps.o database.o hash.o getmac.o common_subr.o \
interface.o delarp.o
-LDFLAGS = -lkvm
-CC = gcc
-CFLAGS = -g -Wall -I. #-DCOMPAT_RFC1541 #-DNOICMPCHK
-#CC = cc
-#CFLAGS = -g -I. #-DCOMPAT_RFC1541 #-DNOICMPCHK
--- 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
+LDFLAGS =
+#CC = gcc
+#CFLAGS = -g -Wall -I. #-DCOMPAT_RFC1541 #-DNOICMPCHK
+CC = cc
+CFLAGS += -Wall -I. #-DCOMPAT_RFC1541 #-DNOICMPCHK
+#PREFIX = /usr/local
+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
dhcps: ${OBJ}
${CC} ${CFLAGS} -o dhcps ${OBJ} ${LDFLAGS}
@@ -15,11 +15,8 @@
install: dhcps
${INSTALL} -m 755 -s dhcps ${SBIN}/dhcps
cp dhcpdb.pool.5 ${MAN}/man5/dhcpdb.pool.5
- gzip ${MAN}/man5/dhcpdb.pool.5
cp dhcpdb.relay.5 ${MAN}/man5/dhcpdb.relay.5
- gzip ${MAN}/man5/dhcpdb.relay.5
cp dhcps.8 ${MAN}/man8/dhcps.8
- gzip ${MAN}/man8/dhcps.8
clean:
rm -f *~ *.o *core* dhcps

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

@ -1,33 +1,22 @@
--- relay/Makefile.FreeBSD.orig Tue Feb 25 17:48:32 1997
+++ relay/Makefile.FreeBSD Wed Apr 22 01:46:06 1998
@@ -1,12 +1,12 @@
OBJ = relay.o getmac.o common_subr.o interface.o
-CC = gcc
-CFLAGS = -g -Wall -I. -I../server
-#CC = cc
-#CFLAGS = -g -I. -I../server
--- 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 @@
CC = cc
CFLAGS += -O -I. -I../server
-LDFLAGS = -lkvm
-SBIN = /usr/local/sbin
-LIBEXEC = /usr/local/libexec
-MAN = /usr/local/man
+#CC = gcc
+#CFLAGS = -g -Wall -I. -I../server
+CC = cc
+CFLAGS += -Wall -I. -I../server
+LDFLAGS =
+#LDFLAGS = -lkvm
+#PREFIX = /usr/local
+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
relay: ${OBJ}
${CC} ${CFLAGS} -o relay ${OBJ} ${LDFLAGS}
@@ -14,9 +14,7 @@
install: relay
${INSTALL} -m 755 -s relay ${SBIN}/relay
cp relay.8 ${MAN}/man8/relay.8
- gzip ${MAN}/man8/relay.8
cp dhcpdb.server.5 ${MAN}/man5/dhcpdb.server.5
- gzip ${MAN}/man5/dhcpdb.server.5
relay.o: relay.c common.h ../server/dhcp.h ../server/common_subr.h
common_subr.o: ../server/common_subr.c ../server/dhcp.h common.h ../server/common_subr.h

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

@ -1,24 +1,19 @@
--- tools/Makefile.FreeBSD.orig Tue Jun 4 12:30:49 1996
+++ tools/Makefile.FreeBSD Wed Apr 22 01:47:54 1998
@@ -1,10 +1,10 @@
-CC = gcc
-CFLAGS = -g -Wall -I. -I../server
-#CC = cc
-#CFLAGS = -g -I. -I../server
--- 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
+#CC = gcc
+#CFLAGS = -g -Wall -I. -I../server
+CC = cc
+CFLAGS += -Wall -I. -I../server
+#PREFIX = /usr/local
+SBIN = ${PREFIX}/sbin
+LIBEXEC = ${PREFIX}/libexec
+MAN = ${PREFIX}/man
dhcpm: dhcpm.c ../server/dhcp.h
$(CC) $(CFLAGS) dhcpm.c -o dhcpm
@@ -12,7 +12,6 @@
@@ -10,7 +11,6 @@
install: dhcpm
${INSTALL} -m 755 -s dhcpm ${SBIN}/dhcpm
cp dhcpm.8 ${MAN}/man8/dhcpm.8