From a299dbc5667ccce4e9c7e40b5ed1e106e27e787f Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Sun, 26 Jan 2014 10:49:23 +1100 Subject: [PATCH] restore 'Portions of this code' notice --- COPYRIGHT | 4 ++++ util/update_copyrights | 1 + 2 files changed, 5 insertions(+) diff --git a/COPYRIGHT b/COPYRIGHT index f17022da51..514dbe7e2f 100644 --- 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 824c7d51cf..7a1b6b0268 100644 --- a/util/update_copyrights +++ b/util/update_copyrights @@ -354,6 +354,7 @@ foreach $file (keys %file_types) { $/ = ""; # paragraph at a time while () { # Not very maintainable, but ok enough for now. + last if /Portions of this code/; last unless /[Cc]opyright/ || /See COPYRIGHT in the source root/ ||