Update of /cvsroot/fink/fink/perlmod/Fink
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17537
Modified Files:
ChangeLog Validation.pm
Log Message:
Allow "new-style" GPL license fields which follow the string "GPL" with either
"2", "3", or "23", optionally followed by "+".
Index: Validation.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -d -r1.300 -r1.301
--- Validation.pm 2 Apr 2009 15:11:14 -0000 1.300
+++ Validation.pm 4 Apr 2009 15:50:29 -0000 1.301
@@ -104,7 +104,10 @@
descdetail descusage
);
-# Allowed values for the license field
+# Allowed values for the license field: note that there are now "new-style"
+# GPL license fields which follow the string "GPL" with either "2", "3", or
+# "23", optionally followed by "+". Rather than list all the possibilities
+# here, we use some regexp magic later on.
our %allowed_license_values = map {$_, 1}
(
"GPL", "LGPL", "GPL/LGPL", "BSD", "Artistic", "Artistic/GPL", "GFDL",
@@ -562,6 +565,12 @@
$value =~ s/\(.*?\)//g; # remove all conditionals
$value =~ s/^\s*//; # ...which sometimes leaves leading
whitespace
foreach (split /\s*,\s*/, $value) {
+ if ($_ =~ /GPL(\/|$)/) {
+ # this is an "old-style" GPL license field
+ # (at some future time we will deprecate these)
+ }
+ $_ =~ s/GPL(2|3|23)\+?/GPL/g; #remove the "decorations"
from
+ #new-style GPL license
fields
if (not $allowed_license_values{$_}) {
print "Warning: Unknown license \"$_\".
($filename)\n";
$looks_good = 0;
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1587
retrieving revision 1.1588
diff -u -d -r1.1587 -r1.1588
--- ChangeLog 3 Apr 2009 07:47:47 -0000 1.1587
+++ ChangeLog 4 Apr 2009 15:50:27 -0000 1.1588
@@ -1,3 +1,9 @@
+2009-04-04 Dave Morrison <d...@finkproject.org>
+
+ * Validation.pm: Allow "new-style" GPL license fields which follow
+ the string "GPL" with either "2", "3", or "23", optionally followed
+ by "+".
+
2009-04-03 Daniel Macks <dma...@netspace.org>
* Engine.pm: fink.conf NotifyPlugin "xterm" token controls xterm
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
