X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=cgi-bin%2Fshow_package.pl;h=5eaa73f0da6b6f58f97599b94fcc4734b7b2469d;hb=1d735d4df7e110481faa67897ba4c35936998fc0;hp=34613995fb1a695a271ee09c75b3aec9d9490dac;hpb=91edc66c5f872b41114dc61bdefc6d89c205a183;p=deb%2Fpackages.git

diff --git a/cgi-bin/show_package.pl b/cgi-bin/show_package.pl
index 3461399..5eaa73f 100755
--- a/cgi-bin/show_package.pl
+++ b/cgi-bin/show_package.pl
@@ -13,6 +13,7 @@
 # see http://www.fsf.org/copyleft/gpl.html for a copy of the license
 
 use strict;
+use lib '../lib';
 use CGI qw( -oldstyle_urls );
 use CGI::Carp qw( fatalsToBrowser );
 use POSIX;
@@ -22,10 +23,14 @@ use DB_File;
 use Benchmark;
 
 use Deb::Versions;
+use Packages::Config qw( $DBDIR $ROOT @SUITES @ARCHIVES @SECTIONS
+			 @ARCHITECTURES %FTP_SITES );
 use Packages::CGI;
+use Packages::DB;
 use Packages::Search qw( :all );
-use Packages::HTML ();
+use Packages::HTML;
 use Packages::Page ();
+use Packages::SrcPage ();
 
 &Packages::CGI::reset;
 
@@ -47,38 +52,8 @@ my $debug = $debug_allowed && $input->param("debug");
 $debug = 0 if !defined($debug) || $debug !~ /^\d+$/o;
 $Packages::CGI::debug = $debug;
 
-# read the configuration
-our $config_read_time ||= 0;
-our $db_read_time ||= 0;
-our ( $topdir, $ROOT, @SUITES, @SECTIONS, @ARCHIVES, @ARCHITECTURES );
-
-# FIXME: move to own module
-my $modtime = (stat( "../config.sh" ))[9];
-if ($modtime > $config_read_time) {
-    if (!open (C, '<', "../config.sh")) {
-	error( "Internal: Cannot open configuration file." );
-    }
-    while (<C>) {
-	next if /^\s*\#/o;
-	chomp;
-	$topdir = $1 if /^\s*topdir="?([^\"]*)"?\s*$/o;
-	$ROOT = $1 if /^\s*root="?([^\"]*)"?\s*$/o;
-	$Packages::HTML::HOME = $1 if /^\s*home="?([^\"]*)"?\s*$/o;
-	$Packages::HTML::SEARCH_CGI = $1 if /^\s*searchcgi="?([^\"]*)"?\s*$/o;
-	$Packages::HTML::SEARCH_PAGE = $1 if /^\s*searchpage="?([^\"]*)"?\s*$/o;
-	$Packages::HTML::WEBMASTER_MAIL = $1 if /^\s*webmaster="?([^\"]*)"?\s*$/o;
-	$Packages::HTML::CONTACT_MAIL = $1 if /^\s*contact="?([^\"]*)"?\s*$/o;
-	@SUITES = split(/\s+/, $1) if /^\s*suites="?([^\"]*)"?\s*$/o;
-	@SECTIONS = split(/\s+/, $1) if /^\s*sections="?([^\"]*)"?\s*$/o;
-	@ARCHIVES = split(/\s+/, $1) if /^\s*archives="?([^\"]*)"?\s*$/o;
-	@ARCHITECTURES = split(/\s+/, $1) if /^\s*architectures="?([^\"]*)"?\s*$/o;
-    }
-    close (C);
-    debug( "read config ($modtime > $config_read_time)" );
-    $config_read_time = $modtime;
-}
-my $DBDIR = $topdir . "/files/db";
-my $thisscript = $Packages::HTML::SEARCH_CGI;
+&Packages::Config::init( '../' );
+&Packages::DB::init();
 
 if (my $path = $input->param('path')) {
     my @components = map { lc $_ } split /\//, $path;
@@ -91,287 +66,513 @@ if (my $path = $input->param('path')) {
     foreach (@components) {
 	if ($SUITES{$_}) {
 	    $input->param('suite', $_);
-	}# elsif ($SECTIONS{$_}) {
-#	    $input->param('section', $_);
-#	} elsif ($ARCHIVES{$_}) {
-#	    $input->param('archive', $_);
-#	} elsif ($ARCHITECTURES{$_}) {
-#	    $input->param('arch', $_);
-#	}
+	} elsif ($SECTIONS{$_}) {
+	    $input->param('section', $_);
+	} elsif ($ARCHIVES{$_}) {
+	    $input->param('archive', $_);
+	} elsif ($ARCHITECTURES{$_}) {
+	    $input->param('arch', $_);
+	} elsif ($_ eq 'source') {
+	    $input->param('source', 1);
+	}
     }
 }
 
