Update to 5.10.1

7 files changed, 48 insertions, 218 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 93d6eb3c071a..bfaa7cc380a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = opennebula
 	pkgdesc = Virtual management infrastructure as a service (IaaS) toolkit for cloud computing (NOTE: Read the PKGBUILD!)
-	pkgver = 5.8.5
+	pkgver = 5.10.1
 	pkgrel = 1
 	url = https://opennebula.org/
 	install = opennebula.install
@@ -30,9 +30,10 @@ pkgbase = opennebula
 	depends = nfs-utils
 	depends = cdrkit
 	depends = log4cpp
-	depends = python2
+	depends = python
 	depends = mariadb
 	depends = libmariadbclient
+	depends = zeromq
 	optdepends = nfs-utils: for using the shared file system storage model
 	optdepends = ruby-sequel: required when upgrading the database
 	optdepends = ruby-sqlite3: required when upgrading the database
@@ -85,7 +86,7 @@ pkgbase = opennebula
 	backup = etc/one/sunstone-views/user.yaml
 	backup = etc/one/sched.conf
 	backup = etc/one/ec2_driver.default
-	source = https://github.com/OpenNebula/one/archive/release-5.8.5.tar.gz
+	source = https://github.com/OpenNebula/one/archive/release-5.10.1.tar.gz
 	source = opennebula.service
 	source = opennebula-scheduler.service
 	source = opennebula-sunstone.service
@@ -95,12 +96,10 @@ pkgbase = opennebula
 	source = opennebula-novnc.service
 	source = opennebula.conf
 	source = opennebula.logrotate
-	source = chown_fix.patch
-	source = set_locations.patch
+	source = install.sh.patch
 	source = fix_kvm_emulator.patch
 	source = opennebula.install
-	source = scons_python3.patch
-	md5sums = 8c277bcb2f851621a189c28891c51be1
+	md5sums = 3168d199782c10af07012991c2447b1a
 	md5sums = 69c4374554ae689c44b0ef8c0a31b911
 	md5sums = 74bc0a908441063a44cb134449564db1
 	md5sums = f207636bd04a621f20b14a37c6ad49b7
@@ -110,11 +109,9 @@ pkgbase = opennebula
 	md5sums = 3c38e24ef93de0982737f3dabbb9d251
 	md5sums = 05f58094a1d132f2164599e068158cd7
 	md5sums = 2f1c73538c52324c224684072ea7877b
-	md5sums = cd272404aba91a27cf89ce22364e51b4
-	md5sums = bab6415dd2437c6dfdadad90efedeff3
+	md5sums = e00db582c46c97d96115eef252f37b40
 	md5sums = 680931b4555ea25a17ea8c20b382d175
-	md5sums = d6fd565c86ea40001c618689f18a222d
-	md5sums = 8fd54ddb28ae34a75425cff104fdca64
+	md5sums = 6db815e867c77e4bee908381798cb79b
 
 pkgname = opennebula
 
diff --git a/ChangeLog b/ChangeLog
index 42230b3b5ae9..d80938196a55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-12-15 Sledge Sulaweyo <sledge.sulaweyo#gmail.com>
+
+  * 5.10.1-1:
+  New upstream release (5.10.1)
+  http://docs.opennebula.org/5.10/intro_release_notes/release_notes/index.html
+  http://docs.opennebula.org/5.10/intro_release_notes/release_notes/compatibility.html
+
 2019-10-06 Sledge Sulaweyo <sledge.sulaweyo#gmail.com>
 
   * 5.8.5-1:
diff --git a/PKGBUILD b/PKGBUILD
index a5cbfb9c367d..a1abc0708c5c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=opennebula
 _unstable_pkg=opennebula-unstable
-pkgver=5.8.5
+pkgver=5.10.1
 pkgrel=1
 pkgdesc="Virtual management infrastructure as a service (IaaS) toolkit for cloud computing (NOTE: Read the PKGBUILD!)"
 arch=('i686' 'x86_64')
