xymon: update to 4.3.28

1 files changed, 59 insertions, 45 deletions

diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD
index c619eaa..e69afd4 100755
--- a/abs/core/xymon/PKGBUILD
+++ b/abs/core/xymon/PKGBUILD
@@ -1,43 +1,45 @@
 pkgbase=xymon
 pkgname=('xymonserver' 'xymonclient')
-pkgver=4.3.17
-pkgrel=24
+pkgver=4.3.28
+pkgrel=1
 pkgdesc="Xymon is a system for monitoring of hosts and networks"
 license=('GPL')
 arch=('i686' 'x86_64')
 url="http://www.xymon.com/"
 source=("https://downloads.sourceforge.net/project/xymon/Xymon/$pkgver/$pkgbase-$pkgver.tar.gz"
-        'hobbitadd.py'
-        'xymon_ghost_check'
-        'graphs.cfg.diff'
-        'xymonserver.cfg.diff'
-        'tasks.d.mv'
-        'clientlaunch.cfg.patch'
-        'hobbitstorage.py'
-        'hbnotes.py'
-        'hobbit-myth-orphan.sh'
-        'analysis.cfg'
+        'alerts.cfg'
         'analysis.cfg.patch'
-        'hbfunc.py'
         'be.png' 'tuner.png' 'tv.png'
-        'hobbit-mem-myth.sh'
+        'clientlaunch.cfg.patch'
+        'client-local.cfg.patch'
+        'graphs.cfg.diff'
+        'hbfunc.py'
+        'hbnotes.py'
         'hobbit_notify.sh'
-        'login_notify.sh'
-        'alerts.cfg'
+        'hobbit-mem-myth.sh'
+        'hobbit-myth-orphan.sh'
         'hobbit_myth_data.py'
+        'hobbitadd.py'
+        'hobbitstorage.py'
+        'hosts.cfg.patch'
+        'log_list.sh'
+        'led_themes.tar.gz'
+        'login_notify.sh'
+        'logrotate-server.xymon'
+        'logrotate-client.xymon'
+        'tasks.d.mv'
+        'xymon_ghost_check'
         'xymon-gputemp.sh'
         'xymon-hddtemp.sh'
         'xymon-smart.sh'
-        'logrotate-server.xymon'
-        'logrotate-client.xymon'
-        'log_list.sh'
-        'client-local.cfg.patch'
-        'led_themes.tar.gz'
+        'xymon-server.include'
+        'xymon-server.gen_light_conf.d'
+        'xymonserver.cfg.diff'
         'xymon-server.rules'
         'xymon-client.rules'
-        'hosts.cfg.patch')
+        )
 depends=('rrdtool' 'fping' 'pcre' 'python2' 'graphviz' 'smartmontools')
