X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=cgi-bin%2Fshow_package.pl;h=53d0f7be63c670c56bc15a8135d00cfeae20ba4b;hp=34613995fb1a695a271ee09c75b3aec9d9490dac;hb=5ca21f1ba07a6b559395bec8d6bc1e528eb238d1;hpb=91edc66c5f872b41114dc61bdefc6d89c205a183;ds=sidebyside diff --git a/cgi-bin/show_package.pl b/cgi-bin/show_package.pl index 3461399..53d0f7b 100755 --- a/cgi-bin/show_package.pl +++ b/cgi-bin/show_package.pl @@ -22,9 +22,11 @@ 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::Search qw( :all ); -use Packages::HTML (); +use Packages::HTML; use Packages::Page (); &Packages::CGI::reset; @@ -48,37 +50,9 @@ $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 () { - 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( '../' ); if (my $path = $input->param('path')) { my @components = map { lc $_ } split /\//, $path; @@ -91,32 +65,36 @@ 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', $_); + } } } -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)] } }, + 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 } ); 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') { @@ -125,27 +103,46 @@ if ($format eq 'html') { 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, %packages_all, %sources_all, %descriptions); my (@results, @non_results); +my $page = 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]; + 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: $!"; 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", + tie %descriptions, 'DB_File', "$DBDIR/descriptions.db", O_RDONLY, 0666, $DB_BTREE - or die "couldn't tie DB $DBDIR/packages_all_$suite.db: $!"; + or die "couldn't tie DB $DBDIR/descriptions.db: $!"; + debug( "tied databases ($dbmodtime > $db_read_time)" ); $db_read_time = $dbmodtime; } @@ -158,220 +155,226 @@ unless (@Packages::CGI::fatal_errors) { } 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) = @$entry; + + my $data = $packages_all{"$pkg $arch $version"}; + $page->merge_data($pkg, $version, $arch, $data) or debug( "Merging $pkg $arch $version FAILED", 2 ); + } + + $version = $page->{newest}; + my $source = $page->get_newest( 'source' ); + my $source_version = $page->get_newest( 'source-version' ) + || $version; + my $src_data = $sources_all{"$source $source_version"}; + unless ($src_data) { #fucking binNMUs + my $versions = $page->get_versions; + my $sources = $page->get_arch_field( 'source' ); + my $source_versions = $page->get_arch_field( 'source-version' ); + foreach (version_sort keys %$versions) { + $source = $sources->{$versions->{$_}[0]}; + $source = $source_versions->{$versions->{$_}[0]} + || $version; + $src_data = $sources_all{"$source $source_version"}; + last if $src_data; + } + error( "couldn't find source package" ) unless $src_data; + } + $page->add_src_data( $source, $source_version, $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' ); + $archive = $page->get_newest( 'archive' ); + $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~-]+?/?)((\>\;)?[)]?[']?[:.\,]?(\s|$)),$1$3,go; # syntax highlighting -> ']; + $long_desc =~ s/\A //o; + $long_desc =~ s/\n /\n/sgo; + $long_desc =~ s/\n.\n/\n

\n/go; + $long_desc =~ s/(((\n|\A) [^\n]*)+)/\n

$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)$/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 .= "[ $_ ] ";
+		} else {
+		    $package_page .=
+			"[ $_ ] ";
+		}
+	    }
+	    $package_page .= '
'; + + $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( "Package: %s (%s)" ), $pkg, $v_str ); + $title .= " ".marker( $archive ) if $archive ne 'us'; + $title .= " ".marker( $section ) if $section ne 'main'; + $package_page .= title( $title ); + + $package_page .= "

".gettext( "Versions:" )." $v_str_arch

\n" + unless $version eq $v_str; + + if ($suite eq "experimental") { + $package_page .= note( gettext( "Experimental package"), + gettext( "Warning: This package is from the experimental 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.")."

". + 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 debian-installer 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 .= "

\n"; + $package_page .= sprintf( "

".gettext( "Other Packages Related to %s" )."

\n", $pkg ); + if ($suite eq "experimental") { + note( gettext( "Note that the \"experimental\" distribution is not self-contained; missing dependencies are likely found in the \"unstable\" distribution." ) ); + } + + $package_page .= pdeplegend( [ 'dep', gettext( 'depends' ) ], + [ 'rec', gettext( 'recommends' ) ], + [ 'sug', gettext( 'suggests' ) ], ); + + $package_page .= $dep_list; + $package_page .= "
\n"; + } + + # + # Download package + # + my $encodedpack = uri_escape( $pkg ); + $package_page .= "
"; + $package_page .= sprintf( "

".gettext( "Download %s\n" )."

", + $pkg ) ; + $package_page .= "\n"; + $package_page .= "\n"; + $package_page .= "\n"; + $package_page .= "\n"; + foreach my $a ( @archs ) { + $package_page .= "\n"; + $package_page .= "\n"; + $package_page .= "\n\n\n"; + } + $package_page .= "
".gettext("Download for all available architectures")."
".gettext("Architecture")."".gettext("Files")."".gettext( "Package Size")."".gettext("Installed Size")."
{$a}); + $package_page .= "&md5sum=$file_md5sums->{$a}"; + $package_page .= "&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 + for ($archives->{$a}) { + /security/o && do { + $package_page .= "&type=security"; last }; + /volatile/o && do { + $package_page .= "&type=volatile"; last }; + /non-us/io && do { + $package_page .= "&type=nonus"; last }; + $package_page .= "&type=main"; + } + $package_page .= "\">$a"; + if ( $suite ne "experimental" ) { + $package_page .= sprintf( "[".gettext( "list of files" )."]\n", "$FILELIST_URL$encodedpkg&version=$suite&arch=$a", $pkg ); + } else { + $package_page .= gettext( "no current information" ); + } + $package_page .= ""; + $package_page .= floor(($sizes_deb->{$a}/102.4)+0.5)/10; + $package_page .= ""; + $package_page .= $sizes_inst->{$a}; + $package_page .= "

".gettext ( "Size is measured in kBytes." )."

\n"; + $package_page .= "
\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 ); } } } +use Data::Dumper; +debug( "Final page object:\n".Dumper($page), 3 ); + print Packages::HTML::header( title => "Details of package $pkg in $suite" , 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 "$_ | "; - } else { - print "$_ | "; - } - } - print "
"; - -my $page = new Packages::Page( $pkg ); - - for my $entry (@results) { - print join ":", @$entry; - print "
\n"; - my (undef, $archive, undef, $arch, $section, $subsection, - $priority, $version) = @$entry; - print "
".$packages_all{"$pkg $arch $version"}."
"; - } - -# 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~-]+?/?)((\>\;)?[)]?[']?[:.\,]?(\s|$)),$1$3,go; # syntax highlighting -> ']; -# $long_desc =~ s/\A //o; -# $long_desc =~ s/\n /\n/sgo; -# $long_desc =~ s/\n.\n/\n

\n/go; -# $long_desc =~ s/(((\n|\A) [^\n]*)+)/\n

$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 .= "

".gettext( "Versions:" )." $d->{v_str_arch}

\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 experimental 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.")."

". -# 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 debian-installer 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 .= "

\n"; -# $package_page .= sprintf( "

".gettext( "Other Packages Related to %s" )."

\n", $name ); -# if ($env->{distribution} eq "experimental") { -# $package_page .= note( gettext( "Note that the \"experimental\" distribution is not self-contained; missing dependencies are likely found in the \"unstable\" distribution." ) ); -# } - -# $package_page .= pdeplegend( [ 'dep', gettext( 'depends' ) ], -# [ 'rec', gettext( 'recommends' ) ], -# [ 'sug', gettext( 'suggests' ) ], ); - -# $package_page .= $dep_list; -# $package_page .= "
\n"; -# } - -# # -# # Download package -# # -# my $encodedpack = uri_escape( $name ); -# $package_page .= "
"; -# $package_page .= sprintf( "

".gettext( "Download %s\n" )."

", -# $name ) ; -# $package_page .= "\n"; -# $package_page .= "\n"; -# $package_page .= "\n"; -# $package_page .= "\n"; -# foreach my $a ( @all_archs ) { -# if ( exists $versions{a2v}{$a} ) { -# $package_page .= "\n"; -# $package_page .= "\n"; -# $package_page .= "\n\n\n"; -# } -# } -# $package_page .= "
".gettext("Download for all available architectures")."
".gettext("Architecture")."".gettext("Files")."".gettext( "Package Size")."".gettext("Installed Size")."
\n

"; -# $package_page .= "&file=".uri_escape($filenames{a2f}->{$a}); -# $package_page .= "&md5sum=$file_md5s{a2f}->{$a}"; -# $package_page .= "&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 .= "&type=security"; -# } elsif ($subsuites{a2f}{$a} -# && ($subsuites{a2f}{$a} =~ /volatile/o) ) { -# $package_page .= "&type=volatile"; -# } elsif ($d->{is_nonus}) { -# $package_page .= "&type=nonus"; -# } else { -# $package_page .= "&type=main"; -# } -# $package_page .= "\">$a

"; -# if ( $env->{distribution} ne "experimental" ) { -# $package_page .= sprintf( "[".gettext( "list of files" )."]\n", "$FILELIST_URL$encodedpack&version=$env->{distribution}&arch=$a", $name ); -# } else { -# $package_page .= "no files"; -# } -# $package_page .= ""; -# my $size = $d->{sizes_deb}{$a}; -# $package_page .= "$size"; -# $package_page .= ""; -# my $inst_size = $d->{sizes_inst}{$a}; -# $package_page .= "$inst_size"; -# $package_page .= "

".gettext ( "Size is measured in kBytes." )."

\n"; -# $package_page .= "
\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);