@@ -26,9 +26,10 @@ depends=('ruby'
          'nfs-utils'
          'cdrkit'
          'log4cpp'
-         'python2' # needed for novnc
+         'python'
          'mariadb'
-         'libmariadbclient')
+         'libmariadbclient'
+         'zeromq')
 makedepends=('xmlrpc-c'
              'pkgconfig'
              'scons'
@@ -102,26 +103,22 @@ source=("https://github.com/OpenNebula/one/archive/release-${pkgver}.tar.gz"
         'opennebula-novnc.service'
         'opennebula.conf'
         'opennebula.logrotate'
-        'chown_fix.patch'
-        'set_locations.patch'
+        'install.sh.patch'
         'fix_kvm_emulator.patch'
-        'opennebula.install'
-        'scons_python3.patch')
-md5sums=('8c277bcb2f851621a189c28891c51be1'
-         '69c4374554ae689c44b0ef8c0a31b911'
-         '74bc0a908441063a44cb134449564db1'
-         'f207636bd04a621f20b14a37c6ad49b7'
-         '91d608d9576dc800a12597135ad0203d'
-         '773c9f257b8a367ad4b4ca7694294460'
-         '63b217d32a279adbb50b68106cc83578'
-         '3c38e24ef93de0982737f3dabbb9d251'
-         '05f58094a1d132f2164599e068158cd7'
-         '2f1c73538c52324c224684072ea7877b'
-         'cd272404aba91a27cf89ce22364e51b4'
-         'bab6415dd2437c6dfdadad90efedeff3'
-         '680931b4555ea25a17ea8c20b382d175'
-         'd6fd565c86ea40001c618689f18a222d'
-         '8fd54ddb28ae34a75425cff104fdca64')
+        'opennebula.install')
+md5sums=('3168d199782c10af07012991c2447b1a' # package
+         '69c4374554ae689c44b0ef8c0a31b911' # opennebula.service
+         '74bc0a908441063a44cb134449564db1' # opennebula-scheduler.service
+         'f207636bd04a621f20b14a37c6ad49b7' # opennebula-sunstone.service
+         '91d608d9576dc800a12597135ad0203d' # opennebula-econe.service
+         '773c9f257b8a367ad4b4ca7694294460' # opennebula-oneflow.service
+         '63b217d32a279adbb50b68106cc83578' # opennebula-onegate.service
+         '3c38e24ef93de0982737f3dabbb9d251' # opennebula-novnc.service
+         '05f58094a1d132f2164599e068158cd7' # opennebula.conf
+         '2f1c73538c52324c224684072ea7877b' # opennebula.logrotate
+         'e00db582c46c97d96115eef252f37b40' # install.sh.patch
+         '680931b4555ea25a17ea8c20b382d175' # fix_kvm_emulator.patch
+         '6db815e867c77e4bee908381798cb79b') # opennebula.install
 
 prepare() {
   cd "one-release-${pkgver}"
@@ -129,16 +126,14 @@ prepare() {
   # Patch upstream install script to not attempt to chown the install
   # directories because `makepkg` will otherwise fail on a fresh installation.
   # We do our own chown in post_install().
-  patch < "${srcdir}/chown_fix.patch"
-  patch < "${srcdir}/set_locations.patch"
+  patch < "${srcdir}/install.sh.patch"
   patch -p0 < "${srcdir}/fix_kvm_emulator.patch"
-  # Fix for scons with python3 https://github.com/OpenNebula/one/issues/3584
-  patch  -p1 < "${srcdir}/scons_python3.patch"
-  # Patch npm package versions to support node 12
+  # Patch npm package versions to support node 12+
   # grunt-sass version
   sed -i 's/1.2.1/2.1.0/' "${srcdir}/one-release-${pkgver}/src/sunstone/public/package.json"
   # node-sass
-  sed -i 's/3.10.1/4.12.0/' "${srcdir}/one-release-${pkgver}/src/sunstone/public/package.json"
+  sed -i 's/3.10.1/4.13.0/' "${srcdir}/one-release-${pkgver}/src/sunstone/public/package.json"
+
   # As we install from the github release sources we need to build sunstone as well.
   # To do that we need the npm environment set up
   # https://docs.opennebula.org/5.4/integration/references/sunstone_dev.html#sunstone-dev
diff --git a/chown_fix.patch b/chown_fix.patch
deleted file mode 100644
index 3e2cb2c54a71..000000000000
--- a/chown_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- install.sh   2017-06-02 18:53:23.000000000 +0200
-+++ install.sh   2017-06-07 07:40:34.624734338 +0200
-@@ -1918,7 +1918,8 @@
-
- if [ "$UNINSTALL" = "no" ] ; then
-     for d in $CHOWN_DIRS; do
--        chown -R $ONEADMIN_USER:$ONEADMIN_GROUP $DESTDIR$d
-+        :
-+        #chown -R $ONEADMIN_USER:$ONEADMIN_GROUP $DESTDIR$d
-     done
- else
-     for d in `echo $DELETE_DIRS | awk '{for (i=NF;i>=1;i--) printf $i" "}'`; do
diff --git a/set_locations.patch b/install.sh.patch
index 62381b1d4033..133960d0c9fe 100644
--- a/set_locations.patch
+++ b/install.sh.patch
@@ -1,9 +1,9 @@
 Index: install.sh
 ===================================================================
---- install.sh   2017-06-02 18:53:23.000000000 +0200
-+++ install.sh   2017-06-07 07:40:34.624734338 +0200
-@@ -114,8 +114,8 @@
-     ONEFLOW_LOCATION="$LIB_LOCATION/oneflow"
+--- install.sh	2019-12-10 16:00:55.000000000 +0100
++++ install.sh	2019-12-15 08:55:09.000000000 +0100
+@@ -107,8 +107,8 @@
+     ONEHEM_LOCATION="$LIB_LOCATION/onehem"
      SYSTEM_DS_LOCATION="$VAR_LOCATION/datastores/0"
      DEFAULT_DS_LOCATION="$VAR_LOCATION/datastores/1"
 -    RUN_LOCATION="/var/run/one"
@@ -13,10 +13,9 @@ Index: install.sh
      INCLUDE_LOCATION="/usr/include"
      SHARE_LOCATION="/usr/share/one"
      MAN_LOCATION="/usr/share/man/man1"
-
-@@ -1918,7 +1918,8 @@
-
- if [ "$UNINSTALL" = "no" ] ; then
+@@ -2450,7 +2450,8 @@
+         ln -s $VAR_LOCATION/sunstone/main.js $DESTDIR$SUNSTONE_LOCATION/public/dist/main.js
+     fi
      for d in $CHOWN_DIRS; do
 -        chown -R $ONEADMIN_USER:$ONEADMIN_GROUP $DESTDIR$d
 +        :
diff --git a/opennebula.install b/opennebula.install
index 98a6552c0538..32aecbeaa4c7 100644
--- a/opennebula.install
+++ b/opennebula.install
@@ -14,12 +14,13 @@ post_install() {
 	fi
 	chown oneadmin:cloud -R /var/log/one /var/lib/one /run/one /run/lock/one
 	echo ">> To install required gems run as root:"
-	echo ">> '/usr/share/one/install_gems --showallgems | xargs -l gem install --no-user-install --no-document --conservative'"
+	echo ">> '/usr/share/one/install_gems --showallgems | xargs -l gem install --no-user-install --no-document'"
 }
 
 post_upgrade(){
   chown oneadmin:cloud -R /var/lib/one/sunstone
-	printf "NOTE: This is may be an major upgrade! If you are not installing from scratch, check the compatibility guide at:\n\n\thttp://docs.opennebula.org/5.8/intro_release_notes/release_notes/compatibility.html\n\thttp://docs.opennebula.org/5.8/intro_release_notes/upgrades/index.html\n"
+	printf "NOTE: This is may be an major upgrade! If you are not installing from scratch, check the compatibility guide at:\n\n\thttp://docs.opennebula.org/5.10/intro_release_notes/release_notes/compatibility.html\n\thttp://docs.opennebula.org/5.10/intro_release_notes/upgrades/index.html\n"
+	echo ">> Check if all required gems are installed! /usr/share/one/install_gems --showallgems"
 }
 
 pre_remove() {
diff --git a/scons_python3.patch b/scons_python3.patch
deleted file mode 100644
index f6fdd7a594ae..000000000000
--- a/scons_python3.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From e4ca0a4f07304e110f63bcb3c74361ff9c93498a Mon Sep 17 00:00:00 2001
-From: Jan Orel <jorel@opennebula.systems>
-Date: Wed, 4 Sep 2019 10:07:26 +0200
-Subject: [PATCH] B #3584: Make scons python3 compatible
-
----
- SConstruct                     | 66 +++++++++++++++++-----------------
- share/rubygems/SConstruct      |  4 +--
- src/docker_machine/SConstruct  |  4 +--
- src/sunstone/public/SConstruct |  4 +--
- 4 files changed, 39 insertions(+), 39 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index e758fc2dd0..f531cb461b 100755
---- a/SConstruct
-+++ b/SConstruct
-@@ -40,15 +40,15 @@ main_env['CXXFLAGS'] = " -DGITVERSION=\'\"" + git_version + "\"\'"
-
- # snippet borrowed from http://dev.gentoo.org/~vapier/scons-blows.txt
- # makes scons aware of build related environment variables
--if os.environ.has_key('CC'):
-+if 'CC' in os.environ:
-     main_env['CC'] = os.environ['CC']
--if os.environ.has_key('CFLAGS'):
-+if 'CFLAGS' in os.environ:
-     main_env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
--if os.environ.has_key('CXX'):
-+if 'CXX' in os.environ:
-     main_env['CXX'] = os.environ['CXX']
--if os.environ.has_key('CXXFLAGS'):
-+if 'CXXFLAGS' in os.environ:
-     main_env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
--if os.environ.has_key('LDFLAGS'):
-+if 'LDFLAGS' in os.environ:
-     main_env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
- else:
-     os.environ['LDFLAGS'] = ""
-@@ -186,15 +186,15 @@ if not main_env.GetOption('clean'):
-     try:
-         if mysql == 'yes':
-             main_env.ParseConfig('mysql_config --cflags --libs')
--    except Exception, e:
--        print ""
--        print "mysql_config was not found in the path"
--        print ""
--        print "Check that mysql development package is installed and"
--        print "mysql_config is in the path. If your mysql config tool"
--        print "is called mysql5_config make a symlink as mysql_config"
--        print "to a directory in the path."
--        print ""
-+    except Exception as e:
-+        print ("")
-+        print ("mysql_config was not found in the path")
-+        print ("")
-+        print ("Check that mysql development package is installed and")
-+        print ("mysql_config is in the path. If your mysql config tool")
-+        print ("is called mysql5_config make a symlink as mysql_config")
-+        print ("to a directory in the path.")
-+        print ("")
-         exit(-1)
-
-     try:
-@@ -203,24 +203,24 @@ if not main_env.GetOption('clean'):
-         main_env.ParseConfig(("LDFLAGS='%s' share/scons/get_xmlrpc_config" +
-                               " client") % (os.environ['LDFLAGS'],))
-
--    except Exception, e:
--        print ""
--        print "Error searching for xmlrpc-c libraries. Please check this" +\
--            " things:"
--        print ""
--        print " * You have installed development libraries for xmlrpc-c. One" +\
--            " way to check"
--        print "   this is calling xmlrpc-c-config that is provided with the" +\
--            " development"
--        print "   package."
--        print " * Check that the version of xmlrpc-c is at least 1.06. You" +\
--            " can do this also"
--        print "   calling:"
--        print "   $ xmlrpc-c-config --version"
--        print " * If all this requirements are already met please send log" +\
--            " files located in"
--        print "   .xmlrpc_test to the mailing list."
--        print ""
-+    except Exception as e:
-+        print ("")
-+        print ("Error searching for xmlrpc-c libraries. Please check this") +\
-+            (" things:")
-+        print ("")
-+        print (" * You have installed development libraries for xmlrpc-c. One") +\
-+            (" way to check")
-+        print ("   this is calling xmlrpc-c-config that is provided with the") +\
-+            (" development")
-+        print ("   package.")
-+        print (" * Check that the version of xmlrpc-c is at least 1.06. You") +\
-+            (" can do this also")
-+        print ("   calling:")
-+        print ("   $ xmlrpc-c-config --version")
-+        print (" * If all this requirements are already met please send log") +\
-+            (" files located in")
-+        print ("   .xmlrpc_test to the mailing list.")
-+        print ("")
-         exit(-1)
- else:
-     main_env.Replace(mysql='yes')
-diff --git a/share/rubygems/SConstruct b/share/rubygems/SConstruct
-index b3e3d8e148..60add7927b 100644
---- a/share/rubygems/SConstruct
-+++ b/share/rubygems/SConstruct
-@@ -21,10 +21,10 @@ import os
- Import('env')
-
- if env['rubygems']=='yes':
--    print "Generating rubygems packages\n"
-+    print ("Generating rubygems packages\n")
-     exit_code=os.system("./generate")
-
-     if exit_code != 0:
--        print "Error generating rubygem packages\n"
-+        print ("Error generating rubygem packages\n")
-         exit(-1)
-
-diff --git a/src/docker_machine/SConstruct b/src/docker_machine/SConstruct
-index 6027a5cc3c..bff5870b78 100644
---- a/src/docker_machine/SConstruct
-+++ b/src/docker_machine/SConstruct
-@@ -21,9 +21,9 @@ import os
- Import('env')
-
- if env['docker_machine']=='yes':
--    print "Generating docker-machine-driver-opennebula\n"
-+    print ("Generating docker-machine-driver-opennebula\n")
-     exit_code=os.system("make -C src/docker_machine build")
-
-     if exit_code != 0:
--        print "Error generating docker-machine-driver-opennebula\n"
-+        print ("Error generating docker-machine-driver-opennebula\n")
-         exit(-1)
-diff --git a/src/sunstone/public/SConstruct b/src/sunstone/public/SConstruct
-index bf5e588d6e..c418231ece 100644
---- a/src/sunstone/public/SConstruct
-+++ b/src/sunstone/public/SConstruct
-@@ -22,11 +22,11 @@ Import('env')
-
-
- if env['sunstone']=='yes':
--    print "Generating Sunstone minified files\n"
-+    print ("Generating Sunstone minified files\n")
-
-     exit_code=os.system("./build.sh")
-
-     if exit_code != 0:
--        print "Error generating minifying Sunstone files\n"
-+        print ("Error generating minifying Sunstone files\n")
-         exit(-1)
-
-