From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Nov 26 00:20:18 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5BF8616A4CE for ; Wed, 26 Nov 2003 00:20:18 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19A2843F75 for ; Wed, 26 Nov 2003 00:20:17 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id hAQ8KGFY024289 for ; Wed, 26 Nov 2003 00:20:16 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id hAQ8KG9g024288; Wed, 26 Nov 2003 00:20:16 -0800 (PST) (envelope-from gnats) Date: Wed, 26 Nov 2003 00:20:16 -0800 (PST) Message-Id: <200311260820.hAQ8KG9g024288@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Sergey Akifyev Subject: Re: ports/56266: [new port] net/jffnms - Very advanced network monitoring and control system X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Sergey Akifyev List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2003 08:20:18 -0000 The following reply was made to PR ports/56266; it has been noted by GNATS. From: Sergey Akifyev To: freebsd-gnats-submit@FreeBSD.org Cc: Subject: Re: ports/56266: [new port] net/jffnms - Very advanced network monitoring and control system Date: Wed, 26 Nov 2003 11:14:30 +0300 Following patch does: * Bump port version to 0.7.4 * Fix package install issues * Fix database issue * Correct tmpwatch.sh ==== begin jffnms.diff diff -ruN jffnms.orig/Makefile jffnms/Makefile --- jffnms.orig/Makefile Mon Oct 20 13:34:49 2003 +++ jffnms/Makefile Wed Nov 26 08:06:58 2003 @@ -6,7 +6,7 @@ # PORTNAME= jffnms -PORTVERSION= 0.7.3 +PORTVERSION= 0.7.4 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=${PORTNAME} @@ -14,14 +14,13 @@ MAINTAINER= asa@gascom.ru COMMENT= Very advanced network monitoring and control system -RUN_DEPENDS= safe_mysqld:${PORTSDIR}/databases/mysql323-server \ - mysql:${PORTSDIR}/databases/mysql323-client \ - neato:${PORTSDIR}/graphics/graphviz \ +RUN_DEPENDS= neato:${PORTSDIR}/graphics/graphviz \ rrdtool:${PORTSDIR}/net/rrdtool \ php:${PORTSDIR}/lang/php4-nms \ - nmap:${PORTSDIR}/security/nmap + nmap:${PORTSDIR}/security/nmap \ + tmpwatch:${PORTSDIR}/sysutils/tmpwatch -NO_BUILD= yes +USE_MYSQL= yes USE_REINPLACE= yes JFFNMSDIR?= share/jffnms @@ -31,7 +30,7 @@ PLIST_SUB= JFFNMSDIR=${JFFNMSDIR} -do-patch: +do-build: @${REINPLACE_CMD} -e 's|/opt/jffnms|${LOCALBASE}/${JFFNMSDIR}| g' \ -e 's|/usr/bin/php|${LOCALBASE}/bin/php|g' \ -e 's|/usr/bin/rrdtool|${LOCALBASE}/bin/rrdtool|g' \ diff -ruN jffnms.orig/distinfo jffnms/distinfo --- jffnms.orig/distinfo Mon Oct 20 13:34:49 2003 +++ jffnms/distinfo Mon Oct 20 13:35:46 2003 @@ -1 +1 @@ -MD5 (jffnms-0.7.3.tar.gz) = eade7a03fec982ddde01eaa27e302109 +MD5 (jffnms-0.7.4.tar.gz) = 57bc81bc5e4350ab05957c8c4c9421c9 diff -ruN jffnms.orig/files/jffnms.cron jffnms/files/jffnms.cron --- jffnms.orig/files/jffnms.cron Mon Oct 20 13:34:49 2003 +++ jffnms/files/jffnms.cron Wed Nov 26 07:55:43 2003 @@ -1,7 +1,7 @@ # jffnms crontab file # Created by Sergey Akifyev JFFNMS=%JFFNMSDIR%/engine -PATH=${PATH}:%LOCALBASE%/bin # JFFNMS +PATH=${PATH}:/bin:/usr/bin:%LOCALBASE%/bin:/sbin:/usr/sbin:/%LOCALBASE %/sbin # JFFNMS */1 * * * * cd $JFFNMS && php -q consolidate.php >/dev/null 2>&1 */5 * * * * cd $JFFNMS && php -q poller.php >/dev/null 2>&1 */30 * * * * cd $JFFNMS && php -q rrd_analizer.php >/dev/null 2>&1 diff -ruN jffnms.orig/files/jffnms_db.sh jffnms/files/jffnms_db.sh --- jffnms.orig/files/jffnms_db.sh Mon Oct 20 13:34:49 2003 +++ jffnms/files/jffnms_db.sh Wed Nov 26 07:49:30 2003 @@ -2,8 +2,10 @@ # Created by Sergey Akifyev # -echo "CREATE DATABASE jffnms; -GRANT ALL PRIVILEGES ON jffnms.* TO jffnms@localhost -IDENTIFIED BY 'jffnms'; -FLUSH PRIVILEGES;" | mysql && -mysql jffnms < %JFFNMSDIR%/docs/%JFFNMS%.mysql +{ + echo "CREATE DATABASE jffnms; + GRANT ALL PRIVILEGES ON jffnms.* TO jffnms@localhost + IDENTIFIED BY 'jffnms'; + FLUSH PRIVILEGES;" + cat %JFFNMSDIR%/docs/%JFFNMS%.mysql +} | mysql ${*} diff -ruN jffnms.orig/files/patch-engine_tmpwatch.sh jffnms/files/ patch-engine_tmpwatch.sh --- jffnms.orig/files/patch-engine_tmpwatch.sh Thu Jan 1 00:00:00 1970 +++ jffnms/files/patch-engine_tmpwatch.sh Wed Nov 26 07:53:01 2003 @@ -0,0 +1,19 @@ +--- engine/tmpwatch.sh.orig Wed Nov 26 07:50:39 2003 ++++ engine/tmpwatch.sh Wed Nov 26 07:52:09 2003 +@@ -3,14 +3,14 @@ + basedir=$1; + hours="24"; + dirs="$basedir/../htdocs/images/temp $basedir/temp $basedir/../logs"; +-tmpwatch="/usr/sbin/tmpwatch --ctime -f $hours"; ++tmpwatch="tmpwatch --ctime -f $hours"; + + for DIR in $dirs + do + echo -n "Cleaning $hours hs. old files in $DIR ..."; + if [ -d "$DIR" ]; then + $tmpwatch $DIR +- /bin/touch $DIR/.check ++ touch $DIR/.check + echo "done."; + else + echo "error."; diff -ruN jffnms.orig/pkg-plist jffnms/pkg-plist --- jffnms.orig/pkg-plist Mon Oct 20 13:34:49 2003 +++ jffnms/pkg-plist Wed Nov 26 08:01:06 2003 @@ -12,8 +12,8 @@ %%JFFNMSDIR%%/conf/functions.php %%JFFNMSDIR%%/docs/apache-example %%JFFNMSDIR%%/docs/cisco-example -%%JFFNMSDIR%%/docs/jffnms-0.7.3.mysql -%%JFFNMSDIR%%/docs/jffnms-0.7.3.pgsql +%%JFFNMSDIR%%/docs/jffnms-0.7.4.mysql +%%JFFNMSDIR%%/docs/jffnms-0.7.4.pgsql %%JFFNMSDIR%%/docs/unix/php.ini.example %%JFFNMSDIR%%/docs/unix/snmp.conf %%JFFNMSDIR%%/docs/unix/snmptrap.txt @@ -21,7 +21,7 @@ %%JFFNMSDIR%%/docs/unix/syslog.conf %%JFFNMSDIR%%/docs/unix/tac_plus.cfg %%JFFNMSDIR%%/docs/unix/tftp -%%JFFNMSDIR%%/docs/upgrade/jffnms-0.7.2-to-0.7.3.patch +%%JFFNMSDIR%%/docs/upgrade/jffnms-0.7.3-to-0.7.4.patch %%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.2-to-0.7.3.mysql.diff.auth %%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.2-to-0.7.3.mysql.diff. envmib %%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.2-to-0.7.3.mysql.diff. hosts_config @@ -34,6 +34,18 @@ %%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.2-to-0.7.3.mysql.diff. snmptrap %%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.2-to-0.7.3.mysql.diff. sw_cat_os %%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.2-to-0.7.3.mysql.diff. unackfilter +%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff. x_fix_internal_ids +%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff. config_size +%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff. ad_track +%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff. tcp_content +%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff. new_trap +%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff. reachability +%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff. dates +%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff. linux_tc +%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff. sla_in_errors +%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff. profile_len +%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff. triggered +%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff. juniper_state %%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.2-to-0.7.3.pgsql.diff.auth %%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.2-to-0.7.3.pgsql.diff. envmib %%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.2-to-0.7.3.pgsql.diff. hosts_config @@ -46,6 +58,18 @@ %%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.2-to-0.7.3.pgsql.diff. snmptrap %%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.2-to-0.7.3.pgsql.diff. sw_cat_os %%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.2-to-0.7.3.pgsql.diff. unackfilter +%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff. x_fix_internal_ids +%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff. config_size +%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff. ad_track +%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff. new_trap +%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff. tcp_content +%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff. reachability +%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff. dates +%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff. linux_tc +%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff. sla_in_errors +%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff. profile_len +%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff. triggered +%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff. juniper_state %%JFFNMSDIR%%/docs/utils/adjust_bw.php %%JFFNMSDIR%%/docs/utils/clean_auth.php %%JFFNMSDIR%%/docs/utils/lines.sh @@ -56,12 +80,15 @@ %%JFFNMSDIR%%/docs/utils/rrd_export.php %%JFFNMSDIR%%/docs/utils/rrd_import.php %%JFFNMSDIR%%/docs/utils/slice-rrd.php -%%JFFNMSDIR%%/docs/utils/soapclient.php -%%JFFNMSDIR%%/docs/utils/soapserver.php %%JFFNMSDIR%%/docs/utils/sql_alter_pg.php %%JFFNMSDIR%%/docs/utils/sql_diff.php %%JFFNMSDIR%%/docs/utils/syslog_file_import.php %%JFFNMSDIR%%/docs/utils/tftp_put_host_config.php +%%JFFNMSDIR%%/docs/utils/satellite-client.php +%%JFFNMSDIR%%/docs/utils/jffnms-snmp/iptables.inc.php +%%JFFNMSDIR%%/docs/utils/jffnms-snmp/jffnms-snmp.php +%%JFFNMSDIR%%/docs/utils/jffnms-snmp/tc.inc.php +%%JFFNMSDIR%%/docs/utils/jffnms-snmp/snmpd.conf.example %%JFFNMSDIR%%/docs/windows/httpd.conf %%JFFNMSDIR%%/docs/windows/php.ini %%JFFNMSDIR%%/engine/actions/email.inc.php @@ -84,6 +111,7 @@ %%JFFNMSDIR%%/engine/consolidate/syslog.php %%JFFNMSDIR%%/engine/consolidate/tacacs.php %%JFFNMSDIR%%/engine/consolidate/traps.php +%%JFFNMSDIR%%/engine/consolidate/alarms.php %%JFFNMSDIR%%/engine/discovery/bgp_peers.inc.php %%JFFNMSDIR%%/engine/discovery/cisco_accounting.inc.php %%JFFNMSDIR%%/engine/discovery/cisco_envmib.inc.php @@ -96,6 +124,11 @@ %%JFFNMSDIR%%/engine/discovery/snmp_interfaces.inc.php %%JFFNMSDIR%%/engine/discovery/storage.inc.php %%JFFNMSDIR%%/engine/discovery/tcp_ports.inc.php +%%JFFNMSDIR%%/engine/discovery/snmp_interfaces.inc.php.save +%%JFFNMSDIR%%/engine/discovery/reachability.inc.php +%%JFFNMSDIR%%/engine/discovery/linux_tc.inc.php +%%JFFNMSDIR%%/engine/graphs/tc_rate.inc.php +%%JFFNMSDIR%%/engine/graphs/tc_rate_aggregation.inc.php %%JFFNMSDIR%%/engine/graphs/acct_bytes.inc.php %%JFFNMSDIR%%/engine/graphs/acct_packets.inc.php %%JFFNMSDIR%%/engine/graphs/bgp_updates.inc.php @@ -158,6 +191,13 @@ %%JFFNMSDIR%%/engine/pollers/verify_bgp_peer_number.php %%JFFNMSDIR%%/engine/pollers/verify_interface_number.php %%JFFNMSDIR%%/engine/pollers/verify_smokeping_number.php +%%JFFNMSDIR%%/engine/pollers/reachability_values.php +%%JFFNMSDIR%%/engine/pollers/tcp_port_content.php +%%JFFNMSDIR%%/engine/pollers/reachability_start.php +%%JFFNMSDIR%%/engine/pollers/reachability_wait.php +%%JFFNMSDIR%%/engine/pollers/verify_tc_class_number.php +%%JFFNMSDIR%%/engine/pollers/reachability_end.php +%%JFFNMSDIR%%/engine/pollers/reachability_status.php %%JFFNMSDIR%%/engine/rrd_analizer.php %%JFFNMSDIR%%/engine/satellite/distribution.inc.php %%JFFNMSDIR%%/engine/satellite/ping.inc.php @@ -388,6 +428,7 @@ @dirrm %%JFFNMSDIR%%/docs/upgrade/mysql @dirrm %%JFFNMSDIR%%/docs/upgrade/pgsql @dirrm %%JFFNMSDIR%%/docs/upgrade +@dirrm %%JFFNMSDIR%%/docs/utils/jffnms-snmp @dirrm %%JFFNMSDIR%%/docs/utils @dirrm %%JFFNMSDIR%%/docs/windows @dirrm %%JFFNMSDIR%%/docs/unix @@ -395,4 +436,5 @@ @dirrm %%JFFNMSDIR%%/conf @dirrm %%JFFNMSDIR%%/tftpd @dirrm %%JFFNMSDIR%% +@exec crontab -u www %%JFFNMSDIR%%/jffnms.cron @unexec crontab -u www -l | sed 's|.*JFFNMS.*||' | crontab -u www - ==== end jffnms.diff