admin: distfiles/file-fetcher.pl, distfiles/specparser.pl - allow & in uris...

[sparky]

Author: sparky                       Date: Tue Apr  6 19:08:55 2010 GMT
Module: admin                         Tag: HEAD
---- Log message:
- allow & in uris
- allow filename forcing hack, to force output file name different than
  default one construct uris like this one:
  http://server/path?options#/DESIRED-NAME-VERSION.tar.gz

---- Files affected:
admin/distfiles:
   file-fetcher.pl (1.51 -> 1.52) , specparser.pl (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: admin/distfiles/file-fetcher.pl
diff -u admin/distfiles/file-fetcher.pl:1.51 admin/distfiles/file-fetcher.pl:1.52
--- admin/distfiles/file-fetcher.pl:1.51	Thu Feb 25 15:49:29 2010
+++ admin/distfiles/file-fetcher.pl	Tue Apr  6 21:08:50 2010
@@ -66,7 +66,7 @@
       $problems .= $_;
       next;
     }
-    if (/^([a-f0-9]{32})\s+((ftp|http|https|no-url|no-url-copy):\/\/([=\@\?a-z0-9A-Z:;\+\~\.,\-\/_]|\%[0-9])+)\s*$/) {
+    if (/^([a-f0-9]{32})\s+((ftp|http|https|no-url|no-url-copy):\/\/([a-z0-9A-Z;:\=\?&\@\+\~\.,\-\/_]|\%[0-9])+(#\/[a-zA-Z0-9\._-]+)?)\s*$/) {
       if (/\/$/) {
 	$problems .= "$file: cannot fetch dir";
       } else {

================================================================
Index: admin/distfiles/specparser.pl
diff -u admin/distfiles/specparser.pl:1.22 admin/distfiles/specparser.pl:1.23
--- admin/distfiles/specparser.pl:1.22	Thu Feb 25 14:06:19 2010
+++ admin/distfiles/specparser.pl	Tue Apr  6 21:08:50 2010
@@ -217,7 +217,7 @@
 {
 	my ($no, $md5, $s) = @_;
 
-	if ($s =~ /^([a-z0-9A-Z;:\=\?\@\+\~\.,\-\/_]|\%[0-9])+$/) {
+	if ($s =~ /^([a-z0-9A-Z;:\=\?&\@\+\~\.,\-\/_]|\%[0-9])+(#\/[a-zA-Z0-9\._-]+)?$/) {
 		if ($s =~ /^(ftp|http|https):\/\//) {
 			if ($s =~ /\/$/) {
 				error("source $no ($s) is directory");
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/admin/distfiles/file-fetcher.pl?r1=1.51&r2=1.52&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/admin/distfiles/specparser.pl?r1=1.22&r2=1.23&f=u