This commit was generated by cvs2svn to compensate for changes in r133783,

which included commits to RCS files with non-trunk default branches.

4 files changed, 30 insertions, 11 deletions

diff --git a/contrib/isc-dhcp/README b/contrib/isc-dhcp/README
index b4ef281..682bd19 100644
--- a/contrib/isc-dhcp/README
+++ b/contrib/isc-dhcp/README
@@ -1,6 +1,6 @@
 	       Internet Systems Consortium DHCP Distribution
-			   Version 3.0.1rc14
-			     June 09, 2004
+			     Version 3.0.1
+			     July 14, 2004
 
 			      README FILE
 
@@ -96,8 +96,7 @@ system.
 
 			    RELEASE STATUS
 
-This is fourteenth release candidate of version 3.0.1 of the ISC DHCP
-Distribution.  
+This is release version 3.0.1 of the ISC DHCP Distribution.  
 
 In this release, the server and relay agent are currently fully
 functional on NetBSD, Linux systems with kernel version 2.2 or later,
@@ -140,17 +139,17 @@ information.   On Digital Unix, type ``man pfilt''.
 To build the DHCP Distribution, unpack the compressed tar file using
 the tar utility and the gzip command - type something like:
 
-	zcat dhcp-3.0.1rc14.tar.gz |tar xvf -
+	zcat dhcp-3.0.1.tar.gz |tar xvf -
 
 On BSD/OS, you have to type gzcat, not zcat, and you may run into
 similar problems on other operating systems.
 
 			    CONFIGURING IT
 
-Now, cd to the dhcp-3.0.1rc14 subdirectory that you've just
-created and configure the source tree by typing:
+Now, cd to the dhcp-3.0.1 subdirectory that you've just created and
+configure the source tree by typing:
 
-		./configure
+	./configure
 
 If the configure utility can figure out what sort of system you're
 running on, it will create a custom Makefile for you for that
diff --git a/contrib/isc-dhcp/RELNOTES b/contrib/isc-dhcp/RELNOTES
index c483f8f..9a2b351 100644
--- a/contrib/isc-dhcp/RELNOTES
+++ b/contrib/isc-dhcp/RELNOTES
@@ -1,6 +1,6 @@
 	      Internet Systems Consortium DHCP Distribution
-			   Version 3.0.1rc14
-			     June 09, 2004
+			     Version 3.0.1
+			     July 14, 2004
 
 			     Release Notes
 
@@ -43,6 +43,25 @@ Murrell at BC Tel Advanced Communications.  I'd like to express my
 thanks to all of these good people here, both for working on the code
 and for prodding me into improving it.
 
+			Changes since 3.0.1rc14
+
+- The global variable 'cur_time' was centralized and is now uniformly of a
+  type #defined in system-dependent headers.  It had previously been defined
+  in one of many places as a 32-bit value, and this causes mayhem on 64-bit
+  big endian systems.  It probably wasn't too healthy on little endian
+  systems either.
+
+- A printf format string error introduced in rc14 was repaired.
+
+- AIX system-dependent header file was altered to only define NO_SNPRINTF
+  if the condition used to #ifdef in vsnprintf in AIX' header files
+  is false.
+
+- The Alpha/OSF system-dependent header file was altered to define
+  NO_SNPRINTF on OS revisions older than 4.0G.
+
+- omapip/test.c had string.h added to its includes.
+
 			Changes since 3.0.1rc13
 
 ! CAN-2004-0460 - CERT VU#317350: Five stack overflow exploits were closed
diff --git a/contrib/isc-dhcp/includes/version.h b/contrib/isc-dhcp/includes/version.h
index 01089c6..ad359ab 100644
--- a/contrib/isc-dhcp/includes/version.h
+++ b/contrib/isc-dhcp/includes/version.h
@@ -1,3 +1,3 @@
 /* Current version of ISC DHCP Distribution. */
 
-#define DHCP_VERSION	"V3.0.1rc14"
+#define DHCP_VERSION	"V3.0.1"
diff --git a/contrib/isc-dhcp/omapip/test.c b/contrib/isc-dhcp/omapip/test.c
index 2432c02..fbcaf7b 100644
--- a/contrib/isc-dhcp/omapip/test.c
+++ b/contrib/isc-dhcp/omapip/test.c
@@ -36,6 +36,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <string.h>
 #include <isc-dhcp/result.h>
 #include <sys/time.h>
 #include <omapip/omapip.h>