]> git.donarmstrong.com Git - wannabuild.git/blobdiff - bin/wanna-build
Newer versions of Dpkg::Version export version_compare instead of vercmp.
[wannabuild.git] / bin / wanna-build
index c54460257f79aec7506e3c4b3cb6fa30268723ac..8787c717f24ae9dc837e804a2a92d8afc60873f4 100755 (executable)
@@ -3,6 +3,7 @@
 # wanna-build: coordination script for Debian buildds
 # Copyright (C) 1998 Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>
 # Copyright (C) 2005-2008 Ryan Murray <rmurray@debian.org>
+# Copyright (C) 2010      Andreas Barth <aba@not.so.argh.org>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
+use strict;
+use warnings;
+use 5.010;
 
 package conf;
+
+use vars qw< $basedir $dbbase $transactlog $mailprog $buildd_domain >;
 # defaults
 $basedir ||= "/var/lib/debbuild";
 $dbbase ||= "build-db";
@@ -31,16 +37,29 @@ die "dbbase is empty\n" if ! $dbbase;
 die "transactlog is empty\n" if ! $transactlog;
 die "mailprog binary $conf::mailprog does not exist or isn't executable\n"
        if !-x $conf::mailprog;
-die "no distributions defined\n" if ! %distributions;
 package main;
 
-use strict;
 use POSIX;
 use FileHandle;
 use File::Copy;
 use DBI;
-use lib '/org/wanna-build/bin';
+use lib '/org/wanna-build/lib';
+#use lib 'lib';
 use WannaBuild;
+use YAML::Tiny;
+use Data::Dumper;
+use Hash::Merge qw ( merge );
+use String::Format;
+use Date::Parse;
+use List::Util qw[max];
+use Dpkg::Version (); # import nothing
+if ( defined $Dpkg::Version::VERSION ) {
+    *vercmp = \&Dpkg::Version::version_compare;
+} else {
+    *vercmp = \&Dpkg::Version::vercmp;
+}
+
+use Dpkg::Deps; # TODO: same
 
 our ($verbose, $mail_logs, $list_order, $list_state,
     $curr_date, $op_mode, $user, $real_user, $distribution,
@@ -49,10 +68,19 @@ our ($verbose, $mail_logs, $list_order, $list_state,
     $info_all_dists, $arch,
     $category, %catval, %short_category,
     $short_date, $list_min_age, $dbbase, @curr_time,
-    $build_priority, %new_vers, $binNMUver, %merge_srcvers, %merge_binsrc);
+    $build_priority, %new_vers, $binNMUver, %merge_srcvers, %merge_binsrc,
+    $printformat, $ownprintformat, $privmode, $extra_depends, $extra_conflicts,
+    %distributions, %distribution_aliases
+    );
+our $Pas = '/org/buildd.debian.org/etc/packages-arch-specific/Packages-arch-specific';
+our $simulate = 0;
+our $simulate_edos = 0;
+our $api = undef; # allow buildds to specify an different api
+our $recorduser = undef;
 
 # global vars
 $ENV{'PATH'} = "/bin:/usr/bin:/usr/local/bin:/org/wanna-build/bin/";
+$ENV{'LC_ALL'} = 'C';
 $verbose = 0;
 $mail_logs = "";
 @curr_time = gmtime;
@@ -67,9 +95,6 @@ my %prognames = ( "uploaded-build"  => "set-uploaded",
                                  "give-back-build" => "set-needs-build",
                                  "dep-wait-build"  => "set-dep-wait",
                                  "forget-build"        => "forget",
-                                 "merge-quinn"         => "merge-quinn",
-                                 "merge-packages"  => "merge-packages",
-                                 "merge-sources"   => "merge-sources",
                                  "build-info"          => "info" );
 
 %short_category = ( u => "uploaded-fixed-pkg",
@@ -94,6 +119,14 @@ elsif ($progname =~ /^list-(.*)$/) {
 
 my %options =
        (# flags
+        simulate       => { flag => \$simulate }, # this is not supported by all operations (yet)!
+        "simulate-edos"  => { flag => \$simulate_edos },
+        "simulate-all" => { code => sub { $simulate = 1; $simulate_edos = 1; } },
+        api            => { arg => \$api, code => sub {
+                            # official apis are numeric
+                            die "$api isn't numeric" unless int($api) eq $api;
+                            die "$api too large" unless $api <= 1;
+                            } },
         verbose        => { short => "v", flag => \$verbose },
         override               => { short => "o", flag => \$opt_override },
         "create-db"    => { flag => \$opt_create_db },
@@ -112,13 +145,15 @@ my %options =
         "dep-wait"             => { mode => "set-dep-wait" },
         forget                 => { mode => "forget" },
         'forget-user' => { mode => 'forget-user' },
-        "merge-quinn"  => { mode => "merge-quinn" },
-        "merge-partial-quinn" => { mode => "merge-partial-quinn" },
-        "merge-packages" => { mode => "merge-packages" },
-        "merge-sources" => { mode => "merge-sources" },
+        update                 => { mode => "set-update" },
+        #"merge-quinn"  => { mode => "merge-quinn" },
+        #"merge-partial-quinn" => { mode => "merge-partial-quinn" },
+        #"merge-packages" => { mode => "merge-packages" },
+        #"merge-sources" => { mode => "merge-sources" },
         "pretend-avail" => { short => "p", mode => "pretend-avail" },
-        "merge-all"     => { mode => "merge-all" },
-        "merge-all-secondary" => { mode => "merge-all-secondary" },
+        #"merge-all"     => { mode => "merge-all" },
+        #"merge-all-secondary" => { mode => "merge-all-secondary" },
+        "merge-v3"      => { mode => "merge-v3" },
         info                   => { short => "i", mode => "info" },
         'binNMU' => { mode => 'set-binary-nmu', arg => \$binNMUver, 
                             code => sub { die "Invalid binNMU version: $binNMUver\n"
@@ -135,7 +170,7 @@ my %options =
                   die "Unknown state to list: $list_state\n"
                           if !isin( $list_state, qw(needs-build building uploaded
                                                 built build-attempted failed installed dep-wait
-                                                not-for-us all failed-removed
+                                                not-for-us auto-not-for-us all failed-removed
                                                 install-wait reupload-wait bd-uninstallable));} },
         # options with args
         dist           =>
@@ -156,7 +191,7 @@ my %options =
         { short => "O", arg => \$list_order,
           code => sub {
                   die "Bad ordering character\n"
-                          if $list_order !~ /^[PSpsncbCW]+$/;
+                          if $list_order !~ /^[PSpsncbCWT]+$/;
           } },
         message        => { short => "m", arg => \$fail_reason },
         # database is deprecated, use arch instead.
@@ -181,10 +216,17 @@ my %options =
                                                                 if $list_min_age == 0;
                                                         $list_min_age *= -1;
                                                 } },
+         "format"       => { arg => \$printformat },
+         "own-format"       => { arg => \$ownprintformat },
+         "Pas"          => { arg => \$Pas },
+        "extra-depends"=> { arg => \$extra_depends },
+        "extra-conflicts"=> { arg => \$extra_conflicts },
         # special actions
         export         => { arg => \$export_to, mode => "export" },
         import         => { arg => \$import_from, mode => "import" },
         "manual-edit"  => { mode => "manual-edit" },
+        "distribution-architectures" => { mode => "distribution-architectures" },
+        "distribution-aliases" => { mode => "distribution-aliases" },
         );
 
 while( @ARGV && $ARGV[0] =~ /^-/ ) {
@@ -228,13 +270,74 @@ while( @ARGV && $ARGV[0] =~ /^-/ ) {
        }
 }
 
+my $dbh;
+
+END {
+       if (defined $dbh)
+       {
+               $dbh->disconnect or warn $dbh->errstr;
+       }
+}
+
+$distribution ||= "sid";
+if ($distribution eq 'any-priv') {
+    $privmode = 1;
+    $distribution = 'any';
+}
+if ($distribution eq 'any-unpriv') {
+    $privmode = 0;
+    $distribution = 'any';
+}
+
+my $schema_suffix = '';
+$recorduser //= (not -t and $user//"" =~ /^buildd_/);
+if (isin( $op_mode, qw(list info)) && $distribution !~ /security/ && !$recorduser && !($privmode)) {
+       $dbh = DBI->connect("DBI:Pg:service=wanna-build") || 
+               die "FATAL: Cannot open database: $DBI::errstr\n";
+       $schema_suffix = '_public';
+}
+else
+{
+       $dbh = DBI->connect("DBI:Pg:service=wanna-build-privileged") || 
+               die "FATAL: Cannot open database: $DBI::errstr\n";
+}
+
+# TODO: This shouldn't be needed, file a bug.
+$dbh->{pg_server_prepare} = 0;
+
+$dbh->begin_work or die $dbh->errstr;
+
+my $q = 'SELECT distribution, public, auto_dep_wait, build_dep_resolver, suppress_successful_logs, archive FROM distributions';
+my $rows = $dbh->selectall_hashref($q, 'distribution');
+foreach my $name (keys %$rows) {
+       $distributions{$name} = {};
+       $distributions{$name}->{'noadw'} = 1 if !($rows->{$name}->{'auto_dep_wait'});
+       $distributions{$name}->{'hidden'} = 1 if !($rows->{$name}->{'public'});
+       $distributions{$name}->{'build_dep_resolver'} = $rows->{$name}->{'build_dep_resolver'} if $rows->{$name}->{'build_dep_resolver'};
+       $distributions{$name}->{'suppress_successful_logs'} = $rows->{$name}->{'suppress_successful_logs'} if $rows->{$name}->{'suppress_successful_logs'};
+       $distributions{$name}->{'archive'} = $rows->{$name}->{'archive'} if $rows->{$name}->{'archive'};
+}
+
+$q = 'SELECT alias, distribution FROM distribution_aliases';
+$rows = $dbh->selectall_hashref($q, 'alias');
+foreach my $name (keys %$rows) {
+       $distribution_aliases{$name} = $rows->{$name}->{'distribution'};
+}
+$distribution = $distribution_aliases{$distribution} if (isin($distribution, keys %distribution_aliases));
+
 $op_mode = $category ? "set-failed" : "set-building"
        if !$op_mode; # default operation
