Captive release update: 1.1.6.1

+project staticbuild

diff --git a/project/captive/CVS.pm b/project/captive/CVS.pm
index 57cd168..c4b4e4f 100755 (executable)
--- a/project/captive/CVS.pm
+++ b/project/captive/CVS.pm
@@ -51,120 +51,20 @@ make
 
 @{[ vskip "3ex" ]}
 
-<h2>Download</h2>
-
-<table border="1" class="margin-center"><tr><th>Distribution</th>
-       <th>Installation Case #1<br />Filesystem and installer<br />(recommended)</th>
-       <th>Installation Case #2<br />Manual installation<br />(filesystem, expert user)</th>
-       <th>Installation Case #3<br />Command-line client<br />(no filesystem access)</th></tr>
-HERE
-my %pkg=(
-               1=>[qw(captive captive-lufs captive-install lufs gnome-vfs-httpcaptive ntfsprogs ntfsprogs-gnomevfs)],
-               2=>[qw(captive captive-lufs                 lufs)],
-               3=>[qw(captive)],
-               );
-my %version=(
-               map(($_=>["1.1.5","0"]),qw(captive captive-lufs captive-install)),
-               "lufs"=>["0.9.7","1captive8"],
-               "gnome-vfs-httpcaptive"=>["2.3.8captive2","0"],
-               "ntfsprogs"=>["200309071734","1captive1"],
-               "ntfsprogs-gnomevfs"=>["1.0.2","0"],
-               "build-captive-static"=>"2003-12-14-00",
-               );
-my %has_devel=(map(($_=>1),qw(
-               ntfsprogs
-               )));
-my %pkg_nosrc=(map(($_=>1),qw(
-               captive-lufs
-               captive-install
-               ntfsprogs
-               ntfsprogs-gnomevfs
-               )));
-
-my $case;
-my $a_href_arch=sub ($$%)
-{
-my($file_base,$text,%args)=@_;
-
-       $text=~s/[._]\D.*$// if $case!=1 && $text!~/^[.]/;
-       return a_href $file_base,$text,"size"=>($case==1),%args;
-};
-
-my $ntfsprogs_after=sub ($) {
-       my($format)=@_;
-               return if $case!=1;
-               return '<table width="80%" border="0" class="margin-center"><tr><td>'
-                                       .'<hr />requirement: '
-                                       .a_href('http://linux-ntfs.sourceforge.net/downloads.html#downloads','ntfsprogs')
-                                       .' '.$format.' &ge; 1.8.0'
-                               .'</td></tr></table>';
-       };
-
-my @dist=(
-               {
-                       "name"=>"Sources (.tar.gz)",
-                       "id"=>"source",
-                       "out"=>sub {
-                               my($pkg,$version_base,$version_ext)=@_;
-                                       return () if $pkg_nosrc{$pkg};
-                                       $version_ext=~s/^\d+//;
-                                       my $file="$pkg-$version_base".($version_ext=~/^\d+$/ ? "" : $version_ext).".tar.gz";
-                                       return $file,$file;
-                               },
-                       "after"=>sub { return &{$ntfsprogs_after}(".tar.gz"); },
-                       },
-               );
-
-for my $dist (@dist) {
-       print '<tr id="'.$dist->{"id"}.'">';
-               print '<td align="center">'.$dist->{"name"}."</td>";
-               for my $casel (1,2,3) {
-                       $case=$casel;
-                       print '<td align="center">';
-                       print join("<br />",map({ my $pkg=$_;
-                               my($file,$text)=&{$dist->{"out"}}($pkg,@{$version{$pkg}});
-                               (!defined $text ? ($file) || () : (&$a_href_arch("dist/$file",$text)));
-                               } @{$pkg{$case}}),map({ (!$_ ? () : (&{$_}())); } $dist->{"after"}));
-                       print "</td>";
-                       }
-       print "</tr>\n";
-       }
-print <<"HERE";
-               <tr>
-                       <td>'captive-static' build<br />system patches for Red Hat 9 Shrike<br />(never needed for a&nbsp;regular build)</td>
-                       <td colspan="3">
-HERE
-my $build_static_basename=(map("$_-".$version{$_}.".tar.gz","build-captive-static"))[0];
-print a_href "dist/$build_static_basename",$build_static_basename;
-print <<"HERE";
-               </td>
+<h2 id="source">Download</h2>
+
+<table border="1" class="margin-center">
+       <tr><th>Distribution Type</th><th>Downloadable File</th></tr>
+       <tr><td>Sources (.tar.gz)</td><td>@{[ a_href 'dist/captive-1.1.6.1.tar.gz',undef(),"basename"=>1 ]}</td></tr>
+       <tr>
+               <td>'captive-static' build<br />(never needed for a&nbsp;regular build)</td>
+               <td colspan="3">my @{[ a_href '/project/staticbuild/','staticbuild' ]} project link</td>
        </tr>
 </table>
 
 @{[ vskip "3ex" ]}
 
 
-<h2>Pending Integrations</h2>
-
-<dl>
-       <dt>
-               @{[ a_href $W->{"project_viewcvs"}.'/lufs/','lufs-captive' ]}
-               [@{[ a_href $W->{"project_viewcvs"}.'/*checkout*/lufs/NEWS.captive?rev=1.1.2.11','NEWS' ]}]
-       </dt>
-       <dd>
-               <p>@{[ a_href 'http://lufs.sourceforge.net/lufs/','LUFS' ]} still has not yet integrated
-                               the Captive-developed patches. No integration schedule is currently known.</p>
-               <ul>
-                       <li>Linux kernel module has implemented support for statfs(2)/df(1)</li>
-                       <li>Many fixes of the userland lufsd(8) daemon</li>
-                       <li>Scripts for unattended Linux kernel module prebuilds/compilation/installation</li>
-               </ul>
-               <p>The recommended way is to port Captive project to maintained
-               @{[ a_href 'http://fuse.sourceforge.net/','FUSE' ]}.</p>
-       </dd>
-</dl>
-
-
 <h1>@{[ a_href './','Back to Captive Main Page' ]}</h1>
 
 HERE