\n/go; - $long_desc =~ s/(((\n|\A) [^\n]*)+)/\n
$1\n<\/pre>/sgo;
+ sub process_description {
+ my ($desc) = @_;
- $contents{desc} = { short => $short_desc,
- long => $long_desc, };
+ my $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;
+
+ return ($short_desc, $long_desc);
+ }
+
+ my $desc = $descriptions{$did};
+ my $long_desc;
+ ($short_desc, $long_desc) = process_description($desc);
+
+ $contents{desc}{en} = { short => $short_desc,
+ long => $long_desc, };
+
+ debug( "desc_md5=$desc_md5", 2)
+ if DEBUG;
+ my $trans_desc = $desctrans{$desc_md5};
+ if ($trans_desc) {
+ my %trans_desc = split /\000|\001/, $trans_desc;
+ $contents{used_langs} = ['en', sort keys %trans_desc];
+ debug( "TRANSLATIONS: ".join(" ",keys %trans_desc), 2)
+ if DEBUG;
+ while (my ($l, $d) = each %trans_desc) {
+ my ($short_t, $long_t) = process_description($d);
+
+ $contents{desc}{$l} = { short => $short_t,
+ long => $long_t, };
+ }
+ }
my $v_str = $version;
my $multiple_versions = grep { $_ ne $version } values %$versions;
$v_str .= _g(" and others") if $multiple_versions;
$contents{versions} = { short => $v_str,
- multiple => $multiple_versions };
+ multiple => $multiple_versions };
my $provided_by = $page->{provided_by};
$contents{providers} = [];
@@ -161,13 +203,16 @@ sub do_show {
#
# display dependencies
#
- build_deps( \%packages, $opts, $pkg,
+ build_deps( \%packages, $opts, $pkg,
+ $page->get_dep_field('pre-depends'),
+ 'depends', \%contents );
+ build_deps( \%packages, $opts, $pkg,
$page->get_dep_field('depends'),
'depends', \%contents );
- build_deps( \%packages, $opts, $pkg,
+ build_deps( \%packages, $opts, $pkg,
$page->get_dep_field('recommends'),
'recommends', \%contents );
- build_deps( \%packages, $opts, $pkg,
+ build_deps( \%packages, $opts, $pkg,
$page->get_dep_field('suggests'),
'suggests', \%contents );
@@ -181,6 +226,7 @@ sub do_show {
instsize => $sizes_inst->{$a}, );
$d{version} = $versions->{$a} if $multiple_versions;
+ $d{archive} = $archives->{$a};
if ( ($suite ne "experimental")
&& ($subsection ne 'debian-installer')) {
$d{contents_avail} = 1;
@@ -188,7 +234,7 @@ sub do_show {
push @downloads, \%d;
}
$contents{downloads} = \@downloads;
-
+
#
# more information
#
@@ -203,10 +249,6 @@ sub do_show {
$contents{desc}{short} = _g( "virtual package" );
$contents{subsection} = 'virtual';
- my $policy_url = 'http://www.debian.org/doc/debian-policy/';
- note( sprintf( _g( 'This is a virtual package. See the Debian policy for a definition of virtual packages.' ),
- $policy_url, $policy_url ));
-
my $provided_by = $page->{provided_by};
$contents{providers} = [];
pkg_list( \%packages, $opts, $provided_by, 'en', $contents{providers} );
@@ -219,7 +261,7 @@ sub do_show {
debug( join(":", @$entry), 1 ) if DEBUG;
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 ) if DEBUG;
@@ -237,13 +279,13 @@ sub do_show {
$contents{section} = $section;
$subsection = $page->get_newest( 'subsection' );
$contents{subsection} = $subsection;
-
+
my $binaries = find_binaries( $pkg, $archive, $suite, \%src2bin );
if ($binaries && @$binaries) {
$contents{binaries} = [];
pkg_list( \%packages, $opts, $binaries, 'en', $contents{binaries} );
}
-
+
#
# display dependencies
#
@@ -259,16 +301,15 @@ sub do_show {
#
my $source_files = $page->get_src( 'files' );
my $source_dir = $page->get_src( 'directory' );
-
+
$contents{srcfiles} = [];
foreach( @$source_files ) {
my ($src_file_md5, $src_file_size, $src_file_name)
= split /\s+/, $_;
- (my $server = lc $archive) =~ s/-//go; # non-US hack
- $server = $FTP_SITES{$server}
+ my $server = $FTP_SITES{lc $archive}
|| $FTP_SITES{us};
my $path = "/$source_dir/$src_file_name";
-
+
push @{$contents{srcfiles}}, { server => $server, path => $path, filename => $src_file_name,
size => sprintf("%.1f", (floor(($src_file_size/102.4)+0.5)/10)),
md5sum => $src_file_md5 };
@@ -283,7 +324,7 @@ sub do_show {
bugreports => 1,
changesandcopy => 1, maintainers => 1,
search => 1, is_source => 1 );
-
+
} # else (unless $opts->{source})
} # else (unless @results)
} # else (unless (@results || @non_results ))
@@ -318,17 +359,10 @@ sub moreinfo {
if (defined($files) and @$files) {
foreach( @$files ) {
my ($src_file_md5, $src_file_size, $src_file_name) = split /\s/o, $_;
- my ($name, $server, $path);
- # non-US hack
- ($server = lc $page->get_newest('archive')) =~ s/-//go;
- $server = $env->{$server}||$env->{us};
- $path = "$src_dir/$src_file_name";
- if ($src_file_name =~ /dsc$/) {
- $name = 'dsc'
- } else {
- $name = $src_file_name;
- }
- push @downloads, { name => $name, server => $server, path => $path };
+ my ($server, $path);
+ $server = $env->{lc $page->get_newest('archive')}||$env->{us};
+ $path = "/$src_dir/$src_file_name";
+ push @downloads, { name => $src_file_name, server => $server, path => $path };
}
}
$contents->{src}{downloads} = \@downloads;
@@ -339,7 +373,6 @@ sub moreinfo {
(my $src_basename = $source_version) =~ s,^\d+:,,; # strip epoche
$src_basename = "${source}_$src_basename";
$src_dir =~ s,pool/updates,pool,o;
- $src_dir =~ s,pool/non-US,pool,o;
$contents->{files}{changelog}{path} = "$src_dir/$src_basename/changelog";
$contents->{files}{copyright}{path} = "$src_dir/$src_basename/".( $is_source ? 'copyright' : "$name.copyright" );