Skip to content

Commit 9d0623e

Browse files
user340user340
committed
zabbix60-*: Update to 6.0.1
Release note: https://www.zabbix.com/rn/rn6.0.1
1 parent 9d57984 commit 9d0623e

File tree

15 files changed

+36
-39
lines changed

15 files changed

+36
-39
lines changed

‎zabbix60-agent/Makefile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# $NetBSD$
22

3-
PKGREVISION= 1
43
.include "../../wip/zabbix60-server/Makefile.common"
54

65
PKGNAME= ${DISTNAME:S/-/-agent-/}
@@ -15,7 +14,7 @@ CONFIGURE_ARGS+= --enable-agent
1514
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
1615
CONFIGURE_ARGS+= --datarootdir=${PREFIX}/share/${PKGBASE}
1716
CONFIGURE_ARGS+= --with-libcurl
18-
CONFIGURE_ARGS+= --with-libpcre2=${BUILDLINK_PREFIX.pcre}
17+
CONFIGURE_ARGS+= --with-libpcre2
1918
CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
2019

2120
EGDIR= share/examples/${PKGBASE}

‎zabbix60-agent/distinfo‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
$NetBSD$
22

3-
BLAKE2s (zabbix-6.0.0.tar.gz) = c8f0a542c64e9b4a1b85f968aab2701725c959e824500e4cf6b5371b821e7201
4-
SHA512 (zabbix-6.0.0.tar.gz) = 5b52dbee7ad5842c77f4e232d626b146912fe7cd64f781e8af2532eba43d8632dcd75d8126a8a8678c90c9a92273eb9906000d2f8009964fcc5484b3d1b2a76e
5-
Size (zabbix-6.0.0.tar.gz) = 32913629 bytes
6-
SHA1 (patch-configure) = d9019bd72526569a35006e851395bfd6d84a997d
3+
BLAKE2s (zabbix-6.0.1.tar.gz) = dcebf33f587d760e62ff20d8c8f730373515c786d688e01c22c39907082ca234
4+
SHA512 (zabbix-6.0.1.tar.gz) = 1f0b3182976b3ff0db497eedf160ef116c36f631349ed9b973f511d2ec365d55c1c4383528d9a4c470fc5734def315c438242ac4070d6458608fe2062c5d1535
5+
Size (zabbix-6.0.1.tar.gz) = 32974585 bytes
6+
SHA1 (patch-configure) = 661087a4a5342bbce494b5eac45c294f3412318e
77
SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = 0371a5cafe00d01f293a847105f7c501f443616c
88
SHA1 (patch-src_zabbix__agent_Makefile.in) = efbd804ecee4b99db36db5f4fd61583b2ef96a86

‎zabbix60-agent/options.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# $NetBSD$
22

3-
PKG_OPTIONS_VAR= PKG_OPTIONS.zabbix54-agent
3+
PKG_OPTIONS_VAR= PKG_OPTIONS.zabbix60-agent
44
PKG_SUPPORTED_OPTIONS+= inet6
55

66
.if empty(MISSING_FEATURES:Minet6)

‎zabbix60-agent/patches/patch-configure‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ $NetBSD: patch-configure,v 1.1 2020/11/03 22:46:23 otis Exp $
22

33
Fix bash-ism.
44

5-
--- configure.orig 2022-02-18 17:27:51.936726134 +0900
6-
+++ configure
7-
@@ -9476,7 +9476,7 @@
8-
rm -f core conftest.err conftest.$ac_objext conftest.beam \
5+
--- configure.orig 2022-03-02 19:06:50.761881804 +0900
6+
+++ configure 2022-03-02 19:06:46.903210187 +0900
7+
@@ -8649,7 +8649,7 @@
8+
rm -f core conftest.err conftest.$ac_objext \
99
conftest$ac_exeext conftest.$ac_ext
1010

1111
- if test "$found_mysql_tls" == "yes"; then
1212
+ if test "$found_mysql_tls" = "yes"; then
1313

14-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TLS ciphersuites in MySQL library" >&5
15-
printf %s "checking for TLS ciphersuites in MySQL library... " >&6; }
14+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TLS ciphersuites in MySQL library" >&5
15+
$as_echo_n "checking for TLS ciphersuites in MySQL library... " >&6; }

‎zabbix60-frontend/distinfo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$NetBSD$
22

3-
BLAKE2s (zabbix-6.0.0.tar.gz) = c8f0a542c64e9b4a1b85f968aab2701725c959e824500e4cf6b5371b821e7201
4-
SHA512 (zabbix-6.0.0.tar.gz) = 5b52dbee7ad5842c77f4e232d626b146912fe7cd64f781e8af2532eba43d8632dcd75d8126a8a8678c90c9a92273eb9906000d2f8009964fcc5484b3d1b2a76e
5-
Size (zabbix-6.0.0.tar.gz) = 32913629 bytes
3+
BLAKE2s (zabbix-6.0.1.tar.gz) = dcebf33f587d760e62ff20d8c8f730373515c786d688e01c22c39907082ca234
4+
SHA512 (zabbix-6.0.1.tar.gz) = 1f0b3182976b3ff0db497eedf160ef116c36f631349ed9b973f511d2ec365d55c1c4383528d9a4c470fc5734def315c438242ac4070d6458608fe2062c5d1535
5+
Size (zabbix-6.0.1.tar.gz) = 32974585 bytes

