Date: Fri, 04 Jun 2004 06:57:36 +0300 From: Andrey Slusar <vasallia@ukr.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/67557: [MAINTAINER] comms/bforce-kst: fix some non critical errors, add docs and contrib utils Message-ID: <E1BW5pn-0005GH-WD@santinel.home.ua> Resent-Message-ID: <200406040400.i5440eus093442@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 67557 >Category: ports >Synopsis: [MAINTAINER] comms/bforce-kst: fix some non critical errors, add docs and contrib utils >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Jun 03 21:00:40 PDT 2004 >Closed-Date: >Last-Modified: >Originator: Andrey Slusar >Release: FreeBSD 5.2-CURRENT i386 >Organization: Santinel >Environment: System: FreeBSD santinel.home.ua 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Tue Jun 1 12:02:59 EEST 2004 root@santinel.home.ua:/usr/obj/usr/src/sys/ANRAY i386 >Description: Add patches: files/patch-daemon.c: fixed bug with sending HUP to daemon files/patch-prot_emsi.c: fixed emsi traffic information Added log file analyser, history analyser, python srif freq-processor and other utils Add docs. Fix showing pkg-message. >How-To-Repeat: N/A >Fix: --- bforce-kst.diff begins here --- diff -ruN bforce-kst/Makefile bforce-kst.new/Makefile --- bforce-kst/Makefile Sun May 30 18:27:47 2004 +++ bforce-kst.new/Makefile Fri Jun 4 06:38:55 2004 @ -23,6 +23,13 @@ CONFIGDIR= etc/fido/bforce +CONTRIBS= bfha/README bfha/bfha.pl bflan callout.sh outman timesync.tcl \ + u-srif/conf/report.footer u-srif/conf/report.header u-srif/conf/u-srif.aliases \ + u-srif/conf/u-srif.conf u-srif/conf/u-srif.dirs u-srif/lib/uconfig.py \ + u-srif/lib/udbase.py u-srif/lib/ufido.py u-srif/lib/unodestat.py \ + u-srif/lib/utmpl.py u-srif/lib/uutil.py u-srif/u-srif-index.py \ + u-srif/u-srif-lookup.py u-srif/u-srif.py + FIXME= include/bforce.h include/util.h include/logger.h \ bforce/bforce.c bforce/conf_proc.c bforce/conf_read.c bforce/daemon.c \ bforce/daemon_branch.c bforce/daemon_call.c bforce/daemon_lines.c \ @@ -56,9 +63,21 @@ ${INSTALL_DATA} ${WRKSRC}/../examples/bforce.subst ${PREFIX}/${CONFIGDIR}/bforce.subst.sample ${INSTALL_DATA} ${WRKSRC}/../examples/freq.aliases ${PREFIX}/${CONFIGDIR}/freq.aliases.sample ${INSTALL_DATA} ${WRKSRC}/../examples/freq.dirs ${PREFIX}/${CONFIGDIR}/freq.dirs.sample + + ${MKDIR} ${DATADIR} ${DATADIR}/bfha ${DATADIR}/u-srif/conf ${DATADIR}/u-srif/lib +.for i in ${CONTRIBS} + ${INSTALL_DATA} ${WRKSRC}/../contrib/${i} ${DATADIR}/${i} +.endfor +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} +.for i in CHANGES CHANGES.kst COPYING README README.kst + ${INSTALL_DATA} ${WRKSRC}/../${i} ${DOCSDIR} +.endfor +.endif ${INSTALL_PROGRAM} ${WRKSRC}/bin/bforce ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/bin/bfindex ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/bin/bfstat ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/bin/nlookup ${PREFIX}/bin + @${SED} -e 's|%%PREFIX%%|${PREFIX}|' -e 's|%%CONFIGDIR%%|${CONFIGDIR}|' ${PKGMESSAGE} .include <bsd.port.mk> diff -ruN bforce-kst/files/patch-daemon.c bforce-kst.new/files/patch-daemon.c --- bforce-kst/files/patch-daemon.c Thu Jan 1 03:00:00 1970 +++ bforce-kst.new/files/patch-daemon.c Fri Jun 4 05:05:28 2004 @@ -0,0 +1,17 @@ +--- bforce/daemon.c.old Tue Jun 1 16:14:31 2004 ++++ bforce/daemon.c Tue Jun 1 16:20:15 2004 +@@ -772,10 +772,13 @@ + fclose(pf); + + if (hispid != 0) { ++ if (hispid == mypid) ++ return 0; + if (kill(hispid, 0) == 0) { + log("daemon_pidfile: another daemon exist. pid=%d", hispid); + return (-1); +- } else if(errno != ESRCH) { ++ } ++ if (errno != ESRCH) { + log("daemon_pidfile: error sending signal. pid=%d, errno=%d", hispid, errno); + return (-1); + } diff -ruN bforce-kst/files/patch-prot_emsi.c bforce-kst.new/files/patch-prot_emsi.c --- bforce-kst/files/patch-prot_emsi.c Thu Jan 1 03:00:00 1970 +++ bforce-kst.new/files/patch-prot_emsi.c Fri Jun 4 05:05:28 2004 @@ -0,0 +1,20 @@ +diff -ruN bforce-0.22.8.kst7/source/bforce/prot_emsi.c bforce-0.22.8.kst8/source/bforce/prot_emsi.c +--- bforce/prot_emsi.c Thu Nov 21 23:22:56 2002 ++++ bforce/prot_emsi.c Sat Nov 30 01:41:15 2002 +@@ -829,10 +829,14 @@ + /* ----------------------------------------------------------------- */ + if( state.caller == 0 && hrc != HRC_BAD_PASSWD ) + { +- emsi->have_traf = emsi->have_moh = 1; ++ emsi->have_traf = 1; + emsi->netmail_size = state.traff_send.netmail_size; + emsi->arcmail_size = state.traff_send.arcmail_size; +- emsi->files_size = state.traff_send.files_size; ++ if ( state.traff_send.files_size ) ++ { ++ emsi->have_moh = 1; ++ emsi->files_size = state.traff_send.files_size; ++ } + } + } + diff -ruN bforce-kst/pkg-message bforce-kst.new/pkg-message --- bforce-kst/pkg-message Fri Jan 17 13:16:53 2003 +++ bforce-kst.new/pkg-message Fri Jun 4 06:30:04 2004 @@ -1,3 +1,8 @@ +************************************************************** + Please don't forget to copy and edit configuration files found -in ${PREFIX}/etc/bforce.END-of-bforce-kst/pkg-message -exit +in %%PREFIX%%/%%CONFIGDIR%%. + +If you using u-srif, please install lang/python + +************************************************************** diff -ruN bforce-kst/pkg-plist bforce-kst.new/pkg-plist --- bforce-kst/pkg-plist Sun May 30 18:27:47 2004 +++ bforce-kst.new/pkg-plist Fri Jun 4 06:28:42 2004 @@ -7,4 +7,34 @@ %%CONFIGDIR%%/bforce.subst.sample %%CONFIGDIR%%/freq.aliases.sample %%CONFIGDIR%%/freq.dirs.sample +%%DATADIR%%/bfha/README +%%DATADIR%%/bfha/bfha.pl +%%DATADIR%%/bflan +%%DATADIR%%/callout.sh +%%DATADIR%%/outman +%%DATADIR%%/timesync.tcl +%%DATADIR%%/u-srif/conf/report.footer +%%DATADIR%%/u-srif/conf/report.header +%%DATADIR%%/u-srif/conf/u-srif.aliases +%%DATADIR%%/u-srif/conf/u-srif.conf +%%DATADIR%%/u-srif/conf/u-srif.dirs +%%DATADIR%%/u-srif/lib/uconfig.py +%%DATADIR%%/u-srif/lib/udbase.py +%%DATADIR%%/u-srif/lib/ufido.py +%%DATADIR%%/u-srif/lib/unodestat.py +%%DATADIR%%/u-srif/lib/utmpl.py +%%DATADIR%%/u-srif/lib/uutil.py +%%DATADIR%%/u-srif/u-srif-index.py +%%DATADIR%%/u-srif/u-srif-lookup.py +%%DATADIR%%/u-srif/u-srif.py +%%PORTDOCS%%%%DOCSDIR%%/CHANGES +%%PORTDOCS%%%%DOCSDIR%%/CHANGES.kst +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.kst +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%CONFIGDIR%% +@dirrm %%DATADIR%%/u-srif/lib +@dirrm %%DATADIR%%/u-srif/conf +@dirrm %%DATADIR%%/u-srif +@dirrm %%DATADIR%%/bfha --- bforce-kst.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1BW5pn-0005GH-WD>