-install=xymon.install
+install=xymon-server.install
 
 build() {
     cd ${srcdir}/xymon-$pkgver
@@ -128,9 +130,20 @@ package_xymonserver(){
     echo "myth_mtc;The <b>myth_mtc</b> column shows the status of the MythTV maintenance script.;" >> $COLDOC
     echo "orphan;The <b>orphan</b> column shows the status of the find_orphans.py script.;" >> $COLDOC
 
+    #move cgiwrap to same partiton as hobbit-cgi and hobbit-seccgi
+    #because pacman is not able to install hardlinks accross partitions
+    mv ${pkgdir}/home/xymon/server/bin/cgiwrap ${pkgdir}/data/srv/httpd/htdocs/xymon/
+
+    #install conf files for lighttpd
+    mkdir -p ${pkgdir}/etc/lighttpd
+    install -D -m 644 ${srcdir}/xymon-server.include ${pkgdir}/etc/lighttpd/
+    #gen_light_conf
+    install -D -m 744 ${srcdir}/xymon-server.gen_light_conf.d ${pkgdir}/etc/gen_light_conf.d/xymon-server.conf
+
     #fix permissions
     chmod 755 ${pkgdir}/data/srv/httpd/htdocs/
     chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/
+    chmod 755 ${pkgdir}/data/srv/httpd/htdocs/xymon/cgiwrap
     chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/notes/
     chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/gifs/
     chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/snap/
@@ -162,35 +175,36 @@ package_xymonclient(){
     cd -
     }
 
-md5sums=('d8d119a777e7b7204d1292fb27314312'
-         'a0fbb9cbeb3600a40943e6205790f22f'
-         'c60b0d59bb39505ee3d62c6dd65429c5'
-         '92bd5e8279c688fd854d514443bc733c'
-         'f0fca78520f434918bd1be717d165073'
-         'a19c8c546dcd95049476bb19f9d4e3ae'
-         'c9a31ea9ae131fb351db913e922c25aa'
-         'b2f98ac0df013332deedc1efae0a270d'
-         'df77d1de72157d23a301a72288fbf7e5'
-         '2a509d81ee1655130ce40bf970719e0a'
-         '4d594fba346b56e479d180162a0db44c'
+md5sums=('14501ab2cfce9a332c1590543dfcbd0f'
+         '9af2ad60ac4c3cb653754618f603e311'
          '77fd7ab6ebbe72d14092ee53c5958f97'
-         '80d9cfac86c6d96836e6f406e35e7cf5'
          'd210c43fb9ee9ad6cd7648e0c2e0efea'
          '0c808fa12672289f86b0651545381308'
          '0469d775db9fdd18ea95dd41937ada82'
-         '0757294eec13771f8e63da23cf066796'
+         'c9a31ea9ae131fb351db913e922c25aa'
+         '31ac5c1f6dcc9408b64c4107b325a9a6'
+         '92bd5e8279c688fd854d514443bc733c'
+         '80d9cfac86c6d96836e6f406e35e7cf5'
+         'df77d1de72157d23a301a72288fbf7e5'
          'b1d5592fa92ef71303621964e84c2b9e'
-         '22d4c9065fd959efe82f121dcb511305'
-         '9af2ad60ac4c3cb653754618f603e311'
+         '0757294eec13771f8e63da23cf066796'
+         '2a509d81ee1655130ce40bf970719e0a'
          '313b11e7a22c3c08fb2afaadbfb46d87'
+         'a0fbb9cbeb3600a40943e6205790f22f'
+         'b2f98ac0df013332deedc1efae0a270d'
+         '606f535a49f32b35802ed9d46bd7d068'
+         '98e9242ae346f729b14cb195786571f2'
+         'c7178bbf384bbe86c318b60fef6faf10'
+         '22d4c9065fd959efe82f121dcb511305'
+         'b4e8641e97e6b689dbc634af785e6799'
+         'e2844513e2c92e8b5084818f3b2a478d'
+         'a19c8c546dcd95049476bb19f9d4e3ae'
+         'c60b0d59bb39505ee3d62c6dd65429c5'
          '6452d891d88bb46d07bcf7790a523ad0'
          'b49e7de696c1a0678ad198bab926266c'
          'e071c387deac6b896b20db19903b7794'
-         'b4e8641e97e6b689dbc634af785e6799'
-         'e2844513e2c92e8b5084818f3b2a478d'
-         '98e9242ae346f729b14cb195786571f2'
-         '31ac5c1f6dcc9408b64c4107b325a9a6'
-         'c7178bbf384bbe86c318b60fef6faf10'
+         '1a00c0b9b9b1a37f1513fa8489ce9d31'
+         '3d1f311f0142f41d763276302a7ce396'
+         'c75c434ba9c39a914e7693004b580554'
          'e9dbff011e57861266d27dfdf465a4b3'
-         'cdfbca43dbae4ce0ca72dd002ec22af1'
-         '606f535a49f32b35802ed9d46bd7d068')
+         'cdfbca43dbae4ce0ca72dd002ec22af1')