Attachment #43374 for bug #67367

View | Details | Raw Unified | Return to bug 67367
Collapse All | Expand All




#

PORTNAME=	bforce
PORTVERSION=	0.22.8.7
PORTREVISION=	1
CATEGORIES=	comms
MASTER_SITES=	http://kst.spb.ru/bforce/
PKGNAMESUFFIX=	-kst
DISTNAME=	${PORTNAME}-0.22.8.kst7

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Simple ifcico like Fidonet technology mailer

USE_BZIP2=	yes
USE_GMAKE=	yes
USE_REINPLACE=  yes
GNU_CONFIGURE=	yes

CONFIGDIR=	/etc/fido/bforce

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 \
		bforce/expression.y bforce/freq_proc.c bforce/freq_wazoo.c bforce/io_modem.c \
		bforce/io_tcpip.c bforce/io_unix_lock.c bforce/io_unix_modem.c \
		bforce/io_unix_tio.c bforce/io_unix_tty.c bforce/logger.c bforce/nodelist.c \
		bforce/os_unix.c bforce/outb_sysqueue.c bforce/prot_common.c bforce/prot_binkp.c \
		bforce/prot_binkp_misc.c bforce/prot_hydra.c bforce/prot_zmmisc.c \
		bforce/prot_zmrecv.c bforce/prot_zmsend.c bforce/prot_yoohoo.c \
		bforce/prot_yoohoo_api.c bforce/prot_emsi.c bforce/prot_emsi_misc.c \
		bforce/prot_emsi_api.c bforce/sess_call.c bforce/sess_answ.c bforce/sess_init.c \
		bforce/sess_main.c bforce/u_misc.c bforce/u_time.c bforce/u_recode.c \
		bforce/u_plock.c bfutil/bfindex.c

WRKSRC=		${WRKDIR}/${DISTNAME}/source

pre-configure:
	${MKDIR} ${WRKSRC}/bin

post-patch:
	${REINPLACE_CMD} -e 's,/etc/bforce,${CONFIGDIR},g' ${WRKSRC}/Makefile.in
.for i in ${FIXME}
	${REINPLACE_CMD} -e 's,log(,bf_log(,g' ${WRKSRC}/${i}
.endfor

do-install:
	${MKDIR} ${PREFIX}/etc/bforce

Lines 1-2 Link Here

(-)bforce-kst.new/distinfo (-2 / +2 lines)
1	MD5 (bforce-0.22.7.kst5.tar.bz2) = 6a5b9b0be70d23e9720787e4aa6c8f4e	1	MD5 (bforce-0.22.8.kst7.tar.bz2) = 2c6f0f8581fec231c6a7d3a3dcfe06a2
2	SIZE (bforce-0.22.7.kst5.tar.bz2) = 217436	2	SIZE (bforce-0.22.8.kst7.tar.bz2) = 217675




--- bforce/bforce.c	Thu Nov 21 23:22:55 2002
+++ bforce/bforce.c	Sat Apr  3 21:47:04 2004
@@ -414,12 +419,12 @@
 		}
 	}
 	
-	if( (rc = log_open(log_getfilename(LOG_FILE_SESSION), NULL, NULL)) )
+/*	if( (rc = log_open(log_getfilename(LOG_FILE_SESSION), NULL, NULL)) )
 	{
 		log("can't continue without logging");
 		gotoexit(BFERR_FATALERROR);
 	}
-	
+*/	
 	/* Process primary config file */
 	if( opts.confname && *opts.confname )
 		rc = conf_readconf(opts.confname, 0);
@@ -433,7 +438,7 @@
 		(void)conf_readconf(opts.incname, 1);
 	
 	/* Reopen log file if it was defined in config */
