pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

zabbix60-*: Update to 6.0.1

Module Name:	pkgsrc-wip
Committed By:	Yuuki Enomoto <uki%e-yuuki.org@localhost>
Pushed By:	e-yuuki
Date:		Wed Mar 2 20:15:33 2022 +0900
Changeset:	9d0623e0b497319d00c539afce3547306bd7d4b5

Modified Files:
	zabbix60-agent/Makefile
	zabbix60-agent/distinfo
	zabbix60-agent/options.mk
	zabbix60-agent/patches/patch-configure
	zabbix60-frontend/distinfo
	zabbix60-frontend/options.mk
	zabbix60-java/distinfo
	zabbix60-java/patches/patch-configure
	zabbix60-proxy/Makefile
	zabbix60-proxy/distinfo
	zabbix60-proxy/options.mk
	zabbix60-server/Makefile
	zabbix60-server/Makefile.common
	zabbix60-server/distinfo
	zabbix60-server/options.mk

Log Message:
zabbix60-*: Update to 6.0.1

Release note: https://www.zabbix.com/rn/rn6.0.1

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9d0623e0b497319d00c539afce3547306bd7d4b5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 zabbix60-agent/Makefile                |  3 +--
 zabbix60-agent/distinfo                |  8 ++++----
 zabbix60-agent/options.mk              |  2 +-
 zabbix60-agent/patches/patch-configure | 12 ++++++------
 zabbix60-frontend/distinfo             |  6 +++---
 zabbix60-frontend/options.mk           |  2 +-
 zabbix60-java/distinfo                 |  8 ++++----
 zabbix60-java/patches/patch-configure  | 12 ++++++------
 zabbix60-proxy/Makefile                |  3 +--
 zabbix60-proxy/distinfo                |  6 +++---
 zabbix60-proxy/options.mk              |  2 +-
 zabbix60-server/Makefile               |  1 -
 zabbix60-server/Makefile.common        |  2 +-
 zabbix60-server/distinfo               |  6 +++---
 zabbix60-server/options.mk             |  2 +-
 15 files changed, 36 insertions(+), 39 deletions(-)

diffs:
diff --git a/zabbix60-agent/Makefile b/zabbix60-agent/Makefile
index cb485cac0e..d8d5256a2e 100644
--- a/zabbix60-agent/Makefile
+++ b/zabbix60-agent/Makefile
@@ -1,6 +1,5 @@
 # $NetBSD$
 
-PKGREVISION=	1
 .include "../../wip/zabbix60-server/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-agent-/}
@@ -15,7 +14,7 @@ CONFIGURE_ARGS+=	--enable-agent
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--datarootdir=${PREFIX}/share/${PKGBASE}
 CONFIGURE_ARGS+=	--with-libcurl
-CONFIGURE_ARGS+=	--with-libpcre2=${BUILDLINK_PREFIX.pcre}
+CONFIGURE_ARGS+=	--with-libpcre2
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
 
 EGDIR=		share/examples/${PKGBASE}
