CVS commit: pkgsrc/sysutils

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils
From: "Juraj Lutter" <otis%netbsd.org@localhost>
Date: Wed, 22 Feb 2023 21:45:17 +0000

Module Name:    pkgsrc
Committed By:   otis
Date:           Wed Feb 22 21:45:17 UTC 2023

Modified Files:
        pkgsrc/sysutils/zabbix60-agent: Makefile
        pkgsrc/sysutils/zabbix60-proxy: Makefile
        pkgsrc/sysutils/zabbix60-server: Makefile distinfo
Added Files:
        pkgsrc/sysutils/zabbix60-server/patches:
            patch-src_zabbix__proxy_Makefile.in
            patch-src_zabbix__server_Makefile.in

Log Message:
zabbix60: Fix build on NetBSD 9

NetBSD 9 provides its own popcount() that conflicts with zabbix's
function of the same name.

Reported by and workardound suggested by: wiz


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/zabbix60-agent/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/zabbix60-proxy/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/zabbix60-server/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/zabbix60-server/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/zabbix60-server/patches/patch-src_zabbix__proxy_Makefile.in \
    pkgsrc/sysutils/zabbix60-server/patches/patch-src_zabbix__server_Makefile.in

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

Modified files:

Index: pkgsrc/sysutils/zabbix60-agent/Makefile
diff -u pkgsrc/sysutils/zabbix60-agent/Makefile:1.2 pkgsrc/sysutils/zabbix60-agent/Makefile:1.3
--- pkgsrc/sysutils/zabbix60-agent/Makefile:1.2 Sun Feb 12 21:03:07 2023
+++ pkgsrc/sysutils/zabbix60-agent/Makefile     Wed Feb 22 21:45:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2023/02/12 21:03:07 otis Exp $
+# $NetBSD: Makefile,v 1.3 2023/02/22 21:45:17 otis Exp $
 
 PKGREVISION= 1
 .include "../../sysutils/zabbix60-server/Makefile.common"
@@ -42,6 +42,12 @@ SUBST_MESSAGE.fix-pkgbase=   Fixing PKGBAS
 SUBST_FILES.fix-pkgbase=       src/zabbix_agent/Makefile.in
 SUBST_SED.fix-pkgbase=         -e 's,%%PKGBASE%%,${PKGBASE},g'
 
+SUBST_CLASSES+=                        fix-popcount
+SUBST_STAGE.fix-popcount=      post-patch
+SUBST_MESSAGE.fix-popcount=    Fix conflict with NetBSD's popcount.
+SUBST_FILES.fix-popcount+=     src/zabbix_server/lld/lld_host.c
+SUBST_SED.fix-popcount+=       -e 's,popcount,zbx_popcount,g'
+
 PLIST_SUBST+=                  PKGBASE=${PKGBASE}
 
 .include "../../mk/bsd.prefs.mk"

Index: pkgsrc/sysutils/zabbix60-proxy/Makefile
diff -u pkgsrc/sysutils/zabbix60-proxy/Makefile:1.2 pkgsrc/sysutils/zabbix60-proxy/Makefile:1.3
--- pkgsrc/sysutils/zabbix60-proxy/Makefile:1.2 Sun Feb 12 21:03:07 2023
+++ pkgsrc/sysutils/zabbix60-proxy/Makefile     Wed Feb 22 21:45:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2023/02/12 21:03:07 otis Exp $
+# $NetBSD: Makefile,v 1.3 2023/02/22 21:45:17 otis Exp $
 
 PKGREVISION= 1
 .include "../../sysutils/zabbix60-server/Makefile.common"
@@ -49,6 +49,12 @@ SUBST_MESSAGE.fix-pkgbase=   Fixing PKGBAS
 SUBST_FILES.fix-pkgbase=       src/zabbix_proxy/Makefile.*
 SUBST_SED.fix-pkgbase=         -e 's,%%PKGBASE%%,${PKGBASE},g'
 