-	if( log_reopen(log_getfilename(LOG_FILE_SESSION), NULL, NULL) )
+	if( log_open(log_getfilename(LOG_FILE_SESSION), NULL, NULL) )
 	{
 		log("can't continue without logging");
 		gotoexit(BFERR_FATALERROR);




--- include/config.h.in	Thu Aug 30 16:33:52 2001
+++ include/config.h.in	Wed Sep 10 15:36:53 2003
@@ -84,7 +84,7 @@
 #undef HAVE_STATFS
 
 /* Define if you have the statvfs function.  */
-#undef HAVE_STATVFS
+// #undef HAVE_STATVFS
 
 /* Define if you have the strcasecmp function.  */
 #undef HAVE_STRCASECMP
@@ -123,10 +123,10 @@
 #undef HAVE_SYS_SELECT_H
 
 /* Define if you have the <sys/statfs.h> header file.  */
-#undef HAVE_SYS_STATFS_H
+// #undef HAVE_SYS_STATFS_H
 
 /* Define if you have the <sys/statvfs.h> header file.  */
-#undef HAVE_SYS_STATVFS_H
+// #undef HAVE_SYS_STATVFS_H
 
 /* Define if you have the <sys/termiox.h> header file.  */
 #undef HAVE_SYS_TERMIOX_H
@@ -135,7 +135,7 @@
 #undef HAVE_SYS_TIME_H
 
 /* Define if you have the <sys/vfs.h> header file.  */
-#undef HAVE_SYS_VFS_H
+// #undef HAVE_SYS_VFS_H
 
 /* Define if you have the <termios.h> header file.  */
 #undef HAVE_TERMIOS_H




--- bforce/expression.y.old	Thu Aug 30 16:33:48 2001
+++ bforce/expression.y	Thu Feb  6 23:38:32 2003
@@ -52,6 +52,7 @@
 #include "logger.h"
 #include "session.h"
 #include "nodelist.h"
+#include "io.h"
 
 static struct tm *now    = NULL;
 static int   expr_result = 0;
@@ -205,6 +206,7 @@
 	{
 		$$ = expr_check_logic($1, OR, $3);
 	}
+	;
 %%
 
 #include "expression_lex.c"
@@ -329,6 +331,10 @@
 	else if( state.modemport && state.modemport->name )
 	{
 		return strstr(state.modemport->name, str) ? 1 : 0;
+	}
+	else if( isatty(0) )
+	{
+		return strstr(ttyname(0), str) ? 1 : 0;
 	}
 	
 	return -1;




--- bforce/sess_call.c.orig	Thu Nov 21 23:22:56 2002
+++ bforce/sess_call.c	Sat May 29 22:37:30 2004
@@ -609,10 +609,20 @@
 		
 		if( !opts->hiddline )
 		{
-			if( timevec_isdefined(&state.override.worktime) )
-				goodtime = timevec_isnow(&state.override.worktime, now);
+			if( state.override.sFlags && !nodelist_checkflag(state.override.sFlags, "CM") )
+				goodtime = TRUE;
 			else
-				goodtime = timevec_isnow(&state.node.worktime, now);
+			{
+				if( timevec_isdefined(&state.override.worktime) )
+					goodtime = timevec_isnow(&state.override.worktime, now);
+				else
+				{
+					if( !nodelist_checkflag(state.node.flags, "CM") )
+						goodtime = TRUE;
+					else
+						goodtime = timevec_isnow(&state.node.worktime, now);
+				}
+			}
 		}
 		else
 			goodtime = timevec_isnow(&state.override.worktime, now);

Return to bug 67367

Lines 6-26 Link Here

(-)bforce-kst.new/Makefile (-3 / +28 lines)
6	#	6	#
7		7
8	PORTNAME= bforce	8	PORTNAME= bforce
9	PORTVERSION= 0.22.7.5	9	PORTVERSION= 0.22.8.7
10	PORTREVISION= 1
11	CATEGORIES= comms	10	CATEGORIES= comms
12	MASTER_SITES= http://kst.spb.ru/bforce/	11	MASTER_SITES= http://kst.spb.ru/bforce/
13	PKGNAMESUFFIX= -kst	12	PKGNAMESUFFIX= -kst
14	DISTNAME= bforce-0.22.7.kst5	13	DISTNAME= ${PORTNAME}-0.22.8.kst7
15		14
16	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
17	COMMENT= Simple ifcico like Fidonet technology mailer	16	COMMENT= Simple ifcico like Fidonet technology mailer
18		17
19	USE_BZIP2= yes	18	USE_BZIP2= yes
20	USE_GMAKE= yes	19	USE_GMAKE= yes
		20	USE_REINPLACE= yes
21	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
22		22
		23	CONFIGDIR= /etc/fido/bforce
		24
		25	FIXME= include/bforce.h include/util.h include/logger.h \
		26	bforce/bforce.c bforce/conf_proc.c bforce/conf_read.c bforce/daemon.c \
		27	bforce/daemon_branch.c bforce/daemon_call.c bforce/daemon_lines.c \
		28	bforce/expression.y bforce/freq_proc.c bforce/freq_wazoo.c bforce/io_modem.c \
		29	bforce/io_tcpip.c bforce/io_unix_lock.c bforce/io_unix_modem.c \
		30	bforce/io_unix_tio.c bforce/io_unix_tty.c bforce/logger.c bforce/nodelist.c \
		31	bforce/os_unix.c bforce/outb_sysqueue.c bforce/prot_common.c bforce/prot_binkp.c \
		32	bforce/prot_binkp_misc.c bforce/prot_hydra.c bforce/prot_zmmisc.c \
		33	bforce/prot_zmrecv.c bforce/prot_zmsend.c bforce/prot_yoohoo.c \
		34	bforce/prot_yoohoo_api.c bforce/prot_emsi.c bforce/prot_emsi_misc.c \
		35	bforce/prot_emsi_api.c bforce/sess_call.c bforce/sess_answ.c bforce/sess_init.c \
		36	bforce/sess_main.c bforce/u_misc.c bforce/u_time.c bforce/u_recode.c \
		37	bforce/u_plock.c bfutil/bfindex.c
		38
23	WRKSRC= ${WRKDIR}/${DISTNAME}/source	39	WRKSRC= ${WRKDIR}/${DISTNAME}/source
		40
		41	pre-configure:
		42	${MKDIR} ${WRKSRC}/bin
		43
		44	post-patch:
		45	${REINPLACE_CMD} -e 's,/etc/bforce,${CONFIGDIR},g' ${WRKSRC}/Makefile.in
		46	.for i in ${FIXME}
		47	${REINPLACE_CMD} -e 's,log(,bf_log(,g' ${WRKSRC}/${i}
		48	.endfor
24		49
25	do-install:	50	do-install:
26	${MKDIR} ${PREFIX}/etc/bforce	51	${MKDIR} ${PREFIX}/etc/bforce

Line 0 Link Here

(-)bforce-kst.new/files/patch-bforce.c (+26 lines)
	1	--- bforce/bforce.c Thu Nov 21 23:22:55 2002
	2	+++ bforce/bforce.c Sat Apr 3 21:47:04 2004
	3	@@ -414,12 +419,12 @@
	4	}
	5	}
	6
	7	- if( (rc = log_open(log_getfilename(LOG_FILE_SESSION), NULL, NULL)) )
	8	+/* if( (rc = log_open(log_getfilename(LOG_FILE_SESSION), NULL, NULL)) )
	9	{
	10	log("can't continue without logging");
	11	gotoexit(BFERR_FATALERROR);
	12	}
	13	-
	14	+*/
	15	/* Process primary config file */
	16	if( opts.confname && *opts.confname )
	17	rc = conf_readconf(opts.confname, 0);
	18	@@ -433,7 +438,7 @@
	19	(void)conf_readconf(opts.incname, 1);
	20
	21	/* Reopen log file if it was defined in config */
	22	- if( log_reopen(log_getfilename(LOG_FILE_SESSION), NULL, NULL) )
	23	+ if( log_open(log_getfilename(LOG_FILE_SESSION), NULL, NULL) )
	24	{
	25	log("can't continue without logging");
	26	gotoexit(BFERR_FATALERROR);

Line 0 Link Here

(-)bforce-kst.new/files/patch-config.h.in (+33 lines)
	1	--- include/config.h.in Thu Aug 30 16:33:52 2001
	2	+++ include/config.h.in Wed Sep 10 15:36:53 2003
	3	@@ -84,7 +84,7 @@
	4	#undef HAVE_STATFS
	5
	6	/* Define if you have the statvfs function. */
	7	-#undef HAVE_STATVFS
	8	+// #undef HAVE_STATVFS
	9
	10	/* Define if you have the strcasecmp function. */
	11	#undef HAVE_STRCASECMP
	12	@@ -123,10 +123,10 @@
	13	#undef HAVE_SYS_SELECT_H
	14
	15	/* Define if you have the <sys/statfs.h> header file. */
	16	-#undef HAVE_SYS_STATFS_H
	17	+// #undef HAVE_SYS_STATFS_H
	18
	19	/* Define if you have the <sys/statvfs.h> header file. */
	20	-#undef HAVE_SYS_STATVFS_H
	21	+// #undef HAVE_SYS_STATVFS_H
	22
	23	/* Define if you have the <sys/termiox.h> header file. */
	24	#undef HAVE_SYS_TERMIOX_H
	25	@@ -135,7 +135,7 @@
	26	#undef HAVE_SYS_TIME_H
	27
	28	/* Define if you have the <sys/vfs.h> header file. */
	29	-#undef HAVE_SYS_VFS_H
	30	+// #undef HAVE_SYS_VFS_H
	31
	32	/* Define if you have the <termios.h> header file. */
	33	#undef HAVE_TERMIOS_H

Line 0 Link Here

(-)bforce-kst.new/files/patch-expression.y (+29 lines)
	1	--- bforce/expression.y.old Thu Aug 30 16:33:48 2001
	2	+++ bforce/expression.y Thu Feb 6 23:38:32 2003
	3	@@ -52,6 +52,7 @@
	4	#include "logger.h"
	5	#include "session.h"
	6	#include "nodelist.h"
	7	+#include "io.h"
	8
	9	static struct tm *now = NULL;
	10	static int expr_result = 0;
	11	@@ -205,6 +206,7 @@
	12	{
	13	$$ = expr_check_logic($1, OR, $3);
	14	}
	15	+ ;
	16	%%
	17
	18	#include "expression_lex.c"
	19	@@ -329,6 +331,10 @@
	20	else if( state.modemport && state.modemport->name )
	21	{
	22	return strstr(state.modemport->name, str) ? 1 : 0;
	23	+ }
	24	+ else if( isatty(0) )
	25	+ {
	26	+ return strstr(ttyname(0), str) ? 1 : 0;
	27	}
	28
	29	return -1;

Line 0 Link Here

(-)bforce-kst.new/files/patch-sess_call.c (+26 lines)
	1	--- bforce/sess_call.c.orig Thu Nov 21 23:22:56 2002
	2	+++ bforce/sess_call.c Sat May 29 22:37:30 2004
	3	@@ -609,10 +609,20 @@
	4
	5	if( !opts->hiddline )
	6	{
	7	- if( timevec_isdefined(&state.override.worktime) )
	8	- goodtime = timevec_isnow(&state.override.worktime, now);
	9	+ if( state.override.sFlags && !nodelist_checkflag(state.override.sFlags, "CM") )
	10	+ goodtime = TRUE;
	11	else
	12	- goodtime = timevec_isnow(&state.node.worktime, now);
	13	+ {
	14	+ if( timevec_isdefined(&state.override.worktime) )
	15	+ goodtime = timevec_isnow(&state.override.worktime, now);
	16	+ else
	17	+ {
	18	+ if( !nodelist_checkflag(state.node.flags, "CM") )
	19	+ goodtime = TRUE;
	20	+ else
	21	+ goodtime = timevec_isnow(&state.node.worktime, now);
	22	+ }
	23	+ }
	24	}
	25	else
	26	goodtime = timevec_isnow(&state.override.worktime, now);