From 11fd4b5f87f668eeb33922c6f64823e40828d137 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Sat, 8 Sep 2007 11:16:51 +0200 Subject: [PATCH] Remove non-US support At this point I see no reason to keep all these hacks around. --- bin/create_index_pages | 2 -- bin/newpkg_info | 2 +- bin/parse-packages | 2 -- bin/parse-sources | 2 -- cgi-bin/index.html | 1 - config.sh.sed.in | 1 - lib/Packages/Dispatcher.pm | 2 -- lib/Packages/DoSearch.pm | 2 +- lib/Packages/DoShow.pm | 8 ++---- lib/Packages/Sections.pm | 2 -- templates/config/mirrors.tmpl | 47 ----------------------------------- templates/html/show.tmpl | 1 - 12 files changed, 4 insertions(+), 68 deletions(-) diff --git a/bin/create_index_pages b/bin/create_index_pages index 2c62033..30962ea 100755 --- a/bin/create_index_pages +++ b/bin/create_index_pages @@ -44,8 +44,6 @@ tie my %src2bin, 'DB_File', "$DBDIR/sources_packages.db", my $sections = retrieve "$DBDIR/sections.info"; my $subsections = retrieve "$DBDIR/subsections.info"; -# work around problems with non-US security updates -$subsections->{oldstable}{us}{'non-US'}++; my $priorities = retrieve "$DBDIR/priorities.info"; #use Data::Dumper; diff --git a/bin/newpkg_info b/bin/newpkg_info index 700a079..37b7290 100755 --- a/bin/newpkg_info +++ b/bin/newpkg_info @@ -62,7 +62,7 @@ for (my $age = 0; $age < 7; $age++) { $changes{$_} = -1; } - my %archives = map { $_ => 1 } qw( us security non-US ); + my %archives = map { $_ => 1 } qw( us security ); foreach (sort keys %changes) { my $entry = []; if ($changes{$_} == 1) { diff --git a/bin/parse-packages b/bin/parse-packages index 11e0ef0..64c690d 100755 --- a/bin/parse-packages +++ b/bin/parse-packages @@ -149,8 +149,6 @@ for my $suite (@SUITES) { my $subsection = $data{section} || '-'; if ($data{section} && ($data{section} =~ m=/=o)) { ($section, $subsection) = split m=/=o, $data{section}, 2; - ($subsection, $section) = split m=/=o, $data{section}, 2 - if $section eq 'non-US'; } $data{'section'} = $section; $data{'subsection'} = $subsection; diff --git a/bin/parse-sources b/bin/parse-sources index 8ec35db..5a9073a 100755 --- a/bin/parse-sources +++ b/bin/parse-sources @@ -77,8 +77,6 @@ for my $archive (@ARCHIVES) { my $subsection = $data{section} || '-'; if ($data{section} && ($data{section} =~ m=/=o)) { ($section, $subsection) = split m=/=o, $data{section}, 2; - ($subsection, $section) = split m=/=o, $data{section}, 2 - if $section eq 'non-US'; } $data{'section'} = $section; $data{'subsection'} = $subsection; diff --git a/cgi-bin/index.html b/cgi-bin/index.html index 16e0ddd..e4084a3 100644 --- a/cgi-bin/index.html +++ b/cgi-bin/index.html @@ -30,7 +30,6 @@ Section: - diff --git a/config.sh.sed.in b/config.sh.sed.in index 361bf70..aecefa9 100644 --- a/config.sh.sed.in +++ b/config.sh.sed.in @@ -26,7 +26,6 @@ localdir=/org/ftp.debian.org/debian #ftproot=/org/ftp.root ftpsite=http://ftp.de.debian.org/debian -nonus_ftpsite=http://ftp.uk.debian.org/debian-non-US security_ftpsite=http://security.debian.org/debian-security volatile_ftpsite=http://volatile.debian.org/debian-volatile backports_ftpsite=http://backports.org/debian diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm index 4c3c31f..aad1d57 100755 --- a/lib/Packages/Dispatcher.pm +++ b/lib/Packages/Dispatcher.pm @@ -205,8 +205,6 @@ sub do_dispatch { set_param_once( $input, \%params_set, 'archive', $_); } elsif (!$need_pkg && $sections_descs{$_}) { set_param_once( $input, \%params_set, 'subsection', $_); - } elsif (!$need_pkg && ($_ eq 'non-us')) { # non-US hack - set_param_once( $input, \%params_set, 'subsection', 'non-US'); } elsif (!$need_pkg && ($_ eq 'source')) { set_param_once( $input, \%params_set, 'source', 1); } elsif ($ARCHITECTURES{$_}) { diff --git a/lib/Packages/DoSearch.pm b/lib/Packages/DoSearch.pm index 5f91d24..c1b6dfd 100644 --- a/lib/Packages/DoSearch.pm +++ b/lib/Packages/DoSearch.pm @@ -123,7 +123,7 @@ sub do_search { $version) = @$_; my $real_archive = ''; - if ($archive =~ /^(security|non-US)$/) { + if ($archive eq 'security') { $real_archive = $archive; $archive = 'us'; } diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm index 1f8a017..30158c5 100644 --- a/lib/Packages/DoShow.pm +++ b/lib/Packages/DoShow.pm @@ -306,8 +306,7 @@ sub do_show { 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"; @@ -361,9 +360,7 @@ sub moreinfo { foreach( @$files ) { my ($src_file_md5, $src_file_size, $src_file_name) = split /\s/o, $_; my ($server, $path); - # non-US hack - ($server = lc $page->get_newest('archive')) =~ s/-//go; - $server = $env->{$server}||$env->{us}; + $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 }; } @@ -376,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" ); diff --git a/lib/Packages/Sections.pm b/lib/Packages/Sections.pm index 32eb2b0..2e4fd11 100644 --- a/lib/Packages/Sections.pm +++ b/lib/Packages/Sections.pm @@ -51,8 +51,6 @@ our %sections_descs = ( N_("Daemons and clients to connect your Debian GNU/Linux system to the world.") ], news => [ N_("Newsgroups"), N_("Software to access Usenet, to set up news servers, etc.") ], - 'non-US' => [ N_("Software restricted in the U.S."), - N_("These packages probably may not be used in or distributed from the U.S. due to software patents. You should check the regulations in your country before using this software.") ], oldlibs => [ N_("Old Libraries"), N_("Old versions of libraries, kept for backward compatibility with old applications.") ], otherosfs => [ N_("Other OS\'s and file systems"), diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl index e81627b..d80342d 100644 --- a/templates/config/mirrors.tmpl +++ b/templates/config/mirrors.tmpl @@ -169,53 +169,6 @@ mirrors = { "ftp.citkit.ru/pub/HURD/debian", ], }, - - nonus => { - mirror_list => 'http://www.debian.org/mirror/list-non-US', - north_america => [ -# "ftp.ca.debian.org/debian-non-US", - "debian.yorku.ca/debian/non-US", - "mirror.direct.ca/linux/debian-non-US", - ], - europa => [ - "non-us.debian.org/debian-non-US", - "ftp.de.debian.org/debian-non-US", - "ftp.at.debian.org/debian-non-US", - "ftp.bg.debian.org/debian-non-US", - "ftp.cz.debian.org/debian-non-US", - "ftp.fi.debian.org/debian-non-US", - "ftp.fr.debian.org/debian-non-US", - "ftp.hr.debian.org/debian-non-US", - "ftp.hu.debian.org/debian-non-US", - "ftp.ie.debian.org/debian-non-US", - "ftp.is.debian.org/debian-non-US", - "ftp.it.debian.org/debian-non-US", - "ftp.nl.debian.org/debian-non-US", - "ftp.no.debian.org/debian-non-US", - "ftp.pl.debian.org/debian/non-US", - "ftp.si.debian.org/debian-non-US", - "ftp.es.debian.org/debian-non-US", - "ftp.se.debian.org/debian-non-US", - "ftp.tr.debian.org/debian-non-US", - "ftp.uk.debian.org/debian/non-US", - ], - australia => [ - "ftp.au.debian.org/debian-non-US", - "ftp.wa.au.debian.org/debian-non-US", - "ftp.nz.debian.org/debian-non-US", - ], - asia => [ - "ftp.jp.debian.org/debian-non-US", -# "ftp.kr.debian.org/debian-non-US", - "linux.csie.nctu.edu.tw/debian-non-US", - "debian.linux.org.tw/debian-non-US", - "linux.cdpa.nsysu.edu.tw/debian-non-US", - ], - south_america => [ - "ftp.br.debian.org/debian-non-US", - "ftp.cl.debian.org/debian-non-US", - ], - }, } ports_url = 'http://www.debian.org/ports/' diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl index a9ef338..7107d53 100644 --- a/templates/html/show.tmpl +++ b/templates/html/show.tmpl @@ -45,7 +45,6 @@

Package: [% pkg %] ([% versions.short %]) [% END %] [%- PROCESS marker text=archive IF archive && archive != main_archive %] -[%- PROCESS marker text=subsection IF subsection == 'non-US' and archive != 'non-US' %] [%- PROCESS marker text=section IF section && section != main_section %] [%- PROCESS marker text='essential' IF page.get_newest('essential') == 'yes' %]

-- 2.39.2