pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
zabbix60-*: Update Zabbix to 6.0.13
Module Name: pkgsrc-wip
Committed By: Yuuki Enomoto <uki%e-yuuki.org@localhost>
Pushed By: e-yuuki
Date: Sat Feb 4 13:49:41 2023 +0900
Changeset: 68bb2a555e0346cbc756871c7b2d02d51678091a
Modified Files:
zabbix60-agent/distinfo
zabbix60-frontend/PLIST
zabbix60-frontend/distinfo
zabbix60-java/distinfo
zabbix60-proxy/distinfo
zabbix60-server/Makefile.common
zabbix60-server/distinfo
Added Files:
zabbix60-agent2/DESCR
zabbix60-agent2/Makefile
zabbix60-agent2/PLIST
zabbix60-agent2/distinfo
zabbix60-agent2/files/smf/manifest.xml
zabbix60-agent2/files/zabbix_agentd.sh
zabbix60-agent2/options.mk
zabbix60-agent2/patches/patch-configure
zabbix60-agent2/patches/patch-src_libs_zbxsysinfo_netbsd_net.c
zabbix60-agent2/patches/patch-src_zabbix__agent_Makefile.in
Log Message:
zabbix60-*: Update Zabbix to 6.0.13
Release note: https://www.zabbix.com/rn/rn6.0.13
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=68bb2a555e0346cbc756871c7b2d02d51678091a
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
zabbix60-agent/distinfo | 6 +-
zabbix60-agent2/DESCR | 10 ++
zabbix60-agent2/Makefile | 49 +++++
zabbix60-agent2/PLIST | 7 +
zabbix60-agent2/distinfo | 8 +
zabbix60-agent2/files/smf/manifest.xml | 30 ++++
zabbix60-agent2/files/zabbix_agentd.sh | 27 +++
zabbix60-agent2/options.mk | 14 ++
zabbix60-agent2/patches/patch-configure | 15 ++
.../patches/patch-src_libs_zbxsysinfo_netbsd_net.c | 199 +++++++++++++++++++++
.../patches/patch-src_zabbix__agent_Makefile.in | 15 ++
zabbix60-frontend/PLIST | 1 -
zabbix60-frontend/distinfo | 6 +-
zabbix60-java/distinfo | 6 +-
zabbix60-proxy/distinfo | 6 +-
zabbix60-server/Makefile.common | 2 +-
zabbix60-server/distinfo | 6 +-
17 files changed, 390 insertions(+), 17 deletions(-)
diffs:
diff --git a/zabbix60-agent/distinfo b/zabbix60-agent/distinfo
index a2b3f3a971..9154348b36 100644
--- a/zabbix60-agent/distinfo
+++ b/zabbix60-agent/distinfo
@@ -1,8 +1,8 @@
$NetBSD$
-BLAKE2s (zabbix-6.0.12.tar.gz) = 378fdca9d53532f64404d46043ac6a35761b9a7feb021b37fcfee4a7da465bac
-SHA512 (zabbix-6.0.12.tar.gz) = 7cd254282523002d2e4d86295258ea0f56921b54c88d604300104f32ea5807c0b39b5550a9dd98e03ad41adf4dd8e93a7b1deb200d513283dca51d49d46bda4d
-Size (zabbix-6.0.12.tar.gz) = 40419443 bytes
+BLAKE2s (zabbix-6.0.13.tar.gz) = fd8aa1f37b18943b42709d7ead74402bb9637819eb6137ea23c0b2b7cbdca775
+SHA512 (zabbix-6.0.13.tar.gz) = 188622c0c04029eac376ebf60c96ed9d67923bc1f40eff75666a241bb534cb744aca8c51ff4b79d508dfadb9e758f80d9dc46016217bcb5a67e8ede7e645788e
+Size (zabbix-6.0.13.tar.gz) = 41075557 bytes
SHA1 (patch-configure) = 661087a4a5342bbce494b5eac45c294f3412318e
SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = 0371a5cafe00d01f293a847105f7c501f443616c
SHA1 (patch-src_zabbix__agent_Makefile.in) = efbd804ecee4b99db36db5f4fd61583b2ef96a86
diff --git a/zabbix60-agent2/DESCR b/zabbix60-agent2/DESCR
new file mode 100644
index 0000000000..43094c0148
--- /dev/null
+++ b/zabbix60-agent2/DESCR
@@ -0,0 +1,10 @@
+Zabbix is the ultimate enterprise-level software designed for monitoring
+availability and performance of IT infrastructure components. Zabbix is open
+source and comes at no cost.
+
+With Zabbix it is possible to gather virtually limitless types of data from
+the network. High performance real-time monitoring means that tens of thousands
+of servers, virtual machines and network devices can be monitored
+simultaneously. Along with storing the data, visualization features are
+available (overviews, maps, graphs, screens, etc), as well as very flexible
+ways of analyzing the data for the purpose of alerting.
diff --git a/zabbix60-agent2/Makefile b/zabbix60-agent2/Makefile
new file mode 100644
index 0000000000..9a55605bd4
--- /dev/null
+++ b/zabbix60-agent2/Makefile
@@ -0,0 +1,49 @@
+# $NetBSD$
+
+.include "../../wip/zabbix60-server/Makefile.common"
+
+PKGNAME= ${DISTNAME:S/-/-agent2-/}
+COMMENT= Enterprise-class Monitoring Solution for Everyone
+
+CONFLICTS+= zabbix-[0-9]*
+CONFLICTS+= zabbix-agent2-[0-9]*
+
+USE_TOOLS+= pkg-config
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --enable-agent2
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+= --datarootdir=${PREFIX}/share/${PKGBASE}
+CONFIGURE_ARGS+= --with-libcurl
+CONFIGURE_ARGS+= --with-libpcre2
+CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
+
+EGDIR= share/examples/${PKGBASE}
+CONF_FILES+= ${EGDIR}/zabbix_agent2.conf ${PKG_SYSCONFDIR}/zabbix_agent2.conf
+
+RCD_SCRIPTS= zabbix_agent2
+
+INSTALLATION_DIRS+= ${EGDIR} share/${PKGBASE}
+
+SUBST_CLASSES+= fix-paths
+SUBST_STAGE.fix-paths= pre-configure
+SUBST_MESSAGE.fix-paths= Fixing absolute paths.
+SUBST_FILES.fix-paths= conf/*.conf
+SUBST_FILES.fix-paths+= man/*.man
+SUBST_SED.fix-paths= -e 's,/usr/local/etc,${PKG_SYSCONFDIR},g'
+
+SUBST_CLASSES+= fix-pkgbase
+SUBST_STAGE.fix-pkgbase= pre-configure
+SUBST_MESSAGE.fix-pkgbase= Fixing PKGBASE.
+SUBST_FILES.fix-pkgbase= src/go/Makefile.in
+SUBST_SED.fix-pkgbase= -e 's,%%PKGBASE%%,${PKGBASE},g'
+
+PLIST_SUBST+= PKGBASE=${PKGBASE}
+
+.include "../../mk/bsd.prefs.mk"
+
+.include "options.mk"
+
+.include "../../security/openssl/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/zabbix60-agent2/PLIST b/zabbix60-agent2/PLIST
new file mode 100644
index 0000000000..0d9c26d52f
--- /dev/null
+++ b/zabbix60-agent2/PLIST
@@ -0,0 +1,7 @@
+@comment $NetBSD$
+man/man8/zabbix_agent2.8
+sbin/zabbix_agent2
+share/examples/${PKGBASE}/zabbix_agent2.conf
+@pkgdir share/${PKGBASE}
+@pkgdir lib/modules
+@pkgdir etc/zabbix_agentd.conf.d
diff --git a/zabbix60-agent2/distinfo b/zabbix60-agent2/distinfo
new file mode 100644
index 0000000000..a2b3f3a971
--- /dev/null
+++ b/zabbix60-agent2/distinfo
@@ -0,0 +1,8 @@
+$NetBSD$
+
+BLAKE2s (zabbix-6.0.12.tar.gz) = 378fdca9d53532f64404d46043ac6a35761b9a7feb021b37fcfee4a7da465bac
+SHA512 (zabbix-6.0.12.tar.gz) = 7cd254282523002d2e4d86295258ea0f56921b54c88d604300104f32ea5807c0b39b5550a9dd98e03ad41adf4dd8e93a7b1deb200d513283dca51d49d46bda4d
+Size (zabbix-6.0.12.tar.gz) = 40419443 bytes
+SHA1 (patch-configure) = 661087a4a5342bbce494b5eac45c294f3412318e
+SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = 0371a5cafe00d01f293a847105f7c501f443616c
+SHA1 (patch-src_zabbix__agent_Makefile.in) = efbd804ecee4b99db36db5f4fd61583b2ef96a86
diff --git a/zabbix60-agent2/files/smf/manifest.xml b/zabbix60-agent2/files/smf/manifest.xml
new file mode 100644
index 0000000000..df8e63a875
--- /dev/null
+++ b/zabbix60-agent2/files/smf/manifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<service_bundle type="manifest" name="export">
+ <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
+ <dependency name="fs-local" grouping="require_all" restart_on="none" type="service">
+ <service_fmri value="svc:/system/filesystem/local"/>
+ </dependency>
+ <dependency name="network-service" grouping="require_all" restart_on="none" type="service">
+ <service_fmri value="svc:/network/service"/>
+ </dependency>
+ <dependency name="system-log" grouping="optional_all" restart_on="none" type="service">
+ <service_fmri value="svc:/system/system-log"/>
+ </dependency>
+ <method_context>
+ <method_credential user="@ZABBIX_USER@" group="@ZABBIX_GROUP@"/>
+ </method_context>
+ <instance name="@SMF_INSTANCES@" enabled="false">
+ <dependency name="config-file" grouping="require_all" restart_on="refresh" type="path">
+ <service_fmri value="file://localhost@PKG_SYSCONFDIR@/zabbix_agentd.conf"/>
+ </dependency>
+ <exec_method name="start" type="method" exec="@PREFIX@/sbin/zabbix_agentd -c @PKG_SYSCONFDIR@/zabbix_agentd.conf" timeout_seconds="0"/>
+ <exec_method name="stop" type="method" exec=":kill" timeout_seconds="0"/>
+ <template>
+ <common_name>
+ <loctext xml:lang="C">Zabbix agent</loctext>
+ </common_name>
+ </template>
+ </instance>
+ </service>
+</service_bundle>
diff --git a/zabbix60-agent2/files/zabbix_agentd.sh b/zabbix60-agent2/files/zabbix_agentd.sh
new file mode 100644
index 0000000000..b75e300b8d
--- /dev/null
+++ b/zabbix60-agent2/files/zabbix_agentd.sh
@@ -0,0 +1,27 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD$
+#
+# Zabbix agent daemon
+#
+# REQUIRE: DAEMON
+# PROVIDE: zabbix_agentd
+
+if [ -f /etc/rc.subr ]; then
+ . /etc/rc.subr
+fi
+
+name="zabbix_agentd"
+rcvar=${name}
+command="@PREFIX@/sbin/${name}"
+start_precmd="ulimit -s 10240"
+required_files="@PKG_SYSCONFDIR@/${name}.conf"
+
+if [ -f /etc/rc.subr ]; then
+ load_rc_config ${name}
+ run_rc_command "$1"
+else
+ @ECHO@ -n " ${name}"
+ [ "x$1" = "xstart" ] && ulimit -s 10240
+ ${command} ${command_args}
+fi
diff --git a/zabbix60-agent2/options.mk b/zabbix60-agent2/options.mk
new file mode 100644
index 0000000000..2b8b53a397
--- /dev/null
+++ b/zabbix60-agent2/options.mk
@@ -0,0 +1,14 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.zabbix60-agent
+PKG_SUPPORTED_OPTIONS+= inet6
+
+.if empty(MISSING_FEATURES:Minet6)
+PKG_SUGGESTED_OPTIONS+= inet6
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+= --enable-ipv6
+.endif
diff --git a/zabbix60-agent2/patches/patch-configure b/zabbix60-agent2/patches/patch-configure
new file mode 100644
index 0000000000..6cd67a7bef
--- /dev/null
+++ b/zabbix60-agent2/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2020/11/03 22:46:23 otis Exp $
+
+Fix bash-ism.
+
+--- configure.orig 2022-03-02 19:06:50.761881804 +0900
++++ configure 2022-03-02 19:06:46.903210187 +0900
+@@ -8649,7 +8649,7 @@
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+- if test "$found_mysql_tls" == "yes"; then
++ if test "$found_mysql_tls" = "yes"; then
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TLS ciphersuites in MySQL library" >&5
+ $as_echo_n "checking for TLS ciphersuites in MySQL library... " >&6; }
diff --git a/zabbix60-agent2/patches/patch-src_libs_zbxsysinfo_netbsd_net.c b/zabbix60-agent2/patches/patch-src_libs_zbxsysinfo_netbsd_net.c
new file mode 100644
index 0000000000..3ac229d762
--- /dev/null
+++ b/zabbix60-agent2/patches/patch-src_libs_zbxsysinfo_netbsd_net.c
@@ -0,0 +1,199 @@
+$NetBSD: patch-src_libs_zbxsysinfo_netbsd_net.c,v 1.1 2020/11/03 22:44:43 otis Exp $
+
+Rework interface statistics code from using kvm to using sysctl interface.
+
+--- src/libs/zbxsysinfo/netbsd/net.c.orig 2021-10-25 09:49:27.000000000 +0000
++++ src/libs/zbxsysinfo/netbsd/net.c
+@@ -22,6 +22,9 @@
+ #include "zbxjson.h"
+ #include "log.h"
+
++#include <net/route.h>
++#include <net/if_dl.h>
++
+ static struct nlist kernel_symbols[] =
+ {
+ {"_ifnet", N_UNDF, 0, 0, 0},
+@@ -31,42 +34,91 @@ static struct nlist kernel_symbols[] =
+
+ #define IFNET_ID 0
+
++static void
++get_rtaddrs(int addrs, struct sockaddr *sa, struct sockaddr **rti_info)
++{
++ int i;
++
++ for (i = 0; i < RTAX_MAX; i++) {
++ if (addrs & (1 << i)) {
++ rti_info[i] = sa;
++ sa = (struct sockaddr *)((char *)(sa) +
++ RT_ROUNDUP(sa->sa_len));
++ } else
++ rti_info[i] = NULL;
++ }
++}
++
+ static int get_ifdata(const char *if_name,
+ zbx_uint64_t *ibytes, zbx_uint64_t *ipackets, zbx_uint64_t *ierrors, zbx_uint64_t *idropped,
+ zbx_uint64_t *obytes, zbx_uint64_t *opackets, zbx_uint64_t *oerrors,
+ zbx_uint64_t *tbytes, zbx_uint64_t *tpackets, zbx_uint64_t *terrors,
+ zbx_uint64_t *icollisions, char **error)
+ {
+- struct ifnet_head head;
+- struct ifnet *ifp;
+- struct ifnet v;
++ struct if_msghdr *ifm;
++ int mib[6] = { CTL_NET, AF_ROUTE, 0, 0, NET_RT_IFLIST, 0 };
++ char *buf = NULL;
++ char *lim, *next;
++ struct rt_msghdr *rtm;
++ struct if_data *ifd = NULL;
++ struct sockaddr *sa, *rti_info[RTAX_MAX];
++ struct sockaddr_dl *sdl;
++
++ size_t len = 0;
++ size_t olen = 0;
++ int ret = SYSINFO_RET_FAIL;
+
+- kvm_t *kp;
+- int ret = SYSINFO_RET_FAIL;
++ static char name[IFNAMSIZ];
+
+ if (NULL == if_name || '\0' == *if_name)
+ {
+ *error = zbx_strdup(NULL, "Network interface name cannot be empty.");
+- return FAIL;
++ ret = FAIL;
++ goto out;
+ }
+
+- if (NULL == (kp = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL))) /* requires root privileges */
+- {
+- *error = zbx_strdup(NULL, "Cannot obtain a descriptor to access kernel virtual memory.");
+- return FAIL;
+- }
+
+- if (N_UNDF == kernel_symbols[IFNET_ID].n_type)
+- if (0 != kvm_nlist(kp, &kernel_symbols[0]))
+- kernel_symbols[IFNET_ID].n_type = N_UNDF;
+-
+- if (N_UNDF != kernel_symbols[IFNET_ID].n_type)
+- {
+- int len = sizeof(struct ifnet_head);
++ if (sysctl(mib, 6, NULL, &len, NULL, 0) == -1) {
++ *error = zbx_strdup(NULL, "Failed to read network interfaces data");
++ ret = FAIL;
++ goto out;
++ }
+
+- if (kvm_read(kp, kernel_symbols[IFNET_ID].n_value, &head, len) >= len)
+- {
+- len = sizeof(struct ifnet);
++ if (len > olen) {
++ free(buf);
++ if ((buf = zbx_malloc(NULL, len)) == NULL) {
++ *error = zbx_strdup(NULL, "Failed to allocate buffer for network interfaces data");
++ ret = FAIL;
++ goto out;
++ }
++ olen = len;
++ }
++ if (sysctl(mib, 6, buf, &len, NULL, 0) == -1) {
++ *error = zbx_strdup(NULL, "Failed to allocate buffer for network interfaces data");
++ ret = FAIL;
++ goto out;
++ }
++
++ lim = buf + len;
++ for (next = buf; next < lim; next += rtm->rtm_msglen) {
++ rtm = (struct rt_msghdr *)next;
++ if ((rtm->rtm_version == RTM_VERSION) &&
++ (rtm->rtm_type == RTM_IFINFO)) {
++ ifm = (struct if_msghdr *)next;
++ ifd = &ifm->ifm_data;
++
++ sa = (struct sockaddr *)(ifm + 1);
++ get_rtaddrs(ifm->ifm_addrs, sa, rti_info);
++
++ sdl = (struct sockaddr_dl *)rti_info[RTAX_IFP];
++ if (sdl == NULL || sdl->sdl_family != AF_LINK) {
++ continue;
++ }
++ bzero(name, sizeof(name));
++ if (sdl->sdl_nlen >= IFNAMSIZ)
++ memcpy(name, sdl->sdl_data, IFNAMSIZ - 1);
++ else if (sdl->sdl_nlen > 0)
++ memcpy(name, sdl->sdl_data, sdl->sdl_nlen);
+
+ /* if_ibytes; total number of octets received */
+ /* if_ipackets; packets received on interface */
+@@ -100,42 +152,38 @@ static int get_ifdata(const char *if_nam
+ if (icollisions)
+ *icollisions = 0;
+
+- for (ifp = head.tqh_first; ifp; ifp = v.if_list.tqe_next)
++ if (0 == strcmp(if_name, name))
+ {
+- if (kvm_read(kp, (u_long)ifp, &v, len) < len)
+- break;
+-
+- if (0 == strcmp(if_name, v.if_xname))
+- {
+- if (ibytes)
+- *ibytes += v.if_ibytes;
+- if (ipackets)
+- *ipackets += v.if_ipackets;
+- if (ierrors)
+- *ierrors += v.if_ierrors;
+- if (idropped)
+- *idropped += v.if_iqdrops;
+- if (obytes)
+- *obytes += v.if_obytes;
+- if (opackets)
+- *opackets += v.if_opackets;
+- if (oerrors)
+- *oerrors += v.if_oerrors;
+- if (tbytes)
+- *tbytes += v.if_ibytes + v.if_obytes;
+- if (tpackets)
+- *tpackets += v.if_ipackets + v.if_opackets;
+- if (terrors)
+- *terrors += v.if_ierrors + v.if_oerrors;
+- if (icollisions)
+- *icollisions += v.if_collisions;
+- ret = SYSINFO_RET_OK;
+- }
++ if (ibytes)
++ *ibytes += ifd->ifi_ibytes;
++ if (ipackets)
++ *ipackets += ifd->ifi_ipackets;
++ if (ierrors)
++ *ierrors += ifd->ifi_ierrors;
++ if (idropped)
++ *idropped += ifd->ifi_iqdrops;
++ if (obytes)
++ *obytes += ifd->ifi_obytes;
++ if (opackets)
++ *opackets += ifd->ifi_opackets;
++ if (oerrors)
++ *oerrors += ifd->ifi_oerrors;
++ if (tbytes)
++ *tbytes += ifd->ifi_ibytes + ifd->ifi_obytes;
++ if (tpackets)
++ *tpackets += ifd->ifi_ipackets + ifd->ifi_opackets;
++ if (terrors)
++ *terrors += ifd->ifi_ierrors + ifd->ifi_oerrors;
++ if (icollisions)
++ *icollisions += ifd->ifi_collisions;
++ ret = SYSINFO_RET_OK;
++ goto out;
+ }
+ }
+ }
+
+- kvm_close(kp);
++out:
++ free(buf);
+
+ if (SYSINFO_RET_FAIL == ret)
+ {
diff --git a/zabbix60-agent2/patches/patch-src_zabbix__agent_Makefile.in b/zabbix60-agent2/patches/patch-src_zabbix__agent_Makefile.in
new file mode 100644
index 0000000000..b2ba47631e
--- /dev/null
+++ b/zabbix60-agent2/patches/patch-src_zabbix__agent_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_zabbix__agent_Makefile.in,v 1.1 2020/11/03 22:46:23 otis Exp $
+
+Install config file to component's example directory.
+
+--- src/zabbix_agent/Makefile.in.orig 2020-08-24 09:43:03.000000000 +0000
++++ src/zabbix_agent/Makefile.in
+@@ -1113,7 +1113,7 @@ uninstall-am: uninstall-sbinPROGRAMS
+ install-data-hook:
+ $(MKDIR_P) "$(DESTDIR)$(AGENT_CONFIG_FILE).d"
+ $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)"
+- test -f "$(DESTDIR)$(AGENT_CONFIG_FILE)" || cp "../../conf/zabbix_agentd.conf" "$(DESTDIR)$(AGENT_CONFIG_FILE)"
++ $(INSTALL_DATA) "../../conf/zabbix_agentd.conf" "$(DESTDIR)/${PREFIX}/share/examples/%%PKGBASE%%"
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/zabbix60-frontend/PLIST b/zabbix60-frontend/PLIST
index a04758429f..02cdd5487e 100644
--- a/zabbix60-frontend/PLIST
+++ b/zabbix60-frontend/PLIST
@@ -890,7 +890,6 @@ share/zabbix/include/classes/import/converters/CDefaultImportConverter.php
share/zabbix/include/classes/import/converters/CImportConverterFactory.php
share/zabbix/include/classes/import/converters/CImportDataNormalizer.php
share/zabbix/include/classes/import/converters/CTemplateScreenConverter.php
-share/zabbix/include/classes/import/converters/CTransformImportConverter.php
share/zabbix/include/classes/import/importers/CHostImporter.php
share/zabbix/include/classes/import/importers/CImporter.php
share/zabbix/include/classes/import/importers/CMapImporter.php
diff --git a/zabbix60-frontend/distinfo b/zabbix60-frontend/distinfo
index f01371ee07..2f095473b4 100644
--- a/zabbix60-frontend/distinfo
+++ b/zabbix60-frontend/distinfo
@@ -1,5 +1,5 @@
$NetBSD$
-BLAKE2s (zabbix-6.0.12.tar.gz) = 378fdca9d53532f64404d46043ac6a35761b9a7feb021b37fcfee4a7da465bac
-SHA512 (zabbix-6.0.12.tar.gz) = 7cd254282523002d2e4d86295258ea0f56921b54c88d604300104f32ea5807c0b39b5550a9dd98e03ad41adf4dd8e93a7b1deb200d513283dca51d49d46bda4d
-Size (zabbix-6.0.12.tar.gz) = 40419443 bytes
+BLAKE2s (zabbix-6.0.13.tar.gz) = fd8aa1f37b18943b42709d7ead74402bb9637819eb6137ea23c0b2b7cbdca775
+SHA512 (zabbix-6.0.13.tar.gz) = 188622c0c04029eac376ebf60c96ed9d67923bc1f40eff75666a241bb534cb744aca8c51ff4b79d508dfadb9e758f80d9dc46016217bcb5a67e8ede7e645788e
+Size (zabbix-6.0.13.tar.gz) = 41075557 bytes
diff --git a/zabbix60-java/distinfo b/zabbix60-java/distinfo
index 5061fccdfd..138463579c 100644
--- a/zabbix60-java/distinfo
+++ b/zabbix60-java/distinfo
@@ -1,6 +1,6 @@
$NetBSD$
-BLAKE2s (zabbix-6.0.12.tar.gz) = 378fdca9d53532f64404d46043ac6a35761b9a7feb021b37fcfee4a7da465bac
-SHA512 (zabbix-6.0.12.tar.gz) = 7cd254282523002d2e4d86295258ea0f56921b54c88d604300104f32ea5807c0b39b5550a9dd98e03ad41adf4dd8e93a7b1deb200d513283dca51d49d46bda4d
-Size (zabbix-6.0.12.tar.gz) = 40419443 bytes
+BLAKE2s (zabbix-6.0.13.tar.gz) = fd8aa1f37b18943b42709d7ead74402bb9637819eb6137ea23c0b2b7cbdca775
+SHA512 (zabbix-6.0.13.tar.gz) = 188622c0c04029eac376ebf60c96ed9d67923bc1f40eff75666a241bb534cb744aca8c51ff4b79d508dfadb9e758f80d9dc46016217bcb5a67e8ede7e645788e
+Size (zabbix-6.0.13.tar.gz) = 41075557 bytes
SHA1 (patch-configure) = b9f58834d840d24e26ccd2a6b87000c401423c75
diff --git a/zabbix60-proxy/distinfo b/zabbix60-proxy/distinfo
index 224791aa4d..f93af566dc 100644
--- a/zabbix60-proxy/distinfo
+++ b/zabbix60-proxy/distinfo
@@ -1,8 +1,8 @@
$NetBSD$
-BLAKE2s (zabbix-6.0.12.tar.gz) = 378fdca9d53532f64404d46043ac6a35761b9a7feb021b37fcfee4a7da465bac
-SHA512 (zabbix-6.0.12.tar.gz) = 7cd254282523002d2e4d86295258ea0f56921b54c88d604300104f32ea5807c0b39b5550a9dd98e03ad41adf4dd8e93a7b1deb200d513283dca51d49d46bda4d
-Size (zabbix-6.0.12.tar.gz) = 40419443 bytes
+BLAKE2s (zabbix-6.0.13.tar.gz) = fd8aa1f37b18943b42709d7ead74402bb9637819eb6137ea23c0b2b7cbdca775
+SHA512 (zabbix-6.0.13.tar.gz) = 188622c0c04029eac376ebf60c96ed9d67923bc1f40eff75666a241bb534cb744aca8c51ff4b79d508dfadb9e758f80d9dc46016217bcb5a67e8ede7e645788e
+Size (zabbix-6.0.13.tar.gz) = 41075557 bytes
SHA1 (patch-m4_ax__lib__mysql.m4) = 9786c6bff3d22334263921c201bf241a207a46bc
SHA1 (patch-m4_libssh.m4) = 8b4ac3964caf94bb0e4939d265dcefc08a07a0df
SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = 0371a5cafe00d01f293a847105f7c501f443616c
diff --git a/zabbix60-server/Makefile.common b/zabbix60-server/Makefile.common
index d7ec5dbdab..668805b0e3 100644
--- a/zabbix60-server/Makefile.common
+++ b/zabbix60-server/Makefile.common
@@ -5,7 +5,7 @@
# used by wip/zabbix60-frontend/Makefile
# used by wip/zabbix60-java/Makefile
-DISTNAME= zabbix-6.0.12
+DISTNAME= zabbix-6.0.13
CATEGORIES= sysutils
MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/6.0/
diff --git a/zabbix60-server/distinfo b/zabbix60-server/distinfo
index 9980aa16fa..3fd5eb81ad 100644
--- a/zabbix60-server/distinfo
+++ b/zabbix60-server/distinfo
@@ -1,8 +1,8 @@
$NetBSD$
-BLAKE2s (zabbix-6.0.12.tar.gz) = 378fdca9d53532f64404d46043ac6a35761b9a7feb021b37fcfee4a7da465bac
-SHA512 (zabbix-6.0.12.tar.gz) = 7cd254282523002d2e4d86295258ea0f56921b54c88d604300104f32ea5807c0b39b5550a9dd98e03ad41adf4dd8e93a7b1deb200d513283dca51d49d46bda4d
-Size (zabbix-6.0.12.tar.gz) = 40419443 bytes
+BLAKE2s (zabbix-6.0.13.tar.gz) = fd8aa1f37b18943b42709d7ead74402bb9637819eb6137ea23c0b2b7cbdca775
+SHA512 (zabbix-6.0.13.tar.gz) = 188622c0c04029eac376ebf60c96ed9d67923bc1f40eff75666a241bb534cb744aca8c51ff4b79d508dfadb9e758f80d9dc46016217bcb5a67e8ede7e645788e
+Size (zabbix-6.0.13.tar.gz) = 41075557 bytes
SHA1 (patch-m4_ax__lib__mysql.m4) = 9786c6bff3d22334263921c201bf241a207a46bc
SHA1 (patch-m4_libssh.m4) = 8b4ac3964caf94bb0e4939d265dcefc08a07a0df
SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = 0371a5cafe00d01f293a847105f7c501f443616c
Home |
Main Index |
Thread Index |
Old Index