diff --git a/zabbix60-agent/distinfo b/zabbix60-agent/distinfo
index e53061188b..da0d6903f8 100644
--- a/zabbix60-agent/distinfo
+++ b/zabbix60-agent/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-BLAKE2s (zabbix-6.0.0.tar.gz) = c8f0a542c64e9b4a1b85f968aab2701725c959e824500e4cf6b5371b821e7201
-SHA512 (zabbix-6.0.0.tar.gz) = 5b52dbee7ad5842c77f4e232d626b146912fe7cd64f781e8af2532eba43d8632dcd75d8126a8a8678c90c9a92273eb9906000d2f8009964fcc5484b3d1b2a76e
-Size (zabbix-6.0.0.tar.gz) = 32913629 bytes
-SHA1 (patch-configure) = d9019bd72526569a35006e851395bfd6d84a997d
+BLAKE2s (zabbix-6.0.1.tar.gz) = dcebf33f587d760e62ff20d8c8f730373515c786d688e01c22c39907082ca234
+SHA512 (zabbix-6.0.1.tar.gz) = 1f0b3182976b3ff0db497eedf160ef116c36f631349ed9b973f511d2ec365d55c1c4383528d9a4c470fc5734def315c438242ac4070d6458608fe2062c5d1535
+Size (zabbix-6.0.1.tar.gz) = 32974585 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-agent/options.mk b/zabbix60-agent/options.mk
index b5075f87d8..2b8b53a397 100644
--- a/zabbix60-agent/options.mk
+++ b/zabbix60-agent/options.mk
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-PKG_OPTIONS_VAR=		PKG_OPTIONS.zabbix54-agent
+PKG_OPTIONS_VAR=		PKG_OPTIONS.zabbix60-agent
 PKG_SUPPORTED_OPTIONS+=		inet6
 
 .if empty(MISSING_FEATURES:Minet6)
diff --git a/zabbix60-agent/patches/patch-configure b/zabbix60-agent/patches/patch-configure
index 1fc4bc0c06..6cd67a7bef 100644
--- a/zabbix60-agent/patches/patch-configure
+++ b/zabbix60-agent/patches/patch-configure
@@ -2,14 +2,14 @@ $NetBSD: patch-configure,v 1.1 2020/11/03 22:46:23 otis Exp $
 
 Fix bash-ism.
 
---- configure.orig	2022-02-18 17:27:51.936726134 +0900
-+++ configure
-@@ -9476,7 +9476,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.beam \
+--- 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
  
