Date: Wed, 29 Dec 2010 11:13:00 GMT From: Pavel Timofeev <timp87@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/153521: update port net-mgmt/ndoutils to 1.4b9 Message-ID: <201012291113.oBTBD0q7059160@red.freebsd.org> Resent-Message-ID: <201012291120.oBTBKAV3083494@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 153521 >Category: ports >Synopsis: update port net-mgmt/ndoutils to 1.4b9 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Dec 29 11:20:10 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Pavel Timofeev >Release: FreeBSD 8.1-RELEASE-p2 i386 >Organization: ocs >Environment: FreeBSD timbsd.ocs.ru 8.1-RELEASE-p2 FreeBSD 8.1-RELEASE-p2 #0: Wed Dec 1 12:43:36 MSK 2010 ptimofeev@timbsd.ocs.ru:/usr/obj/usr/src/sys/TIMBSD i386 >Description: update net-mgmt/ndoutils from 1.4b8 to 1.4b9 >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN Makefile.orig Makefile --- Makefile.orig 2010-12-28 11:43:15.000000000 +0300 +++ Makefile 2010-12-29 13:31:13.000000000 +0300 @@ -6,8 +6,7 @@ # PORTNAME= ndoutils -PORTVERSION= 1.4b8 -PORTREVISION= 3 +PORTVERSION= 1.4b9 CATEGORIES= net-mgmt MASTER_SITES= SF/nagios/${PORTNAME}-1.x/${PORTNAME}-${PORTVERSION} @@ -25,8 +24,6 @@ CFLAGS+= -I${LOCALBASE}/include -fPIC CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc/ndoutils -CFG_FILES= misccommands ndo2db ndomod - USE_RC_SUBR= ndo2db SUB_FILES= pkg-message @@ -66,13 +63,14 @@ @${INSTALL_PROGRAM} ${WRKSRC}/src/log2ndo ${PREFIX}/bin/ @${INSTALL_PROGRAM} ${WRKSRC}/src/sockdebug ${PREFIX}/bin/ @(cd ${WRKSRC}/db && ${COPYTREE_SHARE} \* ${DATADIR}/) + @(cd ${DATADIR} && ${CHMOD} 755 installdb prepsql upgradedb) .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${DOCSDIR}/) .endif - @for i in ${CFG_FILES}; do \ - ${INSTALL_DATA} ${WRKSRC}/config/$${i}.cfg ${PREFIX}/etc/nagios/$${i}.cfg-sample; \ - done + @${INSTALL_DATA} ${WRKSRC}/config/misccommands.cfg ${PREFIX}/etc/nagios/misccommands.cfg-sample + @${INSTALL_DATA} ${WRKSRC}/config/ndo2db.cfg-sample ${PREFIX}/etc/nagios/ndo2db.cfg-sample + @${INSTALL_DATA} ${WRKSRC}/config/ndomod.cfg-sample ${PREFIX}/etc/nagios/ndomod.cfg-sample @${INSTALL_DATA} ${WRKSRC}/config/nagios.cfg ${PREFIX}/etc/nagios/ndoutils.cfg-sample @${CAT} ${PKGMESSAGE} diff -ruN distinfo.orig distinfo --- distinfo.orig 2010-12-28 11:43:21.000000000 +0300 +++ distinfo 2010-12-29 13:31:25.000000000 +0300 @@ -1,3 +1,2 @@ -MD5 (ndoutils-1.4b8.tar.gz) = 767dbfabd94506bc68c59033d7abdaa4 -SHA256 (ndoutils-1.4b8.tar.gz) = 7cc358b55df92c7e0e4e0c64595eb3b64f91fd1cfe55e52be7789247bd53fa93 -SIZE (ndoutils-1.4b8.tar.gz) = 1558875 +SHA256 (ndoutils-1.4b9.tar.gz) = 9d85187ec41586e91dc89630a9332d53aa78efa8f2bd9be8019bd7a2558b9306 +SIZE (ndoutils-1.4b9.tar.gz) = 2135521 diff -ruN pkg-descr.orig pkg-descr --- pkg-descr.orig 2010-12-29 12:16:09.000000000 +0300 +++ pkg-descr 2010-12-29 13:30:54.000000000 +0300 @@ -1,6 +1,6 @@ -The NDOUTILS addon is designed to store all configuration and event data from -Nagios in a database. Storing information from Nagios in a database will allow -for quicker retrieval and processing of that data and will help serve as a -foundation for the development of a new PHP-based web interface in Nagios 3.0. +NDOUtils allows you to export current and historical data from one or more +Nagios instances to a MySQL database. Several community addons use this as +one of their data sources. NDOUtils consists of a standalone daemon, a Nagios +event broker, and several helper utilities. WWW: http://www.nagios.org diff -ruN pkg-plist.orig pkg-plist --- pkg-plist.orig 2010-12-28 11:59:50.000000000 +0300 +++ pkg-plist 2010-12-29 13:15:40.000000000 +0300 @@ -12,6 +12,70 @@ %%PORTDOCS%%%%DOCSDIR%%/NDOUTILS DB Model.pdf %%PORTDOCS%%%%DOCSDIR%%/NDOUtils Documentation.odt %%PORTDOCS%%%%DOCSDIR%%/NDOUtils Documentation.pdf +%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/Makefile +%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/Makefile.in +%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/NDOUtils.xml +%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/all-entities.ent +%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/components.xml +%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/ent/documents.ent +%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/ent/names.ent +%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/ent/plugins.ent +%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/ent/protocols.ent +%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/ent/urls.ent +%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/ent/version.ent +%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/example-configs.xml +%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/installation.xml +%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/introduction.xml +%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/whatsnew.xml +%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig1.png +%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig10.png +%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig11.png +%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig12.png +%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig13.png +%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig2.png +%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig3.png +%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig4.png +%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig5.png +%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig6.png +%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig7.png +%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig8.png +%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig9.png +%%PORTDOCS%%%%DOCSDIR%%/docbook/images/important.png +%%PORTDOCS%%%%DOCSDIR%%/docbook/images/logofullsize.png +%%PORTDOCS%%%%DOCSDIR%%/docbook/images/note.png +%%PORTDOCS%%%%DOCSDIR%%/docbook/images/tip.png +%%PORTDOCS%%%%DOCSDIR%%/docbook/xsl/fo.xsl +%%PORTDOCS%%%%DOCSDIR%%/docbook/xsl/html-chunked.xsl +%%PORTDOCS%%%%DOCSDIR%%/docbook/xsl/html-single.xsl +%%PORTDOCS%%%%DOCSDIR%%/docbook/xsl/titlepage.xml +%%PORTDOCS%%%%DOCSDIR%%/docbook/xsl/titlepage.xsl +%%PORTDOCS%%%%DOCSDIR%%/html/en-en/ch01.html +%%PORTDOCS%%%%DOCSDIR%%/html/en-en/ch02.html +%%PORTDOCS%%%%DOCSDIR%%/html/en-en/ch03.html +%%PORTDOCS%%%%DOCSDIR%%/html/en-en/ch04.html +%%PORTDOCS%%%%DOCSDIR%%/html/en-en/components.html +%%PORTDOCS%%%%DOCSDIR%%/html/en-en/example-configs.html +%%PORTDOCS%%%%DOCSDIR%%/html/en-en/index.html +%%PORTDOCS%%%%DOCSDIR%%/html/en-en/installation.html +%%PORTDOCS%%%%DOCSDIR%%/html/en-en/intro.html +%%PORTDOCS%%%%DOCSDIR%%/html/en-en/whatsnew.html +%%PORTDOCS%%%%DOCSDIR%%/html/images/fig1.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/fig10.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/fig11.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/fig12.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/fig13.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/fig2.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/fig3.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/fig4.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/fig5.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/fig6.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/fig7.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/fig8.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/fig9.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/important.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/logofullsize.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/note.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/tip.png %%DATADIR%%/README %%DATADIR%%/installdb %%DATADIR%%/mysql-mods-1.4b5.sql @@ -63,4 +127,12 @@ %%DATADIR%%/upgradedb @dirrm %%DATADIR%%/queries @dirrm %%DATADIR%% +@dirrm %%PORTDOCS%%%%DOCSDIR%%/html/images +@dirrm %%PORTDOCS%%%%DOCSDIR%%/html/en-en +@dirrm %%PORTDOCS%%%%DOCSDIR%%/html +@dirrm %%PORTDOCS%%%%DOCSDIR%%/docbook/xsl +@dirrm %%PORTDOCS%%%%DOCSDIR%%/docbook/images +@dirrm %%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/ent +@dirrm %%PORTDOCS%%%%DOCSDIR%%/docbook/en-en +@dirrm %%PORTDOCS%%%%DOCSDIR%%/docbook %%PORTDOCS%%@dirrm %%DOCSDIR%% diff -ruN files/patch-config__misccommands.cfg.orig files/patch-config__misccommands.cfg --- files/patch-config__misccommands.cfg.orig 2010-12-28 14:11:27.000000000 +0300 +++ files/patch-config__misccommands.cfg 2010-12-28 16:03:21.000000000 +0300 @@ -1,13 +1,11 @@ ---- ./config/misccommands.cfg.orig 2008-02-21 18:38:53.000000000 -0500 -+++ ./config/misccommands.cfg 2008-02-21 18:41:56.000000000 -0500 -@@ -5,7 +5,7 @@ - # to suit your needs. This definition will need to be included in your +--- ./config/misccommands.cfg.in.orig 2009-09-07 00:51:38.000000000 +0400 ++++ ./config/misccommands.cfg.in 2010-12-28 14:54:55.000000000 +0300 +@@ -7,5 +7,5 @@ # Nagios config files if you want to use it. - --define command{ -+define command { - command_name rotate_ndo_log -- command_line /bin/mv /usr/local/nagios/var/ndo.dat /usr/local/nagios/var/ndo.`date +%s` -- } -+ command_line /bin/mv /var/spool/nagios/ndo.dat /var/spool/ndo.`date +%s` -+} + + define command{ + command_name rotate_ndo_log +- command_line /bin/mv @localstatedir@/ndo.dat @localstatedir@/ndo.`date +%s` ++ command_line /bin/mv /var/spool/nagios/ndo.dat /var/spool/ndo.`date +%s` + } + diff -ruN files/patch-config__nagios.cfg.orig files/patch-config__nagios.cfg --- files/patch-config__nagios.cfg.orig 2010-12-28 14:20:50.000000000 +0300 +++ files/patch-config__nagios.cfg 2010-12-28 15:32:03.000000000 +0300 @@ -1,12 +1,12 @@ ---- ./config/nagios.cfg.orig 2008-02-21 18:38:58.000000000 -0500 -+++ ./config/nagios.cfg 2008-02-21 18:42:02.000000000 -0500 +--- ./config/nagios.cfg.in.orig 2009-09-07 00:51:38.000000000 +0400 ++++ ./config/nagios.cfg.in 2010-12-28 14:54:55.000000000 +0300 @@ -5,7 +5,7 @@ # configuration file (nagios.cfg). Adjust the paths, etc. to suit your needs. - + # Uncomment the line below if you're running Nagios 2.x --broker_module=/usr/local/nagios/bin/ndomod-2x.o config_file=/usr/local/nagios/etc/ndomod.cfg -+#broker_module=/usr/local/nagios/bin/ndomod-2x.o config_file=/usr/local/nagios/etc/ndomod.cfg - +-broker_module=@bindir@/ndomod-2x.o config_file=@sysconfdir@/ndomod.cfg ++#broker_module=/usr/local/bin/ndomod-2x.o config_file=/usr/local/etc/nagios/ndomod.cfg + # Uncomment the line below if you're running Nagios 3.x --#broker_module=/usr/local/nagios/bin/ndomod-3x.o config_file=/usr/local/nagios/etc/ndomod.cfg -+broker_module=/usr/local/nagios/bin/ndomod-3x.o config_file=/usr/local/nagios/etc/ndomod.cfg +-#broker_module=@bindir@/ndomod-3x.o config_file=@sysconfdir@/ndomod.cfg ++broker_module=/usr/local/bin/ndomod-3x.o config_file=/usr/local/etc/nagios/ndomod.cfg diff -ruN files/patch-config__ndo2db.cfg.orig files/patch-config__ndo2db.cfg --- files/patch-config__ndo2db.cfg.orig 2008-08-14 06:58:34.000000000 +0400 +++ files/patch-config__ndo2db.cfg 2010-12-28 15:32:11.000000000 +0300 @@ -1,11 +1,30 @@ ---- ./config/ndo2db.cfg.orig 2008-02-21 18:39:05.000000000 -0500 -+++ ./config/ndo2db.cfg 2008-02-21 18:43:39.000000000 -0500 -@@ -32,7 +32,7 @@ +--- ./config/ndo2db.cfg-sample.in.orig 2009-09-15 16:08:32.000000000 +0400 ++++ ./config/ndo2db.cfg-sample.in 2010-12-28 14:54:55.000000000 +0300 +@@ -10,7 +10,7 @@ + # This is the lockfile that NDO2DB will use to store its PID number + # in when it is running in daemon mode. + +-lock_file=@localstatedir@/ndo2db.lock ++lock_file=/var/spool/nagios/ndo2db.lock + + + +@@ -41,7 +41,7 @@ # This option is only valid if the socket type specified above # is "unix". - --socket_name=/usr/local/nagios/var/ndo.sock + +-socket_name=@localstatedir@/ndo.sock +socket_name=/var/run/ndo.sock - - - + + + +@@ -177,7 +177,7 @@ + # DEBUG FILE + # This option determines where the daemon should write debugging information. + +-debug_file=@localstatedir@/ndo2db.debug ++debug_file=/var/spool/nagios/ndo2db.debug + + + + diff -ruN files/patch-config__ndomod.cfg.orig files/patch-config__ndomod.cfg --- files/patch-config__ndomod.cfg.orig 2010-12-28 14:24:16.000000000 +0300 +++ files/patch-config__ndomod.cfg 2010-12-28 15:32:18.000000000 +0300 @@ -1,23 +1,24 @@ ---- ./config/ndomod.cfg.orig 2008-02-21 18:39:10.000000000 -0500 -+++ ./config/ndomod.cfg 2008-02-21 18:45:07.000000000 -0500 +--- ./config/ndomod.cfg-sample.in.orig 2009-09-07 00:51:38.000000000 +0400 ++++ ./config/ndomod.cfg-sample.in 2010-12-28 14:54:55.000000000 +0300 @@ -35,9 +35,9 @@ # of fully qualified domain name of the host that the module should # connect to for sending output. - --#output=/usr/local/nagios/var/ndo.dat + +-#output=@localstatedir@/ndo.dat +#output=/var/spool/nagios/ndo.dat #output=127.0.0.1 --output=/usr/local/nagios/var/ndo.sock +-output=@localstatedir@/ndo.sock +output=/var/run/ndo.sock - - - -@@ -68,7 +68,7 @@ + + + +@@ -82,7 +82,7 @@ # Nagios (re)starts, the NDO NEB module will read the contents of this # file and send it to the NDO2DB daemon for processing. - --buffer_file=/usr/local/nagios/var/ndomod.tmp + +-buffer_file=@localstatedir@/ndomod.tmp +buffer_file=/var/spool/nagios/ndomod.tmp - - - + + + + diff -ruN files/pkg-message.in.orig files/pkg-message.in --- files/pkg-message.in.orig 2010-12-28 17:29:32.000000000 +0300 +++ files/pkg-message.in 2010-12-29 13:07:50.000000000 +0300 @@ -1,10 +1,22 @@ ****************************************************************************** +* FOR FIRST INSTALL: +* +* 1. Create database * $ mysqladmin -uroot -pXXXX create nagios -* +* +* 2. Grant privileges * $ mysql -uroot -pXXXX -e \ -* "GRANT SELECT,INSERT,UPDATE,DELETE TO 'nagios'@'%' IDENTIFIED BY 'YYYYY' +* "GRANT ALL TO 'nagios'@'%' IDENTIFIED BY 'YYYYY' +* +* 3. Create tables in database +* $ %%DATADIR%%/installdb -u nagios -p YYYYY -h localhost -d nagios +* * -* $ cd %%DATADIR%%/db -* $ ./installdb +* FOR UPGRADE EXISTING DATABASE: +* +* $ %%DATADIR%%/upgradedb -u nagios -p YYYYY -h localhost -d nagios +****************************************************************************** +* For more information about database scripts see %%DATADIR%%/README ****************************************************************************** + >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012291113.oBTBD0q7059160>