-my ( $pkg, $suite, $format );
+my ( $pkg, $suite, @sections, @archs, @archives, $format );
 my %params_def = ( package => { default => undef, match => '^([a-z0-9.+-]+)$',
 				var => \$pkg },
 		   suite => { default => undef, match => '^(\w+)$',
 			      var => \$suite },
+		   archive => { default => 'all', match => '^(\w+)$',
+				array => ',', var => \@archives,
+				replace => { all => [qw(us security non-US)] } },
+		   section => { default => 'all', match => '^(\w+)$',
+				array => ',', var => \@sections,
+				replace => { all => \@SECTIONS } },
+		   arch => { default => 'any', match => '^(\w+)$',
+			     array => ',', var => \@archs,
+			     replace => { any => \@ARCHITECTURES } },
 		   format => { default => 'html', match => '^(\w+)$',
-                               var => \$format }
+                               var => \$format },
+		   source => { default => 0, match => '^(\d+)$' },
 		   );
 my %opts;
 my %params = Packages::Search::parse_params( $input, \%params_def, \%opts );
 
-$opts{h_suites} =   { $suite => 1 };
-$opts{h_archs} =    { map { $_ => 1 } @ARCHITECTURES };
-$opts{h_sections} = { map { $_ => 1 } @SECTIONS };
-$opts{h_archives} = { map { $_ => 1 } @ARCHIVES };
-
 #XXX: Don't use alternative output formats yet
 $format = 'html';
 if ($format eq 'html') {
-    print $input->header;
+    print $input->header( -charset => 'utf-8' );
 }
 
 if ($params{errors}{package}) {
     fatal_error( "package not valid or not specified" );
+    $pkg = '';
 }
 if ($params{errors}{suite}) {
     fatal_error( "suite not valid or not specified" );
+    $suite = '';
 }
 
+$opts{h_suites} =   { $suite => 1 };
+$opts{h_archs} =    { map { $_ => 1 } @archs };
+$opts{h_sections} = { map { $_ => 1 } @sections };
+$opts{h_archives} = { map { $_ => 1 } @archives };
+
 my $DL_URL = "$pkg/download";
 my $FILELIST_URL = "$pkg/files";
-my $DDPO_URL = "http://qa.debian.org/developer.php?email=";
 
-our (%packages, %packages_all);
+our (%packages_all, %sources_all);
 my (@results, @non_results);
+my $page = $opts{source} ?
+    new Packages::SrcPage( $pkg ) :
+    new Packages::Page( $pkg );
+my $package_page = "";
+my ($short_desc, $version, $archive, $section, $subsection) = ("")x5;
+
+sub gettext { return $_[0]; };
 
