restore 'Portions of this code' notice

(cherry picked from commit a299dbc5667ccce4e9c7e40b5ed1e106e27e787f)

diff --git a/COPYRIGHT b/COPYRIGHT
index f17022da5142641011702394e009f1f4305108f2..514dbe7e2f5c8e5b093599f5a452022b133f675a 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -13,6 +13,10 @@ 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.
 
+       Portions of this code release fall under one or more of the
+       following Copyright notices.  Please see individual source
+       files for details.
+
        For binary releases also see: OpenSSL-LICENSE.
 
 Copyright (C) 1996-2001  Nominum, Inc.

diff --git a/util/update_copyrights b/util/update_copyrights
index 824c7d51cf968a70eb46dff716aead92f2462e47..7a1b6b0268bb6219eb1c0450582abefb3a7c85e5 100644 (file)
--- a/util/update_copyrights
+++ b/util/update_copyrights
@@ -354,6 +354,7 @@ foreach $file (keys %file_types) {
                         $/ = "";            # paragraph at a time
                         while (<SOURCE>) {
                                 # Not very maintainable, but ok enough for now.
+                               last if /Portions of this code/;
                                 last unless
                                   /[Cc]opyright/ ||
                                   /See COPYRIGHT in the source root/ ||