zabbix: upgrade to 6.4.10

1 files changed, 44 insertions, 10 deletions

diff --git a/linhes/zabbix/PKGBUILD b/linhes/zabbix/PKGBUILD
index b242e5a..ef47499 100644
--- a/linhes/zabbix/PKGBUILD
+++ b/linhes/zabbix/PKGBUILD
@@ -1,21 +1,24 @@
 # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Maintainer: Florian Pritz <bluewind@xinu.at>
+# Maintainer: Robin Candau <antiz@archlinux.org>
 
 pkgbase=zabbix
-pkgname=(zabbix-server zabbix-agent{,2} zabbix-proxy zabbix-frontend-php)
-pkgver=6.4.8
+pkgname=(zabbix-server zabbix-agent{,2} zabbix-proxy zabbix-frontend-php zabbix-web-service)
+pkgver=6.4.10
 pkgrel=1
 arch=(x86_64)
 url='https://www.zabbix.com/'
 license=(GPL)
-makedepends=(libxml2 unixodbc net-snmp mariadb-libs libldap libevent go pkgconfig pcre2)
+makedepends=(libxml2 unixodbc net-snmp mariadb-libs libldap libevent go pkgconfig pcre2 openipmi)
 source=("https://cdn.zabbix.com/zabbix/sources/stable/${pkgver%.*}/zabbix-${pkgver}.tar.gz"
         zabbix-agent.{service,sysusers,tmpfiles}
         zabbix-agent2.service
         zabbix-server-mysql.service zabbix-server.{sysusers,tmpfiles}
-        zabbix-proxy-mysql.service zabbix-proxy.{sysusers,tmpfiles})
+        zabbix-proxy-mysql.service zabbix-proxy.{sysusers,tmpfiles}
+        zabbix-web-service.{service,sysusers,tmpfiles}
+        fix-build-with-libxml2.patch)
 
