From 4bc2bb3e2e10fb1d43c1cab835fc2fe498ced630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 24 Jul 2020 08:03:02 +0200 Subject: [PATCH] zabbix: update to 4.4.10 + fix libxml2 check The m4/libxml2.m4 macro expects $PKG_CONFIG to contain the full path. Patch it to look for /usr/bin/pkg-config even though a wrapper may actually be used. For a more detailed description also see: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=245613 --- srcpkgs/zabbix/patches/fix-libxml2_m4.patch | 11 +++++++++++ srcpkgs/zabbix/template | 22 ++++++++++++--------- 2 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/zabbix/patches/fix-libxml2_m4.patch diff --git a/srcpkgs/zabbix/patches/fix-libxml2_m4.patch b/srcpkgs/zabbix/patches/fix-libxml2_m4.patch new file mode 100644 index 0000000000..9b25e9e8a5 --- /dev/null +++ b/srcpkgs/zabbix/patches/fix-libxml2_m4.patch @@ -0,0 +1,11 @@ +--- m4/libxml2.m4 2020-05-10 19:36:06.000000000 +0200 ++++ m4/libxml2.m4 2020-07-24 07:58:12.642619506 +0200 +@@ -52,7 +52,7 @@ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + PKG_PROG_PKG_CONFIG() + +- if test -x "$PKG_CONFIG"; then ++ if test -x "/usr/bin/$PKG_CONFIG"; then + + LIBXML2_CFLAGS="`$PKG_CONFIG --cflags libxml-2.0`" + diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template index e0ce624710..0148d35772 100644 --- a/srcpkgs/zabbix/template +++ b/srcpkgs/zabbix/template @@ -1,22 +1,22 @@ # Template file for 'zabbix' pkgname=zabbix -version=4.4.7 +version=4.4.10 revision=1 build_style=gnu-configure -configure_args="--with-libxml2 --with-gnutls --with-libcurl --with-net-snmp +configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent - --enable-proxy" -hostmakedepends="pkg-config" -makedepends="gnutls-devel libcurl-devel libevent-devel libmysqlclient-devel - libxml2-devel net-snmp-devel pcre-devel" + --enable-proxy ac_cv_lib_xml2_xmlReadMemory=yes" +hostmakedepends="automake libtool pkg-config" +makedepends="gnutls-devel libcurl-devel libxml2-devel libevent-devel + libmysqlclient-devel net-snmp-devel pcre-devel" depends="fping mysql" short_desc="IT Infrastructure components availability and performance monitoring" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://www.zabbix.com" changelog="https://www.zabbix.com/rn/rn${version}" -distfiles="${SOURCEFORGE_SITE}/zabbix/zabbix-${version}.tar.gz" -checksum=497b8fe7905576d4d450c6fa486693c10d42915b6b55564f111957edcb9fec8d +distfiles="https://cdn.zabbix.com/zabbix/sources/stable/${version%.*}/zabbix-${version}.tar.gz" +checksum=2de09bd41ccb2534a0e12ca45c0e7da3896d95f0c4f9f7815477123a3d692c8f conf_files="/etc/zabbix_server.conf" system_accounts="_zabbix_server" system_groups="_zabbix_server" @@ -25,9 +25,13 @@ make_dirs="/var/log/zabbix-server 0750 _zabbix_server _zabbix_server" if [ "$CROSS_BUILD" ]; then # configure scripts is bad at checking, problably runs code instead of # using pkg-config files - hostmakedepends+=" libssh2-devel libevent-devel gnutls-devel pcre-devel" + hostmakedepends+=" ${makedepends}" fi +pre_configure() { + autoreconf -fi +} + post_install() { vsv zabbix-server