- 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TLS ciphersuites in MySQL library" >&5
- printf %s "checking for TLS ciphersuites in MySQL library... " >&6; }
+ 	{ $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-frontend/distinfo b/zabbix60-frontend/distinfo
index 28b4adcdd0..bc9e80d842 100644
--- a/zabbix60-frontend/distinfo
+++ b/zabbix60-frontend/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (zabbix-6.0.0.tar.gz) = c8f0a542c64e9b4a1b85f968aab2701725c959e824500e4cf6b5371b821e7201
-SHA512 (zabbix-6.0.0.tar.gz) = 5b52dbee7ad5842c77f4e232d626b146912fe7cd64f781e8af2532eba43d8632dcd75d8126a8a8678c90c9a92273eb9906000d2f8009964fcc5484b3d1b2a76e
-Size (zabbix-6.0.0.tar.gz) = 32913629 bytes
+BLAKE2s (zabbix-6.0.1.tar.gz) = dcebf33f587d760e62ff20d8c8f730373515c786d688e01c22c39907082ca234
+SHA512 (zabbix-6.0.1.tar.gz) = 1f0b3182976b3ff0db497eedf160ef116c36f631349ed9b973f511d2ec365d55c1c4383528d9a4c470fc5734def315c438242ac4070d6458608fe2062c5d1535
+Size (zabbix-6.0.1.tar.gz) = 32974585 bytes
diff --git a/zabbix60-frontend/options.mk b/zabbix60-frontend/options.mk
index 23e66ce1cb..4cdab10567 100644
--- a/zabbix60-frontend/options.mk
+++ b/zabbix60-frontend/options.mk
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-PKG_OPTIONS_VAR=		PKG_OPTIONS.zabbix54-frontend
+PKG_OPTIONS_VAR=		PKG_OPTIONS.zabbix60-frontend
 PKG_OPTIONS_OPTIONAL_GROUPS=	database
 PKG_OPTIONS_GROUP.database=	mysql pgsql
 PKG_SUGGESTED_OPTIONS+=		pgsql
diff --git a/zabbix60-java/distinfo b/zabbix60-java/distinfo
index 087fec59f0..7237edfdb4 100644
--- a/zabbix60-java/distinfo
+++ b/zabbix60-java/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-BLAKE2s (zabbix-6.0.0.tar.gz) = c8f0a542c64e9b4a1b85f968aab2701725c959e824500e4cf6b5371b821e7201
-SHA512 (zabbix-6.0.0.tar.gz) = 5b52dbee7ad5842c77f4e232d626b146912fe7cd64f781e8af2532eba43d8632dcd75d8126a8a8678c90c9a92273eb9906000d2f8009964fcc5484b3d1b2a76e
-Size (zabbix-6.0.0.tar.gz) = 32913629 bytes
-SHA1 (patch-configure) = 54b0a5a42b7344c4e26421e26dc5a5d506aec0a3
+BLAKE2s (zabbix-6.0.1.tar.gz) = dcebf33f587d760e62ff20d8c8f730373515c786d688e01c22c39907082ca234
+SHA512 (zabbix-6.0.1.tar.gz) = 1f0b3182976b3ff0db497eedf160ef116c36f631349ed9b973f511d2ec365d55c1c4383528d9a4c470fc5734def315c438242ac4070d6458608fe2062c5d1535
+Size (zabbix-6.0.1.tar.gz) = 32974585 bytes
+SHA1 (patch-configure) = b9f58834d840d24e26ccd2a6b87000c401423c75
diff --git a/zabbix60-java/patches/patch-configure b/zabbix60-java/patches/patch-configure
index dd8298bfbb..7bf568a6cc 100644
--- a/zabbix60-java/patches/patch-configure
+++ b/zabbix60-java/patches/patch-configure
@@ -2,14 +2,14 @@ $NetBSD: patch-configure,v 1.1 2020/11/03 22:52:42 otis Exp $
 
 Fix bash-ism.
 
---- configure.orig	2020-07-13 07:56:36.000000000 +0000
-+++ configure
-@@ -9476,7 +9476,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.beam \
+--- configure.orig	2022-03-02 19:35:04.400204452 +0900
++++ configure	2022-03-02 19:35:30.342843458 +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
  
- 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TLS ciphersuites in MySQL library" >&5
- printf %s "checking for TLS ciphersuites in MySQL library... " >&6; }
+ 	{ $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-proxy/Makefile b/zabbix60-proxy/Makefile
index 689c2b53e8..e02b462e12 100644
--- a/zabbix60-proxy/Makefile
+++ b/zabbix60-proxy/Makefile
@@ -1,6 +1,5 @@
 # $NetBSD$
 
-PKGREVISION=	1
 .include "../../wip/zabbix60-server/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-proxy-${ZABBIX_DB_TYPE}-/}
@@ -20,7 +19,7 @@ CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_PREFIX.iconv}
 CONFIGURE_ARGS+=	--with-ldap=${BUILDLINK_PREFIX.openldap-client}
 CONFIGURE_ARGS+=	--with-libcurl
 CONFIGURE_ARGS+=	--with-libevent=${BUILDLINK_PREFIX.libevent}
