CVS commit: pkgsrc/sysutils

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Dec 23 12:34:05 UTC 2022

Modified Files:
        pkgsrc/sysutils/zabbix: Makefile.common
        pkgsrc/sysutils/zabbix50-agent: Makefile
        pkgsrc/sysutils/zabbix50-server: Makefile.common

Log Message:
zabbix*: spread curl 7.87.0 bug workaround


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/sysutils/zabbix/Makefile.common
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/zabbix50-agent/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/zabbix50-server/Makefile.common

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

Modified files:

Index: pkgsrc/sysutils/zabbix/Makefile.common
diff -u pkgsrc/sysutils/zabbix/Makefile.common:1.17 pkgsrc/sysutils/zabbix/Makefile.common:1.18
--- pkgsrc/sysutils/zabbix/Makefile.common:1.17 Thu Sep 17 13:52:15 2020
+++ pkgsrc/sysutils/zabbix/Makefile.common      Fri Dec 23 12:34:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2020/09/17 13:52:15 otis Exp $
+# $NetBSD: Makefile.common,v 1.18 2022/12/23 12:34:05 wiz Exp $
 # used by sysutils/zabbix/Makefile
 # used by sysutils/zabbix-frontend/Makefile
 
@@ -12,3 +12,6 @@ LICENSE=      gnu-gpl-v2
 
 DISTINFO_FILE= ${.CURDIR}/../../sysutils/zabbix/distinfo
 PATCHDIR=      ${.CURDIR}/../../sysutils/zabbix/patches
+
+# workaround for https://github.com/curl/curl/issues/10148
+CPPFLAGS+=     -DCURL_DISABLE_TYPECHECK

Index: pkgsrc/sysutils/zabbix50-agent/Makefile
diff -u pkgsrc/sysutils/zabbix50-agent/Makefile:1.12 pkgsrc/sysutils/zabbix50-agent/Makefile:1.13
--- pkgsrc/sysutils/zabbix50-agent/Makefile:1.12        Fri Dec 23 11:03:13 2022
+++ pkgsrc/sysutils/zabbix50-agent/Makefile     Fri Dec 23 12:34:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2022/12/23 11:03:13 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2022/12/23 12:34:05 wiz Exp $
 
 PKGREVISION= 4
 .include "../../sysutils/zabbix50-server/Makefile.common"
@@ -18,9 +18,6 @@ CONFIGURE_ARGS+=      --with-libcurl
 CONFIGURE_ARGS+=       --with-libpcre=${BUILDLINK_PREFIX.pcre}
 CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl}
 
-# workaround for https://github.com/curl/curl/issues/10148
-CPPFLAGS+=     -DCURL_DISABLE_TYPECHECK
-
 EGDIR=         share/examples/${PKGBASE}
 CONF_FILES+=   ${EGDIR}/zabbix_agentd.conf ${PKG_SYSCONFDIR}/zabbix_agentd.conf
 

Index: pkgsrc/sysutils/zabbix50-server/Makefile.common
diff -u pkgsrc/sysutils/zabbix50-server/Makefile.common:1.4 pkgsrc/sysutils/zabbix50-server/Makefile.common:1.5
--- pkgsrc/sysutils/zabbix50-server/Makefile.common:1.4 Sat Nov 13 20:41:10 2021
+++ pkgsrc/sysutils/zabbix50-server/Makefile.common     Fri Dec 23 12:34:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2021/11/13 20:41:10 otis Exp $
+# $NetBSD: Makefile.common,v 1.5 2022/12/23 12:34:05 wiz Exp $
 # used by sysutils/zabbix50-agent/Makefile
 # used by sysutils/zabbix50-proxy/Makefile
 # used by sysutils/zabbix50-server/Makefile
@@ -26,3 +26,6 @@ FILES_SUBST+=                 ZABBIX_USER=${ZABBIX_USE
 FILES_SUBST+=                  ZABBIX_GROUP=${ZABBIX_GROUP}
 
 OWN_DIRS_PERMS+=               ${ZABBIX_HOMEDIR} ${ZABBIX_USER} ${ZABBIX_GROUP} 0755
+
+# workaround for https://github.com/curl/curl/issues/10148
+CPPFLAGS+=     -DCURL_DISABLE_TYPECHECK