+SUBST_CLASSES+=                        fix-popcount
+SUBST_STAGE.fix-popcount=      post-patch
+SUBST_MESSAGE.fix-popcount=    Fix conflict with NetBSD's popcount.
+SUBST_FILES.fix-popcount+=     src/zabbix_server/lld/lld_host.c
+SUBST_SED.fix-popcount+=       -e 's,popcount,zbx_popcount,g'
+
 PLIST_SUBST+=                  PKGBASE=${PKGBASE}
 
 CFLAGS.SunOS+=                 -DDUK_USE_BYTEORDER=1
@@ -63,8 +69,6 @@ post-install:
        ${RM} ${DESTDIR}${PREFIX}/share/${PKGBASE}/images.sql
        ${MV} ${DESTDIR}${PREFIX}/bin/zabbix_js \
           ${DESTDIR}${PREFIX}/bin/zabbix_proxy_js
-       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/zabbix_proxy.conf \
-               ${DESTDIR}${PREFIX}/${EGDIR}/zabbix_proxy.conf
 
 .include "options.mk"
 

Index: pkgsrc/sysutils/zabbix60-server/Makefile
diff -u pkgsrc/sysutils/zabbix60-server/Makefile:1.2 pkgsrc/sysutils/zabbix60-server/Makefile:1.3
--- pkgsrc/sysutils/zabbix60-server/Makefile:1.2        Sun Feb 12 21:03:07 2023
+++ pkgsrc/sysutils/zabbix60-server/Makefile    Wed Feb 22 21:45:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2023/02/12 21:03:07 otis Exp $
+# $NetBSD: Makefile,v 1.3 2023/02/22 21:45:17 otis Exp $
 # used by sysutils/zabbix60-proxy/Makefile
 # used by sysutils/zabbix60-agent/Makefile
 #
@@ -42,18 +42,24 @@ INSTALLATION_DIRS+= share/${PKGBASE}/mis
 .endfor
 
 SUBST_CLASSES+=                        fix-paths
-SUBST_STAGE.fix-paths=         pre-configure
+SUBST_STAGE.fix-paths=         post-patch
 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_STAGE.fix-pkgbase=       post-patch
 SUBST_MESSAGE.fix-pkgbase=     Fixing PKGBASE.
 SUBST_FILES.fix-pkgbase=       src/zabbix_server/Makefile.*
 SUBST_SED.fix-pkgbase=         -e 's,%%PKGBASE%%,${PKGBASE},g'
 
+SUBST_CLASSES+=                        fix-popcount
+SUBST_STAGE.fix-popcount=      post-patch
+SUBST_MESSAGE.fix-popcount=    Fix conflict with NetBSD's popcount.
+SUBST_FILES.fix-popcount+=     src/zabbix_server/lld/lld_host.c
+SUBST_SED.fix-popcount+=       -e 's,popcount,zbx_popcount,g'
+
 PLIST_SUBST+=                  PKGBASE=${PKGBASE}
 
 CFLAGS.SunOS+=                 -DDUK_USE_BYTEORDER=1
@@ -71,8 +77,6 @@ post-install:
                ${PAX} -rw . ${DESTDIR}${PREFIX}/share/${PKGBASE}/misc/${miscdir}
 .endfor
        ${RM} ${DESTDIR}${PREFIX}/share/${PKGBASE}/Makefile*
-       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/zabbix_server.conf \
-               ${DESTDIR}${PREFIX}/${EGDIR}/zabbix_server.conf
 
 .include "options.mk"
 

Index: pkgsrc/sysutils/zabbix60-server/distinfo
diff -u pkgsrc/sysutils/zabbix60-server/distinfo:1.1 pkgsrc/sysutils/zabbix60-server/distinfo:1.2
--- pkgsrc/sysutils/zabbix60-server/distinfo:1.1        Sun Feb 12 18:37:32 2023
+++ pkgsrc/sysutils/zabbix60-server/distinfo    Wed Feb 22 21:45:17 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2023/02/12 18:37:32 otis Exp $
+$NetBSD: distinfo,v 1.2 2023/02/22 21:45:17 otis Exp $
 
 BLAKE2s (zabbix-6.0.13.tar.gz) = fd8aa1f37b18943b42709d7ead74402bb9637819eb6137ea23c0b2b7cbdca775
 SHA512 (zabbix-6.0.13.tar.gz) = 188622c0c04029eac376ebf60c96ed9d67923bc1f40eff75666a241bb534cb744aca8c51ff4b79d508dfadb9e758f80d9dc46016217bcb5a67e8ede7e645788e
