update copyright notice

diff --git a/lib/lwres/win32/socket.c b/lib/lwres/win32/socket.c
index e173ce3bb60b1d03e8d1a776d9b287a0985970c8..fdcd6d63789e35da432259050feae63c1cfd8c5c 100644 (file)
--- a/lib/lwres/win32/socket.c
+++ b/lib/lwres/win32/socket.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2007  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* $Id: socket.c,v 1.3.10.2 2007/08/06 07:23:12 tbox Exp $ */
+
 #include <stdio.h>
 #include <lwres/platform.h>
 #include <Winsock2.h>

diff --git a/util/merge_copyrights b/util/merge_copyrights
index 5edc6dee74de11eb946fd245d851173f23898856..ed440b0e62575596aecd58331710b4a8850a6c0e 100644 (file)
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -1,9 +1,9 @@
 #!/usr/local/bin/perl -w
 #
 # Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 1998-2001, 2003  Internet Software Consortium.
+# Copyright (C) 1998-2002  Internet Software Consortium.
 #
-# Permission to use, copy, modify, and/or distribute this software for any
+# Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
 # copyright notice and this permission notice appear in all copies.
 #
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: merge_copyrights,v 1.16.2.13 2007/08/06 07:21:30 marka Exp $
+# $Id: merge_copyrights,v 1.16.2.14 2007/08/06 07:23:12 tbox Exp $
 
 %file_types = ();
 %file_years = ();

diff --git a/win32utils/updateopenssl.pl b/win32utils/updateopenssl.pl
index 8667daff9f11d2273f1c7e1c4be2423d3a7cd2ad..f5d4d1b461815c1967be24c72738d1557b24b6c1 100644 (file)
--- a/win32utils/updateopenssl.pl
+++ b/win32utils/updateopenssl.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2006  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: updateopenssl.pl,v 1.3.8.4 2007/08/06 04:30:52 marka Exp $
+# $Id: updateopenssl.pl,v 1.3.8.5 2007/08/06 07:23:12 tbox Exp $
 
 # updateopenssl.pl
 # This script locates the latest version of OpenSSL in the grandparent