Bump to 5.0.1, improve upgrade compatibility

The previous build was not taking advantage of the PKBUILD backup
structure in order to avoid configuration ovewrite causing some
configurations to get missing depending on the build host.

3 files changed, 114 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2325eb687eca..446e44134cbd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed May 25 15:29:54 UTC 2016
+# Wed Jun 29 18:29:25 UTC 2016
 pkgbase = opennebula
 	pkgdesc = Virtual management infrastructure as a service (IaaS) toolkit for cloud computing (NOTE: Read the PKGBUILD!)
-	pkgver = 4.14.2
-	pkgrel = 3
+	pkgver = 5.0.1
+	pkgrel = 1
 	url = http://docs.opennebula.org/stable
 	install = opennebula.install
 	changelog = ChangeLog
@@ -31,14 +31,64 @@ pkgbase = opennebula
 	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
+	optdepends = ruby-sequel: required when upgrading the database
+	optdepends = ruby-sqlite3: required when upgrading the database
 	conflicts = opennebula-unstable
-	source = http://downloads.opennebula.org/packages/opennebula-4.14.2/opennebula-4.14.2.tar.gz
+	backup = etc/one/oned.conf
+	backup = etc/one/sunstone-server.conf
+	backup = etc/one/cli/onedatastore.yaml
+	backup = etc/one/cli/oneshowback.yaml
+	backup = etc/one/cli/onevdc.yaml
+	backup = etc/one/cli/onemarket.yaml
+	backup = etc/one/cli/onetemplate.yaml
+	backup = etc/one/cli/onevm.yaml
+	backup = etc/one/cli/oneacct.yaml
+	backup = etc/one/cli/oneuser.yaml
+	backup = etc/one/cli/onevrouter.yaml
+	backup = etc/one/cli/oneimage.yaml
+	backup = etc/one/cli/onemarketapp.yaml
+	backup = etc/one/cli/onehost.yaml
+	backup = etc/one/cli/onevnet.yaml
+	backup = etc/one/cli/onecluster.yaml
+	backup = etc/one/cli/onezone.yaml
+	backup = etc/one/cli/onesecgroup.yaml
+	backup = etc/one/cli/onegroup.yaml
+	backup = etc/one/cli/oneacl.yaml
+	backup = etc/one/ec2_driver.conf
+	backup = etc/one/econe.conf
+	backup = etc/one/az_driver.conf
+	backup = etc/one/onegate-server.conf
+	backup = etc/one/oneflow-server.conf
+	backup = etc/one/az_driver.default
+	backup = etc/one/tmrc
+	backup = etc/one/vmm_exec/vmm_execrc
+	backup = etc/one/vmm_exec/vmm_exec_vcenter.conf
+	backup = etc/one/vmm_exec/vmm_exec_kvm.conf
+	backup = etc/one/oned.conf
+	backup = etc/one/auth/ldap_auth.conf
+	backup = etc/one/auth/x509_auth.conf
+	backup = etc/one/auth/server_x509_auth.conf
+	backup = etc/one/ec2query_templates/m1.small.erb
+	backup = etc/one/defaultrc
+	backup = etc/one/sunstone-views.yaml
+	backup = etc/one/hm/hmrc
+	backup = etc/one/sunstone-logos.yaml
+	backup = etc/one/sunstone-views/admin.yaml
+	backup = etc/one/sunstone-views/groupadmin_vcenter.yaml
+	backup = etc/one/sunstone-views/cloud_vcenter.yaml
+	backup = etc/one/sunstone-views/admin_vcenter.yaml
+	backup = etc/one/sunstone-views/cloud.yaml
+	backup = etc/one/sunstone-views/groupadmin.yaml
+	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.1/opennebula-5.0.1.tar.gz
 	source = opennebula.service
 	source = opennebula-sunstone.service
 	source = chown_fix.patch
 	source = set_locations.patch
 	source = fix_kvm_emulator.patch
-	sha512sums = ed572bf1a6e0a4eecb85c1f2beb1f686e6729f74a354f41dbb5113fd089af06013f63d022ee8c068234e5be64df818771a0ba0c452ffbf4fd096dd16cf878926
+	sha512sums = 335dc802f4e24e33177854466ca1dc76e08f784dd6ca2748989870cfed3581eb208c1091a1ecbfd962fe7b4461fde62a4ba89fdfd62a928790e27a834f9b4475
 	sha512sums = bd8ed1a94dbb57f8fa65803688cefe7e628bc019e7fbac4a8a19f8a68ea4d656d7e834f879fb2f9acd2dee8933b2bebf046b40c94a44c6ccbefc11406a032b64
 	sha512sums = 8024c51db09d2bfcb1ea90a6f893903d7fd021a912d338132cf95eb685261cb67c803798c9ff0669aff371e1abec54291c39cbebf84c695ac7553acb90a6d94f
 	sha512sums = 8d6a311072da61ca49458aaf787daf4ef5c5969a9aa282f2276d679dc38e14e5fd1c23bc51b12a29d2d40b65aa45bd2c38d6741726b09d75a38565b7d4ad4677
diff --git a/PKGBUILD b/PKGBUILD
index 77bd475132a1..6e4a094ad743 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 
 pkgname=opennebula
 _unstable_pkg=opennebula-unstable
-pkgver=4.14.2
-pkgrel=3
+pkgver=5.0.1
+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'
@@ -31,9 +31,59 @@ makedepends=('xmlrpc-c>=1.31'
              'scons>=0.98')
 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')
+            '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')
 install=opennebula.install
+backup=('etc/one/oned.conf'
+        'etc/one/sunstone-server.conf'
+        'etc/one/cli/onedatastore.yaml'
+        'etc/one/cli/oneshowback.yaml'
+        'etc/one/cli/onevdc.yaml'
+        'etc/one/cli/onemarket.yaml'
+        'etc/one/cli/onetemplate.yaml'
+        'etc/one/cli/onevm.yaml'
+        'etc/one/cli/oneacct.yaml'
+        'etc/one/cli/oneuser.yaml'
+        'etc/one/cli/onevrouter.yaml'
+        'etc/one/cli/oneimage.yaml'
+        'etc/one/cli/onemarketapp.yaml'
+        'etc/one/cli/onehost.yaml'
+        'etc/one/cli/onevnet.yaml'
+        'etc/one/cli/onecluster.yaml'
+        'etc/one/cli/onezone.yaml'
+        'etc/one/cli/onesecgroup.yaml'
+        'etc/one/cli/onegroup.yaml'
+        'etc/one/cli/oneacl.yaml'
+        'etc/one/ec2_driver.conf'
+        'etc/one/econe.conf'
+        'etc/one/az_driver.conf'
+        'etc/one/onegate-server.conf'
+        'etc/one/oneflow-server.conf'
+        'etc/one/az_driver.default'
+        'etc/one/tmrc'
+        'etc/one/vmm_exec/vmm_execrc'
+        'etc/one/vmm_exec/vmm_exec_vcenter.conf'
+        'etc/one/vmm_exec/vmm_exec_kvm.conf'
+        'etc/one/oned.conf'
+        'etc/one/auth/ldap_auth.conf'
+        'etc/one/auth/x509_auth.conf'
+        'etc/one/auth/server_x509_auth.conf'
+        'etc/one/ec2query_templates/m1.small.erb'
+        'etc/one/defaultrc'
+        'etc/one/sunstone-views.yaml'
+        'etc/one/hm/hmrc'
+        'etc/one/sunstone-logos.yaml'
+        'etc/one/sunstone-views/admin.yaml'
+        'etc/one/sunstone-views/groupadmin_vcenter.yaml'
+        'etc/one/sunstone-views/cloud_vcenter.yaml'
+        'etc/one/sunstone-views/admin_vcenter.yaml'
+        'etc/one/sunstone-views/cloud.yaml'
+        'etc/one/sunstone-views/groupadmin.yaml'
+        'etc/one/sunstone-views/user.yaml'
+        'etc/one/sched.conf'
+        'etc/one/ec2_driver.default')
 changelog=ChangeLog
 source=("http://downloads.opennebula.org/packages/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz"
         'opennebula.service'
@@ -41,7 +91,7 @@ source=("http://downloads.opennebula.org/packages/${pkgname}-${pkgver}/${pkgname
         'chown_fix.patch'
         'set_locations.patch'
         'fix_kvm_emulator.patch')
-sha512sums=('ed572bf1a6e0a4eecb85c1f2beb1f686e6729f74a354f41dbb5113fd089af06013f63d022ee8c068234e5be64df818771a0ba0c452ffbf4fd096dd16cf878926'
+sha512sums=('335dc802f4e24e33177854466ca1dc76e08f784dd6ca2748989870cfed3581eb208c1091a1ecbfd962fe7b4461fde62a4ba89fdfd62a928790e27a834f9b4475'
             'bd8ed1a94dbb57f8fa65803688cefe7e628bc019e7fbac4a8a19f8a68ea4d656d7e834f879fb2f9acd2dee8933b2bebf046b40c94a44c6ccbefc11406a032b64'
             '8024c51db09d2bfcb1ea90a6f893903d7fd021a912d338132cf95eb685261cb67c803798c9ff0669aff371e1abec54291c39cbebf84c695ac7553acb90a6d94f'
             '8d6a311072da61ca49458aaf787daf4ef5c5969a9aa282f2276d679dc38e14e5fd1c23bc51b12a29d2d40b65aa45bd2c38d6741726b09d75a38565b7d4ad4677'
@@ -85,14 +135,5 @@ package() {
   install -D -m644 "${srcdir}/opennebula.service" "${pkgdir}/usr/lib/systemd/system/opennebula.service"
   install -D -m644 "${srcdir}/opennebula-sunstone.service" "${pkgdir}/usr/lib/systemd/system/opennebula-sunstone.service"
 
-  # This checks to see whether OpenNebula is currently installed. To avoid
-  # a potentially scary message, errors are sent to /dev/null
-  if [[ ("$(pacman -Qq ${pkgname} 2>/dev/null)" == "${pkgname}") || ("$(pacman -Qq ${_unstable_pkg} 2>/dev/null)" == "${_unstable_pkg}") ]]; then
-    # Use -k when running ./install.sh to keep previous configuration files
-    # Note: It is highly recommended to not keep the oned.conf file.
-    DESTDIR="${pkgdir}" ./install.sh -k -u oneadmin -g cloud
-  else
-    # Do not use -k when running ./install.sh for new installations
-    DESTDIR="${pkgdir}" ./install.sh -u oneadmin -g cloud
-  fi
+  DESTDIR="${pkgdir}" ./install.sh -u oneadmin -g cloud
 }
diff --git a/opennebula.install b/opennebula.install
index 3c801f300f96..7b1c923c4592 100644
--- a/opennebula.install
+++ b/opennebula.install
@@ -15,6 +15,10 @@ post_install() {
 	chown oneadmin:cloud -R /var/log/one /var/lib/one /run/one /run/lock/one
 }
 
+post_upgrade(){
+	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.0/intro_release_notes/release_notes/compatibility.html\n\thttp://docs.opennebula.org/5.0/intro_release_notes/upgrades/upgrade_414.html\n"
+}
+
 pre_remove() {
 	userdel oneadmin && echo ">> User 'oneadmin' has been removed."
 	groupdel cloud && echo ">> Group 'cloud' has been removed."