‎zabbix60-frontend/options.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# $NetBSD$
22

3-
PKG_OPTIONS_VAR= PKG_OPTIONS.zabbix54-frontend
3+
PKG_OPTIONS_VAR= PKG_OPTIONS.zabbix60-frontend
44
PKG_OPTIONS_OPTIONAL_GROUPS= database
55
PKG_OPTIONS_GROUP.database= mysql pgsql
66
PKG_SUGGESTED_OPTIONS+= pgsql

‎zabbix60-java/distinfo‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
$NetBSD$
22

3-
BLAKE2s (zabbix-6.0.0.tar.gz) = c8f0a542c64e9b4a1b85f968aab2701725c959e824500e4cf6b5371b821e7201
4-
SHA512 (zabbix-6.0.0.tar.gz) = 5b52dbee7ad5842c77f4e232d626b146912fe7cd64f781e8af2532eba43d8632dcd75d8126a8a8678c90c9a92273eb9906000d2f8009964fcc5484b3d1b2a76e
5-
Size (zabbix-6.0.0.tar.gz) = 32913629 bytes
6-
SHA1 (patch-configure) = 54b0a5a42b7344c4e26421e26dc5a5d506aec0a3
3+
BLAKE2s (zabbix-6.0.1.tar.gz) = dcebf33f587d760e62ff20d8c8f730373515c786d688e01c22c39907082ca234
4+
SHA512 (zabbix-6.0.1.tar.gz) = 1f0b3182976b3ff0db497eedf160ef116c36f631349ed9b973f511d2ec365d55c1c4383528d9a4c470fc5734def315c438242ac4070d6458608fe2062c5d1535
5+
Size (zabbix-6.0.1.tar.gz) = 32974585 bytes
6+
SHA1 (patch-configure) = b9f58834d840d24e26ccd2a6b87000c401423c75

‎zabbix60-java/patches/patch-configure‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ $NetBSD: patch-configure,v 1.1 2020/11/03 22:52:42 otis Exp $
22

33
Fix bash-ism.
44

5-
--- configure.orig 2020-07-13 07:56:36.000000000 +0000
6-
+++ configure
7-
@@ -9476,7 +9476,7 @@
8-
rm -f core conftest.err conftest.$ac_objext conftest.beam \
5+
--- configure.orig 2022-03-02 19:35:04.400204452 +0900
6+
+++ configure 2022-03-02 19:35:30.342843458 +0900
7+
@@ -8649,7 +8649,7 @@
8+
rm -f core conftest.err conftest.$ac_objext \
99
conftest$ac_exeext conftest.$ac_ext
1010

1111
- if test "$found_mysql_tls" == "yes"; then
1212
+ if test "$found_mysql_tls" = "yes"; then
1313

14-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TLS ciphersuites in MySQL library" >&5
15-
printf %s "checking for TLS ciphersuites in MySQL library... " >&6; }
14+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TLS ciphersuites in MySQL library" >&5
15+
$as_echo_n "checking for TLS ciphersuites in MySQL library... " >&6; }

‎zabbix60-proxy/Makefile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# $NetBSD$
22

3-
PKGREVISION= 1
43
.include "../../wip/zabbix60-server/Makefile.common"
54

65
PKGNAME= ${DISTNAME:S/-/-proxy-${ZABBIX_DB_TYPE}-/}
@@ -20,7 +19,7 @@ CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv}
2019
CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client}
2120
CONFIGURE_ARGS+= --with-libcurl
2221
CONFIGURE_ARGS+= --with-libevent=${BUILDLINK_PREFIX.libevent}
23-
CONFIGURE_ARGS+= --with-libpcre2=${BUILDLINK_PREFIX.pcre}
22+
CONFIGURE_ARGS+= --with-libpcre2=${BUILDLINK_PREFIX.pcre2}
2423
CONFIGURE_ARGS+= --with-libxml2
2524
CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
2625
CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}

‎zabbix60-proxy/distinfo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
$NetBSD$
22

3-
BLAKE2s (zabbix-6.0.0.tar.gz) = c8f0a542c64e9b4a1b85f968aab2701725c959e824500e4cf6b5371b821e7201
4-
SHA512 (zabbix-6.0.0.tar.gz) = 5b52dbee7ad5842c77f4e232d626b146912fe7cd64f781e8af2532eba43d8632dcd75d8126a8a8678c90c9a92273eb9906000d2f8009964fcc5484b3d1b2a76e
5-
Size (zabbix-6.0.0.tar.gz) = 32913629 bytes
3+
BLAKE2s (zabbix-6.0.1.tar.gz) = dcebf33f587d760e62ff20d8c8f730373515c786d688e01c22c39907082ca234
4+
SHA512 (zabbix-6.0.1.tar.gz) = 1f0b3182976b3ff0db497eedf160ef116c36f631349ed9b973f511d2ec365d55c1c4383528d9a4c470fc5734def315c438242ac4070d6458608fe2062c5d1535
5+
Size (zabbix-6.0.1.tar.gz) = 32974585 bytes
66
SHA1 (patch-m4_ax__lib__mysql.m4) = 9786c6bff3d22334263921c201bf241a207a46bc
77
SHA1 (patch-m4_libssh.m4) = 8b4ac3964caf94bb0e4939d265dcefc08a07a0df
88
SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = 0371a5cafe00d01f293a847105f7c501f443616c

0 commit comments

Comments
 (0)