Merge branch 'master' into develop

deb/debianize.pl

@@ -16,6 +16,9 @@ my $DIR_SRC = getcwd;
 my $DIR_DST;
 my $DEBIAN = "DEBIAN";
 
+my %COPY_RELEASES = (
+    'ubuntu-19.04'=> ['ubuntu-18.10','ubuntu-19.10']
+);
 my %DIR = (
     templates => '/usr/share/ravada'
     ,'etc/ravada.conf' => 'etc'
@@ -324,6 +327,18 @@ sub get_fallback {
     print `etc/get_fallback.pl`;
 }
 
+sub copy_identical_releases {
+    for my $source (sort keys %COPY_RELEASES ) {
+        for my $copy (@{$COPY_RELEASES{$source}}) {
+            my $file_source = "$DIR_SRC/../ravada_release/ravada_${VERSION}_${source}_all.deb";
+            die "Error: No $file_source" if !-e $file_source;
+            my $file_copy = "$DIR_SRC/../ravada_release/ravada_${VERSION}_${copy}_all.deb";
+            copy($file_source, $file_copy) or die "Error: $!\n$file_source -> $file_copy";
+        }
+    }
+    exit;
+}
+
 #########################################################################
 
 get_fallback();
@@ -367,3 +382,5 @@ tar($dist);
 create_md5sums();
 create_deb($dist);
 }
+
+copy_identical_releases();

debian/control-debian-10

@@ -4,7 +4,7 @@ Architecture: all
 Section: utils
 Priority: optional
 Maintainer: Francesc Guasch <frankie@telecos.upc.edu>
-Depends: perl (>=5.18),libmojolicious-perl,mysql-common,libauthen-passphrase-perl, libdatetime-perl, libdbd-mysql-perl,libdbi-perl,libdbix-connector-perl,libipc-run3-perl,libio-stringy-perl,libnet-ldap-perl,libproc-pid-file-perl,libvirt-daemon-system,libsys-virt-perl,libxml-libxml-perl,libconfig-yaml-perl,libmoose-perl,libjson-xs-perl,qemu-utils,perlmagick,libmoosex-types-netaddr-ip-perl,libio-interface-perl,libiptables-chainmgr-perl,libnet-dns-perl,wget,liblocale-maketext-lexicon-perl,libmojolicious-plugin-i18n-perl,libdbd-sqlite3-perl, debconf (>= 0.2.26), adduser, libdigest-sha-perl, qemu-kvm, net-tools, libfile-rsync-perl, libnet-ssh2-perl, bridge-utils
+Depends: perl (>=5.18),libmojolicious-perl,mysql-common,libauthen-passphrase-perl, libdatetime-perl, libdbd-mysql-perl,libdbi-perl,libdbix-connector-perl,libipc-run3-perl,libio-stringy-perl,libnet-ldap-perl,libproc-pid-file-perl,libvirt-daemon-system,libsys-virt-perl,libxml-libxml-perl,libconfig-yaml-perl,libmoose-perl,libjson-xs-perl,qemu-utils,perlmagick,libmoosex-types-netaddr-ip-perl,libio-interface-perl,libiptables-chainmgr-perl,libnet-dns-perl,wget,liblocale-maketext-lexicon-perl,libmojolicious-plugin-i18n-perl,libdbd-sqlite3-perl, debconf (>= 0.2.26), adduser, libdigest-sha-perl, qemu-kvm, net-tools, libfile-rsync-perl, libnet-ssh2-perl, bridge-utils, libencode-locale-perl
 Description: Remote Virtual Desktops Manager
  Ravada is a software that allows the user to connect to a
  remote virtual desktop.

debian/control-ubuntu-18.04

@@ -4,7 +4,7 @@ Architecture: all
 Section: utils
 Priority: optional
 Maintainer: Francesc Guasch <frankie@telecos.upc.edu>
