From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jul 10 22:30:10 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8173C1065677 for ; Sun, 10 Jul 2011 22:30:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 5F8898FC19 for ; Sun, 10 Jul 2011 22:30:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p6AMUAGs033694 for ; Sun, 10 Jul 2011 22:30:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p6AMUAxj033693; Sun, 10 Jul 2011 22:30:10 GMT (envelope-from gnats) Resent-Date: Sun, 10 Jul 2011 22:30:10 GMT Resent-Message-Id: <201107102230.p6AMUAxj033693@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Olli Hauer Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 605F61065670 for ; Sun, 10 Jul 2011 22:26:41 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from p578be941.dip0.t-ipconnect.de (p578be941.dip0.t-ipconnect.de [87.139.233.65]) by mx1.freebsd.org (Postfix) with ESMTP id 7D8518FC18 for ; Sun, 10 Jul 2011 22:26:40 +0000 (UTC) Received: by p578be941.dip0.t-ipconnect.de (Postfix, from userid 1100) id C95A22035D; Mon, 11 Jul 2011 00:26:35 +0200 (CEST) Message-Id: <20110710222635.C95A22035D@p578be941.dip0.t-ipconnect.de> Date: Mon, 11 Jul 2011 00:26:35 +0200 (CEST) From: Olli Hauer To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: manos@cs.pdx.edu Subject: ports/158779: net-mgmt/ourmon support apache versions > 13 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Olli Hauer List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2011 22:30:10 -0000 >Number: 158779 >Category: ports >Synopsis: [patch] net-mgmt/ourmon support apache versions > 13 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Jul 10 22:30:09 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Olli Hauer >Release: >Organization: >Environment: >Description: At the moment the port has USE_APACHE=13 hard coded, but I suspect it will also run with apache > 13. I changed the following parts for the port - set IS_INTERACTIVE=yes - use %%WWWDIR%% macro instead hard coded path - make sure we use the rc script from port - use "env" in generated crontab - make sure crontab entries are removed during deinstall - sort pkg-plist (use genplist) - try to uninstall clean Additional place a "#" before the jobs in crontab (can be changed back again if preferred) I havn't test functionality, my main target is to preserve the port if we deprecate apache13. >How-To-Repeat: >Fix: --- ourmon.diff begins here --- Index: ourmon/Makefile =================================================================== RCS file: /home/pcvs/ports/net-mgmt/ourmon/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- ourmon/Makefile 28 Mar 2010 06:41:56 -0000 1.11 +++ ourmon/Makefile 10 Jul 2011 22:05:37 -0000 @@ -6,9 +6,10 @@ PORTNAME= ourmon PORTVERSION= 2.8.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-mgmt -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}281 +MASTER_SITES= SF +MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}/${PORTNAME}281 DISTNAME= ourmon281 MAINTAINER= manos@cs.pdx.edu @@ -19,10 +20,11 @@ RUN_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool WRKSRC= ${WRKDIR}/mrourmon -USE_APACHE= 1.3 +USE_APACHE= 1.3+ USE_PERL5= yes NO_BUILD= yes NO_INSTALL_MANPAGES= yes +IS_INTERACTIVE= yes SUB_FILES= pkg-message @@ -36,8 +38,12 @@ @${ECHO_MSG} "interactive steps, use the created by port instead." @${ECHO_MSG} "===================================================" +post-patch: + @${REINPLACE_CMD} -e 's|%%WWWDIR%%|${WWWDIR}|g' ${WRKSRC}/configure.pl + do-install: @cd ${WRKSRC} && ${PERL5} configure.pl ${PREFIX} + @${FIND} ${WRKSRC} \( -name '*.orig' -o -name '*.bak' -o -name '*.o' \) -delete @${CP} -R ${WRKSRC} ${PREFIX} post-install: Index: ourmon/pkg-deinstall =================================================================== RCS file: ourmon/pkg-deinstall diff -N ourmon/pkg-deinstall --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ourmon/pkg-deinstall 10 Jul 2011 22:05:37 -0000 @@ -0,0 +1,11 @@ +#!/bin/sh + +PATH=/bin:/usr/bin:/usr/sbin +CRONTAB=/etc/crontab + +if [ "$2" = "DEINSTALL" ]; then + # delete entries in crontab + sed -i "" -e '/# == ourmon port cron start/,/# == ourmon port cron end/{' \ + -e 'd' \ + -e '}' ${CRONTAB} +fi Index: ourmon/pkg-plist =================================================================== RCS file: /home/pcvs/ports/net-mgmt/ourmon/pkg-plist,v retrieving revision 1.3 diff -u -r1.3 pkg-plist --- ourmon/pkg-plist 21 May 2008 03:44:12 -0000 1.3 +++ ourmon/pkg-plist 10 Jul 2011 22:05:37 -0000 @@ -1,286 +1,575 @@ -mrourmon/src/web.code/bard/bar99.png -mrourmon/src/web.code/bard/bar57.png -mrourmon/src/web.code/bard/bar52.png -mrourmon/src/web.code/bard/bar30.png +mrourmon/ACKS +mrourmon/CHANGES +mrourmon/INSTALL +mrourmon/README +mrourmon/README.bsd +mrourmon/README.linux +mrourmon/VERSION +mrourmon/bin/batchip.sh +mrourmon/bin/batchipall.sh +mrourmon/bin/daily.pl +mrourmon/bin/irc.pl +mrourmon/bin/mklogdir.sh +mrourmon/bin/monbackup.pl +mrourmon/bin/ombatchip.pl +mrourmon/bin/ombatchipsrc.pl +mrourmon/bin/ombatchsyn.pl +mrourmon/bin/omupdate.pl +mrourmon/bin/omupdate.sh +mrourmon/bin/ourmon +mrourmon/bin/tcpworm.pl +mrourmon/bin/wormtolog.pl +mrourmon/configure.pl +mrourmon/etc/README +mrourmon/etc/cbpfexamples.conf +mrourmon/etc/crontab.sample +mrourmon/etc/ourmon.conf +mrourmon/etc/secmin.conf +@rmtry mrourmon/logs/irc/irc_today +@rmtry mrourmon/logs/mon.lite/mon_today +@rmtry mrourmon/logs/p2preport/p2preport_today +@rmtry mrourmon/logs/portreport/portreport_today +@rmtry mrourmon/logs/rawemail/rawemail_today +@rmtry mrourmon/logs/rawirc/rawirc_today +@rmtry mrourmon/logs/rawp2p/rawp2p_today +@rmtry mrourmon/logs/rawpotdump/rawpotdump_today +@rmtry mrourmon/logs/rawsyndump/rawsyndump_today +@rmtry mrourmon/logs/topn_today +@rmtry mrourmon/logs/tworm/tworm_today +@rmtry mrourmon/logs/udpreport/udpreport_today +mrourmon/makeclean.sh +mrourmon/scripts/README +mrourmon/scripts/checkmon.sh +mrourmon/scripts/monupdate.sh +mrourmon/scripts/runourmon.pl +mrourmon/src/README +mrourmon/src/ircfr/Makefile.bsd +mrourmon/src/ircfr/Makefile.linux +mrourmon/src/ircfr/README +mrourmon/src/ircfr/config.h +mrourmon/src/ircfr/copyright.h +mrourmon/src/ircfr/filter.c +mrourmon/src/ircfr/filter.h +mrourmon/src/ircfr/interfaces.c +mrourmon/src/ircfr/ipanalyze.c +mrourmon/src/ircfr/ircfr.c +mrourmon/src/ircfr/ircfr.h +mrourmon/src/ircfr/ircfr.sh +mrourmon/src/ircfr/ircscan.c +mrourmon/src/ircfr/ircscan.h +mrourmon/src/ircfr/machdep.c +mrourmon/src/ircfr/util.c +mrourmon/src/ourmon/Makefile.bsd +mrourmon/src/ourmon/Makefile.linux +mrourmon/src/ourmon/Makefile.mac +mrourmon/src/ourmon/Makefile.mmap +mrourmon/src/ourmon/Makefile.mmap.linux +mrourmon/src/ourmon/Makefile.solaris +mrourmon/src/ourmon/barthash.c +mrourmon/src/ourmon/bytecodes.h +mrourmon/src/ourmon/config.h +mrourmon/src/ourmon/copyright.h +mrourmon/src/ourmon/cprogram.c +mrourmon/src/ourmon/cprogram.h +mrourmon/src/ourmon/ehash.c +mrourmon/src/ourmon/filter.c +mrourmon/src/ourmon/filter.h +mrourmon/src/ourmon/hashblist.c +mrourmon/src/ourmon/hashblist.h +mrourmon/src/ourmon/hashdns.c +mrourmon/src/ourmon/hashdns.h +mrourmon/src/ourmon/hashicmp.c +mrourmon/src/ourmon/hashicmp.h +mrourmon/src/ourmon/hashport.c +mrourmon/src/ourmon/hashport.h +mrourmon/src/ourmon/hashscan.c +mrourmon/src/ourmon/hashscan.h +mrourmon/src/ourmon/hashsort.c +mrourmon/src/ourmon/hashsort.h +mrourmon/src/ourmon/hashsyn.c +mrourmon/src/ourmon/hashsyn.h +mrourmon/src/ourmon/hwflags.h +mrourmon/src/ourmon/interfaces.c +mrourmon/src/ourmon/ipanalyze.c +mrourmon/src/ourmon/ircscan.c +mrourmon/src/ourmon/ircscan.h +mrourmon/src/ourmon/machdep.c +mrourmon/src/ourmon/monconfig.c +mrourmon/src/ourmon/nonipanalyze.c +@rmtry mrourmon/src/ourmon/ourmon +mrourmon/src/ourmon/ourmon.c +mrourmon/src/ourmon/ourmon.conf +mrourmon/src/ourmon/ourmon.h +mrourmon/src/ourmon/ourmon.sh +mrourmon/src/ourmon/ourpcap.c +mrourmon/src/ourmon/ourpcap.h +mrourmon/src/ourmon/patmatch.c +mrourmon/src/ourmon/patmatch.h +mrourmon/src/ourmon/pktlinux.c +mrourmon/src/ourmon/signal.c +mrourmon/src/ourmon/spinlock.c +mrourmon/src/ourmon/spinlock.h +mrourmon/src/ourmon/stats.h +mrourmon/src/ourmon/stringstore.c +mrourmon/src/ourmon/stringstore.h +mrourmon/src/ourmon/sync.c +mrourmon/src/ourmon/sync.h +mrourmon/src/ourmon/thread.c +mrourmon/src/ourmon/thread.h +mrourmon/src/ourmon/trigger.c +mrourmon/src/ourmon/trigger.h +mrourmon/src/ourmon/util.c +mrourmon/src/scripts/README +mrourmon/src/scripts/getssbots.sh +mrourmon/src/scripts/sizecheck.pl +mrourmon/src/scripts/stirc.pl +mrourmon/src/scripts/stoo.pl +mrourmon/src/web.code/Makefile +mrourmon/src/web.code/README +mrourmon/src/web.code/bard/bar1.png +mrourmon/src/web.code/bard/bar10.png mrourmon/src/web.code/bard/bar100.png -mrourmon/src/web.code/bard/bar26.png -mrourmon/src/web.code/bard/bar55.png -mrourmon/src/web.code/bard/bar27.png -mrourmon/src/web.code/bard/bar56.png -mrourmon/src/web.code/bard/bar79.png -mrourmon/src/web.code/bard/bar87.png -mrourmon/src/web.code/bard/bar76.png -mrourmon/src/web.code/bard/bar41.png mrourmon/src/web.code/bard/bar11.png -mrourmon/src/web.code/bard/bar81.png -mrourmon/src/web.code/bard/bar44.png -mrourmon/src/web.code/bard/bar50.png -mrourmon/src/web.code/bard/bar16.png -mrourmon/src/web.code/bard/bar29.png -mrourmon/src/web.code/bard/bar94.png -mrourmon/src/web.code/bard/bar77.png -mrourmon/src/web.code/bard/bar8.png -mrourmon/src/web.code/bard/bar51.png -mrourmon/src/web.code/bard/bar28.png -mrourmon/src/web.code/bard/bar83.png -mrourmon/src/web.code/bard/bar36.png -mrourmon/src/web.code/bard/bar86.png -mrourmon/src/web.code/bard/bar21.png -mrourmon/src/web.code/bard/bar46.png -mrourmon/src/web.code/bard/bar48.png -mrourmon/src/web.code/bard/bar20.png -mrourmon/src/web.code/bard/bar15.png -mrourmon/src/web.code/bard/bar89.png -mrourmon/src/web.code/bard/bar6.png -mrourmon/src/web.code/bard/bar72.png -mrourmon/src/web.code/bard/bar74.png -mrourmon/src/web.code/bard/bar34.png -mrourmon/src/web.code/bard/bar69.png -mrourmon/src/web.code/bard/bar17.png mrourmon/src/web.code/bard/bar12.png -mrourmon/src/web.code/bard/bar84.png -mrourmon/src/web.code/bard/bar23.png -mrourmon/src/web.code/bard/bar92.png -mrourmon/src/web.code/bard/bar88.png mrourmon/src/web.code/bard/bar13.png -mrourmon/src/web.code/bard/bar59.png -mrourmon/src/web.code/bard/bar78.png -mrourmon/src/web.code/bard/bar3.png -mrourmon/src/web.code/bard/bar45.png -mrourmon/src/web.code/bard/bar25.png +mrourmon/src/web.code/bard/bar14.png +mrourmon/src/web.code/bard/bar15.png +mrourmon/src/web.code/bard/bar16.png +mrourmon/src/web.code/bard/bar17.png +mrourmon/src/web.code/bard/bar18.png +mrourmon/src/web.code/bard/bar19.png +mrourmon/src/web.code/bard/bar2.png +mrourmon/src/web.code/bard/bar20.png +mrourmon/src/web.code/bard/bar21.png mrourmon/src/web.code/bard/bar22.png -mrourmon/src/web.code/bard/bar96.png +mrourmon/src/web.code/bard/bar23.png mrourmon/src/web.code/bard/bar24.png -mrourmon/src/web.code/bard/bar62.png -mrourmon/src/web.code/bard/bar95.png -mrourmon/src/web.code/bard/bar71.png -mrourmon/src/web.code/bard/bar9.png -mrourmon/src/web.code/bard/bar40.png -mrourmon/src/web.code/bard/bar90.png +mrourmon/src/web.code/bard/bar25.png +mrourmon/src/web.code/bard/bar26.png +mrourmon/src/web.code/bard/bar27.png +mrourmon/src/web.code/bard/bar28.png +mrourmon/src/web.code/bard/bar29.png +mrourmon/src/web.code/bard/bar3.png +mrourmon/src/web.code/bard/bar30.png +mrourmon/src/web.code/bard/bar31.png +mrourmon/src/web.code/bard/bar32.png mrourmon/src/web.code/bard/bar33.png +mrourmon/src/web.code/bard/bar34.png +mrourmon/src/web.code/bard/bar35.png +mrourmon/src/web.code/bard/bar36.png +mrourmon/src/web.code/bard/bar37.png +mrourmon/src/web.code/bard/bar38.png +mrourmon/src/web.code/bard/bar39.png +mrourmon/src/web.code/bard/bar4.png +mrourmon/src/web.code/bard/bar40.png +mrourmon/src/web.code/bard/bar41.png mrourmon/src/web.code/bard/bar42.png -mrourmon/src/web.code/bard/bar61.png -mrourmon/src/web.code/bard/bar66.png -mrourmon/src/web.code/bard/bar97.png +mrourmon/src/web.code/bard/bar43.png +mrourmon/src/web.code/bard/bar44.png +mrourmon/src/web.code/bard/bar45.png +mrourmon/src/web.code/bard/bar46.png +mrourmon/src/web.code/bard/bar47.png +mrourmon/src/web.code/bard/bar48.png +mrourmon/src/web.code/bard/bar49.png +mrourmon/src/web.code/bard/bar5.png +mrourmon/src/web.code/bard/bar50.png +mrourmon/src/web.code/bard/bar51.png +mrourmon/src/web.code/bard/bar52.png +mrourmon/src/web.code/bard/bar53.png +mrourmon/src/web.code/bard/bar54.png +mrourmon/src/web.code/bard/bar55.png +mrourmon/src/web.code/bard/bar56.png +mrourmon/src/web.code/bard/bar57.png mrourmon/src/web.code/bard/bar58.png -mrourmon/src/web.code/bard/bar80.png -mrourmon/src/web.code/bard/bar93.png -mrourmon/src/web.code/bard/bar2.png +mrourmon/src/web.code/bard/bar59.png +mrourmon/src/web.code/bard/bar6.png +mrourmon/src/web.code/bard/bar60.png +mrourmon/src/web.code/bard/bar61.png +mrourmon/src/web.code/bard/bar62.png +mrourmon/src/web.code/bard/bar63.png mrourmon/src/web.code/bard/bar64.png mrourmon/src/web.code/bard/bar65.png -mrourmon/src/web.code/bard/bar53.png +mrourmon/src/web.code/bard/bar66.png +mrourmon/src/web.code/bard/bar67.png mrourmon/src/web.code/bard/bar68.png -mrourmon/src/web.code/bard/bar39.png -mrourmon/src/web.code/bard/bar14.png -mrourmon/src/web.code/bard/bar18.png +mrourmon/src/web.code/bard/bar69.png +mrourmon/src/web.code/bard/bar7.png +mrourmon/src/web.code/bard/bar70.png +mrourmon/src/web.code/bard/bar71.png +mrourmon/src/web.code/bard/bar72.png +mrourmon/src/web.code/bard/bar73.png +mrourmon/src/web.code/bard/bar74.png mrourmon/src/web.code/bard/bar75.png -mrourmon/src/web.code/bard/bar67.png -mrourmon/src/web.code/bard/bar1.png -mrourmon/src/web.code/bard/bar60.png -mrourmon/src/web.code/bard/bar10.png -mrourmon/src/web.code/bard/bar49.png -mrourmon/src/web.code/bard/bar85.png -mrourmon/src/web.code/bard/bar47.png -mrourmon/src/web.code/bard/bar37.png +mrourmon/src/web.code/bard/bar76.png +mrourmon/src/web.code/bard/bar77.png +mrourmon/src/web.code/bard/bar78.png +mrourmon/src/web.code/bard/bar79.png +mrourmon/src/web.code/bard/bar8.png +mrourmon/src/web.code/bard/bar80.png +mrourmon/src/web.code/bard/bar81.png mrourmon/src/web.code/bard/bar82.png -mrourmon/src/web.code/bard/bar4.png -mrourmon/src/web.code/bard/bar63.png -mrourmon/src/web.code/bard/bar32.png -mrourmon/src/web.code/bard/bar31.png -mrourmon/src/web.code/bard/bar5.png -mrourmon/src/web.code/bard/bar70.png -mrourmon/src/web.code/bard/bar43.png +mrourmon/src/web.code/bard/bar83.png +mrourmon/src/web.code/bard/bar84.png +mrourmon/src/web.code/bard/bar85.png +mrourmon/src/web.code/bard/bar86.png +mrourmon/src/web.code/bard/bar87.png +mrourmon/src/web.code/bard/bar88.png +mrourmon/src/web.code/bard/bar89.png +mrourmon/src/web.code/bard/bar9.png +mrourmon/src/web.code/bard/bar90.png mrourmon/src/web.code/bard/bar91.png -mrourmon/src/web.code/bard/bar7.png -mrourmon/src/web.code/bard/bar35.png -mrourmon/src/web.code/bard/bar73.png -mrourmon/src/web.code/bard/bar38.png -mrourmon/src/web.code/bard/bar19.png -mrourmon/src/web.code/bard/bar54.png +mrourmon/src/web.code/bard/bar92.png +mrourmon/src/web.code/bard/bar93.png +mrourmon/src/web.code/bard/bar94.png +mrourmon/src/web.code/bard/bar95.png +mrourmon/src/web.code/bard/bar96.png +mrourmon/src/web.code/bard/bar97.png mrourmon/src/web.code/bard/bar98.png -mrourmon/src/web.code/omupdate.pl +mrourmon/src/web.code/bard/bar99.png +mrourmon/src/web.code/batchip.sh +mrourmon/src/web.code/batchipall.sh +mrourmon/src/web.code/daily.pl +mrourmon/src/web.code/drawbar.c mrourmon/src/web.code/drawtopn.c -mrourmon/src/web.code/ombatchsyn.pl -mrourmon/src/web.code/omupdate.sh -mrourmon/src/web.code/wormtolog.pl +mrourmon/src/web.code/irc.pl mrourmon/src/web.code/makebar.pl -mrourmon/src/web.code/README +mrourmon/src/web.code/mklogdir.sh mrourmon/src/web.code/monbackup.pl mrourmon/src/web.code/ombatchip.pl -mrourmon/src/web.code/topn_udp.png -mrourmon/src/web.code/drawbar.c +mrourmon/src/web.code/ombatchipsrc.pl +mrourmon/src/web.code/ombatchsyn.pl +mrourmon/src/web.code/omupdate.pl +mrourmon/src/web.code/omupdate.sh mrourmon/src/web.code/tcpworm.pl mrourmon/src/web.code/testdraw.sh -mrourmon/src/web.code/ombatchipsrc.pl +mrourmon/src/web.code/topn_udp.png mrourmon/src/web.code/udptest.sh -mrourmon/src/web.code/irc.pl -mrourmon/src/web.code/batchip.sh -mrourmon/src/web.code/Makefile -mrourmon/src/web.code/batchipall.sh -mrourmon/src/web.code/mklogdir.sh -mrourmon/src/web.code/daily.pl -mrourmon/src/web.html/info.topipa.html -mrourmon/src/web.html/ourarch.png -mrourmon/src/web.html/pss2.radar.stop.html -mrourmon/src/web.html/neg.radar.stop.html -mrourmon/src/web.html/indexstatic.html -mrourmon/src/web.html/pss.radar.html +mrourmon/src/web.code/wormtolog.pl +mrourmon/src/web.html/README +mrourmon/src/web.html/bpf-emailsyns.html mrourmon/src/web.html/bpf-errors.html +mrourmon/src/web.html/bpf-p2p.html +mrourmon/src/web.html/bpf-ports.html +mrourmon/src/web.html/bpf-protopkts.html +mrourmon/src/web.html/bpf-subnets1.html +mrourmon/src/web.html/bpf-tcpcontrol.html +mrourmon/src/web.html/bpf-unreach.html mrourmon/src/web.html/bpf-vpns.html -mrourmon/src/web.html/flow.html +mrourmon/src/web.html/cast.html mrourmon/src/web.html/dnsstats.html -mrourmon/src/web.html/pkts.html -mrourmon/src/web.html/scans.radar.stop.html -mrourmon/src/web.html/topnstat.html -mrourmon/src/web.html/tworm.html -mrourmon/src/web.html/tcp3.html -mrourmon/src/web.html/l2proto.html -mrourmon/src/web.html/irc.html -mrourmon/src/web.html/pss.radar.stop.html -mrourmon/src/web.html/bpf-emailsyns.html -mrourmon/src/web.html/netww.html -mrourmon/src/web.html/icmperror.html -mrourmon/src/web.html/pss2.radar.html -mrourmon/src/web.html/README -mrourmon/src/web.html/scans.radar.html -mrourmon/src/web.html/ipproto.html -mrourmon/src/web.html/bpf-ports.html +mrourmon/src/web.html/flow.html mrourmon/src/web.html/icmpcodes.txt -mrourmon/src/web.html/neg.radar.html -mrourmon/src/web.html/ipscan.html -mrourmon/src/web.html/udpscan.html -mrourmon/src/web.html/bpf-unreach.html -mrourmon/src/web.html/bpf-p2p.html +mrourmon/src/web.html/icmperror.html mrourmon/src/web.html/index.html -mrourmon/src/web.html/size.html -mrourmon/src/web.html/bpf-subnets1.html -mrourmon/src/web.html/cast.html -mrourmon/src/web.html/bpf-tcpcontrol.html -mrourmon/src/web.html/ipportscan.html -mrourmon/src/web.html/tcpsyn.html +mrourmon/src/web.html/indexstatic.html mrourmon/src/web.html/info.html +mrourmon/src/web.html/info.topipa.html +mrourmon/src/web.html/ipportscan.html +mrourmon/src/web.html/ipproto.html +mrourmon/src/web.html/iprange1.html +mrourmon/src/web.html/ipscan.html +mrourmon/src/web.html/irc.html mrourmon/src/web.html/l2pni.radar.html +mrourmon/src/web.html/l2pni.radar.stop.html +mrourmon/src/web.html/l2proto.html +mrourmon/src/web.html/neg.radar.html +mrourmon/src/web.html/neg.radar.stop.html +mrourmon/src/web.html/netww.html +mrourmon/src/web.html/ourarch.png +mrourmon/src/web.html/pkts.html +mrourmon/src/web.html/pss.radar.html +mrourmon/src/web.html/pss.radar.stop.html +mrourmon/src/web.html/pss2.radar.html +mrourmon/src/web.html/pss2.radar.stop.html mrourmon/src/web.html/radar.html -mrourmon/src/web.html/realhtml.txt mrourmon/src/web.html/radar.stop.html -mrourmon/src/web.html/bpf-protopkts.html -mrourmon/src/web.html/l2pni.radar.stop.html -mrourmon/src/web.html/udpweight.html -mrourmon/src/web.html/udperror.html -mrourmon/src/web.html/iprange1.html mrourmon/src/web.html/radarlist.txt -mrourmon/src/ourmon/hashblist.h -mrourmon/src/ourmon/copyright.h -mrourmon/src/ourmon/signal.c -mrourmon/src/ourmon/ircscan.h -mrourmon/src/ourmon/hashscan.c -mrourmon/src/ourmon/spinlock.h -mrourmon/src/ourmon/barthash.c -mrourmon/src/ourmon/thread.h -mrourmon/src/ourmon/ourpcap.c -mrourmon/src/ourmon/hashicmp.h -mrourmon/src/ourmon/hashsyn.c -mrourmon/src/ourmon/Makefile.mmap.linux -mrourmon/src/ourmon/sync.c -mrourmon/src/ourmon/ehash.c -mrourmon/src/ourmon/ipanalyze.c -mrourmon/src/ourmon/patmatch.c -mrourmon/src/ourmon/cprogram.h -mrourmon/src/ourmon/hashblist.c -mrourmon/src/ourmon/hashdns.c -mrourmon/src/ourmon/stringstore.c -mrourmon/src/ourmon/hashsyn.h -mrourmon/src/ourmon/bytecodes.h -mrourmon/src/ourmon/spinlock.c -mrourmon/src/ourmon/trigger.c -mrourmon/src/ourmon/Makefile.linux -mrourmon/src/ourmon/filter.h -mrourmon/src/ourmon/thread.c -mrourmon/src/ourmon/hashsort.c -mrourmon/src/ourmon/Makefile.solaris -mrourmon/src/ourmon/util.c -mrourmon/src/ourmon/filter.c -mrourmon/src/ourmon/hashport.c -mrourmon/src/ourmon/hashicmp.c -mrourmon/src/ourmon/stats.h -mrourmon/src/ourmon/stringstore.h -mrourmon/src/ourmon/cprogram.c -mrourmon/src/ourmon/machdep.c -mrourmon/src/ourmon/pktlinux.c -mrourmon/src/ourmon/Makefile.mac -mrourmon/src/ourmon/ircscan.c -mrourmon/src/ourmon/nonipanalyze.c -mrourmon/src/ourmon/hwflags.h -mrourmon/src/ourmon/hashport.h -mrourmon/src/ourmon/interfaces.c -mrourmon/src/ourmon/trigger.h -mrourmon/src/ourmon/hashscan.h -mrourmon/src/ourmon/ourmon.c -mrourmon/src/ourmon/sync.h -mrourmon/src/ourmon/Makefile.mmap -mrourmon/src/ourmon/ourmon.h -mrourmon/src/ourmon/ourpcap.h -mrourmon/src/ourmon/hashdns.h -mrourmon/src/ourmon/patmatch.h -mrourmon/src/ourmon/monconfig.c -mrourmon/src/ourmon/hashsort.h -mrourmon/src/ourmon/ourmon.conf -mrourmon/src/ourmon/config.h -mrourmon/src/ourmon/Makefile.bsd -mrourmon/src/ourmon/ourmon.sh -mrourmon/src/scripts/stirc.pl -mrourmon/src/scripts/getssbots.sh -mrourmon/src/scripts/README -mrourmon/src/scripts/stoo.pl -mrourmon/src/scripts/sizecheck.pl -mrourmon/src/ircfr/ircfr.h -mrourmon/src/ircfr/Makefile.bsd -mrourmon/src/ircfr/copyright.h -mrourmon/src/ircfr/ircfr.c -mrourmon/src/ircfr/ircscan.h -mrourmon/src/ircfr/ipanalyze.c -mrourmon/src/ircfr/README -mrourmon/src/ircfr/Makefile.linux -mrourmon/src/ircfr/filter.h -mrourmon/src/ircfr/util.c -mrourmon/src/ircfr/filter.c -mrourmon/src/ircfr/machdep.c -mrourmon/src/ircfr/ircfr.sh -mrourmon/src/ircfr/ircscan.c -mrourmon/src/ircfr/interfaces.c -mrourmon/src/ircfr/config.h -mrourmon/src/README -mrourmon/etc/cbpfexamples.conf -mrourmon/etc/README -mrourmon/etc/ourmon.conf -mrourmon/etc/secmin.conf -mrourmon/etc/crontab.sample -mrourmon/scripts/checkmon.sh -mrourmon/scripts/monupdate.sh -mrourmon/scripts/README -mrourmon/scripts/runourmon.pl -mrourmon/README.bsd -mrourmon/INSTALL -mrourmon/ACKS -mrourmon/uninstall.txt -mrourmon/README -mrourmon/CHANGES -mrourmon/VERSION -mrourmon/README.linux -mrourmon/makeclean.sh -mrourmon/configure.pl +mrourmon/src/web.html/realhtml.txt +mrourmon/src/web.html/scans.radar.html +mrourmon/src/web.html/scans.radar.stop.html +mrourmon/src/web.html/size.html +mrourmon/src/web.html/tcp3.html +mrourmon/src/web.html/tcpsyn.html +mrourmon/src/web.html/topnstat.html +mrourmon/src/web.html/tworm.html +mrourmon/src/web.html/udperror.html +mrourmon/src/web.html/udpscan.html +mrourmon/src/web.html/udpweight.html mrourmon/ubuntudep.sh +mrourmon/uninstall.txt +mrourmon/web.pages +%%WWWDIR%%/INSTALL.txt +%%WWWDIR%%/README +%%WWWDIR%%/bard/bar1.png +%%WWWDIR%%/bard/bar10.png +%%WWWDIR%%/bard/bar100.png +%%WWWDIR%%/bard/bar11.png +%%WWWDIR%%/bard/bar12.png +%%WWWDIR%%/bard/bar13.png +%%WWWDIR%%/bard/bar14.png +%%WWWDIR%%/bard/bar15.png +%%WWWDIR%%/bard/bar16.png +%%WWWDIR%%/bard/bar17.png +%%WWWDIR%%/bard/bar18.png +%%WWWDIR%%/bard/bar19.png +%%WWWDIR%%/bard/bar2.png +%%WWWDIR%%/bard/bar20.png +%%WWWDIR%%/bard/bar21.png +%%WWWDIR%%/bard/bar22.png +%%WWWDIR%%/bard/bar23.png +%%WWWDIR%%/bard/bar24.png +%%WWWDIR%%/bard/bar25.png +%%WWWDIR%%/bard/bar26.png +%%WWWDIR%%/bard/bar27.png +%%WWWDIR%%/bard/bar28.png +%%WWWDIR%%/bard/bar29.png +%%WWWDIR%%/bard/bar3.png +%%WWWDIR%%/bard/bar30.png +%%WWWDIR%%/bard/bar31.png +%%WWWDIR%%/bard/bar32.png +%%WWWDIR%%/bard/bar33.png +%%WWWDIR%%/bard/bar34.png +%%WWWDIR%%/bard/bar35.png +%%WWWDIR%%/bard/bar36.png +%%WWWDIR%%/bard/bar37.png +%%WWWDIR%%/bard/bar38.png +%%WWWDIR%%/bard/bar39.png +%%WWWDIR%%/bard/bar4.png +%%WWWDIR%%/bard/bar40.png +%%WWWDIR%%/bard/bar41.png +%%WWWDIR%%/bard/bar42.png +%%WWWDIR%%/bard/bar43.png +%%WWWDIR%%/bard/bar44.png +%%WWWDIR%%/bard/bar45.png +%%WWWDIR%%/bard/bar46.png +%%WWWDIR%%/bard/bar47.png +%%WWWDIR%%/bard/bar48.png +%%WWWDIR%%/bard/bar49.png +%%WWWDIR%%/bard/bar5.png +%%WWWDIR%%/bard/bar50.png +%%WWWDIR%%/bard/bar51.png +%%WWWDIR%%/bard/bar52.png +%%WWWDIR%%/bard/bar53.png +%%WWWDIR%%/bard/bar54.png +%%WWWDIR%%/bard/bar55.png +%%WWWDIR%%/bard/bar56.png +%%WWWDIR%%/bard/bar57.png +%%WWWDIR%%/bard/bar58.png +%%WWWDIR%%/bard/bar59.png +%%WWWDIR%%/bard/bar6.png +%%WWWDIR%%/bard/bar60.png +%%WWWDIR%%/bard/bar61.png +%%WWWDIR%%/bard/bar62.png +%%WWWDIR%%/bard/bar63.png +%%WWWDIR%%/bard/bar64.png +%%WWWDIR%%/bard/bar65.png +%%WWWDIR%%/bard/bar66.png +%%WWWDIR%%/bard/bar67.png +%%WWWDIR%%/bard/bar68.png +%%WWWDIR%%/bard/bar69.png +%%WWWDIR%%/bard/bar7.png +%%WWWDIR%%/bard/bar70.png +%%WWWDIR%%/bard/bar71.png +%%WWWDIR%%/bard/bar72.png +%%WWWDIR%%/bard/bar73.png +%%WWWDIR%%/bard/bar74.png +%%WWWDIR%%/bard/bar75.png +%%WWWDIR%%/bard/bar76.png +%%WWWDIR%%/bard/bar77.png +%%WWWDIR%%/bard/bar78.png +%%WWWDIR%%/bard/bar79.png +%%WWWDIR%%/bard/bar8.png +%%WWWDIR%%/bard/bar80.png +%%WWWDIR%%/bard/bar81.png +%%WWWDIR%%/bard/bar82.png +%%WWWDIR%%/bard/bar83.png +%%WWWDIR%%/bard/bar84.png +%%WWWDIR%%/bard/bar85.png +%%WWWDIR%%/bard/bar86.png +%%WWWDIR%%/bard/bar87.png +%%WWWDIR%%/bard/bar88.png +%%WWWDIR%%/bard/bar89.png +%%WWWDIR%%/bard/bar9.png +%%WWWDIR%%/bard/bar90.png +%%WWWDIR%%/bard/bar91.png +%%WWWDIR%%/bard/bar92.png +%%WWWDIR%%/bard/bar93.png +%%WWWDIR%%/bard/bar94.png +%%WWWDIR%%/bard/bar95.png +%%WWWDIR%%/bard/bar96.png +%%WWWDIR%%/bard/bar97.png +%%WWWDIR%%/bard/bar98.png +%%WWWDIR%%/bard/bar99.png +%%WWWDIR%%/bpf-emailsyns.html +%%WWWDIR%%/bpf-errors.html +%%WWWDIR%%/bpf-p2p.html +%%WWWDIR%%/bpf-ports.html +%%WWWDIR%%/bpf-protopkts.html +%%WWWDIR%%/bpf-subnets1.html +%%WWWDIR%%/bpf-tcpcontrol.html +%%WWWDIR%%/bpf-unreach.html +%%WWWDIR%%/bpf-vpns.html +%%WWWDIR%%/cast.html +%%WWWDIR%%/dnsstats.html +%%WWWDIR%%/flow.html +%%WWWDIR%%/icmpcodes.txt +%%WWWDIR%%/icmperror.html +%%WWWDIR%%/index.html +%%WWWDIR%%/indexstatic.html +%%WWWDIR%%/info.html +%%WWWDIR%%/info.topipa.html +%%WWWDIR%%/ipportscan.html +%%WWWDIR%%/ipproto.html +%%WWWDIR%%/iprange1.html +%%WWWDIR%%/ipscan.html +%%WWWDIR%%/irc.html +%%WWWDIR%%/l2pni.radar.html +%%WWWDIR%%/l2pni.radar.stop.html +%%WWWDIR%%/l2proto.html +%%WWWDIR%%/neg.radar.html +%%WWWDIR%%/neg.radar.stop.html +%%WWWDIR%%/netww.html +%%WWWDIR%%/ourarch.png +@rmtry %%WWWDIR%%/ourmon +%%WWWDIR%%/pkts.html +%%WWWDIR%%/pss.radar.html +%%WWWDIR%%/pss.radar.stop.html +%%WWWDIR%%/pss2.radar.html +%%WWWDIR%%/pss2.radar.stop.html +%%WWWDIR%%/radar.html +%%WWWDIR%%/radar.stop.html +%%WWWDIR%%/radarlist.txt +%%WWWDIR%%/realhtml.txt +%%WWWDIR%%/scans.radar.html +%%WWWDIR%%/scans.radar.stop.html +%%WWWDIR%%/size.html +%%WWWDIR%%/tcp3.html +%%WWWDIR%%/tcpsyn.html +%%WWWDIR%%/topnstat.html +%%WWWDIR%%/tworm.html +%%WWWDIR%%/udperror.html +%%WWWDIR%%/udpscan.html +%%WWWDIR%%/udpweight.html +@dirrmtry %%WWWDIR%%/bard +@dirrmtry %%WWWDIR%% +@dirrmtry mrourmon/tmp +@dirrmtry mrourmon/src/web.html @dirrmtry mrourmon/src/web.code/bard @dirrmtry mrourmon/src/web.code -@dirrmtry mrourmon/src/web.html -@dirrmtry mrourmon/src/ourmon @dirrmtry mrourmon/src/scripts +@dirrmtry mrourmon/src/ourmon @dirrmtry mrourmon/src/ircfr @dirrmtry mrourmon/src -@dirrmtry mrourmon/bin -@dirrmtry mrourmon/etc @dirrmtry mrourmon/scripts -@dirrmtry mrourmon/tmp @dirrmtry mrourmon/rrddata +@dirrmtry mrourmon/logs/udpreport/Wed +@dirrmtry mrourmon/logs/udpreport/Tue +@dirrmtry mrourmon/logs/udpreport/Thu +@dirrmtry mrourmon/logs/udpreport/Sun +@dirrmtry mrourmon/logs/udpreport/So +@dirrmtry mrourmon/logs/udpreport/Sat +@dirrmtry mrourmon/logs/udpreport/Mon +@dirrmtry mrourmon/logs/udpreport/Fri +@dirrmtry mrourmon/logs/udpreport +@dirrmtry mrourmon/logs/tworm/Wed +@dirrmtry mrourmon/logs/tworm/Tue +@dirrmtry mrourmon/logs/tworm/Thu +@dirrmtry mrourmon/logs/tworm/Sun +@dirrmtry mrourmon/logs/tworm/So +@dirrmtry mrourmon/logs/tworm/Sat +@dirrmtry mrourmon/logs/tworm/Mon +@dirrmtry mrourmon/logs/tworm/Fri +@dirrmtry mrourmon/logs/tworm +@dirrmtry mrourmon/logs/rawsyndump/Wed +@dirrmtry mrourmon/logs/rawsyndump/Tue +@dirrmtry mrourmon/logs/rawsyndump/Thu +@dirrmtry mrourmon/logs/rawsyndump/Sun +@dirrmtry mrourmon/logs/rawsyndump/So +@dirrmtry mrourmon/logs/rawsyndump/Sat +@dirrmtry mrourmon/logs/rawsyndump/Mon +@dirrmtry mrourmon/logs/rawsyndump/Fri +@dirrmtry mrourmon/logs/rawsyndump +@dirrmtry mrourmon/logs/rawpotdump/Wed +@dirrmtry mrourmon/logs/rawpotdump/Tue +@dirrmtry mrourmon/logs/rawpotdump/Thu +@dirrmtry mrourmon/logs/rawpotdump/Sun +@dirrmtry mrourmon/logs/rawpotdump/So +@dirrmtry mrourmon/logs/rawpotdump/Sat +@dirrmtry mrourmon/logs/rawpotdump/Mon +@dirrmtry mrourmon/logs/rawpotdump/Fri +@dirrmtry mrourmon/logs/rawpotdump +@dirrmtry mrourmon/logs/rawp2p/Wed +@dirrmtry mrourmon/logs/rawp2p/Tue +@dirrmtry mrourmon/logs/rawp2p/Thu +@dirrmtry mrourmon/logs/rawp2p/Sun +@dirrmtry mrourmon/logs/rawp2p/So +@dirrmtry mrourmon/logs/rawp2p/Sat +@dirrmtry mrourmon/logs/rawp2p/Mon +@dirrmtry mrourmon/logs/rawp2p/Fri +@dirrmtry mrourmon/logs/rawp2p +@dirrmtry mrourmon/logs/rawirc/Wed +@dirrmtry mrourmon/logs/rawirc/Tue +@dirrmtry mrourmon/logs/rawirc/Thu +@dirrmtry mrourmon/logs/rawirc/Sun +@dirrmtry mrourmon/logs/rawirc/So +@dirrmtry mrourmon/logs/rawirc/Sat +@dirrmtry mrourmon/logs/rawirc/Mon +@dirrmtry mrourmon/logs/rawirc/Fri +@dirrmtry mrourmon/logs/rawirc +@dirrmtry mrourmon/logs/rawemail/Wed +@dirrmtry mrourmon/logs/rawemail/Tue +@dirrmtry mrourmon/logs/rawemail/Thu +@dirrmtry mrourmon/logs/rawemail/Sun +@dirrmtry mrourmon/logs/rawemail/So +@dirrmtry mrourmon/logs/rawemail/Sat +@dirrmtry mrourmon/logs/rawemail/Mon +@dirrmtry mrourmon/logs/rawemail/Fri +@dirrmtry mrourmon/logs/rawemail +@dirrmtry mrourmon/logs/portreport/Wed +@dirrmtry mrourmon/logs/portreport/Tue +@dirrmtry mrourmon/logs/portreport/Thu +@dirrmtry mrourmon/logs/portreport/Sun +@dirrmtry mrourmon/logs/portreport/So +@dirrmtry mrourmon/logs/portreport/Sat +@dirrmtry mrourmon/logs/portreport/Mon +@dirrmtry mrourmon/logs/portreport/Fri +@dirrmtry mrourmon/logs/portreport +@dirrmtry mrourmon/logs/p2preport/Wed +@dirrmtry mrourmon/logs/p2preport/Tue +@dirrmtry mrourmon/logs/p2preport/Thu +@dirrmtry mrourmon/logs/p2preport/Sun +@dirrmtry mrourmon/logs/p2preport/So +@dirrmtry mrourmon/logs/p2preport/Sat +@dirrmtry mrourmon/logs/p2preport/Mon +@dirrmtry mrourmon/logs/p2preport/Fri +@dirrmtry mrourmon/logs/p2preport +@dirrmtry mrourmon/logs/mon.lite/Wed +@dirrmtry mrourmon/logs/mon.lite/Tue +@dirrmtry mrourmon/logs/mon.lite/Thu +@dirrmtry mrourmon/logs/mon.lite/Sun +@dirrmtry mrourmon/logs/mon.lite/So +@dirrmtry mrourmon/logs/mon.lite/Sat +@dirrmtry mrourmon/logs/mon.lite/Mon +@dirrmtry mrourmon/logs/mon.lite/Fri +@dirrmtry mrourmon/logs/mon.lite +@dirrmtry mrourmon/logs/irc/Wed +@dirrmtry mrourmon/logs/irc/Tue +@dirrmtry mrourmon/logs/irc/Thu +@dirrmtry mrourmon/logs/irc/Sun +@dirrmtry mrourmon/logs/irc/So +@dirrmtry mrourmon/logs/irc/Sat +@dirrmtry mrourmon/logs/irc/Mon +@dirrmtry mrourmon/logs/irc/Fri +@dirrmtry mrourmon/logs/irc +@dirrmtry mrourmon/logs/Wed +@dirrmtry mrourmon/logs/Tue +@dirrmtry mrourmon/logs/Thu +@dirrmtry mrourmon/logs/Sun +@dirrmtry mrourmon/logs/So +@dirrmtry mrourmon/logs/Sat +@dirrmtry mrourmon/logs/Mon +@dirrmtry mrourmon/logs/Fri @dirrmtry mrourmon/logs +@dirrmtry mrourmon/etc +@dirrmtry mrourmon/bin @dirrmtry mrourmon Index: ourmon/files/patch-configure.pl =================================================================== RCS file: ourmon/files/patch-configure.pl diff -N ourmon/files/patch-configure.pl --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ourmon/files/patch-configure.pl 10 Jul 2011 22:05:37 -0000 @@ -0,0 +1,88 @@ +--- ./configure.pl.orig 2008-03-15 18:55:10.000000000 +0100 ++++ ./configure.pl 2011-07-10 23:43:06.000000000 +0200 +@@ -110,9 +110,9 @@ + $netmask = "127.0.0.1/32"; + + # default absolute web paths, may be wrong +-$webpath = "/usr/local/apache/htdocs/ourmon"; ++$webpath = "%%WWWDIR%%"; + if ($systype eq "FreeBSD") { +- $webpath = "/usr/local/www/data/ourmon"; ++ $webpath = "%%WWWDIR%%"; + # guess the bsd interface whilst we are at it + $interface = guess_bsd_if(); + $fbsd6 = 0; +@@ -324,10 +324,11 @@ + # make sure everything in bin is executable + system("chmod +x bin/*"); + ++# XXX skip if installed from port + #3 create startup script for ourmon + $YES_CORRECT="y"; +- print "\nDo you want to install the ourmon startup script in the ourmon bin? [y] "; +- $line = ; ++# print "\nDo you want to install the ourmon startup script in the ourmon bin? [y] "; ++ $line = "n"; + unless ($line =~ /^\n/) { + chomp($YES_CORRECT = $line); + } +@@ -441,21 +442,21 @@ + + # WEBDIR + print "We need a local web directory for generated web output.\n"; +- print "hint: the webpath given here is a guess: give the CORRECT base web directory with /ourmon at the end\n"; +- print "enter absolute web server web path directory: [$webpath] "; +- $line = ; +- unless ($line =~ /^\n/) { +- chomp($webpath = $line); +- } ++# print "hint: the webpath given here is a guess: give the CORRECT base web directory with /ourmon at the end\n"; ++# print "enter absolute web server web path directory: [$webpath] "; ++# $line = ; ++# unless ($line =~ /^\n/) { ++# chomp($webpath = $line); ++# } + print "your output web path is: $webpath\n"; + +- print "\nDo you want to create the web directory for ourmon?"; +- print "\nHINT: good idea if it doesn't exist. [y] "; ++# print "\nDo you want to create the web directory for ourmon?"; ++# print "\nHINT: good idea if it doesn't exist. [y] "; + $YES_CORRECT = "y"; +- $line = ; +- unless ($line =~ /^\n/) { +- chomp($YES_CORRECT = $line); +- } ++# $line = ; ++# unless ($line =~ /^\n/) { ++# chomp($YES_CORRECT = $line); ++# } + if (lc($YES_CORRECT) eq "y") { + system("mkdir $webpath"); + } +@@ -781,18 +782,19 @@ + my $dstring = $binpath . "daily.pl " . $logpath; + open(HANDLE, ">$file") || die "Cannot open $file"; + +- print HANDLE "############## ourmon crontab entries ###############\n"; ++ print HANDLE "# == ourmon port cron start (do not remove this anchor line) ==\n"; + $batchip_file = $binpath . $batchip_file; + $batchipall_file = $binpath . $batchipall_file; +- my $basic = "*/1 * * * * root $omupdatepath\n"; ++ my $basic = "*/1 * * * * root env -u LC_TIME LC_TIME=en_US $omupdatepath\n"; + print HANDLE "# run ourmon back-end omupdate.pl etc. per minute\n"; +- print HANDLE "$basic"; ++ print HANDLE "#$basic"; + print HANDLE "# batchip.sh - hourly log summary\n"; +- print HANDLE "0 * * * * root $batchip_file\n"; ++ print HANDLE "#0 * * * * root env -u LC_TIME LC_TIME=en_US $batchip_file\n"; + print HANDLE "# batchipall.sh - roll over daily summary logs at almost midnight\n"; +- print HANDLE "50 23 * * * root $batchipall_file\n"; ++ print HANDLE "#50 23 * * * root env -u LC_TIME LC_TIME=en_US $batchipall_file\n"; + print HANDLE "# daily.pl - re init next day logs at midnight\n"; +- print HANDLE "0 0 * * * root $dstring\n"; ++ print HANDLE "#0 0 * * * root env -u LC_TIME LC_TIME=en_US $dstring\n"; ++ print HANDLE "# == ourmon port cron end (do not remove this anchor line) ==\n"; + close HANDLE; + # concat to /etc/crontab if desired + if ($install eq "y") { --- ourmon.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: