Update to upstream 5.4.1

11 files changed, 31 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 28cd817a304f..059aec840d53 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = opennebula
 	pkgdesc = Virtual management infrastructure as a service (IaaS) toolkit for cloud computing (NOTE: Read the PKGBUILD!)
-	pkgver = 5.4.0
-	pkgrel = 5
+	pkgver = 5.4.1
+	pkgrel = 1
 	url = http://docs.opennebula.org/stable
 	install = opennebula.install
 	changelog = ChangeLog
@@ -80,7 +80,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.4.0/opennebula-5.4.0.tar.gz
+	source = http://downloads.opennebula.org/packages/opennebula-5.4.1/opennebula-5.4.1.tar.gz
 	source = opennebula.service
 	source = opennebula-scheduler.service
 	source = opennebula-sunstone.service
@@ -93,23 +93,21 @@ pkgbase = opennebula
 	source = chown_fix.patch
 	source = set_locations.patch
 	source = fix_kvm_emulator.patch
-	source = vip.sh.patch
 	source = opennebula.install
-	sha512sums = 4d7d4f6c20a6185539a88006e4d15681d90cee45506d36017a538415a3b3cce809f02ff248013f9e2daa5f1d20afd308a0a014853b8462723ad6ba5acaa84626
-	sha512sums = 3d63703f869313ddccc8595ceaca2c65bcfab5ea771df3471909b8421587c1c596227094dbc99fe91181cc0dacf2fdc1a772f88124ee5eb6fa141123998c21ea
+	sha512sums = e6660c44c7fcb1d32077b483814ccaad03bca0f6264671548b6ef9cc60f544b134ea3d9ade13a959340bb1f8c94cf08c8246ea929073cf89d6ee35f8b2e19904
+	sha512sums = e651669847686a3170420485c6181261f5459336f5c5dc3735ba937b1a4cb1876baac60b5b998cb2ae7d04c4f449656c154391ccd62d7181d2a6d60e0c0ac0b1
 	sha512sums = a563f1c6458d16c6b13f92aaf0b515127a2c30f25cd398eba0571d511fd38dfcfc0a3374d2df242dbd1963f6a0fd85fa95ee8ac1766f8d39717d7998479d9db9
-	sha512sums = e5129f9464edc3719d035b81429d1f12af6519b33be7842aa07583f26ac26dcf02545128d68a077c673c7e37debddf5e28edc1cb8d80f9a8a3e9c85f39c80710
-	sha512sums = a78cefc6a28674c8c65d22d8de242130ae46c1aafc82292fe470cd4890dbb5f08b4d74dc72c1961782e96bc415f5d439db2d05d272b43ee84ebdb75cd7026f7b
-	sha512sums = 44b1697d73e6b67cbad5c581f19fa57d730aedd87c4513080628845296d21454f208c746205bef35564dbbb8ca52935441d01bed790d4f3a63ae474e0b9f253d
-	sha512sums = 17ce8a26f187af95420b28fa3fd2db173fd98997080b3de99dc6d077e03054b9d98eff670728dcad34f54b9d27abe69ac4c7cdab2ebab02e9da159921bb1d2b8
+	sha512sums = 102f361eb1760dbac012c14bc1723f94089645dc1e4ce6b752e173154df671c8dcca26872a5487bb6a890460164fc32b641679e4da6f9d6a6c72a2090acd3f22
+	sha512sums = 52518dc9b8b4695b70935ca4e86813c45d0ae5ead1b08eb4935eccd5a7175cf979d0315afdaf5c346d729f39e0bd3cb4b63d4eb02128f48f3f973cae4c6e57df
+	sha512sums = 0f3e2a14b2077366c55c209ec630535b258d9632ce54a424eac36c173929f9886cf94a0991766e9f17d40c1095f8bb157fccbc6568d4bf6228d3ceb826cef628
+	sha512sums = b52f04a655212730089e641bef68bf5a892423b61ed33c2ea5a59e993c1668149e98d81272e162e3e1a87b3e9f904ab1a738248e4dcf32a8a11dc8b471e7cbad
 	sha512sums = 645765b6752d5a021412e633b950959201d0be92e4845894dba2a3137e1dae57d62f41b55ebbd098a065528ba836b07c3ebf1a7a6f7cbfa49b2a3da12ead6012
 	sha512sums = 620581599f1b0c4c6d4fdb87a6b41c937b8ef79401a6a047f8556517c726a5c61f9fc241a3d82a836b5728de3aa36a11d45cbfb1beb111e35c75485cb7b97228
-	sha512sums = 59ccef79f578997b5a1ef5bf53bc36beb233f935b13da466b887254272036b876946e1b74ed3692f4dc8bc2cc3855a61f06d047e179d8aefe73afbfeb886b655
+	sha512sums = 9a8d4f7541bbf29cbaad9b02c4c0c68b38e9bca7814cb2c99de4e7a8e2677a9e742936422d44b82a407d4479279c0ed94bd2774f055987fa91445c2538d01838
 	sha512sums = 01aaf2d6019003ab69cd2e9886618d59bed27062f68fe72f29662f70af9206ce3921053c4cab30c370da958be243a6b19e85094af40ff93b6e370505ddd8bbe2
 	sha512sums = cee672a3fb9bffdac836a9aa00c898a38303144be44521363ad8e5109aebaa00e31fc0ae921e3a71a87e734fc614f6b3350009d5ec899bc5d78e6fe6d6c8fc01
 	sha512sums = 18b1964cb4e3fc2eaa93a7ef79e4b9b185584d33ad4f7fa33cd33a74516334136d9cf0ee25921c189250420b751c753cb0142227e8de39e14f8d110e97cd8e30
-	sha512sums = 5b13cd565d2c73e5a5582dc2efcef58e84ee206b96519c2a371a09b52305620b062ca81daf35ed582e182afcc421b668a8ee3fc999a295fa8973d11482c5083b
-	sha512sums = 235d47ab6b7342db65b73533fab8084484cb95914604ffc68a419a13b41540b5e7983f46808f9b9cfc90bfeb69dfb1dfd8be61167791246e1631e93296a6ac7e
+	sha512sums = 1ba0b07b69f6f7cc48b5c3f79834682e609f207f8e2edb6ed41574bbc06afbed147d4b4ea10993b55a416c328dcc6d72495abc6957a31f73988cee12f31b08d3
 
 pkgname = opennebula
 
diff --git a/ChangeLog b/ChangeLog
index 411cf2e23401..ec1820fec13e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-09-20 Sledge Sulaweyo <sledge.sulaweyo#gmail.com>
+
+  * 5.4.1-1:
+  New upstream release (5.4.1)
+
 2017-09-07 Sledge Sulaweyo <sledge.sulaweyo#gmail.com>
 
   * 5.4.0-5:
diff --git a/PKGBUILD b/PKGBUILD
index 2a9c24a3c289..52742caafae4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
 
 pkgname=opennebula
 _unstable_pkg=opennebula-unstable
-pkgver=5.4.0
-pkgrel=5
+pkgver=5.4.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'
@@ -100,23 +100,21 @@ source=("http://downloads.opennebula.org/packages/${pkgname}-${pkgver}/${pkgname
         'chown_fix.patch'
         'set_locations.patch'
         'fix_kvm_emulator.patch'
-        'vip.sh.patch'
         'opennebula.install')