@@ -9,4 +9,6 @@ SHA1 (patch-m4_libssh.m4) = 8b4ac3964caf
 SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = bc928301fc099d907b83127e2670abf1d6c33553
 SHA1 (patch-src_zabbix__agent_Makefile.in) = efbd804ecee4b99db36db5f4fd61583b2ef96a86
 SHA1 (patch-src_zabbix__proxy_Makefile.am) = 9d2c3d5ca06e676154653b70f0931ed2ea281cf5
+SHA1 (patch-src_zabbix__proxy_Makefile.in) = 000fe95c07af423feac01a452a564bdc63f008ff
 SHA1 (patch-src_zabbix__server_Makefile.am) = d139b4fedf8f443fbe9966256e98374d5e5cdb67
+SHA1 (patch-src_zabbix__server_Makefile.in) = 16c899ed5a53924a351f8c334d4d3bae17490b62

Added files:

Index: pkgsrc/sysutils/zabbix60-server/patches/patch-src_zabbix__proxy_Makefile.in
diff -u /dev/null pkgsrc/sysutils/zabbix60-server/patches/patch-src_zabbix__proxy_Makefile.in:1.1
--- /dev/null   Wed Feb 22 21:45:17 2023
+++ pkgsrc/sysutils/zabbix60-server/patches/patch-src_zabbix__proxy_Makefile.in Wed Feb 22 21:45:17 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_zabbix__proxy_Makefile.in,v 1.1 2023/02/22 21:45:17 otis Exp $
+
+Install config file to component's example directory.
+
+--- src/zabbix_proxy/Makefile.in.orig  2023-02-01 07:20:02.432793641 +0000
++++ src/zabbix_proxy/Makefile.in
+@@ -1071,7 +1071,7 @@ install-data-hook:
+       $(MKDIR_P) "$(DESTDIR)$(PROXY_CONFIG_FILE).d"
+       $(MKDIR_P) "$(DESTDIR)$(EXTERNAL_SCRIPTS_PATH)"
+       $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)"
+-      test -f "$(DESTDIR)$(PROXY_CONFIG_FILE)" || cp "../../conf/zabbix_proxy.conf" "$(DESTDIR)$(PROXY_CONFIG_FILE)"
++      $(INSTALL_DATA) "../../conf/zabbix_proxy.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.
Index: pkgsrc/sysutils/zabbix60-server/patches/patch-src_zabbix__server_Makefile.in
diff -u /dev/null pkgsrc/sysutils/zabbix60-server/patches/patch-src_zabbix__server_Makefile.in:1.1
--- /dev/null   Wed Feb 22 21:45:17 2023
+++ pkgsrc/sysutils/zabbix60-server/patches/patch-src_zabbix__server_Makefile.in        Wed Feb 22 21:45:17 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_zabbix__server_Makefile.in,v 1.1 2023/02/22 21:45:17 otis Exp $
+
+Install config file into component's example directory.
+
+--- src/zabbix_server/Makefile.in.orig 2023-02-01 07:20:02.588795121 +0000
++++ src/zabbix_server/Makefile.in
+@@ -1136,7 +1136,7 @@ install-data-hook:
+       $(MKDIR_P) "$(DESTDIR)$(EXTERNAL_SCRIPTS_PATH)"
+       $(MKDIR_P) "$(DESTDIR)$(ALERT_SCRIPTS_PATH)"
+       $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)"
+-      test -f "$(DESTDIR)$(SERVER_CONFIG_FILE)" || cp "../../conf/zabbix_server.conf" "$(DESTDIR)$(SERVER_CONFIG_FILE)"
++      $(INSTALL_DATA) "../../conf/zabbix_server.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.

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/chat/swirc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/chat/swirc
Indexes:

Home | Main Index | Thread Index | Old Index