Upgrade to upstream version 5.4.0, dropped prebuilt gem packages - install command provided to pull gems

13 files changed, 110 insertions, 78 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f9255a103d0..9aecd67f937d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,39 +1,33 @@
-# Generated by mksrcinfo v8
-# Mon Sep 12 17:59:48 UTC 2016
 pkgbase = opennebula
 	pkgdesc = Virtual management infrastructure as a service (IaaS) toolkit for cloud computing (NOTE: Read the PKGBUILD!)
-	pkgver = 5.0.2
-	pkgrel = 3
+	pkgver = 5.4.0
+	pkgrel = 1
 	url = http://docs.opennebula.org/stable
 	install = opennebula.install
 	changelog = ChangeLog
 	arch = i686
 	arch = x86_64
 	license = Apache
-	makedepends = xmlrpc-c>=1.31
+	makedepends = xmlrpc-c
 	makedepends = pkgconfig
-	makedepends = scons>=0.98
+	makedepends = scons
+	makedepends = mariadb
 	makedepends = libmariadbclient
-	depends = ruby>=1.8.7
-	depends = xmlrpc-c>=1.31
-	depends = openssl>=0.9.8
-	depends = sqlite3>=3.6
+	depends = ruby
+	depends = xmlrpc-c
+	depends = openssl
+	depends = sqlite3
 	depends = openssh
-	depends = libxml2>=2.7
+	depends = libxml2
 	depends = curl
 	depends = libxslt
 	depends = expat
+	depends = nfs-utils
 	depends = cdrkit
-	depends = log4cpp>=1.0
-	depends = ruby-opennebula>=4.14.2
-	depends = ruby-sinatra
-	depends = ruby-builder
-	depends = ruby-nokogiri
-	optdepends = nfs-utils: for using the shared file system storage model
-	optdepends = mariadb>=5.1: optional replacement for SQLite as the DB back-end
-	optdepends = libmariadbclient>=5.1: required if using MariaDB/MySQL instead of SQLite
+	depends = log4cpp
+	depends = mariadb
+	depends = libmariadbclient
 	optdepends = ruby-sequel: required when upgrading the database
-	optdepends = ruby-sqlite3: required when upgrading the database
 	conflicts = opennebula-unstable
 	backup = etc/one/oned.conf
 	backup = etc/one/sunstone-server.conf
@@ -83,7 +77,7 @@ pkgbase = opennebula
 	backup = etc/one/sunstone-views/user.yaml
 	backup = etc/one/sched.conf
 	backup = etc/one/ec2_driver.default
-	source = http://downloads.opennebula.org/packages/opennebula-5.0.2/opennebula-5.0.2.tar.gz
+	source = http://downloads.opennebula.org/packages/opennebula-5.4.0/opennebula-5.4.0.tar.gz
 	source = opennebula.service
 	source = opennebula-sunstone.service
 	source = opennebula-econe.service
@@ -92,15 +86,19 @@ pkgbase = opennebula
 	source = chown_fix.patch
 	source = set_locations.patch
 	source = fix_kvm_emulator.patch
