SF.net SVN: gar:[25366] csw/mgar/pkg/zabbix/trunk

janholzh at users.sourceforge.net janholzh at users.sourceforge.net
Tue Nov 10 12:12:39 CET 2015 

Revision: 25366
          http://sourceforge.net/p/gar/code/25366
Author:   janholzh
Date:     2015-11-10 11:12:39 +0000 (Tue, 10 Nov 2015)
Log Message:
-----------
zabbix/trunk: more tuning

Modified Paths:
--------------
    csw/mgar/pkg/zabbix/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/zabbix/trunk/files/CSWzabbix-agent.cswusergroup
    csw/mgar/pkg/zabbix/trunk/files/cswzabbix-agent.xml

Modified: csw/mgar/pkg/zabbix/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zabbix/trunk/Makefile	2015-11-09 17:00:38 UTC (rev 25365)
+++ csw/mgar/pkg/zabbix/trunk/Makefile	2015-11-10 11:12:39 UTC (rev 25366)
@@ -11,6 +11,7 @@
 
 MASTER_SITES = $(SF_MIRROR)
 DISTFILES  = $(DISTNAME).tar.gz
+DISTFILES += cswzabbix-agent.xml
 
 GARCOMPILER = SOS12U3
 
@@ -34,6 +35,8 @@
 
 BUILD_DEP_PKGS += CSWlibiksemel-dev
 
+USERGROUP = /etc/opt/csw/pkg/CSWzabbix-agent/cswusergroup
+
 PACKAGES += CSWzabbix-agent
 SPKG_DESC_CSWzabbix-agent = Zabbix monitoring system agent
 # PKGFILES is catchall
@@ -46,11 +49,7 @@
 # Linker anomaly
 RUNTIME_DEP_PKGS_CSWzabbix-agent += $(RUNTIME_DEP_PKGS_CSWzabbix-agent_$(GARCH))
 
-# These are just examples
-#CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/zabbix_agentd.8
-#CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/zabbix_sender.1
-#CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/etc/opt/csw/zabbix_agentd.conf.CSW
-#CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/etc/opt/csw/zabbix_agent.conf.CSW
+CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/cswzabbix-agent.xml
 
 PACKAGES-5.10 += CSWzabbix-server
 PACKAGES += $(PACKAGES-$(GAROSREL))
@@ -62,6 +61,7 @@
 PKGFILES_CSWzabbix-server += /opt/csw/share/zabbix/frontends/php/.*
 PKGFILES_CSWzabbix-server += /opt/csw/share/zabbix/database/.*
 #RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibmysqlclient18
+RUNTIME_DEP_PKGS_CSWzabbix-server += CSWzabbix-agent
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibpq5
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibcurl4
@@ -84,12 +84,26 @@
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWphp5-dom
 #For database connection
 
+CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-session
+CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-gd
+CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-xmlwriter
+CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-dom
+CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-gettext
+CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-bcmath
+CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-ctype
+CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-xmlreader
+CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWzabbix-agent
+CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-mbstring
+CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-sockets
+
+
 PACKAGES += CSWzabbix-proxy
 SPKG_DESC_CSWzabbix-proxy = Zabbix monitoring system proxy
 PKGFILES_CSWzabbix-proxy += $(call baseisadirs,$(sbindir),zabbix_proxy)
 PKGFILES_CSWzabbix-proxy += $(mandir)/man8/zabbix_proxy\.8
 PKGFILES_CSWzabbix-proxy += $(sysconfdir)/zabbix_proxy\.conf\.CSW
 PKGFILES_CSWzabbix-proxy += $(sysconfdir)/zabbix_proxy\.conf\.d
+RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWzabbix-agent
 RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWliblber2-4-2
 RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWlibintl8
@@ -100,6 +114,8 @@
 #With postgres build
 RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWlibpq5
 
+CHECKPKG_OVERRIDES_CSWzabbix-proxy += surplus-dependency|CSWzabbix-agent
+
 # Config files are in 64bit build
 MERGE_SCRIPTS_isa-default64 = copy-relocate
 
@@ -147,12 +163,18 @@
 PRESERVECONF += $(sysconfdir)/zabbix_proxy.conf
 PRESERVECONF += $(sysconfdir)/zabbix_server.conf
 
+PROTOTYPE_MODIFIERS += smf
+PROTOTYPE_FILES_smf += /var/opt/csw/svc/manifest/cswzabbix-agent.xml
+PROTOTYPE_CLASS_smf = manifest
+
 include gar/category.mk
 
 post-install-modulated:
 	ginstall -d $(DESTDIR)/opt/csw/share/zabbix/frontends
-	ginstall -d $(DESTDIR)/opt/csw/share/zabbix/database
+	ginstall -d $(DESTDIR)/etc/opt/csw/pkg/CSWzabbix-agent
+	ginstall -m 644 $(FILEDIR)/CSWzabbix-agent.cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWzabbix-agent/cswusergroup
 	cp -r $(WORKDIR)/zabbix-$(VERSION)/frontends/php $(DESTDIR)/opt/csw/share/zabbix/frontends
-	cp -r $(WORKDIR)/zabbix-$(VERSION)/database $(DESTDIR)/opt/csw/share/zabbix/database
+	cp -r $(WORKDIR)/zabbix-$(VERSION)/database $(DESTDIR)/opt/csw/share/zabbix/
 	rm $(DESTDIR)/opt/csw/share/zabbix/database/Make*
+	ginstall -D -m 0644 $(WORKDIR)/cswzabbix-agent.xml $(DESTDIR)/var/opt/csw/svc/manifest/cswzabbix-agent.xml
 	@$(MAKECOOKIE)

Added: csw/mgar/pkg/zabbix/trunk/files/CSWzabbix-agent.cswusergroup
===================================================================
--- csw/mgar/pkg/zabbix/trunk/files/CSWzabbix-agent.cswusergroup	                        (rev 0)
+++ csw/mgar/pkg/zabbix/trunk/files/CSWzabbix-agent.cswusergroup	2015-11-10 11:12:39 UTC (rev 25366)
@@ -0,0 +1 @@
+zabbix:zabbix:::::

Added: csw/mgar/pkg/zabbix/trunk/files/cswzabbix-agent.xml
===================================================================
(Binary files differ)

Index: csw/mgar/pkg/zabbix/trunk/files/cswzabbix-agent.xml
===================================================================
--- csw/mgar/pkg/zabbix/trunk/files/cswzabbix-agent.xml	2015-11-09 17:00:38 UTC (rev 25365)
+++ csw/mgar/pkg/zabbix/trunk/files/cswzabbix-agent.xml	2015-11-10 11:12:39 UTC (rev 25366)

Property changes on: csw/mgar/pkg/zabbix/trunk/files/cswzabbix-agent.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/xml
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the devel mailing list