From 406016dac91dd0acfff4ab49a144aa373b89152e Mon Sep 17 00:00:00 2001
From: Cody Soyland <cody@soyland.org>
Date: Thu, 3 Oct 2019 12:20:52 -0500
Subject: [PATCH] Update license information

---
 NOTICE              |  6 +++---
 server/tlsconfig.go | 31 +++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/NOTICE b/NOTICE
index 82c127d5b..2d655865e 100644
--- a/NOTICE
+++ b/NOTICE
@@ -55,8 +55,8 @@ The file /pilosa/lru/lru.go contains a redistribution of lru
     See the License for the specific language governing permissions and
     limitations under the License.
 
-The files /enterprise/b/btree.go and /roaring/btree.go contain a modified
-redistribution of b (https://github.com/cznic/b); the license follows:
+The file /roaring/btree.go contains a modified redistribution of b
+(https://github.com/cznic/b); the license follows:
 
     Copyright (c) 2014 The b Authors. All rights reserved.
 
@@ -86,7 +86,7 @@ redistribution of b (https://github.com/cznic/b); the license follows:
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-The file /server/tlsconfig.go contain a modified redistribution of bridge 
+The file /server/tlsconfig.go contains a modified redistribution of bridge 
 (https://github.com/robustirc/bridge); the license follows:
   
     Copyright © 2014-2015 The RobustIRC Authors. All rights reserved.
diff --git a/server/tlsconfig.go b/server/tlsconfig.go
index 9ccca02f7..e5e70fc41 100644
--- a/server/tlsconfig.go
+++ b/server/tlsconfig.go
@@ -11,6 +11,37 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//
+// This file contains source code from bridge
+// (https://github.com/robustirc/bridge); which is governed by the following
+// license notice:
+//
+// Copyright © 2014-2015 The RobustIRC Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//       notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above copyright
+//       notice, this list of conditions and the following disclaimer in the
+//       documentation and/or other materials provided with the distribution.
+//
+//     * Neither the name of RobustIRC nor the names of contributors may be used
+//       to endorse or promote products derived from this software without
+//       specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE
+// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package server