pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

zabbix64-server: Update to 6.4.6



Module Name:	pkgsrc-wip
Committed By:	Juraj Lutter <otis%NetBSD.org@localhost>
Pushed By:	otis
Date:		Fri Aug 25 21:52:25 2023 +0000
Changeset:	afb51f751ee311a8a1e696887483096a9dd1fa0b

Modified Files:
	zabbix64-server/Makefile.common
	zabbix64-server/distinfo
Added Files:
	zabbix64-server/patches/patch-m4_pcre.m4
	zabbix64-server/patches/patch-m4_pcre2.m4

Log Message:
zabbix64-server: Update to 6.4.6

- Update to 6.4.6
- Regen patches

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

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

diffstat:
 zabbix64-server/Makefile.common           |  2 +-
 zabbix64-server/distinfo                  |  8 +++++---
 zabbix64-server/patches/patch-m4_pcre.m4  | 15 +++++++++++++++
 zabbix64-server/patches/patch-m4_pcre2.m4 | 15 +++++++++++++++
 4 files changed, 36 insertions(+), 4 deletions(-)

diffs:
diff --git a/zabbix64-server/Makefile.common b/zabbix64-server/Makefile.common
index 74b11cc6bd..baf1eef590 100644
--- a/zabbix64-server/Makefile.common
+++ b/zabbix64-server/Makefile.common
@@ -5,7 +5,7 @@
 # used by wip/zabbix64-frontend/Makefile
 # used by wip/zabbix64-java/Makefile
 
-DISTNAME=	zabbix-6.4.5
+DISTNAME=	zabbix-6.4.6
 CATEGORIES=	sysutils
 MASTER_SITES=	https://cdn.zabbix.com/zabbix/sources/stable/6.4/
 
diff --git a/zabbix64-server/distinfo b/zabbix64-server/distinfo
index 72f2d74636..ef32adc009 100644
--- a/zabbix64-server/distinfo
+++ b/zabbix64-server/distinfo
@@ -1,9 +1,11 @@
 $NetBSD$
 
-BLAKE2s (zabbix-6.4.5.tar.gz) = 17c985f7fbf268eed07c165da12cf6bc2db287d99650786c5f14390aaac89272
-SHA512 (zabbix-6.4.5.tar.gz) = cab201a68f5c580e102516f7de27a0009258e358abed161a3b3e4ae9d531e8d6a93b8aed1239a0244bff8bcafcbdb6f262e21fa500772dc8fccd20e3345089fd
-Size (zabbix-6.4.5.tar.gz) = 43464868 bytes
+BLAKE2s (zabbix-6.4.6.tar.gz) = 51301fa34113bd05f32fed93110a406c3ae19beca6d294a6812392b8b4035ec9
+SHA512 (zabbix-6.4.6.tar.gz) = f343441fb301d05165945ce355e752ce3638d4b12d99dc0eaaed8f70122cddb37a638e274ce999fcee0e1afc9e656ec771d0a208c08d1898999ea24338d8325d
+Size (zabbix-6.4.6.tar.gz) = 43744978 bytes
 SHA1 (patch-m4_ax__lib__mysql.m4) = 9786c6bff3d22334263921c201bf241a207a46bc
 SHA1 (patch-m4_libssh.m4) = 8b4ac3964caf94bb0e4939d265dcefc08a07a0df
+SHA1 (patch-m4_pcre.m4) = 254b6e53e4aa2ae8c0686535b15848f9ac5487c3
+SHA1 (patch-m4_pcre2.m4) = fa64858166e4da1286f39d383c478f530edc6596
 SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = 6716568e78746c77c66e6a946c8b762037485752
 SHA1 (patch-src_zabbix__server_Makefile.am) = d139b4fedf8f443fbe9966256e98374d5e5cdb67
diff --git a/zabbix64-server/patches/patch-m4_pcre.m4 b/zabbix64-server/patches/patch-m4_pcre.m4
new file mode 100644
index 0000000000..32d81bb941
--- /dev/null
+++ b/zabbix64-server/patches/patch-m4_pcre.m4
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix bash-isms.
+
+--- m4/pcre.m4.orig	2023-08-22 08:10:21.991666838 +0000
++++ m4/pcre.m4
+@@ -194,7 +194,7 @@ AS_HELP_STRING([--with-libpcre@<:@=DIR@:
+ 		if test "x$enable_static" = "xyes"; then
+ 			LIBPCRE_LIBS=" $LIBPCRE_LIBS -lpthread"
+ 		elif test "x$enable_static_libs" = "xyes"; then
+-			if test "x$static_linking_support" == "xno"; then
++			if test "x$static_linking_support" = "xno"; then
+ 				AC_MSG_WARN([compiler has no direct suppor for static linkage])
+ 
+ 				if test -n "$libpcre_lib_dir"; then
diff --git a/zabbix64-server/patches/patch-m4_pcre2.m4 b/zabbix64-server/patches/patch-m4_pcre2.m4
new file mode 100644
index 0000000000..851eed6ee5
--- /dev/null
+++ b/zabbix64-server/patches/patch-m4_pcre2.m4
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix bash-isms.
+
+--- m4/pcre2.m4.orig	2023-08-22 08:10:21.991666838 +0000
++++ m4/pcre2.m4
+@@ -195,7 +195,7 @@ AS_HELP_STRING([--with-libpcre2@<:@=DIR@
+ 		if test "x$enable_static" = "xyes"; then
+ 			LIBPCRE2_LIBS=" $LIBPCRE2_LIBS -lpthread"
+ 		elif test "x$enable_static_libs" = "xyes"; then
+-			if test "x$static_linking_support" == "xno"; then
++			if test "x$static_linking_support" = "xno"; then
+ 				AC_MSG_WARN([compiler has no direct suppor for static linkage])
+ 
+ 				if test -n "$libpcre2_lib_dir"; then


Home | Main Index | Thread Index | Old Index