-CONFIGURE_ARGS+=	--with-libpcre2=${BUILDLINK_PREFIX.pcre}
+CONFIGURE_ARGS+=	--with-libpcre2=${BUILDLINK_PREFIX.pcre2}
 CONFIGURE_ARGS+=	--with-libxml2
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
diff --git a/zabbix60-proxy/distinfo b/zabbix60-proxy/distinfo
index a80500e91c..885d3063a6 100644
--- a/zabbix60-proxy/distinfo
+++ b/zabbix60-proxy/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-BLAKE2s (zabbix-6.0.0.tar.gz) = c8f0a542c64e9b4a1b85f968aab2701725c959e824500e4cf6b5371b821e7201
-SHA512 (zabbix-6.0.0.tar.gz) = 5b52dbee7ad5842c77f4e232d626b146912fe7cd64f781e8af2532eba43d8632dcd75d8126a8a8678c90c9a92273eb9906000d2f8009964fcc5484b3d1b2a76e
-Size (zabbix-6.0.0.tar.gz) = 32913629 bytes
+BLAKE2s (zabbix-6.0.1.tar.gz) = dcebf33f587d760e62ff20d8c8f730373515c786d688e01c22c39907082ca234
+SHA512 (zabbix-6.0.1.tar.gz) = 1f0b3182976b3ff0db497eedf160ef116c36f631349ed9b973f511d2ec365d55c1c4383528d9a4c470fc5734def315c438242ac4070d6458608fe2062c5d1535
+Size (zabbix-6.0.1.tar.gz) = 32974585 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-proxy/options.mk b/zabbix60-proxy/options.mk
index 88a544f734..d35c02e958 100644
--- a/zabbix60-proxy/options.mk
+++ b/zabbix60-proxy/options.mk
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-PKG_OPTIONS_VAR=		PKG_OPTIONS.zabbix54-proxy
+PKG_OPTIONS_VAR=		PKG_OPTIONS.zabbix60-proxy
 PKG_SUPPORTED_OPTIONS+=		inet6 ipmi libssh libssh2 snmp
 PKG_OPTIONS_OPTIONAL_GROUPS=	database
 PKG_OPTIONS_GROUP.database=	mysql pgsql sqlite3
diff --git a/zabbix60-server/Makefile b/zabbix60-server/Makefile
index 5da88cbeee..4b7daa1eb0 100644
--- a/zabbix60-server/Makefile
+++ b/zabbix60-server/Makefile
@@ -2,7 +2,6 @@
 # used by wip/zabbix60-proxy/Makefile
 # used by wip/zabbix60-agent/Makefile
 #
-#PKGREVISION=	1
 .include "Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-server-${ZABBIX_DB_TYPE}-/}
diff --git a/zabbix60-server/Makefile.common b/zabbix60-server/Makefile.common
index 19380500bf..80478f72c0 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.0
+DISTNAME=	zabbix-6.0.1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://cdn.zabbix.com/zabbix/sources/stable/6.0/
 
diff --git a/zabbix60-server/distinfo b/zabbix60-server/distinfo
index 78020c3332..be499f8871 100644
--- a/zabbix60-server/distinfo
+++ b/zabbix60-server/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-BLAKE2s (zabbix-6.0.0.tar.gz) = c8f0a542c64e9b4a1b85f968aab2701725c959e824500e4cf6b5371b821e7201
-SHA512 (zabbix-6.0.0.tar.gz) = 5b52dbee7ad5842c77f4e232d626b146912fe7cd64f781e8af2532eba43d8632dcd75d8126a8a8678c90c9a92273eb9906000d2f8009964fcc5484b3d1b2a76e
-Size (zabbix-6.0.0.tar.gz) = 32913629 bytes
+BLAKE2s (zabbix-6.0.1.tar.gz) = dcebf33f587d760e62ff20d8c8f730373515c786d688e01c22c39907082ca234
+SHA512 (zabbix-6.0.1.tar.gz) = 1f0b3182976b3ff0db497eedf160ef116c36f631349ed9b973f511d2ec365d55c1c4383528d9a4c470fc5734def315c438242ac4070d6458608fe2062c5d1535
+Size (zabbix-6.0.1.tar.gz) = 32974585 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/options.mk b/zabbix60-server/options.mk
index b1efcb4010..2025106be9 100644
--- a/zabbix60-server/options.mk
+++ b/zabbix60-server/options.mk
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-PKG_OPTIONS_VAR=		PKG_OPTIONS.zabbix54-server
+PKG_OPTIONS_VAR=		PKG_OPTIONS.zabbix60-server
 PKG_SUPPORTED_OPTIONS+=		inet6 ipmi libssh libssh2 snmp
 PKG_OPTIONS_OPTIONAL_GROUPS=	database
 PKG_OPTIONS_GROUP.database=	mysql pgsql
Home | Main Index | Thread Index | Old Index