-	sha512sums = 95d61476538e32b75c3ac870c4ba19e4f352a90e1d6e76355efab4f4679291ba2fcd223ec39f9b3cbd29bc5c5c7a5388c1c402c5c84b22f81729ff240b6d34b6
-	sha512sums = f91678e5de6f5b980b6b50c7d1922ee9a836df416236ab9cde9e8a9352cdbb9f4102f47870d5405514173c1c9a510feefa191b55644269aee859c559beb8f600
-	sha512sums = 2d1921ccacb222b0c652be6f4f7f74bd3ba482754a9cf19db63c51b7a62b803e4de9b90284e16d51b1b4db215d65ad3fed7269d55cc57135ddfd050fd32b7407
-	sha512sums = 79a778c3086bdd1ef286252add60922d61384f193a44facc47442516e21b6997560326e2a4f6dc9a554615bbd78bf343a1a29569966f25d30238ead346da29d7
-	sha512sums = ab5b458f53047d1c1320f5fc3fb134b19c391ad85332577b5ffadfb8cedd299a4d47bb0973a6bfb1394ab9d15d7e92c7d1e22c269c0aeeb833a2a140ece8d06e
-	sha512sums = 497683976be3dcdc087e8d059fb08487d90010b28d0025e48b8e5becab568fd1d60de51a2a88cd43a3e7cc696e620b6c50f364a06a08d4d39f2965aaba10547f
-	sha512sums = 8d6a311072da61ca49458aaf787daf4ef5c5969a9aa282f2276d679dc38e14e5fd1c23bc51b12a29d2d40b65aa45bd2c38d6741726b09d75a38565b7d4ad4677
-	sha512sums = 1f20e688a0f6d36a6bc875392473e75c7de77b159b9cbdf262ac0f093b4d65555231ab15897156e2558d0df6ae631f8d79a3265073ea8c0546586937544e47c9
-	sha512sums = 997218a2dbc807cf2114fc5bb68a3da8d17cdf38aa3d7b51afaab52cf2638cc46293d42799a6d805b799c7748e326ab2780f81ca73121ebdf320ec046c41407d
+	source = vip.sh.patch
+	source = opennebula.install
+	sha512sums = 4d7d4f6c20a6185539a88006e4d15681d90cee45506d36017a538415a3b3cce809f02ff248013f9e2daa5f1d20afd308a0a014853b8462723ad6ba5acaa84626
+	sha512sums = d86b01dd0b0718e1f2c75ffa1220a621ce4953d2cb722defef51c9cb0ec7b3f7709c7cd760c87da9ecb16468ffed2eb7ecb40295f0d24f275648758784ecb745
+	sha512sums = 165232dfcae58a19dac689cf11c3b49ec0dea5c98835f7ced2c3cc32819204ffd16b90ac67e421730339613cc306577cebfe305d19ed5ea5edbfca70785f52f5
+	sha512sums = f3b9bad7c234010b3aab20df17a4c2ab74242e2305acc2cdfa3e36130674c8804aa5c89bdd8ca952d3d188541570da9841fa308d6f5e8dfc9c433628c7628898
+	sha512sums = a8e9c781f575d57ba8badb4491ffb4ed1dd5b2b5b7434735974516f2a1533aca5b64a898759b861ca0aff72fe1c629547d8dcbbc29ad45429d3e29f4e7a01160
+	sha512sums = 0fcfa0990623f6df0d48f24d1bcbc7482e589a454f33e47b4832633f064475d69f1784d87588d66e6d8b37ee448ab64e9a73442c56fcdd3eca66e4b487ea7b84
+	sha512sums = 01aaf2d6019003ab69cd2e9886618d59bed27062f68fe72f29662f70af9206ce3921053c4cab30c370da958be243a6b19e85094af40ff93b6e370505ddd8bbe2
+	sha512sums = cee672a3fb9bffdac836a9aa00c898a38303144be44521363ad8e5109aebaa00e31fc0ae921e3a71a87e734fc614f6b3350009d5ec899bc5d78e6fe6d6c8fc01
+	sha512sums = 18b1964cb4e3fc2eaa93a7ef79e4b9b185584d33ad4f7fa33cd33a74516334136d9cf0ee25921c189250420b751c753cb0142227e8de39e14f8d110e97cd8e30
+	sha512sums = ad649b9671d55280485000f2f74beb676065dda7596d0dbc879a3323495b8e0384454692e2d380a055dc72d5056b2020826d056e163d64b85762ad84438e2509
+	sha512sums = 75f83115a23959777e5763fbe5287304eca2adda4c91e719c9f4fbede6e40cd2122b2b9ecbdb6bd69827eb1949823e9a1894180054c66d0ab294d73d0bc45b4d
 
 pkgname = opennebula
 
diff --git a/ChangeLog b/ChangeLog
index 1177db5ea33f..85b51dc7f6dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-08-13 Sledge Sulaweyo <sledge.sulaweyo#gmail.com>
+
+  * 5.4.0
+  Takeover and upgrade to current release (5.4.0)
+
 2015-05-05 Jason St. John <jstjohn .. purdue . edu>
 
 	* 4.12.1-1:
diff --git a/PKGBUILD b/PKGBUILD
index 05a47c8c7a04..ae61365a3e30 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,34 +7,32 @@
 
 pkgname=opennebula
 _unstable_pkg=opennebula-unstable
-pkgver=5.0.2
-pkgrel=3
+pkgver=5.4.0
+pkgrel=1
 pkgdesc="Virtual management infrastructure as a service (IaaS) toolkit for cloud computing (NOTE: Read the PKGBUILD!)"
 arch=('i686' 'x86_64')
 url='http://docs.opennebula.org/stable'
 license=('Apache')
