Support xz compressed Debian repos

Author: lnussel

Build/Debrepo.pm

@@ -95,6 +95,8 @@ sub parse {
   } else {
     if ($in =~ /\.gz$/) {
       open($fd, '-|', "gzip", "-dc", $in) || die("$in: $!\n");
+    } elsif ($in =~ /\.xz$/) {
+      open($fd, '-|', "xz", "-dc", $in) || die("$in: $!\n");
     } else {
       open($fd, '<', $in) || die("$in: $!\n");
     }
@@ -141,6 +143,7 @@ sub parserepourl {
   my ($url) = @_;
   my @components;
   my $baseurl;
+  my $compression = 'gz';
   if ($url =~ /\?/) {
     my ($base, $query) = split(/\?/, $url, 2);
     if ("&$query" =~ /\&dist=/) {
@@ -151,10 +154,12 @@ sub parserepourl {
         $v = urldecode($v, 1);
         $dist = $v if $k eq 'dist';
         push @components, split(/[,+]/, $v) if $k eq 'component';
+        $compression = $v if $k eq 'compression';
       }
       $baseurl = $base;
       $baseurl .= '/' unless $baseurl =~ /\/$/;
-      $url = "${baseurl}dists/${dist}/";
+      $url = $baseurl;
+      $url .= "dists/${dist}/" if $dist;
       push @components, 'main' unless @components;
     }
   }
@@ -177,7 +182,7 @@ sub parserepourl {
     $url =~ s/([^\/]+\/)$/dists\/$1/;
     $baseurl =~ s/([^\/]+\/)$//;
   }
-  return $baseurl, $url, \@components;
+  return $baseurl, $url, \@components, $compression;
 }
 
 1;

PBuild/RemoteRepo.pm

@@ -113,20 +113,20 @@ sub fetchrepo_apk {
 
 sub fetchrepo_debian {
   my ($url, $tmpdir, %opts) = @_;
-  my ($baseurl, $disturl, $components) = Build::Debrepo::parserepourl($url);
+  my ($baseurl, $disturl, $components, $compression) = Build::Debrepo::parserepourl($url);
   die("fetchrepo_debian needs an architecture\n") unless $opts{'arch'};
   my $basearch = Build::Deb::basearch($opts{'arch'});
   my @bins;
   for my $component (@$components) {
     unlink("$tmpdir/Packages.gz");
     if ($component eq '.') {
-      download("${disturl}Packages.gz", "$tmpdir/Packages.gz");
-      die("Packages.gz missing\n") unless -s "$tmpdir/Packages.gz";
+      download("${disturl}Packages.$compression", "$tmpdir/Packages.$compression");
+      die("Packages.gz missing\n") unless -s "$tmpdir/Packages.$compression";
     } else {
-      download("$disturl$component/binary-$basearch/Packages.gz", "$tmpdir/Packages.gz");
-      die("Packages.gz missing for basearch $basearch, component $component\n") unless -s "$tmpdir/Packages.gz";
+      download("$disturl$component/binary-$basearch/Packages.$compression", "$tmpdir/Packages.$compression");
+      die("Packages.$compression missing for basearch $basearch, component $component\n") unless -s "$tmpdir/Packages.$compression";
     }
-    Build::Debrepo::parse("$tmpdir/Packages.gz", sub { addpkg(\@bins, $_[0], $baseurl) }, 'addselfprovides' => 1, 'withchecksum' => 1, 'normalizedeps' => 1);
+    Build::Debrepo::parse("$tmpdir/Packages.$compression", sub { addpkg(\@bins, $_[0], $baseurl) }, 'addselfprovides' => 1, 'withchecksum' => 1, 'normalizedeps' => 1);
   }
   return \@bins;
 }