bump version to 3.4.0

[dab.git] / DAB.pm

diff --git a/DAB.pm b/DAB.pm
index 6c804c2f4d246fadc7bb24d995724e6cd2ab9abf..2cdd2c31ce22781f001df06f7c078d94550cb857 100644 (file)
--- a/DAB.pm
+++ b/DAB.pm
@@ -937,7 +937,7 @@ sub ve_status {
        }
     }
     close($fh);
-    
+
     return $res;
 }
 
@@ -949,9 +949,9 @@ sub ve_command {
 
     if (ref ($cmd) eq 'ARRAY') {
        unshift @$cmd, 'lxc-attach', '-n', $veid, '--rcfile', $conffile, '--clear-env', '--', 'defenv';
-       $self->run_command ($cmd, $input);      
+       $self->run_command($cmd, $input);
     } else {
-       $self->run_command ("lxc-attach -n $veid --rcfile $conffile --clear-env -- defenv $cmd", $input);
+       $self->run_command("lxc-attach -n $veid --rcfile $conffile --clear-env -- defenv $cmd", $input);
     }
 }
 
@@ -1402,12 +1402,11 @@ sub bootstrap {
     }
 
     my $closure = {};
-    $required = $self->closure ($closure, $required);
-    $important = $self->closure ($closure, $important);
+    $required = $self->closure($closure, $required);
+    $important = $self->closure($closure, $important);
 
     if (!$opts->{minimal}) {
-       push @$standard, 'xbase-clients';
-       $standard = $self->closure ($closure, $standard);
+       $standard = $self->closure($closure, $standard);
     }
 
     # test if we have all 'ubuntu-minimal' and 'ubuntu-standard' packages
@@ -1450,6 +1449,7 @@ sub bootstrap {
     }
 
     my $compressor2opt = {
+       'zst' => '--zstd',
        'gz' => '--gzip',
        'xz' => '--xz',
     };
@@ -1573,8 +1573,7 @@ EOD
     $self->ve_divert_add ("/sbin/udevd");
 
     if ($suite eq 'etch') {
-       # disable apache2 startup
-       write_file ("NO_START=1\n", "$rootdir/etc/default/apache2");
+       write_file ("NO_START=1\n", "$rootdir/etc/default/apache2"); # disable apache2 startup
     }
 
     $self->logmsg ("configure required packages\n");
@@ -1756,7 +1755,7 @@ sub compute_required {
     my $instpkgs = $self->read_installed ();
 
     my $closure = {};
-    __record_provides ($pkginfo, $closure, [keys %$instpkgs]);
+    __record_provides($pkginfo, $closure, [keys $instpkgs->%*]);
 
     return $self->closure ($closure, $pkglist);
 }
@@ -1765,7 +1764,7 @@ sub task_postgres {
     my ($self, $opts) = @_;
 
     my @supp = ('7.4', '8.1');
-    my $pgversion = '8.1';
+    my $pgversion; # NOTE: not setting that defaults to the distro default, normally the best choice
 
     my $suite = $self->{config}->{suite};
 
@@ -1776,34 +1775,33 @@ sub task_postgres {
        @supp = ('8.4');
        $pgversion = '8.4';
     } elsif ($suite eq 'wheezy') {
-        @supp = ('9.1');
-        $pgversion = '9.1';
+       @supp = ('9.1');
+       $pgversion = '9.1';
     } elsif ($suite eq 'jessie') {
-        @supp = ('9.4');
-        $pgversion = '9.4';
+       @supp = ('9.4');
+       $pgversion = '9.4';
     } elsif ($suite eq 'stretch') {
-        @supp = ('9.6');
-        $pgversion = '9.6';
+       @supp = ('9.6');
+       $pgversion = '9.6';
     } elsif ($suite eq 'buster') {
-        @supp = ('11');
-        $pgversion = '11';
+       @supp = ('11');
+       $pgversion = '11';
     } elsif ($suite eq 'bullseye') {
        @supp = ('13');
-       $pgversion = '13';
     } elsif ($suite eq 'bookworm') {
        # FIXME: update once froozen
-       @supp = ('13');
-       $pgversion = '13';
+       @supp = ('13', '14');
     }
-
     $pgversion = $opts->{version} if $opts->{version};
 
-    die "unsupported postgres version '$pgversion'\n" 
-       if !grep { $pgversion eq $_; } @supp;
-
-    my $rootdir = $self->{rootfs};
+    my $required;
+    if (defined($pgversion)) {
+       die "unsupported postgres version '$pgversion'\n" if !grep { $pgversion eq $_; } @supp;
 
-    my $required = $self->compute_required (["postgresql-$pgversion"]);
+       $required = $self->compute_required (["postgresql-$pgversion"]);
+    } else {
+       $required = $self->compute_required (["postgresql"]);
+    }
 
     $self->cache_packages ($required);
  
@@ -1825,7 +1823,7 @@ sub task_mysql {
     my $rootdir = $self->{rootfs};
 
     my $suite = $self->{config}->{suite};
-    
+
     my $ver = '5.0';
     if ($suite eq 'squeeze') {
       $ver = '5.1';
@@ -1871,7 +1869,7 @@ sub task_php {
     my $memlimit = $opts->{memlimit};
     my $rootdir = $self->{rootfs};
 
-    my $required = $self->compute_required ([qw (php5 php5-cli libapache2-mod-php5 php5-gd)]);
+    my $required = $self->compute_required([qw(php php-cli libapache2-mod-php php-gd)]);
 
     $self->cache_packages ($required);