-sha512sums=('712e9f3fdb772475137c7238e8ca26f510180c147b7aa74b29567033f62d4beb00275b96aaf05c978fec341b08c82102ecf1976a5e8af257e848ae3974a6fec9'
+sha512sums=('bd8460da2cca3b8a0b4e0adbf5a7a30e74c30667bd95f161ca6159798f788748f5de6a512a3b36f2b47d695daf3e810abcf68b3016af6fd06602075a76cb4ef6'
             '8c1fa2676bc0ef91bc39ec5f97b4d3ba5c365d063420455a3785121a54e120bc5afeacde42a48f4509c115f940dcc3b6c2f43044a7fbfb421182fc93b22a2444'
             '3ab3ac1acc7e35c8896157aef601ebc30815237ac5252cbd0c1ecb26eeaf9eccf5c49938ae8c85bb79a6f95f607f082f6b80ed660829599ec03aa626cca6d3dc'
             'ca6b4779de23829dfdd80ee21e924fbe4e2754f4e693bed4b1a2aa846cd87d150e399b1169d7fe58d30c50ed837c1b8254e580de420267d0a1834d6dc409c43d'
@@ -25,16 +28,24 @@ sha512sums=('712e9f3fdb772475137c7238e8ca26f510180c147b7aa74b29567033f62d4beb002
             'b6d548a26f845ef1a39724e3273aa521715272e20a0038144f86d377a26dfec6e3e129404cfda77632cad2f5cd6bab4a33f70a26c8c67b0d0b2abb3678ad2d83'
             '94701f34fe5df4859c6a4d0459c16062374e8f89f4f51c414e71c9c2db14f61e087721e68dddb3e8d88bf1c097477c1a21e27ba4705fd07d88c60adb41acc1be'
             '7c1072a8cd5837095f857b50124cb45d1bdbddbce108f6f067a35c3c9ebb1ad0502ef617dfa10f9c843631220177a6286a97b1c2a46539200be72fa83cb23b99'
-            '64042ddf511b56b2a5a311e34643f4e049c09d909ea65b7343a8a9637f33dc59f2b1342201290ca0774cbcbf616096b3696982047fb622b7d51afb5eceb298dd')
+            '64042ddf511b56b2a5a311e34643f4e049c09d909ea65b7343a8a9637f33dc59f2b1342201290ca0774cbcbf616096b3696982047fb622b7d51afb5eceb298dd'
+            '545bb284ac28386f8b9f33f0c5066bb73b3634fab8760861bc172fe83897f22e54ecaf186970f0ef178256c9ff152a3e806636145a77af78964f7af0fdcec1a1'
+            '2766787aaeef2f48909c52deb411b47971931a972282f701c401f8315264c8817fc1f9f49a2672152c78a0ebba7d72329c18b441e134c5ec3db5f12681b6e590'
+            '309f55c8c381364eca6d31c4709a0ebb7e04cefad9e51f44173d839a58e7f8e95e3c678922f9e1fe42cff90dba5144cc7ee3a6e1c236b079b501c0e08ad2152d'
+            '1e29dd44ac8b51b768352bdfbb4176f2ea82fa2a0887fd59ab2f114874745833a013874896850fce515e25ae56f39d16192b27f3044319725e8f77c6f64c00e5')
 
 prepare() {
   cd $pkgbase-$pkgver
   sed -i \
     -e '/^LogFile=.*/d' \
     -e 's/# LogType=file/LogType=system/' \
-    conf/zabbix_{agentd,proxy,server}.conf
+    conf/zabbix_{agentd,proxy,server}.conf src/go/conf/zabbix_web_service.conf
 
   autoreconf -fi
+
+ # Temporary patch to fix build against libxml2
+ # See https://support.zabbix.com/browse/ZBX-23738
+ patch -Np1 <${srcdir}/fix-build-with-libxml2.patch
 }
 
 build() {
@@ -58,6 +69,8 @@ build() {
     --with-libpcre2
     --with-ssh2
     --with-unixodbc
+    --with-openipmi
+    --enable-webservice
   )
 
   cd $pkgbase-$pkgver
@@ -86,7 +99,9 @@ build() {
 package_zabbix-server() {
   pkgdesc='Monitoring software for networks and applications'
   depends=(net-snmp curl libxml2 unixodbc libldap libevent pcre2)
-  optdepends=('mariadb-libs: for MariaDB support')
+  optdepends=('mariadb-libs: for MariaDB support'
+              'openipmi: for IPMI support'
+              'zabbix-web-service: for scheduled PDF report generation')
   backup=(etc/zabbix/zabbix_server.conf)
 
   cd $pkgbase-$pkgver
@@ -172,8 +187,9 @@ package_zabbix-agent2() {
 
 package_zabbix-proxy() {
   pkgdesc='Data collecting proxy for Zabbix'
-  depends=(net-snmp curl libxml2 sqlite unixodbc libldap pcre2 libevent)
-  optdepends=('mariadb-libs: for MariaDB support')
+  depends=(net-snmp curl libxml2 unixodbc libldap pcre2 libevent)
+  optdepends=('mariadb-libs: for MariaDB support'
+              'openipmi: for IPMI support')
   backup=(etc/zabbix/zabbix_proxy.conf)
 
   cd $pkgbase-$pkgver
@@ -211,3 +227,21 @@ package_zabbix-frontend-php() {
   cp -a ui/* "$pkgdir/usr/share/webapps/zabbix"
   chown 33:33 ${pkgdir}/usr/share/webapps/zabbix/conf/ # write access for http user
 }
+
+package_zabbix-web-service() {
+  pkgdesc='Zabbix web service used to generate and send scheduled reports'
+  depends=(chromium)
+  backup=(etc/zabbix/zabbix_web_service.conf)
+
+  cd $pkgbase-$pkgver
+  install -Dm755 src/go/bin/zabbix_web_service "$pkgdir/usr/bin/zabbix_web_service"
+  install -Dm644 src/go/conf/zabbix_web_service.conf "$pkgdir/etc/zabbix/zabbix_web_service.conf"
+  chown 173:173 "$pkgdir/etc/zabbix/zabbix_web_service.conf"
+
+  install -Dm644 "$srcdir/zabbix-web-service.service" \
+	"$pkgdir/usr/lib/systemd/system/zabbix-web-service.service"
+  install -Dm644 "$srcdir/zabbix-web-service.sysusers" \
+	"$pkgdir/usr/lib/sysusers.d/zabbix-web-service.conf"
+  install -Dm644 "$srcdir/zabbix-web-service.tmpfiles" \
+	"$pkgdir/usr/lib/tmpfiles.d/zabbix-web-service.conf"
+}