From 2d46d268ccff30bb50e661b47c6496d23d9156c7 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Sun, 8 Nov 2009 23:52:20 +0000 Subject: [PATCH] handle openssl patches --- util/merge_copyrights | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/util/merge_copyrights b/util/merge_copyrights index e957aefc5d..08854d82e3 100644 --- a/util/merge_copyrights +++ b/util/merge_copyrights @@ -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.33 2009/06/11 23:47:56 tbox Exp $ +# $Id: merge_copyrights,v 1.34 2009/11/08 23:52:20 marka Exp $ %file_types = (); %file_years = (); @@ -54,6 +54,8 @@ while () { # Contributed code should maintain its own copyright. if ($base =~ /\.\/contrib\//) { $file_types{$_} = "X"; + } elsif ($base =~ /\/openssl-[a-z0-9.]*-patch$/) { + $file_types{$_} = "X"; } elsif ($base =~ /\.(c|h|css)$/) { $file_types{$_} = "C"; } elsif ($base =~ /\.y$/) {