fixed regex to fetch certdata.txt version since it was replaced by CVS (argh!)

added a switch to display certdata.txt version header.

1 files changed, 6 insertions, 3 deletions

diff --git a/lib/mk-ca-bundle.pl b/lib/mk-ca-bundle.pl
index f6f63ecd0..bbfe32c0c 100755
--- a/lib/mk-ca-bundle.pl
+++ b/lib/mk-ca-bundle.pl
@@ -41,12 +41,13 @@ my $tmp = 'mytmpfile.txt';
 # If the OpenSSL commandline is not in search path you can configure it here!
 my $openssl = 'openssl';
 
-getopts('hinuv');
+getopts('hilnuv');
 
 if ($opt_h) {
   $0 =~ s/\\/\//g;
-  printf("Usage:\t%s [-i] [-n] [-u] [-v]\n", substr($0, rindex($0, '/') + 1));
+  printf("Usage:\t%s [-i] [-l] [-n] [-u] [-v]\n", substr($0, rindex($0, '/') + 1));
   print "\t-i\tprint version info about used modules\n";
+  print "\t-l\tprint license info about certdata.txt\n";
   print "\t-n\tno download of certdata.txt (to use existing)\n";
   print "\t-u\tunlink (remove) certdata.txt after processing\n";
   print "\t-v\tbe verbose and print out processed CAs\n";
@@ -108,8 +109,10 @@ while (<TXT>) {
   if (/\*\*\*\*\* BEGIN LICENSE BLOCK \*\*\*\*\*/) {
     open(CRT, ">>$crt") or die "Couldn't open $crt: $!";
     print CRT;
+    print if ($opt_l);
     while (<TXT>) {
       print CRT;
+      print if ($opt_l);
       last if (/\*\*\*\*\* END LICENSE BLOCK \*\*\*\*\*/);
     }
     close(CRT) or die "Couldn't close $crt: $!";
@@ -117,7 +120,7 @@ while (<TXT>) {
   next if /^#/;
   next if /^\s*$/;
   chomp;
-  if (/(\$RCSfile$\s+\$Revision$\s+\$Date$)\"/) {
+  if (/^CVS_ID\s+\"(.*)\"/) {
     open(CRT, ">>$crt") or die "Couldn't open $crt: $!";
     print CRT "# $1\n";
     close(CRT) or die "Couldn't close $crt: $!";