-Depends: perl (>=5.18),libmojolicious-perl,mysql-common,libauthen-passphrase-perl, libdatetime-perl, libdbd-mysql-perl,libdbi-perl,libdbix-connector-perl,libipc-run3-perl,libio-stringy-perl,libnet-ldap-perl,libproc-pid-file-perl,libvirt-bin,libvirt-daemon-system,libsys-virt-perl,libxml-libxml-perl,libconfig-yaml-perl,libmoose-perl,libjson-xs-perl,qemu-utils,perlmagick,libmoosex-types-netaddr-ip-perl,libio-interface-perl,libiptables-chainmgr-perl,libnet-dns-perl,wget,liblocale-maketext-lexicon-perl,libmojolicious-plugin-i18n-perl,libdbd-sqlite3-perl, debconf (>= 0.2.26), adduser, libdigest-sha-perl, qemu-kvm, net-tools, libfile-rsync-perl, libnet-ssh2-perl, bridge-utils
+Depends: perl (>=5.18),libmojolicious-perl,mysql-common,libauthen-passphrase-perl, libdatetime-perl, libdbd-mysql-perl,libdbi-perl,libdbix-connector-perl,libipc-run3-perl,libio-stringy-perl,libnet-ldap-perl,libproc-pid-file-perl,libvirt-bin,libvirt-daemon-system,libsys-virt-perl,libxml-libxml-perl,libconfig-yaml-perl,libmoose-perl,libjson-xs-perl,qemu-utils,perlmagick,libmoosex-types-netaddr-ip-perl,libio-interface-perl,libiptables-chainmgr-perl,libnet-dns-perl,wget,liblocale-maketext-lexicon-perl,libmojolicious-plugin-i18n-perl,libdbd-sqlite3-perl, debconf (>= 0.2.26), adduser, libdigest-sha-perl, qemu-kvm, net-tools, libfile-rsync-perl, libnet-ssh2-perl, bridge-utils, libencode-locale-perl
 Description: Remote Virtual Desktops Manager
  Ravada is a software that allows the user to connect to a
  remote virtual desktop.

debian/control-ubuntu-18.10

-control-ubuntu-19.04
\ No newline at end of file

lib/Ravada.pm

@@ -3,7 +3,7 @@ package Ravada;
 use warnings;
 use strict;
 
-our $VERSION = '0.5.0-rc8';
+our $VERSION = '0.5.0-rc9';
 
 use Carp qw(carp croak);
 use Data::Dumper;
@@ -2388,7 +2388,6 @@ sub _do_execute_command {
     if ($err) {
         my $user = $request->defined_arg('user');
         if ($user) {
-            warn "sending message to ".$user->id." ".$user->name;
             my $subject = $err;
             my $message = '';
             if (length($subject) > 40 ) {

lib/Ravada/Domain.pm

@@ -2290,14 +2290,21 @@ sub _add_expose($self, $internal_port, $name, $restricted) {
         ." VALUES (?,?,?,?,?)"
     );
 
-    my $public_port = $self->_vm->_new_free_port();
 
-    $sth->execute($self->id
-        , $public_port, $internal_port
-        , ($name or undef)
-        , $restricted
-    );
-    $sth->finish;
+    my $public_port;
+    for (;;) {
+        eval {
+            $public_port = $self->_vm->_new_free_port();
+            $sth->execute($self->id
+                , $public_port, $internal_port
+                , ($name or undef)
+                , $restricted
+            );
+            $sth->finish;
+        };
+        last if !$@;
+        confess $@ if $@ && $@ !~ /Duplicate entry .*for key 'public/;
+    }
 
     $self->_open_exposed_port($internal_port, $name, $restricted)
         if $self->is_active && $self->ip;

lib/Ravada/VM/Void.pm

@@ -7,7 +7,6 @@ use Encode::Locale;
 use Fcntl qw(:flock O_WRONLY O_EXCL O_CREAT);
 use Hash::Util qw(lock_hash);
 use IPC::Run3 qw(run3);
-use LWP::UserAgent;
 use Moose;
 use Socket qw( inet_aton inet_ntoa );
 use Sys::Hostname;