-depends=('ruby>=1.8.7'
-         'xmlrpc-c>=1.31'
-         'openssl>=0.9.8'
-         'sqlite3>=3.6'
+depends=('ruby'
+         'xmlrpc-c'
+         'openssl'
+         'sqlite3'
          'openssh'
-         'libxml2>=2.7'
+         'libxml2'
          'curl'
          'libxslt'
          'expat'
+         'nfs-utils'
          'cdrkit'
-         'log4cpp>=1.0'
-         'ruby-opennebula>=4.14.2'
-         'ruby-sinatra'
-         'ruby-builder'
-         'ruby-nokogiri')
-makedepends=('xmlrpc-c>=1.31'
+         'log4cpp'
+         'mariadb'
+         'libmariadbclient')
+makedepends=('xmlrpc-c'
              'pkgconfig'
-             'scons>=0.98'
+             'scons'
+             'mariadb'
              'libmariadbclient')
 optdepends=('nfs-utils: for using the shared file system storage model'
-            'mariadb>=5.1: optional replacement for SQLite as the DB back-end'
-            'libmariadbclient>=5.1: required if using MariaDB/MySQL instead of SQLite'
             'ruby-sequel: required when upgrading the database'
             'ruby-sqlite3: required when upgrading the database')
 conflicts=('opennebula-unstable')
@@ -96,16 +94,20 @@ source=("http://downloads.opennebula.org/packages/${pkgname}-${pkgver}/${pkgname
         'opennebula-onegate.service'
         'chown_fix.patch'
         'set_locations.patch'
-        'fix_kvm_emulator.patch')
-sha512sums=('95d61476538e32b75c3ac870c4ba19e4f352a90e1d6e76355efab4f4679291ba2fcd223ec39f9b3cbd29bc5c5c7a5388c1c402c5c84b22f81729ff240b6d34b6'
-            'f91678e5de6f5b980b6b50c7d1922ee9a836df416236ab9cde9e8a9352cdbb9f4102f47870d5405514173c1c9a510feefa191b55644269aee859c559beb8f600'
-            '2d1921ccacb222b0c652be6f4f7f74bd3ba482754a9cf19db63c51b7a62b803e4de9b90284e16d51b1b4db215d65ad3fed7269d55cc57135ddfd050fd32b7407'
-            '79a778c3086bdd1ef286252add60922d61384f193a44facc47442516e21b6997560326e2a4f6dc9a554615bbd78bf343a1a29569966f25d30238ead346da29d7'
-            'ab5b458f53047d1c1320f5fc3fb134b19c391ad85332577b5ffadfb8cedd299a4d47bb0973a6bfb1394ab9d15d7e92c7d1e22c269c0aeeb833a2a140ece8d06e'
-            '497683976be3dcdc087e8d059fb08487d90010b28d0025e48b8e5becab568fd1d60de51a2a88cd43a3e7cc696e620b6c50f364a06a08d4d39f2965aaba10547f'
-            '8d6a311072da61ca49458aaf787daf4ef5c5969a9aa282f2276d679dc38e14e5fd1c23bc51b12a29d2d40b65aa45bd2c38d6741726b09d75a38565b7d4ad4677'
-            '1f20e688a0f6d36a6bc875392473e75c7de77b159b9cbdf262ac0f093b4d65555231ab15897156e2558d0df6ae631f8d79a3265073ea8c0546586937544e47c9'
-            '997218a2dbc807cf2114fc5bb68a3da8d17cdf38aa3d7b51afaab52cf2638cc46293d42799a6d805b799c7748e326ab2780f81ca73121ebdf320ec046c41407d')
+        'fix_kvm_emulator.patch'
+        'vip.sh.patch'
+        'opennebula.install')
+sha512sums=('4d7d4f6c20a6185539a88006e4d15681d90cee45506d36017a538415a3b3cce809f02ff248013f9e2daa5f1d20afd308a0a014853b8462723ad6ba5acaa84626'
+            'd86b01dd0b0718e1f2c75ffa1220a621ce4953d2cb722defef51c9cb0ec7b3f7709c7cd760c87da9ecb16468ffed2eb7ecb40295f0d24f275648758784ecb745'
+            '165232dfcae58a19dac689cf11c3b49ec0dea5c98835f7ced2c3cc32819204ffd16b90ac67e421730339613cc306577cebfe305d19ed5ea5edbfca70785f52f5'
+            'f3b9bad7c234010b3aab20df17a4c2ab74242e2305acc2cdfa3e36130674c8804aa5c89bdd8ca952d3d188541570da9841fa308d6f5e8dfc9c433628c7628898'
+            'a8e9c781f575d57ba8badb4491ffb4ed1dd5b2b5b7434735974516f2a1533aca5b64a898759b861ca0aff72fe1c629547d8dcbbc29ad45429d3e29f4e7a01160'
+            '0fcfa0990623f6df0d48f24d1bcbc7482e589a454f33e47b4832633f064475d69f1784d87588d66e6d8b37ee448ab64e9a73442c56fcdd3eca66e4b487ea7b84'
+            '01aaf2d6019003ab69cd2e9886618d59bed27062f68fe72f29662f70af9206ce3921053c4cab30c370da958be243a6b19e85094af40ff93b6e370505ddd8bbe2'
+            'cee672a3fb9bffdac836a9aa00c898a38303144be44521363ad8e5109aebaa00e31fc0ae921e3a71a87e734fc614f6b3350009d5ec899bc5d78e6fe6d6c8fc01'
+            '18b1964cb4e3fc2eaa93a7ef79e4b9b185584d33ad4f7fa33cd33a74516334136d9cf0ee25921c189250420b751c753cb0142227e8de39e14f8d110e97cd8e30'
+            'ad649b9671d55280485000f2f74beb676065dda7596d0dbc879a3323495b8e0384454692e2d380a055dc72d5056b2020826d056e163d64b85762ad84438e2509'
+            '235d47ab6b7342db65b73533fab8084484cb95914604ffc68a419a13b41540b5e7983f46808f9b9cfc90bfeb69dfb1dfd8be61167791246e1631e93296a6ac7e')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
@@ -115,7 +117,9 @@ prepare() {
   # We do our own chown in post_install().
   patch < "${srcdir}/chown_fix.patch"
   patch < "${srcdir}/set_locations.patch"
-  patch -p1 < "${srcdir}/fix_kvm_emulator.patch"
+  patch -p0 < "${srcdir}/fix_kvm_emulator.patch"
+  # Patch for https://dev.opennebula.org/issues/5309
+  patch -p0 < "${srcdir}/vip.sh.patch"
 }
 
 build() {
@@ -130,7 +134,7 @@ build() {
   ###########################################################################
 
   # This builds the vanilla OpenNebula package. Tweak this line as desired.
-  scons -j "$(nproc)" new_xmlrpc=yes mysql=yes
+  scons -j "$(nproc)" new_xmlrpc=yes mysql=yes sqlite=yes
 }
 
 package() {
@@ -144,3 +148,4 @@ package() {
 
   DESTDIR="${pkgdir}" ./install.sh -u oneadmin -g cloud
 }
+
diff --git a/chown_fix.patch b/chown_fix.patch
index 0bb7ea2a1007..3e2cb2c54a71 100644
--- a/chown_fix.patch
+++ b/chown_fix.patch
@@ -1,16 +1,12 @@
---- install.sh	2013-11-27 14:49:25.474802021 -0400
-+++ install.sh.new	2015-03-10 21:28:10.505393378 -0400
-@@ -2078,11 +2078,12 @@
-
- # --- Set ownership or remove OpenNebula directories ---
+--- 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
++        #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
-         rmdir $d
-     done
diff --git a/fix_kvm_emulator.patch b/fix_kvm_emulator.patch
index 145f34936deb..1e9511ca9a7b 100644
--- a/fix_kvm_emulator.patch
+++ b/fix_kvm_emulator.patch
@@ -1,13 +1,12 @@
-Index: opennebula-4.14.2/src/vmm_mad/exec/vmm_exec_kvm.conf
-===================================================================
---- opennebula-4.14.2.orig/src/vmm_mad/exec/vmm_exec_kvm.conf
-+++ opennebula-4.14.2/src/vmm_mad/exec/vmm_exec_kvm.conf
+Index: src/vmm_mad/exec/vmm_exec_kvm.conf
+--- src/vmm_mad/exec/vmm_exec_kvm.conf
++++ src/vmm_mad/exec/vmm_exec_kvm.conf
 @@ -27,7 +27,7 @@
  #  - hyperv_options: options used for FEATURES = [ HYPERV = yes ]
  # NOTE: raw attribute value is appended to that on the VM template
- 
+
 -#EMULATOR = /usr/libexec/qemu-kvm
 +EMULATOR = /usr/bin/qemu-system-x86_64
- 
+
  #VCPU = 1
- 
+
diff --git a/opennebula-econe.service b/opennebula-econe.service
index cf0923de48f8..f3b0abaf92ff 100644
--- a/opennebula-econe.service
+++ b/opennebula-econe.service
@@ -10,6 +10,7 @@ Type=forking
 PermissionsStartOnly=true
 ExecStart=/usr/bin/econe-server start
 ExecStop=/usr/bin/econe-server stop
+Restart=on-abnormal
 
 [Install]
 WantedBy=multi-user.target
diff --git a/opennebula-oneflow.service b/opennebula-oneflow.service
index ee938552ee6a..4fa287f2d403 100644
--- a/opennebula-oneflow.service
+++ b/opennebula-oneflow.service
@@ -10,6 +10,7 @@ Type=forking
 PermissionsStartOnly=true
 ExecStart=/usr/bin/oneflow-server start
 ExecStop=/usr/bin/oneflow-server stop
+Restart=on-abnormal
 
 [Install]
 WantedBy=multi-user.target
diff --git a/opennebula-onegate.service b/opennebula-onegate.service
index 8a0af846745e..aa3644f24d66 100644
--- a/opennebula-onegate.service
+++ b/opennebula-onegate.service
@@ -10,6 +10,7 @@ Type=forking
 PermissionsStartOnly=true
 ExecStart=/usr/bin/onegate-server start
 ExecStop=/usr/bin/onegate-server stop
+Restart=on-abnormal
 
 [Install]
 WantedBy=multi-user.target
diff --git a/opennebula-sunstone.service b/opennebula-sunstone.service
index ce8eae09f45f..0355b8d16f3b 100644
--- a/opennebula-sunstone.service
+++ b/opennebula-sunstone.service
@@ -10,6 +10,7 @@ Type=forking
 PermissionsStartOnly=true
 ExecStart=/usr/bin/sunstone-server start
 ExecStop=/usr/bin/sunstone-server stop
+Restart=on-abnormal
 
 [Install]
 WantedBy=multi-user.target
diff --git a/opennebula.install b/opennebula.install
index 7b1c923c4592..6615d94293e8 100644
--- a/opennebula.install
+++ b/opennebula.install
@@ -13,6 +13,8 @@ post_install() {
 		echo ">> You must edit the password in /var/lib/one/.one/one_auth"
 	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'"
 }
 
 post_upgrade(){
diff --git a/opennebula.service b/opennebula.service
index 4414e241e74b..f32f691146f7 100644
--- a/opennebula.service
+++ b/opennebula.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=OpenNebula management
-After=network.target local-fs.target remote-fs.target mysqld.service 
+After=network.target local-fs.target remote-fs.target mysqld.service
 
 [Service]
 User=oneadmin
@@ -13,6 +13,7 @@ ExecStartPre=/usr/bin/chown -R oneadmin:cloud /var/run/one
 ExecStartPre=/usr/bin/chown -R oneadmin:cloud /var/lock/one
 ExecStart=/usr/bin/one start
 ExecStop=/usr/bin/one stop
+Restart=on-abnormal
 
 [Install]
 WantedBy=multi-user.target
diff --git a/set_locations.patch b/set_locations.patch
index 0795928dd7a0..62381b1d4033 100644
--- a/set_locations.patch
+++ b/set_locations.patch
@@ -1,8 +1,8 @@
-Index: opennebula-4.14.2/install.sh
+Index: install.sh
 ===================================================================
---- opennebula-4.14.2.orig/install.sh
-+++ opennebula-4.14.2/install.sh
-@@ -114,8 +114,8 @@ if [ -z "$ROOT" ] ; then
+--- 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"
      SYSTEM_DS_LOCATION="$VAR_LOCATION/datastores/0"
      DEFAULT_DS_LOCATION="$VAR_LOCATION/datastores/1"
@@ -13,3 +13,14 @@ Index: opennebula-4.14.2/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
+     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/vip.sh.patch b/vip.sh.patch
new file mode 100644
index 000000000000..ab0ba7049c43
--- /dev/null
+++ b/vip.sh.patch
@@ -0,0 +1,11 @@
+--- share/hooks/raft/vip.sh
++++ share/hooks/raft/vip.sh
+@@ -17,7 +17,7 @@ fi
+ case $ACTION in
+ leader)
+     sudo ip address add $IP dev $INTERFACE
+-    arping -c 5 -A -I $INTERFACE ${IP%%/*}
++    arping -c 5 -U -I $INTERFACE ${IP%%/*}
+     ;;
+
+ follower)