-sha512sums=('4d7d4f6c20a6185539a88006e4d15681d90cee45506d36017a538415a3b3cce809f02ff248013f9e2daa5f1d20afd308a0a014853b8462723ad6ba5acaa84626' #package
-            '3d63703f869313ddccc8595ceaca2c65bcfab5ea771df3471909b8421587c1c596227094dbc99fe91181cc0dacf2fdc1a772f88124ee5eb6fa141123998c21ea' #opennebula.service
+sha512sums=('e6660c44c7fcb1d32077b483814ccaad03bca0f6264671548b6ef9cc60f544b134ea3d9ade13a959340bb1f8c94cf08c8246ea929073cf89d6ee35f8b2e19904' #package
+            'e651669847686a3170420485c6181261f5459336f5c5dc3735ba937b1a4cb1876baac60b5b998cb2ae7d04c4f449656c154391ccd62d7181d2a6d60e0c0ac0b1' #opennebula.service
             'a563f1c6458d16c6b13f92aaf0b515127a2c30f25cd398eba0571d511fd38dfcfc0a3374d2df242dbd1963f6a0fd85fa95ee8ac1766f8d39717d7998479d9db9' #opennebula-scheduler.service
-            'e5129f9464edc3719d035b81429d1f12af6519b33be7842aa07583f26ac26dcf02545128d68a077c673c7e37debddf5e28edc1cb8d80f9a8a3e9c85f39c80710' #opennebula-sunstone.service
-            'a78cefc6a28674c8c65d22d8de242130ae46c1aafc82292fe470cd4890dbb5f08b4d74dc72c1961782e96bc415f5d439db2d05d272b43ee84ebdb75cd7026f7b' #opennebula-econe.service
-            '44b1697d73e6b67cbad5c581f19fa57d730aedd87c4513080628845296d21454f208c746205bef35564dbbb8ca52935441d01bed790d4f3a63ae474e0b9f253d' #opennebula-oneflow.service
-            '17ce8a26f187af95420b28fa3fd2db173fd98997080b3de99dc6d077e03054b9d98eff670728dcad34f54b9d27abe69ac4c7cdab2ebab02e9da159921bb1d2b8' #opennebula-onegate.service
+            '102f361eb1760dbac012c14bc1723f94089645dc1e4ce6b752e173154df671c8dcca26872a5487bb6a890460164fc32b641679e4da6f9d6a6c72a2090acd3f22' #opennebula-sunstone.service
+            '52518dc9b8b4695b70935ca4e86813c45d0ae5ead1b08eb4935eccd5a7175cf979d0315afdaf5c346d729f39e0bd3cb4b63d4eb02128f48f3f973cae4c6e57df' #opennebula-econe.service
+            '0f3e2a14b2077366c55c209ec630535b258d9632ce54a424eac36c173929f9886cf94a0991766e9f17d40c1095f8bb157fccbc6568d4bf6228d3ceb826cef628' #opennebula-oneflow.service
+            'b52f04a655212730089e641bef68bf5a892423b61ed33c2ea5a59e993c1668149e98d81272e162e3e1a87b3e9f904ab1a738248e4dcf32a8a11dc8b471e7cbad' #opennebula-onegate.service
             '645765b6752d5a021412e633b950959201d0be92e4845894dba2a3137e1dae57d62f41b55ebbd098a065528ba836b07c3ebf1a7a6f7cbfa49b2a3da12ead6012' #opennebula-novnc.service
             '620581599f1b0c4c6d4fdb87a6b41c937b8ef79401a6a047f8556517c726a5c61f9fc241a3d82a836b5728de3aa36a11d45cbfb1beb111e35c75485cb7b97228' #opennebula.conf
-            '59ccef79f578997b5a1ef5bf53bc36beb233f935b13da466b887254272036b876946e1b74ed3692f4dc8bc2cc3855a61f06d047e179d8aefe73afbfeb886b655' #opennebula.logrotate
+            '9a8d4f7541bbf29cbaad9b02c4c0c68b38e9bca7814cb2c99de4e7a8e2677a9e742936422d44b82a407d4479279c0ed94bd2774f055987fa91445c2538d01838' #opennebula.logrotate
             '01aaf2d6019003ab69cd2e9886618d59bed27062f68fe72f29662f70af9206ce3921053c4cab30c370da958be243a6b19e85094af40ff93b6e370505ddd8bbe2' #chown_fix.patch
             'cee672a3fb9bffdac836a9aa00c898a38303144be44521363ad8e5109aebaa00e31fc0ae921e3a71a87e734fc614f6b3350009d5ec899bc5d78e6fe6d6c8fc01' #set_locations.patch
             '18b1964cb4e3fc2eaa93a7ef79e4b9b185584d33ad4f7fa33cd33a74516334136d9cf0ee25921c189250420b751c753cb0142227e8de39e14f8d110e97cd8e30' #fix_kvm_emulator.patch
-            '5b13cd565d2c73e5a5582dc2efcef58e84ee206b96519c2a371a09b52305620b062ca81daf35ed582e182afcc421b668a8ee3fc999a295fa8973d11482c5083b' #vip.sh.patch
-            '235d47ab6b7342db65b73533fab8084484cb95914604ffc68a419a13b41540b5e7983f46808f9b9cfc90bfeb69dfb1dfd8be61167791246e1631e93296a6ac7e' #opennebula.install
+            '1ba0b07b69f6f7cc48b5c3f79834682e609f207f8e2edb6ed41574bbc06afbed147d4b4ea10993b55a416c328dcc6d72495abc6957a31f73988cee12f31b08d3' #opennebula.install
             )
 
 prepare() {
@@ -128,8 +126,6 @@ prepare() {
   patch < "${srcdir}/chown_fix.patch"
   patch < "${srcdir}/set_locations.patch"
   patch -p0 < "${srcdir}/fix_kvm_emulator.patch"
-  # Patch for https://dev.opennebula.org/issues/5309
-  patch -p0 < "${srcdir}/vip.sh.patch"
 }
 
 build() {
diff --git a/opennebula-econe.service b/opennebula-econe.service
index d58f2ff72253..2c588fbda07c 100644
--- a/opennebula-econe.service
+++ b/opennebula-econe.service
@@ -9,7 +9,6 @@ Group=cloud
 Type=simple
 
 ExecStart=/usr/bin/ruby /usr/lib/one/ruby/cloud/econe/econe-server.rb
-ExecStop=/bin/kill -TERM $MAINPID
 PIDFile=/var/run/one/econe-server.pid
 Restart=always
 
diff --git a/opennebula-oneflow.service b/opennebula-oneflow.service
index fa1e01f6d0df..997a5b6a6c49 100644
--- a/opennebula-oneflow.service
+++ b/opennebula-oneflow.service
@@ -10,7 +10,6 @@ Type=simple
 
 
 ExecStart=/usr/bin/ruby /usr/lib/one/oneflow/oneflow-server.rb
-ExecStop=/bin/kill -TERM $MAINPID
 PIDFile=/var/run/one/oneflow.pid
 Restart=always
 
diff --git a/opennebula-onegate.service b/opennebula-onegate.service
index 63db31ca74e3..0fa0a421ae96 100644
--- a/opennebula-onegate.service
+++ b/opennebula-onegate.service
@@ -9,7 +9,6 @@ Group=cloud
 Type=simple
 
 ExecStart=/usr/bin/ruby /usr/lib/one/onegate/onegate-server.rb
-ExecStop=/bin/kill -TERM $MAINPID
 PIDFile=/var/run/one/onegate.pid
 Restart=always
 
diff --git a/opennebula-sunstone.service b/opennebula-sunstone.service
index cf1a45cbbd26..ec4baa6f2174 100644
--- a/opennebula-sunstone.service
+++ b/opennebula-sunstone.service
@@ -11,7 +11,6 @@ Type=simple
 PermissionsStartOnly=true
 
 ExecStart=/usr/bin/ruby /usr/lib/one/sunstone/sunstone-server.rb
-ExecStop=/bin/kill -TERM $MAINPID
 PIDFile=/var/run/one/sunstone.pid
 Restart=always
 
diff --git a/opennebula.install b/opennebula.install
index 6615d94293e8..3272a4127464 100644
--- a/opennebula.install
+++ b/opennebula.install
@@ -18,7 +18,7 @@ post_install() {
 }
 
 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"
+	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.4/intro_release_notes/release_notes/compatibility.html\n\thttp://docs.opennebula.org/5.4/intro_release_notes/upgrades/index.html\n"
 }
 
 pre_remove() {
diff --git a/opennebula.logrotate b/opennebula.logrotate
index 6b8db4c0b89d..03e0d63f7c46 100644
--- a/opennebula.logrotate
+++ b/opennebula.logrotate
@@ -4,7 +4,7 @@ dateformat -%Y%m%d-%s
 
 compress
 weekly
-rotate 52
+rotate 4
 
 /var/log/one/one_xmlrpc.log {
    missingok
diff --git a/opennebula.service b/opennebula.service
index 89d2e683a563..8587d3f66120 100644
--- a/opennebula.service
+++ b/opennebula.service
@@ -18,9 +18,10 @@ ExecStart=/usr/bin/oned -f
 # Log file location must exist
 ExecStartPre=/bin/mkdir -p /var/log/one
 ExecStartPre=/bin/chown oneadmin:cloud /var/log/one
-ExecStartPre=/usr/bin/logrotate -s /tmp/logrotate.state -f /etc/logrotate.d/opennebula
+ExecStartPre=-/usr/bin/logrotate -s /tmp/logrotate.state -f /etc/logrotate.d/opennebula
 ExecStop=/bin/kill -TERM $MAINPID
-ExecStopPost=/usr/bin/rm /var/lock/one/one
+ExecStopPost=/usr/bin/rm -f /var/lock/one/one
+ExecStopPost=/usr/share/one/follower_cleanup
 PIDFile=/var/run/one/oned.pid
 Restart=always
 
diff --git a/vip.sh.patch b/vip.sh.patch
deleted file mode 100644
index d2a4bf897cf1..000000000000
--- a/vip.sh.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- share/hooks/raft/vip.sh
-+++ share/hooks/raft/vip.sh
-@@ -16,11 +16,14 @@
-
- case $ACTION in
- leader)
-+    logger -t opennebula-raft -p alert "Taking over floating IP $IP on $INTERFACE"
-     sudo ip address add $IP dev $INTERFACE
--    arping -c 5 -A -I $INTERFACE ${IP%%/*}
-+    sudo arping -c 3 -U -I $INTERFACE ${IP%%/*}
-+    sudo arping -c 3 -UA -I $INTERFACE ${IP%%/*}
-     ;;
-
- follower)
-+    logger -t opennebula-raft -p alert "Giving up floating IP $IP on $INTERFACE"
-     sudo ip address del $IP dev $INTERFACE
-     ;;