Merge commit 'origin/master' into debian-master

diff --git a/bin/create_index_pages b/bin/create_index_pages
index 2c62033ddce7a22d6a3155b906ad7b99ce214904..30962ea8653bef1dc4ab969ca8c77ad5b14bc5c9 100755 (executable)
--- 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/extract_files b/bin/extract_files
index c129153c7b26674e409cb8df21e478de5e52bff7..d6da82c966aeb207cfcd3ad70113a503c0e86782 100755 (executable)
--- a/bin/extract_files
+++ b/bin/extract_files
@@ -134,26 +134,20 @@ sub add_log {
 # PACKAGE HANDLING (UNPACKING/CLEANUP)
 
 sub unpack_srcpkg {
-    my ( $dscname, $log ) = @_;
+    my ( $pkgname, $dscname, $log ) = @_;
 
     chdir( $TEMPDIR ) or do_error( "couldn't change working directory to $TEMPDIR" );
 
-    add_log( $log, "dpkg-source -sn -x $dscname"  );
+    add_log( $log, "dpkg-source -sn -x $dscname $pkgname+source"  );
 
-    my $out = qx/dpkg-source -sn -x "$dscname" 2>&1/;
-    my ($dir) = ($out =~ /(\S+)$/mo);
-
-    add_log( $log, "dpkg-source output: ", $out );
-
-#Bug#246802
-#    system("dpkg-source", "-x", $dscname ) == 0
-#      or do {
-#          do_warning( "couldn't unpack $dscname" );
-#          add_log( $log, "couldn't unpack $dscname" );
-#          return;
-#      };
+    system("dpkg-source", "-sn", "-x", $dscname, "$pkgname+source" ) == 0
+       or do {
+           do_warning( "couldn't unpack $dscname: $!" );
+           add_log( $log, "couldn't unpack $dscname: $!" );
+           return;
+       };
 
-    return $dir;
+    return "$pkgname+source";
 }
 
 sub unpack_binpkg {
@@ -409,7 +403,7 @@ sub extract_files {
        return;
     }
 
-    if (my $source_dir = unpack_srcpkg( $pkg_data->{dsc}, \$log )) {
+    if (my $source_dir = unpack_srcpkg( $pkg_data->{src_name}, $pkg_data->{dsc}, \$log )) {
 
        $source_dir = "$TEMPDIR/$source_dir";
 

diff --git a/bin/newpkg_info b/bin/newpkg_info
index 700a07989b5345cda1c63ab743655cb61e18d293..37b7290753d4567c9da0938f7813b58995c6708c 100755 (executable)
--- 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 11e0ef0ef6a4579686ffe48591a776f371066678..64c690de5dff0fc93cbbcd5df7be8d0b9513b5f7 100755 (executable)
--- 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 8ec35dbb94d4cdeb7071564eb3dc7a25f7693f1d..5a9073a4620c17342060496a78631fcdddad1cba 100755 (executable)
--- 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 16e0dddb879c0259187e5e65b85146f6061d8caa..e4084a3bc920a10b50e8c3f4b3b49f19ec1e7019 100644 (file)
--- a/cgi-bin/index.html
+++ b/cgi-bin/index.html
@@ -30,7 +30,6 @@ Section:
   <option value="main">main</option>
   <option value="contrib">contrib</option>
   <option value="non-free">non-free</option>
-  <option value="non-us">non-US</option>
   <option value="all" selected="selected">any</option>
 </select>
 

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 7db02b6e658b291038389eb1d35a813b86fc9f52..1c8658eca759592722fbf226bbd24827cc4cabd3 100644 (file)
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -26,7 +26,6 @@ localdir=/org/ftp.root/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/cron.d/100syncarchive b/cron.d/100syncarchive
index 1436bd971ff327e07f52edc50ee71ed607b27ab3..804865959ff054345af9abb5ce6e5cac1bb3f808 100755 (executable)
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -52,8 +52,8 @@ else
         echo "retrieve Releases(.gpg) $dist"
        test -d us/${dist} || mkdir -p us/${dist}
        (cd us/${dist} &&
-           rsync -t ${localdir}/dists/${dist}/Release &&
-           rsync -t ${localdir}/dists/${dist}/Release.gpg )
+           rsync -t ${localdir}/dists/${dist}/Release us/${dist}/Release &&
+           rsync -t ${localdir}/dists/${dist}/Release.gpg us/${dist}/Release.gpg )
 
        foo=\$arch_${dist//-/_}
        for arch in `eval echo $foo`

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 9639e92deff877d4f344385e1d1b81a4ee295977..440b15971b5b60a3a6915e6aa6e2ea02cc72c43f 100755 (executable)
--- 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 5f91d2463adb3fd2addbae713e43dc3c9ed3466c..c1b6dfdd01cd8c51420a530e68ff895eb9bab91b 100644 (file)
--- 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 1f8a0178c7ea1e81a83b7020d717b3aa8662dff3..30158c54b42d35ce6f5dcc91e8b008aac502efb3 100644 (file)
--- 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 32eb2b050eb29ec6410a151d50af8c2be4441b39..2e4fd11781270a34cbfc3e474e370c4210ede4c0 100644 (file)
--- 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 4dbb61a99f4ac00badf81ddd02013a80345e5ed8..d80342d2649ec8bc1cacf8169071a7b96a1281f1 100644 (file)
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -18,12 +18,9 @@ mirrors = {
 #only amd64,i386                       "ftp.debian.org/debian",
                        "ftp.egr.msu.edu/debian",
                        "mirrors.kernel.org/debian",
-                       "debian.crosslink.net/debian",
 #not amd64                     "ftp-mirror.internap.com/pub/debian",
 #only amd64,i386                       "ftp.cerias.purdue.edu/pub/os/debian",
-                       "ftp.lug.udel.edu/debian",
                        "debian.lcs.mit.edu/debian",
-                       "debian.teleglobe.net",
                        "debian.oregonstate.edu/debian",
                ],
                europa => [
@@ -172,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 a9ed93b5370323135094fd49b859c956c5b96ebe..b524d47c176208902cc8ad69288b93d1e7f287d3 100644 (file)
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -45,7 +45,6 @@
 <h1>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' %]</h1>
 

diff --git a/templates/txt/index.tmpl b/templates/txt/index.tmpl
index ab8c4734f7bb0c4b3525268586f376994b48348b..383c609c34f8a27cc7834f25b6f72bb790e79535 100644 (file)
--- a/templates/txt/index.tmpl
+++ b/templates/txt/index.tmpl
@@ -11,7 +11,7 @@ See <URL:[% license.url %]> for the license terms.
     [%- PROCESS marker text=section IF section != main_section -%]
     [%- PROCESS marker text=archive IF archive != main_archive -%]
   [%- END -%]
-  [%- IF providers %]
+  [%- IF providers.size %]
 [% name %] virtual package provided by [% providers.join(', ') %]
   [%- END -%]
   [%- IF versions %]