From 58dce27e80bcf9be709beb4e85adda3ec2fea4c7 Mon Sep 17 00:00:00 2001
From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 25 Aug 2014 18:58:27 -0700
Subject: [PATCH] Boilerplate: update authorship claims

* Robert Collins actually gave permission to update a long time back.

* Duane Wessels permission to update now granted.

* UCSD authorship claims being left in place with CREDITS entry.
---
 compat/assert.h       |  4 ----
 compat/xstrerror.cc   |  4 ----
 include/rfc1035.h     |  4 ----
 include/rfc2617.h     |  4 ----
 scripts/boiler-mgr.pl | 14 ++++----------
 5 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/compat/assert.h b/compat/assert.h
index a2979fba2f..c1a49357be 100644
--- a/compat/assert.h
+++ b/compat/assert.h
@@ -6,10 +6,6 @@
  * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
-/*
- * AUTHOR: Duane Wessels
- */
-
 #ifndef SQUID_ASSERT_H
 #define SQUID_ASSERT_H
 
diff --git a/compat/xstrerror.cc b/compat/xstrerror.cc
index 520fdd4a45..74cebb3f56 100644
--- a/compat/xstrerror.cc
+++ b/compat/xstrerror.cc
@@ -6,10 +6,6 @@
  * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
-/*
- * AUTHOR: Duane Wessels
- */
-
 #include "squid.h"
 #include "compat/xstrerror.h"
 
diff --git a/include/rfc1035.h b/include/rfc1035.h
index 19b5f85240..c4ed6dded3 100644
--- a/include/rfc1035.h
+++ b/include/rfc1035.h
@@ -6,10 +6,6 @@
  * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
-/*
- * AUTHOR: Duane Wessels
- */
-
 #ifndef SQUID_RFC1035_H
 #define SQUID_RFC1035_H
 
diff --git a/include/rfc2617.h b/include/rfc2617.h
index b3c830f43f..a1d8ca89fa 100644
--- a/include/rfc2617.h
+++ b/include/rfc2617.h
@@ -20,10 +20,6 @@
  * to prevent squid knowing the users password (idea suggested in RFC 2617).
  */
 
-/*
- * AUTHOR: RFC 2617 & Robert Collins
- */
-
 #ifndef SQUID_RFC2617_H
 #define SQUID_RFC2617_H
 
diff --git a/scripts/boiler-mgr.pl b/scripts/boiler-mgr.pl
index 7fa1aac446..29490ff6f8 100755
--- a/scripts/boiler-mgr.pl
+++ b/scripts/boiler-mgr.pl
@@ -69,6 +69,10 @@ my $reClaimPrefix = qr{
 
 # We have persmission to move these frequent claims to CONTRIBUTORS.
 my $reClaimsOkToMove = qr{
+	Robert.Collins|<robertc\@squid-cache.org>|
+
+	Duane.Wessels|
+
 	Francesco.Chemolli|<kinkie\@squid-cache.org>|<kinkie\@kame.usr.dsi.unimi.it>|
 
 	Amos.Jeffries|<amosjeffries\@squid-cache.org>|<squid3\@treenet.co.nz>|
@@ -78,16 +82,6 @@ my $reClaimsOkToMove = qr{
 	Henrik.Nordstrom|<henrik\@henriknordstrom.net>|
 	MARA.Systems.AB|
 }xi;
-# XXX: We have not gotten permission for some of the entries yet:
-#
-#	Robert.Collins|<robertc\@squid-cache.org>|
-#
-#	Guido Serassio|<serassio\@squid-cache.org>|
-#
-#	Duane Wessels|
-#
-#	the.Regents.of.the.University.of
-
 
 # inspirations are not copyright claims but should be preserved
 my $reInspiration = qr/^[\s*]*(inspired by previous work.*?)$/mi;
-- 
2.47.2