+my $st0 = new Benchmark;
 unless (@Packages::CGI::fatal_errors) {
-    my $dbmodtime = (stat("$DBDIR/packages_small.db"))[9];
-    if ($dbmodtime > $db_read_time) {
-	tie %packages, 'DB_File', "$DBDIR/packages_small.db",
-	O_RDONLY, 0666, $DB_BTREE
-	    or die "couldn't tie DB $DBDIR/packages_small.db: $!";
-	tie %packages_all, 'DB_File', "$DBDIR/packages_all_$suite.db",
-	O_RDONLY, 0666, $DB_BTREE
-	    or die "couldn't tie DB $DBDIR/packages_all_$suite.db: $!";
-    	debug( "tied databases ($dbmodtime > $db_read_time)" );
-	$db_read_time = $dbmodtime;
-    }
+    tie %packages_all, 'DB_File', "$DBDIR/packages_all_$suite.db",
+    O_RDONLY, 0666, $DB_BTREE
+	or die "couldn't tie DB $DBDIR/packages_all_$suite.db: $!";
+    tie %sources_all, 'DB_File', "$DBDIR/sources_all_$suite.db",
+    O_RDONLY, 0666, $DB_BTREE
+	or die "couldn't tie DB $DBDIR/sources_all_$suite.db: $!";
+
+    unless ($opts{source}) {
+	read_entry_all( \%packages, $pkg, \@results, \@non_results, \%opts );
+
+	unless (@results || @non_results ) {
+	    fatal_error( "No such package".
+			 "{insert link to search page with substring search}" );
+	} else {
+	    unless (@results) {
+		fatal_error( "Package not available in this suite" );
+	    } else {
+		for my $entry (@results) {
+		    debug( join(":", @$entry), 1 );
+		    my (undef, $archive, undef, $arch, $section, $subsection,
+			$priority, $version, $provided_by) = @$entry;
+		    
+		    if ($arch ne 'virtual') {
+			my %data = split /\000/, $packages_all{"$pkg $arch $version"};
+			$data{package} = $pkg;
+			$data{architecture} = $arch;
+			$data{version} = $version;
+			$page->merge_package(\%data) or debug( "Merging $pkg $arch $version FAILED", 2 );
+		    } else {
+			$page->add_provided_by([split /\s+/, $provided_by]);
+		    }
+		}
+		
+		unless ($page->is_virtual()) {
+		    $version = $page->{newest};
+		    my $source = $page->get_newest( 'source' );
+		    $archive = $page->get_newest( 'archive' );
+		    debug( "find source package: source=$source", 1);
+		    my $src_data = $sources_all{"$archive $suite $source"};
+		    $page->add_src_data( $source, $src_data )
+			if $src_data;
+
+		    my $st1 = new Benchmark;
+		    my $std = timediff($st1, $st0);
+		    debug( "Data search and merging took ".timestr($std) );
+
+		    my $encodedpkg = uri_escape( $pkg );
+		    my ($v_str, $v_str_arch, $v_str_arr) = $page->get_version_string();
+		    my $did = $page->get_newest( 'description' );
+		    $section = $page->get_newest( 'section' );
+		    $subsection = $page->get_newest( 'subsection' );
+		    my $filenames = $page->get_arch_field( 'filename' );
+		    my $file_md5sums = $page->get_arch_field( 'md5sum' );
+		    my $archives = $page->get_arch_field( 'archive' );
+		    my $sizes_inst = $page->get_arch_field( 'installed-size' );
+		    my $sizes_deb = $page->get_arch_field( 'size' );
+		    my @archs = sort $page->get_architectures;
+
+		    # process description
+		    #
+		    my $desc = $descriptions{$did};
+		    $short_desc = encode_entities( $1, "<>&\"" )
+			if $desc =~ s/^(.*)$//m;
+		    my $long_desc = encode_entities( $desc, "<>&\"" );
+		    
+		    $long_desc =~ s,((ftp|http|https)://[\S~-]+?/?)((\&gt\;)?[)]?[']?[:.\,]?(\s|$)),<a href=\"$1\">$1</a>$3,go; # syntax highlighting -> '];
+		    $long_desc =~ s/\A //o;
+		    $long_desc =~ s/\n /\n/sgo;
+		    $long_desc =~ s/\n.\n/\n<p>\n/go;
+		    $long_desc =~ s/(((\n|\A) [^\n]*)+)/\n<pre>$1\n<\/pre>/sgo;
+# 	    $long_desc = conv_desc( $lang, $long_desc );
+# 	    $short_desc = conv_desc( $lang, $short_desc );
+
+		    my %all_suites;
+		    foreach (@results, @non_results) {
+			my $a = $_->[1];
+			my $s = $_->[2];
+			if ($a =~ /^(?:us|security|non-US)$/o) {
+			    $all_suites{$s}++;
+			} else {
+			    $all_suites{"$s/$a"}++;
+			}
+		    }
+		    foreach (suites_sort(keys %all_suites)) {
+			if (("$suite/$archive" eq $_)
+			    || (!$all_suites{"$suite/$archive"} && ($suite eq $_))) {
+			    $package_page .= "[ <strong>$_</strong> ] ";
+			} else {
+			    $package_page .=
+				"[ <a href=\"$ROOT/$_/".uri_escape($pkg)."\">$_</a> ] ";
+			}
+		    }
+		    $package_page .= '<br>';
+
+		    $package_page .= simple_menu( [ gettext( "Distribution:" ),
+						    gettext( "Overview over this suite" ),
+						    "$ROOT/$suite/",
+						    $suite ],
+						  [ gettext( "Section:" ),
+						    gettext( "All packages in this section" ),
+						    "$ROOT/$suite/$subsection/",
+						    $subsection ],
+						  );
+
+		    my $title .= sprintf( gettext( "Package: %s (%s)" ), $pkg, $v_str );
+		    $title .=  " ".marker( $archive ) if $archive ne 'us';
+		    $title .=  " ".marker( $subsection ) if $subsection eq 'non-US'
+			and $archive ne 'non-US'; # non-US/security
+		    $title .=  " ".marker( $section ) if $section ne 'main';
+		    $package_page .= title( $title );
+		    
+		    $package_page .= "<h2>".gettext( "Versions:" )." $v_str_arch</h2>\n" 
+			unless $version eq $v_str;
+		    if (my $provided_by = $page->{provided_by}) {
+			note( gettext( "This is also a virtual package provided by ").join( ', ', map { "<a href=\"$ROOT/$suite/$_\">$_</a>"  } @$provided_by) );
+		    }
+		    
+		    if ($suite eq "experimental") {
+			note( gettext( "Experimental package"),
+			      gettext( "Warning: This package is from the <span class=\"pred\">experimental</span> distribution. That means it is likely unstable or buggy, and it may even cause data loss. If you ignore this warning and install it nevertheless, you do it on your own risk.")."</p><p>".
+			      gettext( "Users of experimental packages are encouraged to contact the package maintainers directly in case of problems." )
+			      );
+		    }
+		    if ($subsection eq "debian-installer") {
+			note( gettext( "debian-installer udeb package"),
+			      gettext( "Warning: This package is intended for the use in building <a href=\"http://www.debian.org/devel/debian-installer\">debian-installer</a> images only. Do not install it on a normal Debian system." )
+			      );
+		    }
+		    $package_page .= pdesc( $short_desc, $long_desc );
+
+		    #
+		    # display dependencies
+		    #
+		    my $dep_list;
+		    $dep_list = print_deps( \%packages, \%opts, $pkg,
+					    $page->get_dep_field('depends'),
+					    'depends' );
+		    $dep_list .= print_deps( \%packages, \%opts, $pkg,
+					     $page->get_dep_field('recommends'),
+					     'recommends' );
+		    $dep_list .= print_deps( \%packages, \%opts, $pkg,
+					     $page->get_dep_field('suggests'),
+					     'suggests' );
+
+		    if ( $dep_list ) {
+			$package_page .= "<div id=\"pdeps\">\n";
+			$package_page .= sprintf( "<h2>".gettext( "Other Packages Related to %s" )."</h2>\n", $pkg );
+			if ($suite eq "experimental") {
+			    note( gettext( "Note that the \"<span class=\"pred\">experimental</span>\" distribution is not self-contained; missing dependencies are likely found in the \"<a href=\"/unstable/\">unstable</a>\" distribution." ) );
+			}
+			
+			$package_page .= pdeplegend( [ 'dep',  gettext( 'depends' ) ],
+						     [ 'rec',  gettext( 'recommends' ) ],
+						     [ 'sug',  gettext( 'suggests' ) ], );
+			
+			$package_page .= $dep_list;
+			$package_page .= "</div> <!-- end pdeps -->\n";
+		    }
+
+		    #
+		    # Download package
+		    #
+		    my $encodedpack = uri_escape( $pkg );
+		    $package_page .= "<div id=\"pdownload\">";
+		    $package_page .= sprintf( "<h2>".gettext( "Download %s\n" )."</h2>",
+					      $pkg ) ;
+		    $package_page .= "<table border=\"1\" summary=\"".gettext("The download table links to the download of the package and a file overview. In addition it gives information about the package size and the installed size.")."\">\n";
+		    $package_page .= "<caption class=\"hidecss\">".gettext("Download for all available architectures")."</caption>\n";
+		    $package_page .= "<tr>\n";
+		    $package_page .= "<th>".gettext("Architecture")."</th><th>".gettext("Files")."</th><th>".gettext( "Package Size")."</th><th>".gettext("Installed Size")."</th></tr>\n";
+		    foreach my $a ( @archs ) {
+			$package_page .= "<tr>\n";
+			$package_page .=  "<th><a href=\"$ROOT/$suite/$encodedpkg/$a/download";
+			$package_page .=  "\">$a</a></th>\n";
+			$package_page .= "<td>";
+			if ( $suite ne "experimental" ) {
+			    $package_page .= sprintf( "[<a href=\"%s\">".gettext( "list of files" )."</a>]\n",
+						      "$ROOT/$suite/$encodedpkg/$a/filelist", $pkg );
+			} else {
+			    $package_page .= gettext( "no current information" );
+			}
+			$package_page .= "</td>\n<td align=right>"; #FIXME: css
+			$package_page .=  floor(($sizes_deb->{$a}/102.4)+0.5)/10 . "&nbsp;kB";
+			$package_page .= "</td>\n<td align=right>"; #FIXME: css
+			$package_page .=  $sizes_inst->{$a} . "&nbsp;kB";
+			$package_page .= "</td>\n</tr>";
+		    }
+		    $package_page .= "</table>\n";
+		    $package_page .= "</div> <!-- end pdownload -->\n";
+		    
+		    #
+		    # more information
+		    #
+		    $package_page .= pmoreinfo( name => $pkg, data => $page,
+						opts => \%opts,
+						env => \%FTP_SITES,
+						bugreports => 1, sourcedownload => 1,
+						changesandcopy => 1, maintainers => 1,
+						search => 1 );
+		} else { # unless $page->is_virtual
+		    $short_desc = gettext( "virtual package" );
+
+		    my %all_suites;
+		    foreach (@results, @non_results) {
+			my $a = $_->[1];
+			my $s = $_->[2];
+			if ($a =~ /^(?:us|security|non-US)$/o) {
+			    $all_suites{$s}++;
+			} else {
+			    $all_suites{"$s/$a"}++;
+			}
+		    }
+		    foreach (suites_sort(keys %all_suites)) {
+			if (("$suite/$archive" eq $_)
+			    || (!$all_suites{"$suite/$archive"} && ($suite eq $_))) {
+			    $package_page .= "[ <strong>$_</strong> ] ";
+			} else {
+			    $package_page .=
+				"[ <a href=\"$ROOT/$_/".uri_escape($pkg)."\">$_</a> ] ";
+			}
+		    }
+		    $package_page .= '<br>';
+		    $package_page .= simple_menu( [ gettext( "Distribution:" ),
+						    gettext( "Overview over this distribution" ),
+						    "$ROOT/",
+						    $suite ],
+						  [ gettext( "Section:" ),
+						    gettext( "All packages in this section" ),
+						    "$ROOT/$suite/virtual/",
 
-    read_entry_all( \%packages, $pkg, \@results, \@non_results, \%opts );
+						    'virtual' ], );
 
-    unless (@results || @non_results ) {
-	fatal_error( "No such package".
-		     "{insert link to search page with substring search}" );
+		    $package_page .= title( sprintf( gettext( "Virtual Package: %s" ),
+						     $pkg ) );
+
+		    my $policy_url = 'http://www.debian.org/doc/debian-policy/';
+		    note( sprintf( gettext( "This is a <em>virtual package</em>. See the <a href=\"%s\">Debian policy</a> for a <a href=\"%sch-binary.html#s-virtual_pkg\">definition of virtual packages</a>." ),
+				   $policy_url, $policy_url ));
+
+		    $package_page .= sprintf( "<h2>".gettext( "Packages providing %s" )."</h2>",                              $pkg );
+			  my $provided_by = $page->{provided_by};
+		    $package_page .= pkg_list( \%packages, \%opts, $provided_by, 'en');
+
+		} # else (unless $page->is_virtual)
+	    } # else (unless @results)
+	} # else (unless (@results || @non_results ))
     } else {
-	unless (@results) {
-	    fatal_error( "Package not available in this suite" );
+	read_src_entry_all( \%sources, $pkg, \@results, \@non_results, \%opts );
+
+	unless (@results || @non_results ) {
+	    fatal_error( "No such package".
+			 "{insert link to search page with substring search}" );
+	} else {
+	    unless (@results) {
+		fatal_error( "Package not available in this suite" );
+	    } else {
+		for my $entry (@results) {
+		    debug( join(":", @$entry), 1 );
+		    my (undef, $archive, undef, $section, $subsection,
+			$priority, $version) = @$entry;
+		    
+		    my $data = $sources_all{"$archive $suite $pkg"};
+		    $page->merge_data($pkg, $suite, $archive, $data) or debug( "Merging $pkg $version FAILED", 2 );
+		}
+		$version = $page->{version};
+
+		my $st1 = new Benchmark;
+		my $std = timediff($st1, $st0);
+		debug( "Data search and merging took ".timestr($std) );
+
+		my $encodedpkg = uri_escape( $pkg );
+		my ($v_str, $v_str_arr) = $page->get_version_string();
+		$archive = $page->get_newest( 'archive' );
+		$section = $page->get_newest( 'section' );
+		$subsection = $page->get_newest( 'subsection' );
+
+		my %all_suites;
+		foreach (@results, @non_results) {
+		    my $a = $_->[1];
+		    my $s = $_->[2];
+		    if ($a =~ /^(?:us|security|non-US)$/o) {
+			$all_suites{$s}++;
+		    } else {
+			$all_suites{"$s/$a"}++;
+		    }
+		}
+		foreach (suites_sort(keys %all_suites)) {
+		    if (("$suite/$archive" eq $_)
+			|| (!$all_suites{"$suite/$archive"} && ($suite eq $_))) {
+			$package_page .= "[ <strong>$_</strong> ] ";
+		    } else {
+			$package_page .=
+			    "[ <a href=\"$ROOT/$_/source/".uri_escape($pkg)."\">$_</a> ] ";
+		    }
+		}
+		$package_page .= '<br>';
+
+		$package_page .= simple_menu( [ gettext( "Distribution:" ),
+						gettext( "Overview over this suite" ),
+						"/$suite/",
+						$suite ],
+					      [ gettext( "Section:" ),
+						gettext( "All packages in this section" ),
+						"/$suite/$subsection/",
+						$subsection ],
+					      );
+
+		my $title .= sprintf( gettext( "Source Package: %s (%s)" ),
+				      $pkg, $v_str );
+		$title .=  " ".marker( $archive ) if $archive ne 'us';
+		$title .=  " ".marker( $subsection ) if $subsection eq 'non-US'
+		    and $archive ne 'non-US'; # non-US/security
+		$title .=  " ".marker( $section ) if $section ne 'main';
+		$package_page .= title( $title );
+		
+		if ($suite eq "experimental") {
+		    $package_page .= note( gettext( "Experimental package"),
+					   gettext( "Warning: This package is from the <span class=\"pred\">experimental</span> distribution. That means it is likely unstable or buggy, and it may even cause data loss. If you ignore this warning and install it nevertheless, you do it on your own risk.")."</p><p>".
+					   gettext( "Users of experimental packages are encouraged to contact the package maintainers directly in case of problems." )
+					   );
+		}
+		if ($subsection eq "debian-installer") {
+		    note( gettext( "debian-installer udeb package"),
+			  gettext( "Warning: This package is intended for the use in building <a href=\"http://www.debian.org/devel/debian-installer\">debian-installer</a> images only. Do not install it on a normal Debian system." )
+			  );
+		}
+
+		my $binaries = find_binaries( $pkg, $archive, $suite, \%src2bin );
+		if ($binaries && @$binaries) {
+		    $package_page .= '<div class="pdesc">';
+		    $package_page .= gettext( "The following binary packages are built from this source package:" );
+		    $package_page .= pkg_list( \%packages, \%opts, $binaries, 'en' );
+		    $package_page .= '</div> <!-- end pdesc -->';
+		}
+		
+		#
+		# display dependencies
+		#
+		my $dep_list;
+		$dep_list = print_src_deps( \%packages, \%opts, $pkg,
+					    $page->get_dep_field('build-depends'),
+					    'build-depends' );
+		$dep_list .= print_src_deps( \%packages, \%opts, $pkg,
+					     $page->get_dep_field('build-depends-indep'),
+					     'build-depends-indep' );
+
+		if ( $dep_list ) {
+		    $package_page .= "<div id=\"pdeps\">\n";
+		    $package_page .= sprintf( "<h2>".gettext( "Other Packages Related to %s" )."</h2>\n", $pkg );
+		    if ($suite eq "experimental") {
+			note( gettext( "Note that the \"<span class=\"pred\">experimental</span>\" distribution is not self-contained; missing dependencies are likely found in the \"<a href=\"/unstable/\">unstable</a>\" distribution." ) );
+		    }
+		    
+		    $package_page .= pdeplegend( [ 'adep',  gettext( 'build-depends' ) ],
+						 [ 'idep',  gettext( 'build-depends-indep' ) ],
+						 );
+		    
+		    $package_page .= $dep_list;
+		    $package_page .= "</div> <!-- end pdeps -->\n";
+		}
+
+		#
+		# Source package download
+		#
+		$package_page .= "<div id=\"pdownload\">\n";
+		my $encodedpack = uri_escape( $pkg );
+		$package_page .= sprintf( "<h2>".gettext( "Download %s" )."</h2>\n",
+					  $pkg ) ;
+
+		my $source_files = $page->get_src( 'files' );
+		my $source_dir = $page->get_src( 'directory' );
+
+		$package_page .= sprintf( "<table cellspacing=\"0\" cellpadding=\"2\" summary=\"Download information for the files of this source package\">\n"
+					  ."<tr><th>%s</th><th>%s</th><th>%s</th>",
+					  gettext("File"),
+					  gettext("Size (in kB)"),
+					  gettext("md5sum") );
+		foreach( @$source_files ) {
+		    my ($src_file_md5, $src_file_size, $src_file_name)
+			= split /\s+/, $_;
+		    my $src_url;
+		    for ($archive) {
+			/security/o &&  do {
+			    $src_url = $FTP_SITES{security}; last };
+			/volatile/o &&  do {
+			    $src_url = $FTP_SITES{volatile}; last };
+			/backports/o &&  do {
+			    $src_url = $FTP_SITES{backports}; last };
+			/non-us/io  &&  do {
+			    $src_url = $FTP_SITES{'non-US'}; last };
+			$src_url = $FTP_SITES{us};
+		    }
+		    $src_url .= "/$source_dir/$src_file_name";
+		    
+		    $package_page .= "<tr><td><a href=\"$src_url\">$src_file_name</a></td>\n"
+			."<td class=\"dotalign\">".sprintf("%.1f", (floor(($src_file_size/102.4)+0.5)/10))."</td>\n"
+			."<td>$src_file_md5</td></tr>";
+		}
+		$package_page .= "</table>\n";
+		$package_page .= "</div> <!-- end pdownload -->\n";
+
+		#
+		# more information
+		#
+		$package_page .= pmoreinfo( name => $pkg, data => $page,
+					    opts => \%opts,
+					    env => \%FTP_SITES,
+					    bugreports => 1,
+					    changesandcopy => 1, maintainers => 1,
+					    search => 1, is_source => 1 );
+	    }
 	}
     }
 }
 
-print Packages::HTML::header( title => "Details of package <em>$pkg</em> in $suite" ,
+use Data::Dumper;
+debug( "Final page object:\n".Dumper($page), 3 );
+
+my $title = $opts{source} ?
+    "Details of source package <em>$pkg</em> in $suite"  :
+    "Details of package <em>$pkg</em> in $suite" ;
+my $title_tag = $opts{source} ?
+    "Details of source package $pkg in $suite"  :
+    "Details of package $pkg in $suite" ;
+print Packages::HTML::header( title => $title ,
 			      lang => 'en',
+			      desc => $short_desc,
+			      keywords => "$suite, $archive, $section, $subsection, $version",
 			      title_tag => "Details of package $pkg in $suite",
-			      print_title_above => 1
 			      );
 
 print_errors();
 print_hints();
 print_msgs();
 print_debug();
+print_notes();
 
 unless (@Packages::CGI::fatal_errors) {
-
-my %all_suites = map { $_->[2] => 1 } (@results, @non_results);
-    foreach (suites_sort(keys %all_suites)) {
-	if ($suite eq $_) {
-	    print "<strong>$_</strong> | ";
-	} else {
-	    print "<a href=\"../$_/".uri_escape($pkg)."\">$_</a> | ";
-	}
-    }
-    print "<br>";
-    
-my $page = new Packages::Page( $pkg );
-
-    for my $entry (@results) {
-	print join ":", @$entry;
-	print "<br>\n";
-	my (undef, $archive, undef, $arch, $section, $subsection,
-	    $priority, $version) = @$entry;
-	print "<pre>".$packages_all{"$pkg $arch $version"}."</pre>";
-    }
-	
-# 	my %versions = $pkg->get_arch_versions( $env->{archs} );
-# 	my %subsuites   = $pkg->get_arch_fields( 'subdistribution', 
-# 						 $env->{archs} );
-# 	my %filenames   = $pkg->get_arch_fields( 'filename',
-# 						 $env->{archs} );
-# 	my %file_md5s   = $pkg->get_arch_fields( 'md5sum',
-# 						 $env->{archs} );
-	
-# 	my $subsuite_kw = $d->{subsuite} || $env->{distribution};
-# 	my $size_kw = exists $d->{sizes_deb}{i386} ? $d->{sizes_deb}{i386} : first_val($d->{sizes_deb});
-	
-	
-# 	foreach my $lang (@{$env->{langs}}) {
-# 	    &Generated::Strings::string_lang($lang);
-	    
-# 	    my $dirname = "$env->{dest_dir}/$d->{subsection}";
-# 	    my $filename = "$dirname/$name.$lang.html";
-	    
-# 	    unless (( $lang eq 'en' ) 
-# 		    || $env->{db}->is_translated( $name, $d->{version},
-# 						  ${$versions{v2a}{$d->{version}}}[0],
-# 						  $lang )) {
-# 		next;
-# 	    }
-# 	    progress() if $env->{opts}{progress};
-	    
-# 	    #
-# 	    # process description
-# 	    #
-# 	    my $short_desc = encode_entities( $env->{db}->get_short_desc( $d->{desc_md5},
-# 									  $lang ), "<>&\"" );
-# 	    my $long_desc = encode_entities( $env->{db}->get_long_desc( $d->{desc_md5},
-# 									$lang ), "<>&\"" );
-	    
-# 	    $long_desc =~ s,((ftp|http|https)://[\S~-]+?/?)((\&gt\;)?[)]?[']?[:.\,]?(\s|$)),<a href=\"$1\">$1</a>$3,go; # syntax highlighting -> '];
-# 	    $long_desc =~ s/\A //o;
-# 	    $long_desc =~ s/\n /\n/sgo;
-# 	    $long_desc =~ s/\n.\n/\n<p>\n/go;
-# 	    $long_desc =~ s/(((\n|\A) [^\n]*)+)/\n<pre>$1\n<\/pre>/sgo;
-	    
-# 	    $long_desc = conv_desc( $lang, $long_desc );
-# 	    $short_desc = conv_desc( $lang, $short_desc );
-	    
-# 	    #
-# 	    # begin output
-# 	    #
-# 	    my $package_page = header( title => $name, lang => $lang,
-# 				       desc => $short_desc,
-# 				       keywords => "$env->{distribution}, $subsuite_kw, $d->{section}, $d->{subsection}, size:$size_kw $d->{version}" );
-# 	    $package_page .= simple_menu( [ gettext( "Distribution:" ),
-# 					    gettext( "Overview over this distribution" ),
-# 					    "../",
-# 					    $env->{distribution} ],
-# 					  [ gettext( "Section:" ),
-# 					    gettext( "All packages in this section" ),
-# 					    "../$d->{subsection}/",
-# 					    $d->{subsection} ],
-# 					  );
-	    
-# 	    my $title .= sprintf( gettext( "Package: %s (%s)" ), $name, $d->{v_str_simple} );
-# 	    $title .=  " ".marker( $d->{subsuite} ) if $d->{subsuite};
-# 	    $title .=  " ".marker( $d->{section} ) if $d->{section} ne 'main';
-# 	    $package_page .= title( $title );
-	    
-# 	    $package_page .= "<h2>".gettext( "Versions:" )." $d->{v_str_arch}</h2>\n" 
-# 		unless $d->{version} eq $d->{v_str_simple};
-	    
-# 	    if ($env->{distribution} eq "experimental") {
-# 		$package_page .= note( gettext( "Experimental package"),
-# 				       gettext( "Warning: This package is from the <span class=\"pred\">experimental</span> distribution. That means it is likely unstable or buggy, and it may even cause data loss. If you ignore this warning and install it nevertheless, you do it on your own risk.")."</p><p>".
-# 				       gettext( "Users of experimental packages are encouraged to contact the package maintainers directly in case of problems." )
-# 				       );
-# 	    }
-# 	    if ($d->{section} eq "debian-installer") {
-# 		$package_page .= note( gettext( "debian-installer udeb package"),
-# 				       gettext( "Warning: This package is intended for the use in building <a href=\"http://www.debian.org/devel/debian-installer\">debian-installer</a> images only. Do not install it on a normal Debian system." )
-# 				       );
-# 	    }
-# 	    $package_page .= pdesc( $short_desc, $long_desc );
-	    
-# 	    #
-# 	    # display dependencies
-# 	    #
-# 	    my $dep_list = print_deps( $env, $lang, $pkg, $d->{depends},    'depends' );
-# 	    $dep_list   .= print_deps( $env, $lang, $pkg, $d->{recommends}, 'recommends' );
-# 	    $dep_list   .= print_deps( $env, $lang, $pkg, $d->{suggests},   'suggests' );
-	    
-# 	    if ( $dep_list ) {
-# 		$package_page .= "<div id=\"pdeps\">\n";
-# 		$package_page .= sprintf( "<h2>".gettext( "Other Packages Related to %s" )."</h2>\n", $name );
-# 		if ($env->{distribution} eq "experimental") {
-# 		    $package_page .= note( gettext( "Note that the \"<span class=\"pred\">experimental</span>\" distribution is not self-contained; missing dependencies are likely found in the \"<a href=\"../../unstable/\">unstable</a>\" distribution." ) );
-# 		}
-		
-# 		$package_page .= pdeplegend( [ 'dep',  gettext( 'depends' ) ],
-# 					     [ 'rec',  gettext( 'recommends' ) ],
-# 					     [ 'sug',  gettext( 'suggests' ) ], );
-		
-# 		$package_page .= $dep_list;
-# 		$package_page .= "</div> <!-- end pdeps -->\n";
-# 	    }
-	    
-# 	    #
-# 	    # Download package
-# 	    #
-# 	    my $encodedpack = uri_escape( $name );
-# 	    $package_page .= "<div id=\"pdownload\">";
-# 	    $package_page .= sprintf( "<h2>".gettext( "Download %s\n" )."</h2>",
-# 				      $name ) ;
-# 	    $package_page .= "<table border=\"1\" summary=\"".gettext("The download table links to the download of the package and a file overview. In addition it gives information about the package size and the installed size.")."\">\n";
-# 	    $package_page .= "<caption class=\"hidecss\">".gettext("Download for all available architectures")."</caption>\n";
-# 	    $package_page .= "<tr>\n";
-# 	    $package_page .= "<th>".gettext("Architecture")."</th><th>".gettext("Files")."</th><th>".gettext( "Package Size")."</th><th>".gettext("Installed Size")."</th></tr>\n";
-# 	    foreach my $a ( @all_archs ) {
-# 		if ( exists $versions{a2v}{$a} ) {
-# 		    $package_page .= "<tr>\n";
-# 		    $package_page .=  "<th><a href=\"$DL_URL?arch=$a";
-# 		    # \&amp\;file=\" method=\"post\">\n<p>";
-# 		    $package_page .=  "&amp;file=".uri_escape($filenames{a2f}->{$a});
-# 		    $package_page .=  "&amp;md5sum=$file_md5s{a2f}->{$a}";
-# 		    $package_page .=  "&amp;arch=$a";
-# 		    # there was at least one package with two
-# 		    # different source packages on different
-# 		    # archs where one had a security update
-# 		    # and the other one not
-# 		    if ($subsuites{a2f}{$a}
-# 			&& ($subsuites{a2f}{$a} =~ /security/o) ) {
-# 			$package_page .=  "&amp;type=security";
-# 		    } elsif ($subsuites{a2f}{$a}
-# 			     && ($subsuites{a2f}{$a} =~ /volatile/o) ) {
-# 			$package_page .=  "&amp;type=volatile";
-# 		    } elsif ($d->{is_nonus}) {
-# 			$package_page .=  "&amp;type=nonus";
-# 		    } else {
-# 			$package_page .=  "&amp;type=main";
-# 		    }
-# 		    $package_page .=  "\">$a</a></th>\n";
-# 		    $package_page .= "<td>";
-# 		    if ( $env->{distribution} ne "experimental" ) {
-# 			$package_page .= sprintf( "[<a href=\"%s\">".gettext( "list of files" )."</a>]\n", "$FILELIST_URL$encodedpack&amp;version=$env->{distribution}&amp;arch=$a", $name );
-# 		    } else {
-# 			$package_page .= "no files";
-# 		    }
-# 		    $package_page .= "</td>\n<td>";
-# 		    my $size = $d->{sizes_deb}{$a};
-# 		    $package_page .=  "$size";
-# 		    $package_page .= "</td>\n<td>";
-# 		    my $inst_size = $d->{sizes_inst}{$a};
-# 		    $package_page .=  "$inst_size";
-# 		    $package_page .= "</td>\n</tr>";
-# 		}
-# 	    }
-# 	    $package_page .= "</table><p>".gettext ( "Size is measured in kBytes." )."</p>\n";
-# 	    $package_page .= "</div> <!-- end pdownload -->\n";
-	    
-# 	    #
-# 	    # more information
-# 	    #
-# 	    $package_page .= pmoreinfo( name => $name, env => $env, data => $d,
-# 					bugreports => 1, sourcedownload => 1,
-# 					changesandcopy => 1, maintainers => 1,
-# 					search => 1 );
-	    
-# 	    #
-# 	    # Trailer
-# 	    #
-# 	    my @tr_langs = ();
-# 	    foreach my $l (@{$env->{langs}}) {
-# 		next if $l eq $lang;
-# 		push @tr_langs, $l if ( $l eq 'en' ) 
-# 		    || $env->{db}->is_translated( $name, $d->{version}, 
-# 						  ${$versions{v2a}{$d->{version}}}[0],
-# 						  $l );
-# 	    }
-# 	    $package_page .= trailer( '../..', $name, $lang, @tr_langs );
-# 	}
-#     }
+    print $package_page;
 }
 my $tet1 = new Benchmark;
 my $tetd = timediff($tet1, $tet0);