diff -rNc2 dhcp-2.0b1pl4/Makefile.conf dhcp-2.0b1pl5/Makefile.conf
*** dhcp-2.0b1pl4/Makefile.conf	Fri Jun 26 10:41:12 1998
--- dhcp-2.0b1pl5/Makefile.conf	Fri Jun 26 11:19:04 1998
***************
*** 92,96 ****
  #LIBS = -lresolv -lsocket -lnsl -lgen
  #CC=gcc
! #COPTS = -Wall -Wstrict-prototypes -Wno-unused -Wno-implicit -Wno-comment \
  #	 -Wno-uninitialized -Wno-char-subscripts -Werror
  #CF = cf/sunos5-5.h
--- 92,96 ----
  #LIBS = -lresolv -lsocket -lnsl -lgen
  #CC=gcc
! #COPTS = -Wall -Wno-unused -Wno-implicit -Wno-comment \
  #	 -Wno-uninitialized -Wno-char-subscripts -Werror
  #CF = cf/sunos5-5.h
diff -rNc2 dhcp-2.0b1pl4/RELNOTES dhcp-2.0b1pl5/RELNOTES
*** dhcp-2.0b1pl4/RELNOTES	Fri Jun 26 11:00:42 1998
--- dhcp-2.0b1pl5/RELNOTES	Fri Jun 26 11:25:01 1998
***************
*** 47,50 ****
--- 47,62 ----
  experiment, or for sites that desperately need the new features.
  
+ 	      CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 4
+ 
+ - Do not use -Wstrict-prototypes on Solaris with gcc - if the Internet
+   Software Consortium BIND distribution is not installed, this produces
+   errors.
+ 
+ - Actually use the new DLPI support on Solaris - although the code was
+   added in Patchlevel 2, it wasn't enabled (blush).
+ 
+ - Fix a prototype bug that's exposed when DLPI support is enabled on
+   Solaris.
+ 
  	      CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 3
  
diff -rNc2 dhcp-2.0b1pl4/common/packet.c dhcp-2.0b1pl5/common/packet.c
*** dhcp-2.0b1pl4/common/packet.c	Sat Jun  7 21:08:01 1997
--- dhcp-2.0b1pl5/common/packet.c	Fri Jun 26 11:20:44 1998
***************
*** 43,47 ****
  #ifndef lint
  static char copyright[] =
! "$Id: packet.c,v 1.18 1997/06/08 04:08:01 mellon Exp $ Copyright (c) 1996 The Internet Software Consortium.  All rights reserved.\n";
  #endif /* not lint */
  
--- 43,47 ----
  #ifndef lint
  static char copyright[] =
! "$Id: packet.c,v 1.18.2.1 1998/06/26 18:20:44 mellon Exp $ Copyright (c) 1996 The Internet Software Consortium.  All rights reserved.\n";
  #endif /* not lint */
  
***************
*** 159,163 ****
  	u_int32_t from;
  	u_int32_t to;
! 	u_int16_t port;
  	unsigned char *data;
  	int len;
--- 159,163 ----
  	u_int32_t from;
  	u_int32_t to;
! 	unsigned int port;
  	unsigned char *data;
  	int len;
diff -rNc2 dhcp-2.0b1pl4/includes/cf/sunos5-5.h dhcp-2.0b1pl5/includes/cf/sunos5-5.h
*** dhcp-2.0b1pl4/includes/cf/sunos5-5.h	Fri Nov 28 23:53:12 1997
--- dhcp-2.0b1pl5/includes/cf/sunos5-5.h	Fri Jun 26 11:20:10 1998
***************
*** 4,8 ****
  
  /*
!  * Copyright (c) 1996 The Internet Software Consortium.  All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 4,9 ----
  
  /*
!  * Copyright (c) 1996, 1998 The Internet Software Consortium.
!  * All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 121,125 ****
     the all-ones broadcast address. */
  #if defined (USE_DEFAULT_NETWORK)
! # define USE_SOCKETS
  #endif
  
--- 122,126 ----
     the all-ones broadcast address. */
  #if defined (USE_DEFAULT_NETWORK)
! # define USE_DLPI
  #endif
  
diff -rNc2 dhcp-2.0b1pl4/includes/dhcpd.h dhcp-2.0b1pl5/includes/dhcpd.h
*** dhcp-2.0b1pl4/includes/dhcpd.h	Thu Jun 25 14:11:33 1998
--- dhcp-2.0b1pl5/includes/dhcpd.h	Fri Jun 26 11:19:51 1998
***************
*** 848,852 ****
  				int *, struct hardware *));
  void assemble_udp_ip_header PROTO ((struct interface_info *, unsigned char *,
! 				    int *, u_int32_t, u_int32_t, u_int16_t,
  				    unsigned char *, int));
  ssize_t decode_hw_header PROTO ((struct interface_info *, unsigned char *,
--- 848,852 ----
  				int *, struct hardware *));
  void assemble_udp_ip_header PROTO ((struct interface_info *, unsigned char *,
! 				    int *, u_int32_t, u_int32_t, unsigned int,
  				    unsigned char *, int));
  ssize_t decode_hw_header PROTO ((struct interface_info *, unsigned char *,
diff -rNc2 dhcp-2.0b1pl4/server/dhcpd.c dhcp-2.0b1pl5/server/dhcpd.c
*** dhcp-2.0b1pl4/server/dhcpd.c	Sat Dec  6 03:25:32 1997
--- dhcp-2.0b1pl5/server/dhcpd.c	Sat Dec  6 03:25:32 1997
***************
*** 49,53 ****
  "Copyright 1995, 1996 The Internet Software Consortium.";
  static char arr [] = "All rights reserved.";
! static char message [] = "Internet Software Consortium DHCPD $Name: V2-BETA-1-PATCH-4 $";
  
  #include "dhcpd.h"
--- 49,53 ----
  "Copyright 1995, 1996 The Internet Software Consortium.";
  static char arr [] = "All rights reserved.";
! static char message [] = "Internet Software Consortium DHCPD $Name: V2-BETA-1-PATCH-5 $";
  
  #include "dhcpd.h"