-$list_order = $list_state eq "failed" ? 'fPcpsn' : 'PScpsn'
-       if !$list_order and $list_state;
-$distribution ||= "unstable";
-die "Bad distribution '$distribution'\n"
-       if !isin($distribution, keys %conf::distributions);
+undef $distribution if $distribution eq 'any';
+if ($distribution) {
+    my @dists = split(/[, ]+/, $distribution);
+    foreach my $dist (@dists) {
+        die "Bad distribution '$distribution'\n"
+           if !isin($dist, keys %distributions);
+    }
+}
+if (!isin ( $op_mode, qw(list) ) && ( !$distribution || $distribution =~ /[ ,]/)) {
+    die "multiple distributions are only allowed for list";
+}
 
 # If they didn't specify an arch, try to get it from database name which
 # is in the form of $arch/build-db
@@ -254,7 +357,8 @@ if ($verbose) {
 
 if (!@ARGV && !isin( $op_mode, qw(list merge-quinn merge-partial-quinn import export
                                  merge-packages manual-edit
-                                 merge-sources))) {
+                                 merge-sources distribution-architectures
+                                 distribution-aliases))) {
        warn "No packages given.\n";
        usage();
 }
@@ -294,31 +398,27 @@ if (!$fail_reason) {
        }
 }
 
-my $dbh;
-
-END {
-       if (defined $dbh)
-       {
-               $dbh->disconnect or warn $dbh->errstr;
-       }
-}
-
-my $schema_suffix = '';
-if (isin( $op_mode, qw(list info)) && $distribution !~ /security/ && !(not -t and $user =~ /-/)) {
-       $dbh = DBI->connect("DBI:Pg:service=wanna-build") || 
-               die "FATAL: Cannot open database: $DBI::errstr\n";
-       $schema_suffix = '_public';
+my $yamlmap = ();
+my $yamldir = "/org/wanna-build/etc/yaml";
+my @files = ('wanna-build.yaml');
+if ((getpwuid($>))[7]) { push (@files, ((getpwuid($>))[7])."/.wanna-build.yaml"); }
+if ($user && $user =~ /(buildd.*)-/) { push (@files, "$1.yaml") };
+if ($user) { push ( @files, "$user.yaml"); }
+foreach my $file (@files) {
+        my $cfile = File::Spec->rel2abs( $file, $yamldir );
+       if ($verbose >= 2) { print "Trying to read $file ($cfile) ...\n"; }
+       next unless -f $cfile;
+       if ($verbose >= 2) { print "Read $file ($cfile) ...\n"; }
+       my $m = YAML::Tiny->read( $cfile )->[0];
+       $yamlmap = merge($m, $yamlmap);
 }
-else
-{
-       $dbh = DBI->connect("DBI:Pg:service=wanna-build-privileged") || 
-               die "FATAL: Cannot open database: $DBI::errstr\n";
+if (not $yamlmap) {
+       die "FATAL: no configuration found\n";
 }
-
-# TODO: This shouldn't be needed, file a bug.
-$dbh->{pg_server_prepare} = 0;
-
-$dbh->begin_work or die $dbh->errstr;
+$list_order = $yamlmap->{"list-order"}{$list_state} if !$list_order and $list_state;
+$list_order ||= $yamlmap->{"list-order"}{'default'};
+$api //= $yamlmap->{"api"};
+$api //= 0;
 
 process();
 
@@ -409,7 +509,7 @@ sub process {
                        parse_quinn_diff(0);
                        @ARGV = ( $ARGS[2] );
                        my $srcs = parse_sources(1);
-                       call_edos_depcheck( $ARGS[0], $srcs );
+                       call_edos_depcheck( {'arch' => $arch, 'pkgs' => ($ARGS[0]), 'srcs' => $srcs });
                        last SWITCH;
                };
                /^merge-all-secondary/ && do {
@@ -427,14 +527,42 @@ sub process {
                        @ARGV = ( $ARGS[0] );
                        my $pkgs = parse_packages(0);
                        @ARGV = ( $ARGS[3] );
-                       my $pkgs = parse_packages(1);
+                       $pkgs = parse_packages(1);
                        @ARGV = ( $ARGS[1] );
                        parse_quinn_diff(0);
                        @ARGV = ( $ARGS[2] );
                        my $srcs = parse_sources(1);
-                       call_edos_depcheck( $ARGS[3], $srcs );
+                       call_edos_depcheck( {'arch' => $arch, 'pkgs' => ($ARGS[3]), 'srcs' => $srcs });
                        last SWITCH;
                };
+               /^merge-v3/ && do {
+                        die "This operation is restricted to admin users\n"
+                           if (defined @conf::admin_users and !isin( $real_user, @conf::admin_users) and !$simulate);
+                        # call with installed-packages+ . installed-sources+ [ . available-for-build-packages* [ . consider-as-installed-source* ]  ]
+                        # in case available-for-build-packages is not specified, installed-packages are used
+                        lock_table() unless $simulate;
+                        my $replacemap = { '%ARCH%' => $arch, '%SUITE%' => $distribution };
+                        map { my $k = $_; grep { $k =~ s,$_,$replacemap->{$_}, } keys %{$replacemap}; $_ = $k; } @ARGV;
+                        my @ipkgs = &parse_argv( \@ARGV, '.');
+                        my @isrcs = &parse_argv( \@ARGV, '.');
+                        my @bpkgs = &parse_argv( \@ARGV, '.');
+                        my @psrcs = &parse_argv( \@ARGV, '.');
+                        use WB::QD;
+                        my $srcs = WB::QD::readsourcebins($arch, $Pas, \@isrcs, \@ipkgs);
+                        if (@psrcs) {
+                            my $psrcs = WB::QD::readsourcebins($arch, $Pas, \@psrcs, []);
+                            foreach my $k (keys %$$psrcs) {
+                                next if $$srcs->{$k};
+                                my $pkg = $$psrcs->{$k};
+                                $pkg->{'status'} = 'related';
+                                $$srcs->{$k} = $pkg;
+                            }
+                        }
+                        parse_all_v3($$srcs, {'arch' => $arch, 'suite' => $distribution, 'time' => $curr_date});
+                        @bpkgs = @ipkgs unless @bpkgs;
+                        call_edos_depcheck( {'arch' => $arch, 'pkgs' => \@bpkgs, 'srcs' => $$srcs, 'depwait' => 1 });
+                        last SWITCH;
+               };
                /^import/ && do {
                        die "This operation is restricted to admin users\n"
                                if (defined @conf::admin_users and
@@ -451,10 +579,18 @@ sub process {
                        export_db( $export_to );
                        last SWITCH;
                };
+               /^distribution-architectures/ && do {
+                       show_distribution_architectures();
+                       last SWITCH;
+               };
+               /^distribution-aliases/ && do {
+                       show_distribution_aliases();
+                       last SWITCH;
+               };
 
                die "Unexpected operation mode $op_mode\n";
        }
-       if (not -t and $user =~ /-/) {
+       if ($recorduser) {
                my $userinfo = get_user_info($user);
                if (!defined $userinfo)
                {
@@ -517,6 +653,9 @@ sub add_packages {
                elsif ($op_mode eq "set-binary-nmu") {
                        set_one_binnmu( $name, $version );
                }
+               elsif ($op_mode eq "set-update") {
+                       set_one_update( $name, $version );
+               }
        }
 }
 
@@ -639,6 +778,7 @@ sub add_one_building {
                }
        }
        if ($ok) {
+            if ($api < 1) {
                my $ok = 'ok';
                if ($pkg->{'binary_nmu_version'}) {
                        print "$name: Warning: needs binary NMU $pkg->{'binary_nmu_version'}\n" .
@@ -649,16 +789,33 @@ sub add_one_building {
                                if $pkg->{'previous_state'} =~ /^Failed/ ||
                                   $pkg->{'state'} =~ /^Failed/;
                }
+               print "$name: $ok\n" if $verbose;
+            } else {
+                print  "- $name:\n";
+                print  "    - status: ok\n";
+                printf "    - pkg-ver: %s_%s\n", $name, $version;
+                print  "    - binNMU: $pkg->{'binary_nmu_version'}\n" if $pkg->{'binary_nmu_version'};
+                print  "    - extra-changelog: $pkg->{'binary_nmu_changelog'}\n" if $pkg->{'binary_nmu_changelog'} && $pkg->{'binary_nmu_version'};
+                print  "    - extra-depends: $pkg->{'extra_depends'}\n" if $pkg->{'extra_depends'};
+                print  "    - extra-conflicts: $pkg->{'extra_conflicts'}\n" if $pkg->{'extra_conflicts'};
+                print  "    - archive: $distributions{$distribution}->{'archive'}\n" if $distributions{$distribution}->{'archive'};
+                print  "    - build_dep_resolver: $distributions{$distribution}->{'build_dep_resolver'}\n" if $distributions{$distribution}->{'build_dep_resolver'};
+                print  "    - arch_all: $pkg->{'build_arch_all'}\n" if $pkg->{'build_arch_all'};
+                print  "    - suppress_successful_logs: $distributions{$distribution}->{'suppress_successful_logs'}\n" if $distributions{$distribution}->{'suppress_successful_logs'};
+            }
                change_state( \$pkg, 'Building' );
                $pkg->{'package'} = $name;
                $pkg->{'version'} = $version;
                $pkg->{'builder'} = $user;
                log_ta( $pkg, "--take" );
                update_source_info($pkg);
-               print "$name: $ok\n" if $verbose;
        }
        else {
+            if ($api < 1) {
                print "$name: NOT OK!\n  $reason\n";
+            } else {
+               print "- $name:\n    - status: not ok\n    - reason: \"$reason\"\n";
+            }
        }
 }
 
@@ -981,7 +1138,7 @@ sub add_one_needsbuild {
                          "Skipping.\n";
                return;
        }
-       if ($distribution eq "unstable") {
+       if (!defined $distributions{$distribution}{noadw}) {
                change_state( \$pkg, 'BD-Uninstallable' );
                $pkg->{'bd_problem'} = "Installability of build dependencies not tested yet";
        } else {
@@ -1029,6 +1186,11 @@ sub set_one_binnmu {
                        $pkg->{'notes'} = 'out-of-date';
                        $pkg->{'buildpri'} = $pkg->{'permbuildpri'}
                                if (defined $pkg->{'permbuildpri'});
+                       if (defined $distributions{$distribution}{noadw}) {
+                               change_state( \$pkg, 'Installed' );
+                       } else {
+                               change_state( \$pkg, 'BD-Uninstallable' );
+                       }
                }
                log_ta( $pkg, "--binNMU" );
                update_source_info($pkg);
@@ -1050,7 +1212,7 @@ sub set_one_binnmu {
                return;
        }
 
-       if ($distribution eq "unstable") {
+       if (!defined $distributions{$distribution}{noadw}) {
                change_state( \$pkg, 'BD-Uninstallable' );
                $pkg->{'bd_problem'} = "Installability of build dependencies not tested yet";
        }
@@ -1179,6 +1341,21 @@ sub add_one_depwait {
        print "$name: registered as waiting for dependencies\n" if $verbose;
 }
 
+sub set_one_update {
+       my $name = shift;
+       my $version = shift;
+       my $pkg = get_source_info($name);
+
+       if (!defined($pkg)) {
+               print "$name: not registered yet.\n";
+               return;
+       }
+        $pkg->{'version'} =~ s/\+b[0-9]+$//;
+
+       log_ta( $pkg, "--update" );
+       update_source_info($pkg);
+}
+
 
 sub parse_sources {
        my %pkgs;
@@ -1740,102 +1917,53 @@ BEGIN {
 }
 
 sub sort_list_func {
-       my( $letter, $x, $ax, $bx );
-
-       foreach $letter (split( "", $list_order )) {
-         SWITCH: foreach ($letter) {
-                 /C/ && do {
-                       $x = $b->{'calprio'} <=> $a->{'calprio'};
-                       return $x if $x != 0;
-                       last SWITCH;
-                 };
-                 /W/ && do {
-                       $x = $b->{'waiting_days'} <=> $a->{'waiting_days'};
-                       return $x if $x != 0;
-                       last SWITCH;
-                 };
-                 /P/ && do {
-                       $x = $b->{'buildpri'} <=> $a->{'buildpri'};
-                       return $x if $x != 0;
-                       last SWITCH;
-                 };
-                 /p/ && do {
-                         $x = $prioval{$a->{'priority'}} <=> $prioval{$b->{'priority'}};
-                         return $x if $x != 0;
-                         last SWITCH;
-                 };
-                 /s/ && do {
-                         $x = $sectval{$a->{'section'}} <=> $sectval{$b->{'section'}};
-                         return $x if $x != 0;
-                         last SWITCH;
-                 };
-                 /n/ && do {
-                         $x = $a->{'package'} cmp $b->{'package'};
-                         return $x if $x != 0;
-                         last SWITCH;
-                 };
-                 /b/ && do {
-                         $x = $a->{'builder'} cmp $b->{'builder'};
-                         return $x if $x != 0;
-                         last SWITCH;
-                 };
-                 /c/ && do {
-                         $ax = ($a->{'notes'} =~ /^(out-of-date|partial)/) ? 0 :
-                                   ($a->{'notes'} =~ /^uncompiled/) ? 2 : 1;
-                         $bx = ($b->{'notes'} =~ /^(out-of-date|partial)/) ? 0 :
-                                   ($b->{'notes'} =~ /^uncompiled/) ? 2 : 1;
-                         $x = $ax <=> $bx;
-                         return $x if $x != 0;
-                         last SWITCH;
-                 };
-                 /f/ && do {
-                         my $ca = defined $a->{'failed_category'} ?
-                                 $a->{'failed_category'} : "none";
-                         my $cb = defined $b->{'failed_category'} ?
-                                 $b->{'failed_category'} : "none";
-                         $x = $catval{$ca} <=> $catval{$cb};
-                         return $x if $x != 0;
-                         last SWITCH;
-                 };
-                 /S/ && do {
-                         my $pa = $prioval{$a->{'priority'}} >
-                                 $prioval{'standard'};
-                         my $pb = $prioval{$b->{'priority'}} >
-                                 $prioval{'standard'};
-                         $x = $pa <=> $pb;
-                         return $x if $x != 0;
-                         last SWITCH;
-                 };
-         }
+    my $map_funcs = {
+        'C' => ['<->', sub { return $_[0]->{'calprio'}; }],
+        'W' => ['<->', sub { return $_[0]->{'state_days'}; }],
+        'P' => ['<->', sub { return $_[0]->{'buildpri'}; }],
+        'p' => ['<=>', sub { return $prioval{$_[0]->{'priority'}}; }],
+        's' => ['<=>', sub { return $sectval{$_[0]->{'section'}}; }],
+        'n' => ['cmp', sub { return $_[0]->{'package'}; }],
+        'b' => ['cmp', sub { return $_[0]->{'builder'}; }],
+        'c' => ['<=>', sub { return ($_[0]->{'notes'} =~ /^(out-of-date|partial)/) ? 0: ($_[0]->{'notes'} =~ /^uncompiled/) ? 2 : 1; }],
+        'f' => ['<=>', sub { return $catval{ $_[0]->{'failed_category'} ? $_[0]->{'failed_category'}: "none" }; }],
+        'S' => ['<=>', sub { return $prioval{$_[0]->{'priority'}} > $prioval{'standard'}; }],
+        'T' => ['<->', sub { return $_[0]->{'state_time'} % 86400;} ], # Fractions of a day
+    };
+
+       foreach my $letter (split( //, $list_order )) {
+            my $r;
+            $r = &{$map_funcs->{$letter}[1]}($b) <=> &{$map_funcs->{$letter}[1]}($a) if $map_funcs->{$letter}[0] eq '<->';
+            $r = &{$map_funcs->{$letter}[1]}($a) <=> &{$map_funcs->{$letter}[1]}($b) if $map_funcs->{$letter}[0] eq '<=>';
+            $r = &{$map_funcs->{$letter}[1]}($a) cmp &{$map_funcs->{$letter}[1]}($b) if $map_funcs->{$letter}[0] eq 'cmp';
+            return $r if $r != 0;
        }
        return 0;
 }
 
 sub calculate_prio {
-######################
-# priority: required = 50, important = 40, standard = 30, optional = 5
-# section: libs = 4, devel = 2
-# component: contrib = -10, non-free = -20
-# never built = -20
-# max(floor(waitingdays),6)
-
-       my $priomap;
-       $priomap->{'priority'} = { 'required' => 50, 'important' => 40, 'standard' => 30, 'optional' => 5 };
-       $priomap->{'section'} = { 'libs' => 4, 'devel' => 2 };
-       $priomap->{'component'} = { 'contrib' => -10, 'non-free' => -20 };
-       $priomap->{'notes'} = { 'uncompiled' => 20, 'out-of-date' => 40, 'partial' => 40 };
-       $priomap->{'waitingdays'} = { 'min' => 0, 'max' => 6, scale => 2 };
+       my $priomap = $yamlmap->{priority};
        my $pkg = shift;
+        my @s=split("/", $pkg->{'section'});
+        $pkg->{'component'} = $s[0] if $s[1];
+        $pkg->{'component'} ||= 'main';
        $pkg->{'calprio'} = 0;
-       foreach my $k (keys %$priomap) {
-               $pkg->{'calprio'} += $priomap->{$k}{$pkg->{$k}} if $pkg->{$k} and $priomap->{$k}{$pkg->{$k}};
+       foreach my $k (keys %{$priomap->{keys}}) {
+               $pkg->{'calprio'} += $priomap->{keys}->{$k}{$pkg->{$k}} if $pkg->{$k} and $priomap->{keys}->{$k}{$pkg->{$k}};
        }
 
-       my $wd = $pkg->{'waiting_days'};
-       $wd = $priomap->{'waitingdays'}->{'min'} if $priomap->{'waitingdays'}->{'min'} and $wd < $priomap->{'waitingdays'}->{'min'};
-       $wd = $priomap->{'waitingdays'}->{'max'} if $priomap->{'waitingdays'}->{'max'} and $wd > $priomap->{'waitingdays'}->{'max'};
+       my $days = $pkg->{'state_days'};
+       $days = $priomap->{'waitingdays'}->{'min'} if $priomap->{'waitingdays'}->{'min'} and $days < $priomap->{'waitingdays'}->{'min'};
+       $days = $priomap->{'waitingdays'}->{'max'} if $priomap->{'waitingdays'}->{'max'} and $days > $priomap->{'waitingdays'}->{'max'};
        my $scale = $priomap->{'waitingdays'}->{'scale'} || 1;
-       $pkg->{'calprio'} += $wd * $scale;
+       $pkg->{'calprio'} += $days * $scale;
+
+        my $btime = max($pkg->{'anytime'}//0, $pkg->{'successtime'}//0);
+        my $bhours = $btime ? int($btime/3600) : ($priomap->{'buildhours'}->{'default'} || 2);
+       $bhours = $priomap->{'buildhours'}->{'min'} if $priomap->{'buildhours'}->{'min'} and $bhours < $priomap->{'buildhours'}->{'min'};
+       $bhours = $priomap->{'buildhours'}->{'max'} if $priomap->{'buildhours'}->{'max'} and $bhours > $priomap->{'buildhours'}->{'max'};
+       $scale = $priomap->{'buildhours'}->{'scale'} || 1;
+        $pkg->{'calprio'} -= $bhours * $scale;
 
        $pkg->{'calprio'} += $pkg->{'permbuildpri'} if  $pkg->{'permbuildpri'};
        $pkg->{'calprio'} += $pkg->{'buildpri'} if  $pkg->{'buildpri'};
@@ -1844,6 +1972,131 @@ sub calculate_prio {
 }
 
 
+sub seconds2time {
+    my $t = shift;
+    return "" unless $t;
+    my $sec = $t % 60;
+    my $min = int($t/60) % 60;
+    my $hours = int($t / 3600);
+    return sprintf("%d:%02d:%02d", $hours, $min, $sec) if $hours;
+    return sprintf("%d:%02d", $min, $sec);
+}
+
+
+sub use_fmt {
+    my $r;
+
+    if (ref($_[0]) eq 'CODE') {
+        $r = &{$_[0]};
+    } else {
+        $r = $_[0];
+    }
+
+    shift;
+    my $t = shift;
+
+    $r ||= "";
+    return $r unless $t;
+
+    my $pkg = shift;
+    my $var = shift;
+    if (substr($t,0,1) eq '!') {
+        $t = substr($t,1);
+        return "" if $r;
+    } else {
+        return "" unless $r;
+    }
+    if ($t =~ /%/) {
+        return print_format($t, $pkg, $var);
+    }
+    return $t;
+}
+sub make_fmt { my $c = shift; my $pkg = shift; my $var = shift; return sub { use_fmt($c, $_[0], $pkg, $var); } };
+
+sub print_format {
+    my $printfmt = shift;
+    my $pkg = shift;
+    my $var = shift;
+
+=pod
+
+Within an format string, the following values are allowed (need to be preceded by %).
+This can be combined to e.g.
+wanna-build --format='wanna-build -A %a --give-back %p_%v' -A mipsel --list=failed
+
+a Architecture
+c section (e.g. libs or utils)
+D in case of BD-Uninstallable the reason for the uninstallability
+d distribution
+E in case of Dep-Wait the packages being waited on, in case of Needs-Build the number in the queue
+F in case of Failed the fail reason
+n newline
+o time of last successful build (seconds)
+O time of last successful build (formated)
+P previous state
+p Package name
+q time of last build (seconds)
+Q time of last build (formated)
+r max time of last (successful) build (seconds)
+R max time of last (successful) build (formated)
+S Package state
+s Time in this state in full seconds since epoch
+t time of state change
+T time since state change
+u Builder (e.g. buildd_mipsel-rem)
+v Package version
+V full Package version (i.e. with +b.., = %v%{+b}B%B
+X the string normally between [], e.g. optional:out-of-date:calprio{61}:days{25}
+
+%{Text}?  print Text in case ? is not empty; ? is never printed
+%{!Text}? print Text in case ? is empty; ? is never printed
+Text could contain further %. To start with !, use %!
+
+=cut
+
+    return stringf($printfmt, (
+        'p' => make_fmt( $pkg->{'package'}, $pkg, $var),
+        'a' => make_fmt( $arch, $pkg, $var),
+        's' => make_fmt( sub { return floor(str2time($pkg->{'state_change'})); }, $pkg, $var),
+        'v' => make_fmt( $pkg->{'version'}, $pkg, $var),
+        'V' => make_fmt( sub { $pkg->{'binary_nmu_version'} ? $pkg->{'version'}."+b".$pkg->{'binary_nmu_version'} : $pkg->{'version'} }, $pkg, $var),
+        'S' => make_fmt( $pkg->{'state'}, $pkg, $var),
+        'u' => make_fmt( $pkg->{'builder'}, $pkg, $var),
+        'X' => make_fmt( sub {
+            my $c = "$pkg->{'priority'}:$pkg->{'notes'}";
+            $c .= ":PREV-FAILED" if $pkg->{'previous_state'} && $pkg->{'previous_state'} =~ /^Failed/;
+            $c .= ":bp{" . $pkg->{'buildpri'} . "}" if defined $pkg->{'buildpri'};
+            $c .= ":binNMU{" . $pkg->{'binary_nmu_version'} . "}" if defined $pkg->{'binary_nmu_version'};
+            $c .= ":calprio{". $pkg->{'calprio'}."}";
+            $c .= ":days{". $pkg->{'state_days'}."}";
+            return $c;
+            }, $pkg, $var),
+        'c' => make_fmt( $pkg->{'section'}, $pkg, $var),
+        'P' => make_fmt( $pkg->{'previous_state'} || "unknwon", $pkg, $var),
+        'E' => make_fmt( sub { return $pkg->{'depends'} if $pkg->{'state'} eq "Dep-Wait";
+            return $var->{scnt}{'Needs-Build'} + 1 if $pkg->{'state'} eq 'Needs-Build';
+            return ""; }, $pkg, $var),
+       'F' => make_fmt( sub { return "" unless $pkg->{'failed'};
+           my $failed = $pkg->{'failed'};
+           $failed =~ s/\\/\\\\/g;
+            return $pkg->{'package'}."#".$arch."-failure\n ".
+           join("\\0a",split("\n",$failed))."\\0a\n"; }, $pkg, $var),
+        'D' => make_fmt( sub { return "" unless $pkg->{'bd_problem'};
+            return $pkg->{'package'}."#".$arch."-bd-problem\n".
+            join("\\0a",split("\n",$pkg->{'bd_problem'}))."\\0a\n"; }, $pkg, $var),
+        'B' => make_fmt( sub { return $pkg->{'binary_nmu_version'} if defined $pkg->{'binary_nmu_version'}; }, $pkg, $var),
+        'd' => make_fmt( $pkg->{'distribution'}, $pkg, $var),
+        't' => make_fmt( $pkg->{'state_change'}, $pkg, $var),
+        'T' => make_fmt( sub { return seconds2time(time() - floor(str2time($pkg->{'state_change'}))); }, $pkg, $var),
+        'o' => make_fmt( $pkg->{'successtime'}, $pkg, $var),
+        'O' => make_fmt( sub { return seconds2time ( $pkg->{'successtime'}); }, $pkg, $var),
+        'q' => make_fmt( $pkg->{'anytime'}, $pkg, $var),
+        'Q' => make_fmt( sub { return seconds2time ( $pkg->{'anytime'}); }, $pkg, $var),
+        'r' => make_fmt( sub { my $c = max($pkg->{'successtime'}//0, $pkg->{'anytime'}//0); return $c if $c; return; }, $pkg, $var),
+        'R' => make_fmt( sub { return seconds2time ( max($pkg->{'successtime'}//0, $pkg->{'anytime'}//0)); }, $pkg, $var),
+    ));
+}
+
 sub list_packages {
        my $state = shift;
        my( $name, $pkg, @list );
@@ -1857,22 +2110,30 @@ sub list_packages {
                push @list, calculate_prio($db->{$name});
        }
 
+        # filter components
+        @list = grep { my $i = $_->{'component'}; grep { $i eq $_ } split /[, ]+/, $yamlmap->{"restrict"}{'component'} } @list;
+        # extra depends / conflicts only from api 1 on
+        @list = grep { !$_->{'extra_depends'} and !$_->{'extra_conflicts'} } @list if $api < 1 ;
+
+        # first adjust ownprintformat, then set printformat accordingly
+        $printformat ||= $yamlmap->{"format"}{$ownprintformat} if $ownprintformat;
+        $printformat ||= $yamlmap->{"format"}{"default"}{$state};
+        $printformat ||= $yamlmap->{"format"}{"default"}{"default"};
+        undef $printformat if ($ownprintformat && $ownprintformat eq 'none');
+
        foreach $pkg (sort sort_list_func @list) {
-               print "$pkg->{'section'}/$pkg->{'package'}_$pkg->{'version'}";
-               print ": $pkg->{'state'}"
+                if ($printformat) {
+                    print print_format($printformat, $pkg, {'cnt' => $cnt, 'scnt' => \%scnt})."\n";
+                   ++$cnt;
+                   $scnt{$pkg->{'state'}}++;
+                    next;
+                }
+               print print_format("%c/%p_%v", $pkg, {});
+               print print_format(": %S", $pkg, {})
                        if $state eq "all";
-               print " by $pkg->{'builder'}"
-                       if $pkg->{'state'} ne "Needs-Build" && $pkg->{'builder'};
-               print " [$pkg->{'priority'}:$pkg->{'notes'}";
-               print ":PREV-FAILED"
-                       if $pkg->{'previous_state'} =~ /^Failed/;
-               print ":bp{" . $pkg->{'buildpri'} . "}"
-                       if defined $pkg->{'buildpri'};
-               print ":binNMU{" . $pkg->{'binary_nmu_version'} . "}"
-                       if defined $pkg->{'binary_nmu_version'};
-               print ":calprio{". $pkg->{'calprio'}."}";
-               print ":wd{". $pkg->{'waiting_days'}."}";
-               print "]\n";
+               print print_format("%{ by }u%u", $pkg, {})
+                       if $pkg->{'state'} ne "Needs-Build";
+               print print_format(" [%X]\n", $pkg, {});
                print "  Reasons for failing:\n",
                          "    [Category: ",
                          defined $pkg->{'failed_category'} ? $pkg->{'failed_category'} : "none",
@@ -1884,23 +2145,26 @@ sub list_packages {
                print "  Reasons for BD-Uninstallable:\n    ",
                          join("\n    ",split("\n",$pkg->{'bd_problem'})), "\n"
                        if $pkg->{'state'} eq "BD-Uninstallable";
-               print "  Previous state was $pkg->{'previous_state'} until ",
-                         "$pkg->{'state_change'}\n"
+               print "  Previous state was $pkg->{'previous_state'}\n"
                        if $verbose && $pkg->{'previous_state'};
                print "  No previous state recorded\n"
                        if $verbose && !$pkg->{'previous_state'};
+               print "  State changed at $pkg->{'state_change'}\n"
+                       if $verbose && $pkg->{'state_change'};
+               print "  Previous state $pkg->{'previous_state'} left $pkg->{'state_time'} ago\n"
+                       if $verbose && $pkg->{'previous_state'};
                print "  Previous failing reasons:\n    ",
                      join("\n    ",split("\n",$pkg->{'old_failed'})), "\n"
                        if $verbose && $pkg->{'old_failed'};
                ++$cnt;
                $scnt{$pkg->{'state'}}++ if $state eq "all";
        }
-       if ($state eq "all") {
+       if ($state eq "all" && !$printformat) {
                foreach (sort keys %scnt) {
                        print "Total $scnt{$_} package(s) in state $_.\n";
                }
        }
-       print "Total $cnt package(s)\n";
+       print "Total $cnt package(s)\n" unless $printformat;
        
 }
 
@@ -1908,7 +2172,24 @@ sub info_packages {
        my( $name, $pkg, $key, $dist );
        my @firstkeys = qw(package version builder state section priority
                                           installed_version previous_state state_change);
-       my @dists = $info_all_dists ? keys %conf::distributions : ($distribution);
+       my @dists = $info_all_dists ? keys %distributions : ($distribution);
+       my %beautykeys = ( 'package' => 'Package', 'version' => 'Version', 'builder' => 'Builder',
+               'state' => 'State', 'section' => 'Section', 'priority' => 'Priority',
+               'installed_version' => 'Installed-Version', 'previous_state' => 'Previous-State',
+               'state_change' => 'State-Change',
+               'bd_problem' => 'BD-Problem', 
+               'binary_nmu_changelog' => 'Binary-NMU-Changelog', 'binary_nmu_version' => 'Binary-NMU-Version',
+               'buildpri' => 'BuildPri', 'depends' => 'Depends', 'failed' => 'Failed',
+               'failed_category' => 'Failed-Category', 'notes' => 'Notes',
+               'distribution' => 'Distribution', 'old_failed' => 'Old-Failed',
+               'permbuildpri' => 'PermBuildPri', 'rel' => 'Rel',
+               'calprio' => 'CalculatedPri', 'state_days' => 'State-Days', 'state_time' => 'State-Time',
+                'successtime' => 'Success-build-time',
+                'anytime' => 'Build-time',
+                'extra_depends' => 'Extra-Dependencies',
+                'extra_conflicts' => 'Extra-Conflicts',
+                'build_arch_all' => 'Build-Arch-All',
+                        );
        
        foreach $name (@_) {
                $name =~ s/_.*$//; # strip version
@@ -1930,15 +2211,7 @@ sub info_packages {
                                $val = "\n$val" if isin( $key, qw(Failed Old-Failed));
                                $val =~ s/\n/\n    /g;
                                my $print_key = $key;
-                               $print_key = 'Package' if ($key eq 'package');
-                               $print_key = 'Version' if ($key eq 'version');
-                               $print_key = 'Builder' if ($key eq 'builder');
-                               $print_key = 'State' if ($key eq 'state');
-                               $print_key = 'Section' if ($key eq 'section');
-                               $print_key = 'Priority' if ($key eq 'priority');
-                               $print_key = 'Installed-Version' if ($key eq 'installed_version');
-                               $print_key = 'Previous-State' if ($key eq 'previous_state');
-                               $print_key = 'State-Change' if ($key eq 'state_change');
+                               $print_key = $beautykeys{$print_key} if $beautykeys{$print_key};
                                printf "  %-20s: %s\n", $print_key, $val;
                        }
                        foreach $key (sort keys %$pkg) {
@@ -1949,20 +2222,7 @@ sub info_packages {
                                $val = "\n$val" if isin( $key, qw(Failed Old-Failed));
                                $val =~ s/\n/\n    /g;
                                my $print_key = $key;
-                               $print_key = 'BD-Problem' if ($key eq 'bd_problem');
-                               $print_key = 'Binary-NMU-Changelog' if ($key eq 'binary_nmu_changelog');
-                               $print_key = 'Binary-NMU-Version' if ($key eq 'binary_nmu_version');
-                               $print_key = 'BuildPri' if ($key eq 'buildpri');
-                               $print_key = 'Depends' if ($key eq 'depends');
-                               $print_key = 'Failed' if ($key eq 'failed');
-                               $print_key = 'Failed-Category' if ($key eq 'failed_category');
-                               $print_key = 'Notes' if ($key eq 'notes');
-                               $print_key = 'Distribution' if ($key eq 'distribution');
-                               $print_key = 'Old-Failed' if ($key eq 'old_failed');
-                               $print_key = 'PermBuildPri' if ($key eq 'permbuildpri');
-                               $print_key = 'Rel' if ($key eq 'rel');
-                               $print_key = 'CalculatedPri' if ($key eq 'calprio');
-                               $print_key = 'Waiting-Days' if ($key eq 'waiting_days');
+                               $print_key = $beautykeys{$print_key} if $beautykeys{$print_key};
                                printf "  %-20s: %s\n", $print_key, $val;
                        }
                }
@@ -2009,11 +2269,11 @@ sub read_db {
        my $file = shift;
 
        print "Reading ASCII database from $file..." if $verbose >= 1;
-       open( F, "<$file" ) or
+       open( my $fh, '<', $file ) or
                die "Can't open database $file: $!\n";
 
        local($/) = ""; # read in paragraph mode
-       while( <F> ) {
+       while( <$fh> ) {
                my( %thispkg, $name );
                s/[\s\n]+$//;
                s/\n[ \t]+/\376\377/g;  # fix continuation lines
@@ -2041,7 +2301,7 @@ sub read_db {
                                or die $dbh->errstr;
                 }
        }
-       close( F );
+       close( $fh );
        print "done\n" if $verbose >= 1;
 }
 
@@ -2072,7 +2332,7 @@ sub check_entry {
        die "Bad state $pkg->{'state'} of package $pkg->{Package}\n"
                if !isin( $pkg->{'state'},
                                  qw(Needs-Build Building Built Build-Attempted Uploaded Installed Dep-Wait Dep-Wait-Removed
-                                        Failed Failed-Removed Not-For-Us BD-Uninstallable
+                                        Failed Failed-Removed Not-For-Us BD-Uninstallable Auto-Not-For-Us
                                         ) );
 }
 
@@ -2081,7 +2341,7 @@ sub export_db {
        my($name,$pkg,$key);
 
        print "Writing ASCII database to $file..." if $verbose >= 1;
-       open( F, ">$file" ) or
+       open( my $fh, '>', $file ) or
                die "Can't open export $file: $!\n";
 
         my $db = get_all_source_info();
@@ -2094,11 +2354,11 @@ sub export_db {
                        $val =~ s/\n*$//;
                        $val =~ s/^/ /mg;
                        $val =~ s/^ +$/ ./mg;
-                       print F "$key: $val\n";
+                       print $fh "$key: $val\n";
                }
-               print F "\n";
+               print $fh "\n";
        }
-       close( F );
+       close( $fh );
        print "done\n" if $verbose >= 1;
 }
 
@@ -2111,12 +2371,13 @@ sub change_state {
        return if defined($$state) and $$state eq $newstate;
         $pkg->{'previous_state'} = $$state if defined($$state);
        $pkg->{'state_change'} = $curr_date;
+       $pkg->{'do_state_change'} = 1;
 
        if (defined($$state) and $$state eq 'Failed') {
                $pkg->{'old_failed'} =
                        "-"x20 . " $pkg->{'version'} " . "-"x20 . "\n" .
-                       $pkg->{'failed'} . "\n" .
-                       $pkg->{'old_failed'};
+                       ($pkg->{'failed'} // ""). "\n" .
+                       ($pkg->{'old_failed'} // "");
                delete $pkg->{'failed'};
                delete $pkg->{'failed_category'};
        }
@@ -2138,6 +2399,13 @@ sub log_ta {
                   "changed from $prevstate to $pkg->{'state'} ".
                   "by $real_user as $user";
        
+        if ($simulate) {
+            printf "update transactions: %s %s %s %s %s %s %s %s\n",
+               $pkg->{'package'}, $distribution,
+               $pkg->{'version'}, $action, $prevstate, $pkg->{'state'},
+                $real_user, $user;
+            return;
+        }
        $dbh->do('INSERT INTO ' . transactions_table_name() .
                        ' (package, distribution, version, action, ' .
                        ' prevstate, state, real_user, set_user, time) ' .
@@ -2167,13 +2435,13 @@ sub send_mail {
        $to .= '@' . $domain if $to !~ /\@/;
        $text =~ s/^\.$/../mg;
        local $SIG{'PIPE'} = 'IGNORE';
-       open( PIPE,  "| $conf::mailprog -oem $to" )
+       open( my $pipe,  '|-', "$conf::mailprog -oem $to" )
                or die "Can't open pipe to $conf::mailprog: $!\n";
        chomp $text;
-       print PIPE "From: $from\n";
-       print PIPE "Subject: $subject\n\n";
-       print PIPE "$text\n";
-       close( PIPE );
+       print $pipe "From: $from\n";
+       print $pipe "Subject: $subject\n\n";
+       print $pipe "$text\n";
+       close( $pipe );
 }
 
 # for parsing input to dep-wait
@@ -2225,79 +2493,196 @@ sub build_deplist {
        return $result;
 }
 
+
+sub filterarch {
+    return "" unless $_[0];
+    return Dpkg::Deps::parse($_[0], ("reduce_arch" => 1, "host_arch" => $_[1]))->dump();
+}
+
+sub wb_edos_builddebcheck {
+# Copyright (C) 2008 Ralf Treinen <treinen@debian.org>
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, version 2 of the License.
+# integrated into wanna-builds code by Andreas Barth 2010
+
+    my $args = shift;
+    my $sourceprefix="source---";
+    my $architecture=$args->{'arch'};
+    my $edosoptions = "-failures -explain -quiet";
+    my $packagefiles = $args->{'pkgs'};
+    my $sourcesfile = $args->{'src'};
+
+    my $packagearch="";
+    foreach my $packagefile (@$packagefiles) {
+        open(my $fh,'<', $packagefile);
+        while (<$fh>) {
+            next unless /^Architecture/;
+            next if /^Architecture:\s*all/;
+            /Architecture:\s*([^\s]*)/;
+            if ($packagearch eq "") {
+               $packagearch = $1;
+            } elsif ( $packagearch ne $1) {
+               return "Package file contains different architectures: $packagearch, $1";
+            }
+        }
+        close $fh;
+    }
+
+    if ( $architecture eq "" ) {
+        if ( $packagearch eq "" ) {
+       return "No architecture option given, " .
+           "and no non-all architecture found in the Packages file";
+        } else {
+           $architecture = $packagearch;
+        }
+    } else {
+        if ( $packagearch ne "" & $architecture ne $packagearch) {
+           return "Architecture option is $architecture ".
+           "but the package file contains architecture $packagearch";
+        }   
+    }
+
+    print "calling: edos-debcheck $edosoptions < $sourcesfile ".join('', map {" '-base FILE' ".$_ } @$packagefiles)."\n";
+    open(my $result_cmd, '-|',
+        "edos-debcheck $edosoptions < $sourcesfile ".join('', map {" '-base FILE' ".$_ } @$packagefiles));
+
+    my $explanation="";
+    my $result={};
+    my $binpkg="";
+
+    while (<$result_cmd>) {
+# source---pulseaudio (= 0.9.15-4.1~bpo50+1): FAILED
+#   source---pulseaudio (= 0.9.15-4.1~bpo50+1) depends on missing:
+#   - libltdl-dev (>= 2.2.6a-2)
+# source---libcanberra (= 0.22-1~bpo50+1): FAILED
+#   source---libcanberra (= 0.22-1~bpo50+1) depends on missing:
+#   - libltdl-dev
+#   - libltdl7-dev (>= 2.2.6)
+
+        if (/^\s+/) {
+           s/^(\s*)$sourceprefix(.*)depends on/$1$2build-depends on/o;
+            s/^(\s*)$sourceprefix(.*) and (.*) conflict/$1$2 build-conflicts with $3/o;
+            $explanation .= $_;
+        } else {
+            if (/^$sourceprefix(.*) \(.*\): FAILED/o) {
+                $result->{$binpkg} = $explanation if $binpkg;
+                $explanation = "";
+                $binpkg = $1;
+            } elsif (/^(depwait---.*) \(.*\): FAILED/o) {
+                $result->{$binpkg} = $explanation if $binpkg;
+                $explanation = "";
+                $binpkg = $1;
+            } else { # else something broken is happening
+                #print "ignoring $_\n";
+                1;
+            }
+        }
+    }
+
+    close $result_cmd;
+    $result->{$binpkg} = $explanation if $binpkg;
+    return $result;
+
+}
+
+
 sub call_edos_depcheck {
-    my $packagesfile = shift;
-    my $srcs = shift;
+    return if $simulate_edos;
+    my $args = shift;
+    my $srcs = $args->{'srcs'};
     my $key;
     
-    return if defined ($conf::distributions{$distribution}{noadw});
+    return if defined ($distributions{$distribution}{noadw}) && not defined $args->{'depwait'};
 
     # We need to check all of needs-build, as any new upload could make
     # something in needs-build have uninstallable deps
     # We also check everything in bd-uninstallable, as any new upload could
     # make that work again
-    my %interesting_packages;
+    my (%interesting_packages, %interesting_packages_depwait);
     my $db = get_all_source_info();
     foreach $key (keys %$db) {
        my $pkg = $db->{$key};
-        if (defined $pkg and isin($pkg->{'state'}, qw/Needs-Build BD-Uninstallable/)) {
+        if (defined $pkg and isin($pkg->{'state'}, qw/Needs-Build BD-Uninstallable/) and not defined ($distributions{$distribution}{noadw})) {
                $interesting_packages{$key} = undef;
        }
+        if (defined $pkg and isin($pkg->{'state'}, qw/Dep-Wait/) and defined $args->{'depwait'}) {
+               $interesting_packages_depwait{$key} = undef;
+                # we always check for BD-Uninstallability in depwait - could be that depwait is satisfied but package is uninstallable
+               $interesting_packages{$key} = undef unless defined ($distributions{$distribution}{noadw});
+       }
     }
     
     #print "I would look at these sources with edos-depcheck:\n";
     #print join " ", keys %interesting_packages,"\n";
+    return unless %interesting_packages || %interesting_packages_depwait;
 
-    my $tmpfile_pattern = "/tmp/wanna-build-interesting-sources-$distribution.$$-";
-    my ($tmpfile, $i);
-    for( $i = 0;; ++$i ) {
-           $tmpfile = $tmpfile_pattern . $i;
-           last if ! -e $tmpfile;
-    }
-
-    open SOURCES, '>', $tmpfile or die "Could not open temporary file $tmpfile\n";
+    my $tmpfile_pattern = "/tmp/wanna-build-interesting-sources-$distribution.$$-XXXXX";
+    use File::Temp qw/ tempfile /;
+    my ($SOURCES, $tmpfile) = tempfile( $tmpfile_pattern, UNLINK => 1 );
     for my $key (keys %interesting_packages) {
        my $pkg = $db->{$key};
-       print SOURCES "Package: $key\n";
-       print SOURCES "Version: $pkg->{'version'}\n";
-       print SOURCES "Build-Depends: $srcs->{$key}{'dep'}\n" if $srcs->{$key}{'dep'};
-       print SOURCES "Build-Conflicts: $srcs->{$key}{'conf'}\n" if $srcs->{$key}{'conf'};
-       print SOURCES "Architecture: all\n";
-       print SOURCES "\n";
+        # we print the source files as binary ones (with "source---"-prefixed),
+        # so we can try if these "binary" packages are installable.
+        # If such a "binary" package is installable, the corresponding source package is buildable.
+       print $SOURCES "Package: source---$key\n";
+       print $SOURCES "Version: $pkg->{'version'}\n";
+        my $t = &filterarch($srcs->{$key}{'dep'} || $srcs->{$key}{'depends'}, $arch);
+        my $tt = &filterarch($pkg->{'extra_depends'}, $arch);
+        $t = $t ? ($tt ? "$t, $tt" : $t) : $tt;
+       print $SOURCES "Depends: $t\n" if $t;
+        my $u = &filterarch($srcs->{$key}{'conf'} || $srcs->{$key}{'conflicts'}, $arch);
+        my $uu = &filterarch($pkg->{'extra_conflicts'}, $arch);
+        $u = $u ? ($uu ? "$u, $uu" : $u) : $uu;
+       print $SOURCES "Conflicts: $u\n" if $u;
+       print $SOURCES "Architecture: all\n";
+       print $SOURCES "\n";
     }
-    close SOURCES;
-
-    if (open(EDOS,"-|","wb-edos-builddebcheck", "-a", $arch, $packagesfile, $tmpfile))
-    {
-       local($/) = ""; # read in paragraph mode
-       while( <EDOS> ) {
-               my( $key, $reason ) ;
-               s/\s*$//m;
-               /^Package:\s*(\S+)$/mi and $key = $1;
-               /^Failed-Why:(([^\n]|\n ([^\n]|\.))*)$/msi and $reason = $1;
-               $reason =~ s/^\s*//mg;
-               $reason ||= 'No reason given by edos-debcheck';
+    for my $key (keys %interesting_packages_depwait) {
+       my $pkg = $db->{$key};
+        # we print the source files as binary ones (with "depwait---"-prefixed),
+        # so we can try if these "binary" packages are installable.
+        # If such a "binary" package is installable, the corresponding source package goes out of depwait
+       print $SOURCES "Package: depwait---$key\n";
+       print $SOURCES "Version: $pkg->{'version'}\n";
+       print $SOURCES "Depends: $pkg->{'depends'}\n";
+       print $SOURCES "Architecture: all\n";
+       print $SOURCES "\n";
+    }
+    close $SOURCES;
 
+    my $edosresults = wb_edos_builddebcheck({'arch' => $args->{'arch'}, 'pkgs' => $args->{'pkgs'}, 'src' => $tmpfile});
+    if (ref($edosresults) eq 'HASH') {
+        foreach my $key (grep { $_ !~ /^depwait---/ } keys %$edosresults) {
                if (exists $interesting_packages{$key}) {
-                   $interesting_packages{$key} = $reason;
+                   $interesting_packages{$key} = $edosresults->{$key};
                } else {
                    #print "TODO: edos reported a package we do not care about now\n" if $verbose;
                }
-       }
-       close EDOS;
+        }
+        foreach my $key (grep { $_ =~ /^depwait---/ } keys %$edosresults) {
+                $key =~ /^depwait---(.*)/ and $key = $1;
+               if (exists $interesting_packages_depwait{$key}) {
+                   $interesting_packages_depwait{$key} = $edosresults->{"depwait---".$key};
+               } else {
+                   #print "TODO: edos reported a package we do not care about now\n" if $verbose;
+               }
+        }
     } else {
-       print "ERROR: Could not run wb-edos-builddebcheck. I am continuing, assuming\n" .
-             "all packages have installable build-dependencies."
+        # if $edosresults isn't an hash, then something went wrong and the string is the error message
+        print "ERROR: Could not run wb-edos-builddebcheck. I am continuing, assuming\n" .
+             "all packages have installable build-dependencies."
     }
     
     unlink( $tmpfile );
 
     for my $key (keys %interesting_packages) {
+        next if defined $interesting_packages_depwait{$key};
        my $pkg = $db->{$key};
        my $change = 
            (defined $interesting_packages{$key} and $pkg->{'state'} eq 'Needs-Build') ||
            (not defined $interesting_packages{$key} and $pkg->{'state'} eq 'BD-Uninstallable');
-       my $problemchange = $interesting_packages{$key} ne $pkg->{'bd_problem'};
+       my $problemchange = ($interesting_packages{$key}//"") ne ($pkg->{'bd_problem'}//"");
        if ($change) {
            if (defined $interesting_packages{$key}) {
                    change_state( \$pkg, 'BD-Uninstallable' );
@@ -2312,13 +2697,30 @@ sub call_edos_depcheck {
            }   
        }
        if ($change) {
-           log_ta( $pkg, "--merge-all" );
-           print "edos-builddebchange changed state of ${key}_$pkg->{'version'} to $pkg->{'state'}\n" if $verbose;
+           log_ta( $pkg, "--merge-all (edos)" ) unless $simulate;
+           print "edos-builddebchange changed state of ${key}_$pkg->{'version'} ($args->{'arch'}) to $pkg->{'state'}\n" if $verbose || $simulate;
        }
        if ($change || $problemchange) {
-           update_source_info($pkg);
+           update_source_info($pkg) unless $simulate;
        }
     }
+
+    for my $key (keys %interesting_packages_depwait) {
+        if ($interesting_packages_depwait{$key}) {
+            print "dep-wait for $key ($args->{'arch'}) not fullfiled yet\n" if $verbose || $simulate;
+            next;
+        }
+       my $pkg = $db->{$key};
+           if (defined $interesting_packages{$key}) {
+                   change_state( \$pkg, 'BD-Uninstallable' );
+                   $pkg->{'bd_problem'} = $interesting_packages{$key};
+           } else {
+                   change_state( \$pkg, 'Needs-Build' );
+           }
+       log_ta( $pkg, "edos_depcheck: depwait" ) unless $simulate;
+       update_source_info($pkg) unless $simulate;
+       print "edos-builddebchange changed state of ${key}_$pkg->{'version'} ($args->{'arch'}) from dep-wait to $pkg->{'state'}\n" if $verbose || $simulate;
+    }
 }
 
 sub usage {
@@ -2401,18 +2803,28 @@ sub transactions_table_name {
        return '"' . $arch . $schema_suffix . '".transactions';
 }
 
+sub pkg_history_table_name {
+       return '"' . $arch . $schema_suffix . '".pkg_history';
+}
+
 sub get_readonly_source_info {
        my $name = shift;
        # SELECT FLOOR(EXTRACT('epoch' FROM age(localtimestamp, '2010-01-22  23:45')) / 86400) -- change to that?
-       my $pkg = $dbh->selectrow_hashref('SELECT *, extract(days from date_trunc(\'days\', now() - state_change::timestamp)) as waiting_days FROM ' . 
-               table_name() . ' WHERE package = ? AND distribution = ?',
+        my $q = "SELECT rel, priority, state_change, permbuildpri, section, buildpri, failed, state, binary_nmu_changelog, bd_problem, version, package, distribution, installed_version, notes, failed_category, builder, old_failed, previous_state, binary_nmu_version, depends, extract(days from date_trunc('days', now() - state_change)) as state_days, floor(extract(epoch from now()) - extract(epoch from state_change)) as state_time"
+            . ", (SELECT max(build_time) FROM ".pkg_history_table_name()." WHERE pkg_history.package = packages.package AND pkg_history.distribution = packages.distribution AND result = 'successful') AS successtime"
+            . ", (SELECT max(build_time) FROM ".pkg_history_table_name()." WHERE pkg_history.package = packages.package AND pkg_history.distribution = packages.distribution ) AS anytime"
+            . ", extra_depends, extra_conflicts, build_arch_all"
+            . " FROM " .  table_name()
+            . ' WHERE package = ? AND distribution = ?';
+       my $pkg = $dbh->selectrow_hashref( $q,
                undef, $name, $distribution);
        return $pkg;
 }
 
 sub get_source_info {
        my $name = shift;
-       my $pkg = $dbh->selectrow_hashref('SELECT *, extract(days from date_trunc(\'days\', now() - state_change::timestamp)) as waiting_days FROM ' . 
+        return get_readonly_source_info($name) if $simulate;
+       my $pkg = $dbh->selectrow_hashref('SELECT *, extract(days from date_trunc(\'days\', now() - state_change)) as state_days, floor(extract(epoch from now()) - extract(epoch from state_change)) as state_time FROM ' . 
                table_name() . ' WHERE package = ? AND distribution = ?' .
                ' FOR UPDATE',
                undef, $name, $distribution);
@@ -2422,19 +2834,35 @@ sub get_source_info {
 sub get_all_source_info {
        my %options = @_;
 
-       my $q = 'SELECT *, extract(days from date_trunc(\'days\', now() - state_change::timestamp)) as waiting_days FROM ' . table_name()
-               . ' WHERE distribution = ? ';
-       my @args = ($distribution);
+        my $q = "SELECT rel, priority, state_change, permbuildpri, section, buildpri, failed, state, binary_nmu_changelog, bd_problem, version, package, distribution, installed_version, notes, failed_category, builder, old_failed, previous_state, binary_nmu_version, depends, extract(days from date_trunc('days', now() - state_change)) as state_days, floor(extract(epoch from now()) - extract(epoch from state_change)) as state_time"
+#            . ", (SELECT max(build_time) FROM ".pkg_history_table_name()." WHERE pkg_history.package = packages.package AND pkg_history.distribution = packages.distribution AND result = 'successful') AS successtime"
+#            . ", (SELECT max(build_time) FROM ".pkg_history_table_name()." WHERE pkg_history.package = packages.package AND pkg_history.distribution = packages.distribution ) AS anytime"
+            . ", successtime.build_time as successtime, anytime.build_time as anytime, extra_depends, extra_conflicts"
+            . " FROM " .  table_name()
+                . " left join ( "
+                  . "select distinct on (package, distribution) build_time, package, distribution from ".pkg_history_table_name()." where result = 'successful' order by package, distribution, timestamp "
+                  . " ) as successtime using (package, distribution) "
+                . " left join ( "
+                  . "select distinct on (package, distribution) build_time, package, distribution from ".pkg_history_table_name()." order by package, distribution, timestamp desc"
+                  . " ) as anytime using (package, distribution) "
+           . " WHERE TRUE ";
+        my @args = ();
+        if ($distribution) {
+            my @dists = split(/[, ]+/, $distribution);
+            $q .= ' AND ( distribution = ? '.(' OR distribution = ? ' x $#dists).' )';
+            foreach my $d ( @dists ) {
+                push @args, ($d);
+            }
+        }
        if ($options{state} && uc($options{state}) ne "ALL") {
                $q .= ' AND upper(state) = ? ';
                push @args, uc($options{state});
        }
 
-       if ($options{user}) {
+       if ($options{user} && uc($options{state}) ne "NEEDS-BUILD") { # if it's NEEDS-BUILD, we don't look at users
                #this basically means "this user, or no user at all":
-               $q .= ' AND (builder = ? OR upper(state) = ?)';
+               $q .= " AND (builder = ? OR upper(state) = 'NEEDS-BUILD')";
                push @args, $options{user};
-               push @args, "NEEDS-BUILD";
        }
 
        if ($options{category}) {
@@ -2443,13 +2871,13 @@ sub get_all_source_info {
                push @args, "FAILED";
        }
 
-       if ($options{list_min_age} > 0) {
-               $q .= ' AND age(state_change::timestamp) > ? ';
+       if ($options{list_min_age} && $options{list_min_age} > 0) {
+               $q .= ' AND age(state_change) > ? ';
                push @args, $options{list_min_age} . " days";
        }
 
-       if ($options{list_min_age} < 0) {
-               $q .= ' AND age(state_change::timestamp) < ? ';
+       if ($options{list_min_age} && $options{list_min_age} < 0) {
+               $q .= ' AND age(state_change) < ? ';
                push @args, -$options{list_min_age} . " days";
        }
 
@@ -2457,8 +2885,30 @@ sub get_all_source_info {
        return $db;
 }
 
+sub show_distribution_architectures {
+       my $q = 'SELECT distribution, spacecat_all(architecture) AS architectures '.
+               'FROM distribution_architectures '.
+               'GROUP BY distribution';
+       my $rows = $dbh->selectall_hashref($q, 'distribution');
+       foreach my $name (keys %$rows) {
+               print $name.': '.$rows->{$name}->{'architectures'}."\n";
+       }
+}
+
+sub show_distribution_aliases {
+       foreach my $alias (keys %distribution_aliases) {
+               print $alias.': '.$distribution_aliases{$alias}."\n";
+       }
+}
+
 sub update_source_info {
        my $pkg = shift;
+        $pkg->{'extra_depends'} = $extra_depends if defined $extra_depends;
+        undef $pkg->{'extra_depends'} unless $pkg->{'extra_depends'};
+        $pkg->{'extra_conflicts'} = $extra_conflicts if defined $extra_conflicts;
+        undef $pkg->{'extra_conflicts'} unless $pkg->{'extra_conflicts'};
+        print Dumper $pkg if $verbose and $simulate;
+        return if $simulate;
 
        my $pkg2 = get_source_info($pkg->{'package'});
        if (! defined $pkg2)
@@ -2473,7 +2923,7 @@ sub update_source_info {
                        'priority = ?, ' .
                        'installed_version = ?, ' .
                        'previous_state = ?, ' .
-                       'state_change = ?, ' .
+                       (($pkg->{'do_state_change'}) ? "state_change = now()," : "").
                        'notes = ?, ' .
                        'builder = ?, ' .
                        'failed = ?, ' .
@@ -2485,6 +2935,8 @@ sub update_source_info {
                        'buildpri = ?, ' .
                        'depends = ?, ' .
                        'rel = ?, ' .
+                       'extra_depends = ?, ' .
+                       'extra_conflicts = ?, ' .
                        'bd_problem = ? ' .
                        'WHERE package = ? AND distribution = ?',
                undef,
@@ -2494,7 +2946,6 @@ sub update_source_info {
                $pkg->{'priority'},
                $pkg->{'installed_version'},
                $pkg->{'previous_state'},
-               $pkg->{'state_change'},
                $pkg->{'notes'},
                $pkg->{'builder'},
                $pkg->{'failed'},
@@ -2506,12 +2957,15 @@ sub update_source_info {
                $pkg->{'buildpri'},
                $pkg->{'depends'},
                $pkg->{'rel'},
+                $pkg->{'extra_depends'},
+                $pkg->{'extra_conflicts'},
                $pkg->{'bd_problem'},
                $pkg->{'package'},
                $distribution) or die $dbh->errstr;
 }
 
 sub add_source_info {
+        return if $simulate;
        my $pkg = shift;
        $dbh->do('INSERT INTO ' . table_name() .
                        ' (package, distribution) values (?, ?)',
@@ -2519,6 +2973,7 @@ sub add_source_info {
 }
 
 sub del_source_info {
+        return if $simulate;
        my $name = shift;
        $dbh->do('DELETE FROM ' . table_name() .
                        ' WHERE package = ? AND distribution = ?',
@@ -2534,6 +2989,7 @@ sub get_user_info {
 }
 
 sub update_user_info {
+        return if $simulate;
        my $user = shift;
        $dbh->do('UPDATE ' . user_table_name() .
                        ' SET last_seen = now() WHERE username = ?' .
@@ -2544,6 +3000,7 @@ sub update_user_info {
 
 
 sub add_user_info {
+        return if $simulate;
        my $user = shift;
        $dbh->do('INSERT INTO ' . user_table_name() .
                        ' (username, distribution, last_seen)' .
@@ -2552,9 +3009,159 @@ sub add_user_info {
                or die $dbh->errstr;
 }
 
-sub lock_table()
-{
+sub lock_table {
+        return if $simulate;
        $dbh->do('LOCK TABLE ' . table_name() .
                ' IN EXCLUSIVE MODE', undef) or die $dbh->errstr;
 }
 
+sub parse_argv {
+# parts the array $_[0] and $_[1] and returns the sub-array (modifies the original one)
+    my @ret = ();
+    my $args = shift;
+    my $separator = shift;
+    while($args->[0] && $args->[0] ne $separator) { 
+        push @ret, shift @$args;
+    }
+    shift @$args if @$args;
+    return @ret;
+}
+
+sub parse_all_v3 {
+    my $srcs = shift;
+    my $vars = shift;
+    my $db = get_all_source_info();
+    my $binary = $srcs->{'_binary'};
+
+    SRCS:
+    foreach my $name (keys %$srcs) {
+        next if $name eq '_binary';
+
+        # state = installed, out-of-date, uncompiled, not-for-us, auto-not-for-us
+        my $pkgs = $srcs->{$name};
+        my $pkg = $db->{$name};
+
+        unless ($pkg) {
+            next SRCS if $pkgs->{'status'} eq 'not-for-us';
+            my $logstr = sprintf("merge-v3 %s %s_%s (%s, %s):", $vars->{'time'}, $name, $pkgs->{'version'}, $vars->{'arch'}, $vars->{'suite'});
+
+            # does at least one binary exist in the database and is more recent - if so, we're probably just outdated, ignore the source package
+            for my $bin (@{$pkgs->{'binary'}}) {
+                if ($binary->{$bin} and vercmp($pkgs->{'version'}, $binary->{$bin}->{'version'}) < 0) {
+                    print "$logstr skipped because binaries (assumed to be) overwritten\n" if $verbose || $simulate;
+                    next SRCS;
+                }
+            }
+            $pkg->{'package'}  = $name;
+        }
+        my $logstr = sprintf("merge-v3 %s %s_%s", $vars->{'time'}, $name, $pkgs->{'version'}).
+            ($pkgs->{'binnmu'} ? ";b".$pkgs->{'binnmu'} : "").
+            sprintf(" (%s, %s, previous: %s", $vars->{'arch'}, $vars->{'suite'}, $pkg->{'version'}//"").
+            ($pkg->{'binary_nmu_version'} ? ";b".$pkg->{'binary_nmu_version'} : "").
+            ", $pkg->{'state'}):";
+
+        if (isin($pkgs->{'status'}, qw (installed related)) && $pkgs->{'version'} eq $pkg->{'version'} && $pkgs->{'binnmu'}//0 < int($pkg->{'binary_nmu_version'}//0)) {
+                $pkgs->{'status'} = 'out-of-date';
+        }
+        if (isin($pkgs->{'status'}, qw (installed related))) {
+            my $change = 0;
+            if ($pkg->{'state'} ne 'Installed') {
+                change_state( \$pkg, 'Installed');
+                delete $pkg->{'depends'};
+                delete $pkg->{'extra_depends'};
+                delete $pkg->{'extra_conflicts'};
+                $change++;
+            }
+            my $attrs = { 'version' => 'version', 'installed_version' => 'version', 'binary_nmu_version' => 'binnmu', 'section' => 'section', 'priority' => 'priority' };
+            foreach my $k (keys %$attrs) {
+                if (($pkg->{$k}//"") ne ($pkgs->{$attrs->{$k}}//"")) {
+                    $pkg->{$k} = $pkgs->{$attrs->{$k}};
+                    $change++;
+                }
+            }
+            if (isin($pkgs->{'status'}, qw (related)) and $pkg->{'notes'} ne "related") {
+                $pkg->{'notes'} = "related";
+                $change++;
+            }
+            if ($change) {
+                print "$logstr set to installed/".($pkg->{'notes'}//"")."\n" if $verbose || $simulate;
+                log_ta( $pkg, "--merge-v3: installed" ) unless $simulate;
+                update_source_info($pkg) unless $simulate;
+            }
+            next;
+        }
+
+        if ($pkgs->{'status'} eq 'not-for-us') {
+            next if isin( $pkg->{'state'}, qw(Not-For-Us Installed Failed-Removed));
+
+            if (isin( $pkg->{'state'}, qw(Failed Build-Attempted Built))) {
+                change_state( \$pkg, "Failed-Removed" );
+               log_ta( $pkg, "--merge-v3: Failed-Removed" ) unless $simulate;
+               update_source_info($pkg) unless $simulate;
+                print "$logstr (virtually) deleted from database\n" if $verbose || $simulate;
+                next;
+            }
+
+            print "$logstr should delete (not-for-us according to P-a-s)\n" if $verbose || $simulate || 1; # not implemented yet on purpose
+            next;
+        }
+
+        if ($pkgs->{'status'} eq 'auto-not-for-us') {
+            next if isin( $pkg->{'state'}, qw(Not-For-Us Failed Failed-Removed Dep-Wait Dep-Wait-Removed Auto-Not-For-Us));
+            # if the package is currently current, the status is Installed, not not-for-us
+
+            change_state( \$pkg, "Auto-Not-For-Us" );
+           log_ta( $pkg, "--merge-v3: Auto-Not-For-Us" ) unless $simulate;
+           update_source_info($pkg) unless $simulate;
+            print "$logstr set to auto-not-for-us\n" if $verbose || $simulate;
+            next SRCS;
+        }
+
+        # only uncompiled / out-of-date are left, so check if anything new
+        if (!(isin($pkgs->{'status'}, qw (uncompiled out-of-date)))) {
+            print "$logstr package in unknown state: $pkgs->{'status'}\n";
+            next SRCS;
+        }
+        next if $pkgs->{'version'} eq $pkg->{'version'} and $pkgs->{'binnmu'}//0 >= int($pkg->{'binary_nmu_version'}//0);
+        next if $pkgs->{'version'} eq $pkg->{'version'} and !isin( $pkg->{'state'}, qw(Installed));
+        next if isin( $pkg->{'state'}, qw(Not-For-Us Failed-Removed));
+
+        if (defined( $pkg->{'state'} ) && isin( $pkg->{'state'}, qw(Building Built Build-Attempted))) {
+            send_mail( $pkg->{'builder'},
+                "new version of $name (dist=$distribution)",
+                "As far as I'm informed, you're currently building the package $name\n".
+                "in version $pkg->{'version'}.\n\n".
+                "Now there's a new source version $pkgs->{'version'}. If you haven't finished\n".
+                "compiling $name yet, you can stop it to save some work.\n".
+                "Just to inform you...\n".
+                "(This is an automated message)\n" ) unless $simulate;
+           print "$logstr new version while building $pkg->{'version'} -- sending mail to builder ($pkg->{'builder'})\n"
+                                 if $verbose || $simulate;
+           }
+        change_state( \$pkg, 'Needs-Build');
+        $pkg->{'notes'} = $pkgs->{'status'};
+        $pkg->{'version'} = $pkgs->{'version'};
+        $pkg->{'section'} = $pkgs->{'section'};
+        $pkg->{'priority'} = $pkgs->{'priority'};
+        $pkg->{'dep'} = $pkgs->{'depends'};
+        $pkg->{'conf'} = $pkgs->{'conflicts'};
+        delete $pkg->{'builder'};
+        delete $pkg->{'binary_nmu_version'} unless $pkgs->{'binnmu'};
+        delete $pkg->{'binary_nmu_changelog'} unless $pkgs->{'binnmu'};
+        log_ta( $pkg, "--merge-v3: needs-build" ) unless $simulate;
+        update_source_info($pkg) unless $simulate;
+        print "$logstr set to needs-builds\n" if $simulate || $verbose;
+    }
+
+    foreach my $name (keys %$db) {
+        next if $srcs->{$name};
+        my $pkg = $db->{$name};
+        my $logstr = "merge-v3 $vars->{'time'} ".$name."_$pkg->{'version'} ($vars->{'arch'}, $vars->{'suite'}, previous: $pkg->{'state'}):";
+        # package disappeared - delete
+        change_state( \$pkg, 'deleted' );
+        log_ta( $pkg, "--merge-v3: deleted" ) unless $simulate;
+       print "$logstr deleted from database\n" if $verbose || $simulate;
+        del_source_info($name) unless $simulate;
+        delete $db->{$name};
+    }
+}