diff options
Diffstat (limited to 'comms')
-rw-r--r-- | comms/fidogate/Makefile | 5 | ||||
-rw-r--r-- | comms/fidogate/distinfo | 26 | ||||
-rw-r--r-- | comms/fidogate/patches/patch-aa | 21 | ||||
-rw-r--r-- | comms/fidogate/patches/patch-ac | 20 | ||||
-rw-r--r-- | comms/fidogate/patches/patch-al | 25 | ||||
-rw-r--r-- | comms/fidogate/patches/patch-am | 19 | ||||
-rw-r--r-- | comms/fidogate/patches/patch-an | 18 | ||||
-rw-r--r-- | comms/fidogate/patches/patch-ao | 24 | ||||
-rw-r--r-- | comms/fidogate/patches/patch-ap | 18 | ||||
-rw-r--r-- | comms/fidogate/patches/patch-aq | 10 | ||||
-rw-r--r-- | comms/fidogate/patches/patch-at | 9 | ||||
-rw-r--r-- | comms/fidogate/patches/patch-au | 9 |
12 files changed, 121 insertions, 83 deletions
diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile index 2e6dd39c070..8a2235a0721 100644 --- a/comms/fidogate/Makefile +++ b/comms/fidogate/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.33 2004/04/24 02:05:31 tv Exp $ +# $NetBSD: Makefile,v 1.34 2004/08/23 15:18:02 tv Exp $ # -DISTNAME= fidogate-4.4.5 +DISTNAME= fidogate-4.4.9 +PKGREVISION= 1 CATEGORIES= comms MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fidogate/} diff --git a/comms/fidogate/distinfo b/comms/fidogate/distinfo index 867584d2e62..b4680f88e9e 100644 --- a/comms/fidogate/distinfo +++ b/comms/fidogate/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.6 2003/10/10 09:02:44 rtr Exp $ +$NetBSD: distinfo,v 1.7 2004/08/23 15:18:02 tv Exp $ -SHA1 (fidogate-4.4.5.tar.gz) = ba69cb041d45f10f732f7d6399deeb5002f7d7ac -Size (fidogate-4.4.5.tar.gz) = 1171414 bytes -SHA1 (patch-aa) = 0bc06682bdddd8f7c47063bd22f7d70053c46f1a +SHA1 (fidogate-4.4.9.tar.gz) = 7d23802931a67b5b3cc256f5dd85d8b2c47ab4fe +Size (fidogate-4.4.9.tar.gz) = 1186562 bytes +SHA1 (patch-aa) = a12ffe978a32b342a48927b2887b4c5340816c5c SHA1 (patch-ab) = 27457fff799208f3daf72eabb6a7b0b056faf945 -SHA1 (patch-ac) = b93a8656afea504e00692d4a235f117dfb67df68 +SHA1 (patch-ac) = 89e81b49da503eaaf6b641231d30cf75e58b376b SHA1 (patch-ad) = 2562aca505a403e9cd5e493fcf84f9c7b15e764f SHA1 (patch-ae) = e2cf8add74b051111626230257c01793c1c20ca9 SHA1 (patch-af) = 7fbc604c555f210aa49de2ecc1ec13d9835287f0 @@ -13,13 +13,13 @@ SHA1 (patch-ah) = d75936b400f87c87033b07a5481a004ea21d6ddd SHA1 (patch-ai) = 7d3c184bc1071a6e70be67707181650468557cc5 SHA1 (patch-aj) = 0f68f94aa285a4d1ae38cfd2d62b10f96ad325a6 SHA1 (patch-ak) = c24f82c5440095cb4e55ac665f2b5936116b4e32 -SHA1 (patch-al) = 7fe4d59f45bb865dcfbeef3a1f2d7c4023185eca -SHA1 (patch-am) = 6c9735b35ddca75df5e0446ee4a46a62ff69fef3 -SHA1 (patch-an) = ec8d8faf329f40e06f865aa790e36f1b6cd81fbb -SHA1 (patch-ao) = e23fc61440465d1792fbcc51aeeb1077393c87e9 -SHA1 (patch-ap) = 052d155e698fb36b87e4a28a4b1f75f701b7c956 -SHA1 (patch-aq) = 23e551d1bf36e031a629d9d9e817d135886191ab +SHA1 (patch-al) = df1c2da097eead9444c4cf6a43ea515582258ad9 +SHA1 (patch-am) = d005bf2020b0b88026e53a08d6a35a7b451ef777 +SHA1 (patch-an) = 7d454b745e4a7a303c25e040936c72db92554ad4 +SHA1 (patch-ao) = e19a532f79dd4ad203b9fe19bbde49da7f92a753 +SHA1 (patch-ap) = 860c3989306e5d431520ddf5f676938da8806c87 +SHA1 (patch-aq) = 29db774435c55ccadb7ed492c93eb233df502ca0 SHA1 (patch-ar) = 0883b75e210d635f7e9f49c9b2b5d3978645953b SHA1 (patch-as) = daf5a80d044933c17f8ab556bebc0765af1439e3 -SHA1 (patch-at) = 8e3b746df1369ee3a13fff4ab97eff78c8b53f0e -SHA1 (patch-au) = 6f2ea2f3fec2756f0f1267a5d68e92b3773e1065 +SHA1 (patch-at) = f6b3fe0bac12489d314e3a1b39bfe67d67b14374 +SHA1 (patch-au) = 90b0a4630b3029b34752972a7e7892b63462a703 diff --git a/comms/fidogate/patches/patch-aa b/comms/fidogate/patches/patch-aa index f058436f16e..e4da635e480 100644 --- a/comms/fidogate/patches/patch-aa +++ b/comms/fidogate/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.5 2002/07/06 20:15:52 tv Exp $ +$NetBSD: patch-aa,v 1.6 2004/08/23 15:18:02 tv Exp $ ---- config.make.orig Mon Aug 20 01:23:53 2001 -+++ config.make Sat Jul 6 15:19:41 2002 +--- config.make.orig 2003-04-15 14:45:20.000000000 -0400 ++++ config.make @@ -56,13 +56,13 @@ # @@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.5 2002/07/06 20:15:52 tv Exp $ DEFAULT_V_BTBASEDIR = /var/spool/bt DEFAULT_V_INBOUND = $(DEFAULT_V_BTBASEDIR)/in DEFAULT_V_PINBOUND = $(DEFAULT_V_BTBASEDIR)/pin -@@ -83,17 +83,17 @@ +@@ -83,8 +83,8 @@ DEFAULT_V_CHARSETMAP = %L/charset.bin # fixed parameters, DO NOT DELETE ANYTHING!!! # INN (Redhat 5.2) @@ -34,8 +34,11 @@ $NetBSD: patch-aa,v 1.5 2002/07/06 20:15:52 tv Exp $ # INN 1.7 #DEFAULT_F_NEWSLIBDIR = /usr/lib/news #DEFAULT_F_NEWSSPOOLDIR = /var/spool/news - # INN 2.2 --DEFAULT_F_NEWSLIBDIR = /usr/lib +@@ -92,11 +92,11 @@ DEFAULT_F_NEWSVARDIR = /var/lib/news + #DEFAULT_F_NEWSLIBDIR = /usr/lib + #DEFAULT_F_NEWSSPOOLDIR = /var/spool/news/articles + # INN 2.3.4 on RedHat 9 +-DEFAULT_F_NEWSLIBDIR = /usr/lib/news/lib -DEFAULT_F_NEWSSPOOLDIR = /var/spool/news/articles +DEFAULT_F_NEWSLIBDIR = @PREFIX@/inn/lib +DEFAULT_F_NEWSSPOOLDIR = /var/news/spool/articles @@ -46,7 +49,7 @@ $NetBSD: patch-aa,v 1.5 2002/07/06 20:15:52 tv Exp $ # old-style config #DEFAULT_F_CONFIG_GATE = %C/gate.conf -@@ -146,18 +146,15 @@ +@@ -149,18 +149,15 @@ DEFAULT_A_UUINBOUND = %U # The perl interpreter used by subst.pl @@ -70,7 +73,7 @@ $NetBSD: patch-aa,v 1.5 2002/07/06 20:15:52 tv Exp $ # RedHat RPM related dirs RPMBASEDIR = /usr/src/redhat -@@ -197,20 +194,17 @@ +@@ -200,20 +197,17 @@ GROUP = news # install permissions PERM_PROG = 755 PERM_DATA = 644 @@ -93,7 +96,7 @@ $NetBSD: patch-aa,v 1.5 2002/07/06 20:15:52 tv Exp $ INCLUDE = -I$(TOPDIR) -I$(TOPDIR)/src/include -@@ -239,10 +233,10 @@ +@@ -242,10 +236,10 @@ INSTALL = install # MSDOS, OS2, WIN32 # EXE = .exe EXE = diff --git a/comms/fidogate/patches/patch-ac b/comms/fidogate/patches/patch-ac index 820b326c0a6..548d6ae3af0 100644 --- a/comms/fidogate/patches/patch-ac +++ b/comms/fidogate/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.3 2001/02/22 03:00:15 tv Exp $ +$NetBSD: patch-ac,v 1.4 2004/08/23 15:18:02 tv Exp $ ---- config.h.orig Wed Feb 21 16:59:45 2001 -+++ config.h Wed Feb 21 17:09:49 2001 +--- config.h.orig 2002-07-15 16:21:55.000000000 -0400 ++++ config.h @@ -108,7 +108,7 @@ /***** rfc2ftn configuration ************************************************/ @@ -11,12 +11,10 @@ $NetBSD: patch-ac,v 1.3 2001/02/22 03:00:15 tv Exp $ /** Passthru operation for EchoMail: FIDO->Internet->FIDO **/ /* * Implemented, but requires ftntoss run after rfc2ftn to sort SEEN-BY -@@ -300,6 +300,25 @@ - # define HAS_SNPRINTF /* ? */ - # define HAS_HARDLINKS +@@ -302,6 +302,25 @@ # undef HAS_POSIX_REGEX /* ? */ -+#endif -+ + #endif + +#ifdef __NetBSD__ +# define HAS_FCNTL_LOCK +# define HAS_GETTIMEOFDAY @@ -34,6 +32,8 @@ $NetBSD: patch-ac,v 1.3 2001/02/22 03:00:15 tv Exp $ +# define HAS_SNPRINTF +# define HAS_HARDLINKS +# define HAS_POSIX_REGEX - #endif - ++#endif ++ #ifdef ISC /* ISC 3.x, GNU gcc, -DISC necessary */ + # define HAS_FCNTL_LOCK + # define HAS_GETTIMEOFDAY diff --git a/comms/fidogate/patches/patch-al b/comms/fidogate/patches/patch-al index 4c7f04c3614..83e71b6f95c 100644 --- a/comms/fidogate/patches/patch-al +++ b/comms/fidogate/patches/patch-al @@ -1,13 +1,26 @@ -$NetBSD: patch-al,v 1.4 2001/03/19 13:23:36 dmcmahill Exp $ +$NetBSD: patch-al,v 1.5 2004/08/23 15:18:02 tv Exp $ -alpha fixes... - ---- src/common/log.c.orig Wed Oct 18 17:53:57 2000 -+++ src/common/log.c Mon Mar 19 07:37:02 2001 -@@ -138,5 +138,5 @@ +--- src/common/log.c.orig 2003-02-16 10:38:56.000000000 -0500 ++++ src/common/log.c +@@ -137,7 +137,7 @@ void log(const char *fmt, ...) + if(fp) { fprintf(fp, "%s %s ", - date_buf(buf, sizeof(buf), DATE_LOG, (long *)0), logprog); + date_buf(buf, sizeof(buf), DATE_LOG, (time_t *)0), logprog); vfprintf(fp, *fmt == '$' ? fmt + 1 : fmt, args); if (*fmt == '$') + fprintf(fp, " (errno=%d: %s)", errno, strerror(errno)); +@@ -276,12 +276,5 @@ void log_file(char *name) + */ + void log_program(char *name) + { +- char *p; +- + BUF_COPY(logprog, name); +- +- if( (p = getenv("LOGFILE")) ) +- log_file(p); +- if( (p = getenv("FIDOGATE_LOGFILE")) ) +- log_file(p); + } diff --git a/comms/fidogate/patches/patch-am b/comms/fidogate/patches/patch-am index 4c21201c1e6..9f6da46611f 100644 --- a/comms/fidogate/patches/patch-am +++ b/comms/fidogate/patches/patch-am @@ -1,17 +1,18 @@ -$NetBSD: patch-am,v 1.4 2001/03/19 13:23:36 dmcmahill Exp $ +$NetBSD: patch-am,v 1.5 2004/08/23 15:18:02 tv Exp $ -alpha fixes... - ---- src/common/tick.c.orig Fri Jan 28 17:01:11 2000 -+++ src/common/tick.c Mon Mar 19 07:47:47 2001 -@@ -121,5 +121,5 @@ +--- src/common/tick.c.orig 2003-02-16 10:38:58.000000000 -0500 ++++ src/common/tick.c +@@ -120,7 +120,7 @@ int tick_put(Tick *tic, char *name) + fprintf(fp, "CRC %08lX\r\n", tic->crc); fprintf(fp, "Created %s\r\n", tic->created); fprintf(fp, "Size %lu\r\n", tic->size); - fprintf(fp, "Date %ld\r\n", tic->date); + fprintf(fp, "Date %ld\r\n", (long) tic->date); for(pl=tic->path.first; pl; pl=pl->next) fprintf(fp, "Path %s\r\n", pl->line); -@@ -279,6 +279,6 @@ + for(p=tic->seenby.first; p; p=p->next) +@@ -278,8 +278,8 @@ void tick_debug(Tick *tic, int lvl) + for(p=tic->seenby.first; p; p=p->next) debug(lvl, "Seenby : %s", znfp1(&p->node)); debug(lvl, "Pw : %s", tic->pw); - debug(lvl, "Release : %ld", tic->release); @@ -20,7 +21,9 @@ alpha fixes... + debug(lvl, "Date : %ld", (long) tic->date); for(pl=tic->app.first; pl; pl=pl->next) debug(lvl, "App : %s", pl->line); -@@ -368,5 +368,5 @@ + } +@@ -367,6 +367,6 @@ void tick_add_path(Tick *tic) + now = time(NULL); tl_appendf(&tic->path, "%s %ld %s", - znf1(cf_addr()), now, date(DATE_TICK_PATH, &now)); diff --git a/comms/fidogate/patches/patch-an b/comms/fidogate/patches/patch-an index 8a41a458fdb..7ed6db6bf1c 100644 --- a/comms/fidogate/patches/patch-an +++ b/comms/fidogate/patches/patch-an @@ -1,20 +1,22 @@ -$NetBSD: patch-an,v 1.4 2001/03/19 13:23:36 dmcmahill Exp $ +$NetBSD: patch-an,v 1.5 2004/08/23 15:18:02 tv Exp $ -alpha fixes... - ---- src/tick/ftnhatch.c.orig Fri Nov 17 16:18:08 2000 -+++ src/tick/ftnhatch.c Mon Mar 19 07:50:57 2001 -@@ -100,5 +100,5 @@ +--- src/tick/ftnhatch.c.orig 2003-02-16 10:39:02.000000000 -0500 ++++ src/tick/ftnhatch.c +@@ -99,7 +99,7 @@ int hatch(char *area, char *file, char * + file_crc = crc32_file(file_name); debug(4, "file: name=%s size=%ld time=%ld crc=%08lx", - file_name, file_size, file_time, file_crc); + file_name, file_size, (long) file_time, file_crc); /* -@@ -119,5 +119,5 @@ - tic.size = file_size; + * Build Tick struct +@@ -119,7 +119,7 @@ int hatch(char *area, char *file, char * + tic.created = CREATOR; + tic.size = file_size; tl_appendf(&tic.path, "%s %ld %s", - znf1(cf_addr()), now, date(NULL, &now) ); + znf1(cf_addr()), (long) now, date(NULL, &now) ); lon_add(&tic.seenby, cf_addr()); lon_join(&tic.seenby, &bbs->nodes); + /* tic.pw set by hatch_one() */ diff --git a/comms/fidogate/patches/patch-ao b/comms/fidogate/patches/patch-ao index 565d869bd07..57d5ceb6247 100644 --- a/comms/fidogate/patches/patch-ao +++ b/comms/fidogate/patches/patch-ao @@ -1,34 +1,40 @@ -$NetBSD: patch-ao,v 1.1 2001/03/19 13:23:36 dmcmahill Exp $ +$NetBSD: patch-ao,v 1.2 2004/08/23 15:18:02 tv Exp $ -alpha fixes... - ---- src/toss/ftnexpire.c.orig Fri Nov 17 16:18:08 2000 -+++ src/toss/ftnexpire.c Mon Mar 19 08:12:29 2001 -@@ -113,5 +113,5 @@ +--- src/toss/ftnexpire.c.orig 2003-02-16 10:39:02.000000000 -0500 ++++ src/toss/ftnexpire.c +@@ -112,7 +112,7 @@ int do_expire(void) + if(exp_sec < 0) exp_sec = 0; debug(4, "expire: now=%ld max=%ld, expire < %ld", - now_sec, max_sec, exp_sec ); + (long) now_sec, (long) max_sec, (long) exp_sec ); /* Open old history for reading */ -@@ -223,5 +223,5 @@ + if( (hi_o = fopen(history, R_MODE)) == NULL ) +@@ -222,7 +222,7 @@ int do_line(FILE *hi_n, char *line) + t = atol(p); expired = t < exp_sec; debug(7, "msgid=%s time=%ld expired=%s", - msgid, t, expired ? "YES" : "NO" ); + msgid,(long) t, expired ? "YES" : "NO" ); /* Write if not expired */ -@@ -236,5 +236,5 @@ + if(!expired) +@@ -235,7 +235,7 @@ int do_line(FILE *hi_n, char *line) + } /* Write MSGID line to history text file */ - ret = fprintf(hi_n, "%s\t%ld\n", msgid, t); + ret = fprintf(hi_n, "%s\t%ld\n", msgid, (long) t); if (ret == ERROR || fflush(hi_n) == ERROR) { -@@ -391,5 +391,5 @@ + log("$ERROR: write to MSGID history failed"); +@@ -390,7 +390,7 @@ int main(int argc, char **argv) + /* Statistics */ log("ids processed: %ld total, %ld expired in %ld s, %.2f ids/s", n_processed, n_expired, - expire_delta, (double)n_processed/expire_delta); + (long) expire_delta, (double)n_processed/expire_delta); unlock_program(DEFAULT_LOCK_HISTORY); + diff --git a/comms/fidogate/patches/patch-ap b/comms/fidogate/patches/patch-ap index 38ac6093670..628326eeed8 100644 --- a/comms/fidogate/patches/patch-ap +++ b/comms/fidogate/patches/patch-ap @@ -1,25 +1,31 @@ -$NetBSD: patch-ap,v 1.1 2001/03/19 13:23:36 dmcmahill Exp $ +$NetBSD: patch-ap,v 1.2 2004/08/23 15:18:02 tv Exp $ ---- src/toss/ftntoss.c.orig Fri Nov 17 16:18:08 2000 -+++ src/toss/ftntoss.c Mon Mar 19 08:17:20 2001 -@@ -1443,5 +1443,5 @@ +--- src/toss/ftntoss.c.orig 2003-02-16 10:39:02.000000000 -0500 ++++ src/toss/ftntoss.c +@@ -1442,7 +1442,7 @@ int unpack_file(char *pkt_name) + exp_sec = now_sec - max_sec; if(exp_sec < 0) exp_sec = 0; - debug(4, "now=%ld max=%ld, old < %ld", now_sec, max_sec, exp_sec); + debug(4, "now=%ld max=%ld, old < %ld", (long) now_sec, (long) max_sec, (long) exp_sec); /* Open packet and read header */ -@@ -1947,5 +1947,5 @@ + pkt_file = fopen(pkt_name, R_MODE); +@@ -1946,7 +1946,7 @@ int main(int argc, char **argv) + if(pkts_in) log("pkts processed: %ld, %ld Kbyte in %ld s, %.2f Kbyte/s", - pkts_in, pkts_bytes/1024, toss_delta, + pkts_in, pkts_bytes/1024, (long) toss_delta, (double)pkts_bytes/1024./toss_delta ); -@@ -1955,5 +1955,5 @@ + if(msgs_in) +@@ -1954,7 +1954,7 @@ int main(int argc, char **argv) + log("msgs processed: %ld in, %ld out (%ld mail, %ld echo)", msgs_in, msgs_netmail+msgs_echomail, msgs_netmail, msgs_echomail); log("msgs processed: %ld in %ld s, %.2f msgs/s", - msgs_in, toss_delta, (double)msgs_in/toss_delta); + msgs_in, (long) toss_delta, (double)msgs_in/toss_delta); } + if(msgs_unknown || msgs_routed || msgs_insecure || msgs_empty) diff --git a/comms/fidogate/patches/patch-aq b/comms/fidogate/patches/patch-aq index 18a5d824a1f..0094e9f252b 100644 --- a/comms/fidogate/patches/patch-aq +++ b/comms/fidogate/patches/patch-aq @@ -1,8 +1,9 @@ -$NetBSD: patch-aq,v 1.1 2001/03/19 13:23:36 dmcmahill Exp $ +$NetBSD: patch-aq,v 1.2 2004/08/23 15:18:02 tv Exp $ ---- src/toss/history.c.orig Fri Nov 17 16:18:08 2000 -+++ src/toss/history.c Mon Mar 19 08:18:47 2001 -@@ -152,6 +152,6 @@ +--- src/toss/history.c.orig 2003-02-16 10:39:02.000000000 -0500 ++++ src/toss/history.c +@@ -151,8 +151,8 @@ static int hi_write_t(time_t t, time_t m + } /* Write MSGID line to history text file */ - debug(7, "history: offset=%ld: %s %ld", offset, msgid, t); @@ -11,3 +12,4 @@ $NetBSD: patch-aq,v 1.1 2001/03/19 13:23:36 dmcmahill Exp $ + ret = fprintf(hi_file, "%s\t%ld\n", msgid, (long) t); if (ret == ERROR || fflush(hi_file) == ERROR) { + log("$ERROR: write to MSGID history failed"); diff --git a/comms/fidogate/patches/patch-at b/comms/fidogate/patches/patch-at index 540bc00c697..2fe598e62cb 100644 --- a/comms/fidogate/patches/patch-at +++ b/comms/fidogate/patches/patch-at @@ -1,7 +1,8 @@ -$NetBSD: patch-at,v 1.2 2003/10/18 12:04:54 cjep Exp $ ---- src/ffx/ffx.c.orig 2003-10-10 18:44:12.000000000 +1000 -+++ src/ffx/ffx.c 2003-10-10 18:44:27.000000000 +1000 -@@ -396,7 +396,7 @@ +$NetBSD: patch-at,v 1.3 2004/08/23 15:18:02 tv Exp $ + +--- src/ffx/ffx.c.orig 2003-02-16 10:39:00.000000000 -0500 ++++ src/ffx/ffx.c +@@ -396,7 +396,7 @@ int main(int argc, char **argv) /* Don't allow options for setuid ffx */ if(getuid() != geteuid()) { diff --git a/comms/fidogate/patches/patch-au b/comms/fidogate/patches/patch-au index 7c7ab254603..c88b86ec717 100644 --- a/comms/fidogate/patches/patch-au +++ b/comms/fidogate/patches/patch-au @@ -1,7 +1,8 @@ -$NetBSD: patch-au,v 1.2 2003/10/18 12:04:54 cjep Exp $ ---- src/include/prototypes.h.orig 2003-10-10 18:39:41.000000000 +1000 -+++ src/include/prototypes.h 2003-10-10 18:39:55.000000000 +1000 -@@ -271,6 +271,8 @@ +$NetBSD: patch-au,v 1.3 2004/08/23 15:18:02 tv Exp $ + +--- src/include/prototypes.h.orig 2003-02-16 10:39:01.000000000 -0500 ++++ src/include/prototypes.h +@@ -269,6 +269,8 @@ int unlock_program (char *); extern int verbose; extern int no_debug; |