From owner-freebsd-ports Thu Jan 9 01:00:04 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.4/8.8.4) id BAA16631 for ports-outgoing; Thu, 9 Jan 1997 01:00:04 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.8.4/8.8.4) id BAA16602; Thu, 9 Jan 1997 01:00:02 -0800 (PST) Resent-Date: Thu, 9 Jan 1997 01:00:02 -0800 (PST) Resent-Message-Id: <199701090900.BAA16602@freefall.freebsd.org> Resent-From: gnats (GNATS Management) Resent-To: freebsd-ports Resent-Reply-To: FreeBSD-gnats@freefall.FreeBSD.org, dk@farm.org Received: from minor.stranger.com (stranger.vip.best.com [204.156.129.250]) by freefall.freebsd.org (8.8.4/8.8.4) with SMTP id AAA16238 for ; Thu, 9 Jan 1997 00:53:42 -0800 (PST) Received: from dog.farm.org (dog.farm.org [207.111.140.47]) by minor.stranger.com (8.6.12/8.6.12) with ESMTP id AAA22483 for ; Thu, 9 Jan 1997 00:55:10 -0800 Received: (from dk@localhost) by dog.farm.org (8.7.5/dk#3) id AAA28158; Thu, 9 Jan 1997 00:54:04 -0800 (PST) Message-Id: <199701090854.AAA28158@dog.farm.org> Date: Thu, 9 Jan 1997 00:54:04 -0800 (PST) From: dk@farm.org Reply-To: dk@farm.org To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/2428: news/nntpbtr port update: more patches Sender: owner-ports@freebsd.org X-Loop: FreeBSD.org Precedence: bulk >Number: 2428 >Category: ports >Synopsis: more patches for nntpbtr port >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jan 9 01:00:01 PST 1997 >Last-Modified: >Originator: Dmitry Kohmanyuk >Organization: >Release: FreeBSD 2.2-960501-SNAP i386 >Environment: >Description: I am adding more patches for nntpbtr port. Each patch contains author and short description of the problem it fixes. All patches are tested by me in production on 2 news servers. Most are also confirmed with program author, Leonid Yegoshin. >How-To-Repeat: >Fix: note: these patches are all new and should not create any conflicts when imported. # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # patch-ad # patch-ae # patch-af # patch-ag # echo x - patch-ad sed 's/^X//' >patch-ad << 'END-of-patch-ad' XDate: Wed, 8 Jan 1997 09:20:35 -0800 (PST) XFrom: Dmitry Kohmanyuk XSubject: nntpbtr patch - looping in NEWNEWS X X--- old/nntpbtr.c Tue Jan 7 14:07:23 1997 X+++ ./nntpbtr.c Tue Jan 7 14:09:16 1997 X@@ -928,6 +928,8 @@ X log_warn("send NEWNEWS error"); X rep2: X fflush(fd); rewind(fd); ftruncate(fileno(fd),(off_t)0); X+ title("SLEEPING - NEWNEWS failed"); X+ sleep(60); X hfd = reconnect(host); X goto repeat; X } X END-of-patch-ad echo x - patch-ae sed 's/^X//' >patch-ae << 'END-of-patch-ae' Xpatch from serge@freenet.kiev.ua - locking when sleep + decl fix X X--- nntpbtr.c.orig Sun Jun 11 02:16:08 1995 X+++ nntpbtr.c Thu Jan 9 00:15:47 1997 X@@ -51,7 +51,10 @@ X X off_t bytecount = 0; X off_t bfdpos; X+ X+#ifndef RNEWS X char batchtmp[] = BATCHTMP; X+#endif X X #endif X X@@ -273,9 +276,11 @@ X submit(1); X close_history(); X printstat(); X- if( rnum && (time_flag >= 0) ) { X+ if( time_flag >= 0 ) { X title("PAUSE before next run"); X+ getlock(host,oldtime); X sleep(PAUSETIME); X+ unlock(host); X goto repeat; X } X exit(0); END-of-patch-ae echo x - patch-af sed 's/^X//' >patch-af << 'END-of-patch-af' Xpatch from me (dk@farm.org): UDP time either closed on firewalls or unreliable Xover dial-up, TCP time better anyway X X--- nntpbtr.c.old Mon Oct 21 14:22:30 1996 X+++ nntpbtr.c Mon Oct 21 14:23:43 1996 X@@ -478,6 +478,7 @@ X #endif X log_err("connect time out expired"); X } X+#if 0 /* disabled UDP time - unreliable */ X if((server = udp_open(host, "time")) < 0) X log_err("UDP open error"); X signal(SIGALRM, alarm_hdlr); X@@ -492,6 +493,7 @@ X goto finish; X } X close(server); X+#endif /* 0 */ X if((server = tcp_open(host, "time")) < 0) { X sleep(60); X goto repeat; END-of-patch-af echo x - patch-ag sed 's/^X//' >patch-ag << 'END-of-patch-ag' Xfrom bag@ua.net - correct free space check (without root's 10%) X X--- btrspc.c.orig Thu Jan 9 00:33:06 1997 X+++ btrspc.c Thu Jan 9 00:33:44 1997 X@@ -106,8 +106,8 @@ X typedef struct statfs statfs_type; X #define statfilesys statfs X #define bombed(call) ((call) < 0) X-#define blkavail(fs) ((int)((fs).f_bfree)) X-#define filavail(fs) ((int)((fs).f_ffree)) X+#define blkavail(fs) ((long)((fs).f_bavail)) X+#define filavail(fs) ((long)((fs).f_ffree)) X X #elif defined(SVR3) X #include END-of-patch-ag exit >Audit-Trail: >Unformatted: