handle openssl patches

diff --git a/util/merge_copyrights b/util/merge_copyrights
index e957aefc5d6b2922ea484b6e18fad891786042f8..08854d82e368f424e5e2479d7fe307b28660da53 100644 (file)
--- 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 (<FILES>) {
        # 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$/) {