Update to 4.4.10, finally....

Changes of note (security fixes were already integrated in an earlier
4.4.9nbX release):

	* src/gate/ftn2rfc.c (unpack): if * Origin is empty, don't use it
	  for the Organization header, use default from config.

	* src/common/log.c (logit): renamed old log() to avoid conflict
	  with Standard-C math function.

	* src/common/log.c (log_program): removed insecure code entirely,
	  thanks to Niels Heinen for pointing this out.

	* src/gate/send-fidogate.sh: added optimized version using rfc2ftn
	  -f for INN 2.4, thanks to Viktor Kafke.
	  Optimized versions for INN 2.2 und INN 2.4 enabled by
	  OPTIMIZED=yes at the start of this script, default = commented =
	  off.

	* scripts/maintenance/logsendmail2.pl: new version of logsendmail
	  utility.

	* src/gate/rfc2ftn.c (receiver): "sysop" is always a valid name.

	* src/gate/rfc2ftn.c (main): new option "SilentBounces" causes
	  EX_NOHOST, EX_NOUSER errors to return OK without any message.
	  Useful in the never ending fight against spam, when your gateway
	  is flooded with messages to unknown adresses, such as Fido.DE :-(
	  (snd_mail): check silent_bounces, if set return OK and log only.

11 files changed, 73 insertions, 106 deletions

diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile
index 28f0adf87f3..bcd937e27dc 100644
--- a/comms/fidogate/Makefile
+++ b/comms/fidogate/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2005/08/14 18:47:47 tv Exp $
+# $NetBSD: Makefile,v 1.41 2005/08/17 11:43:27 tv Exp $
 #
 
-DISTNAME=	fidogate-4.4.9
-PKGREVISION=	3
+DISTNAME=	fidogate-4.4.10
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fidogate/}
 
diff --git a/comms/fidogate/PLIST b/comms/fidogate/PLIST
index f8bbfa31dbe..30810c65ba5 100644
--- a/comms/fidogate/PLIST
+++ b/comms/fidogate/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2005/08/14 18:47:47 tv Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/08/17 11:43:27 tv Exp $
 lib/fidogate/areafix.help
 lib/fidogate/bin/areasbbssync
 lib/fidogate/bin/ftnafutil
@@ -10,6 +10,7 @@ lib/fidogate/bin/logcheck
 lib/fidogate/bin/logdaily
 lib/fidogate/bin/logreport
 lib/fidogate/bin/logsendmail
+lib/fidogate/bin/logsendmail2
 lib/fidogate/bin/logstat
 lib/fidogate/bin/nl-autoupd
 lib/fidogate/bin/nl-check
@@ -69,10 +70,8 @@ lib/fidogate/ftnseq
 lib/fidogate/ftntick
 lib/fidogate/ftntoss
 lib/fidogate/rfc2ftn
-share/examples/rc.d/fidogate
-@dirrm lib/fidogate/bin
-@dirrm lib/fidogate
 share/doc/fidogate/ANNOUNCE
+share/doc/fidogate/fidogate.txt
 share/doc/fidogate/fidogate_1.html
 share/doc/fidogate/fidogate_2.html
 share/doc/fidogate/fidogate_3.html
@@ -84,7 +83,6 @@ share/doc/fidogate/fidogate_8.html
 share/doc/fidogate/fidogate_abt.html
 share/doc/fidogate/fidogate_ovr.html
 share/doc/fidogate/fidogate_toc.html
-share/doc/fidogate/fidogate.txt
 share/doc/fidogate/msgid-1.html
 share/doc/fidogate/msgid-2.html
 share/doc/fidogate/msgid-3.html
@@ -93,7 +91,7 @@ share/doc/fidogate/msgid-5.html
 share/doc/fidogate/msgid-6.html
 share/doc/fidogate/msgid-7.html
 share/doc/fidogate/msgid.html
-@dirrm share/doc/fidogate
+share/examples/fidogate/README
 share/examples/fidogate/fidogate.conf
 share/examples/fidogate/morannon/aliases
 share/examples/fidogate/morannon/areas
@@ -122,13 +120,16 @@ share/examples/fidogate/point/fidogate.conf
 share/examples/fidogate/point/newsfeeds
 share/examples/fidogate/point/packing
 share/examples/fidogate/point/routing
-share/examples/fidogate/README
-@dirrm share/examples/fidogate/morannon
-@dirrm share/examples/fidogate/orodruin
-@dirrm share/examples/fidogate/point
-@dirrm share/examples/fidogate
+share/examples/rc.d/fidogate
 share/fidogate/sendmail/mailer/ffx.m4
 share/fidogate/sendmail/mailer/ftn.m4
 @dirrm share/fidogate/sendmail/mailer
 @dirrm share/fidogate/sendmail
 @dirrm share/fidogate
+@dirrm share/examples/fidogate/point
+@dirrm share/examples/fidogate/orodruin
+@dirrm share/examples/fidogate/morannon
+@dirrm share/examples/fidogate
+@dirrm share/doc/fidogate
+@dirrm lib/fidogate/bin
+@dirrm lib/fidogate
diff --git a/comms/fidogate/distinfo b/comms/fidogate/distinfo
index f224063c380..815f81342b7 100644
--- a/comms/fidogate/distinfo
+++ b/comms/fidogate/distinfo
@@ -1,27 +1,25 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 16:05:29 agc Exp $
+$NetBSD: distinfo,v 1.10 2005/08/17 11:43:27 tv Exp $
 
-SHA1 (fidogate-4.4.9.tar.gz) = 7d23802931a67b5b3cc256f5dd85d8b2c47ab4fe
-RMD160 (fidogate-4.4.9.tar.gz) = c073aa157cc5bfe6b005076e0c94c1aa427dbf01
-Size (fidogate-4.4.9.tar.gz) = 1186562 bytes
+SHA1 (fidogate-4.4.10.tar.gz) = 531305ac82963d5bd6398d2e8e350676bbc9c5eb
+RMD160 (fidogate-4.4.10.tar.gz) = 09b8dfa7304089ff27c7c39c1b6004aef00edadf
+Size (fidogate-4.4.10.tar.gz) = 1191524 bytes
 SHA1 (patch-aa) = a12ffe978a32b342a48927b2887b4c5340816c5c
 SHA1 (patch-ab) = 27457fff799208f3daf72eabb6a7b0b056faf945
 SHA1 (patch-ac) = 89e81b49da503eaaf6b641231d30cf75e58b376b
-SHA1 (patch-ad) = 2562aca505a403e9cd5e493fcf84f9c7b15e764f
+SHA1 (patch-ad) = bc08f722e53b23181d797e1f504023cf4b1ae5fa
 SHA1 (patch-ae) = e2cf8add74b051111626230257c01793c1c20ca9
 SHA1 (patch-af) = 7fbc604c555f210aa49de2ecc1ec13d9835287f0
 SHA1 (patch-ag) = 0d7babf2526a4b235bdd20ae1aead7ee4d734dd6
 SHA1 (patch-ah) = d75936b400f87c87033b07a5481a004ea21d6ddd
 SHA1 (patch-ai) = 7d3c184bc1071a6e70be67707181650468557cc5
 SHA1 (patch-aj) = 0f68f94aa285a4d1ae38cfd2d62b10f96ad325a6
-SHA1 (patch-ak) = c24f82c5440095cb4e55ac665f2b5936116b4e32
-SHA1 (patch-al) = df1c2da097eead9444c4cf6a43ea515582258ad9
+SHA1 (patch-ak) = 818f81491dcf39e272b6c4107255d738d9f91196
+SHA1 (patch-al) = 229523f59d427a1b60996db9f968fe2c6b119386
 SHA1 (patch-am) = d005bf2020b0b88026e53a08d6a35a7b451ef777
 SHA1 (patch-an) = 7d454b745e4a7a303c25e040936c72db92554ad4
-SHA1 (patch-ao) = e19a532f79dd4ad203b9fe19bbde49da7f92a753
-SHA1 (patch-ap) = 860c3989306e5d431520ddf5f676938da8806c87
-SHA1 (patch-aq) = 29db774435c55ccadb7ed492c93eb233df502ca0
+SHA1 (patch-ao) = 047993df8fa7de8f4f81ba1b1456e2c0e11c54d8
+SHA1 (patch-ap) = 9f8aae03b2b2e758785c9196583221c92d398371
+SHA1 (patch-aq) = cdf5aa7edc6cf6c5b33d95a6b7e9266608f38bca
 SHA1 (patch-ar) = 0883b75e210d635f7e9f49c9b2b5d3978645953b
 SHA1 (patch-as) = daf5a80d044933c17f8ab556bebc0765af1439e3
-SHA1 (patch-at) = f6b3fe0bac12489d314e3a1b39bfe67d67b14374
-SHA1 (patch-au) = 90b0a4630b3029b34752972a7e7892b63462a703
 SHA1 (patch-av) = dec5e163dcba702d929f4242083ac942abbf2160
diff --git a/comms/fidogate/patches/patch-ad b/comms/fidogate/patches/patch-ad
index 5dc1fb9fa7b..64230f302b9 100644
--- a/comms/fidogate/patches/patch-ad
+++ b/comms/fidogate/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.4 2001/02/22 03:00:15 tv Exp $
+$NetBSD: patch-ad,v 1.5 2005/08/17 11:43:27 tv Exp $
 
---- src/tick/ftntick.c.orig	Wed Feb 21 17:37:28 2001
-+++ src/tick/ftntick.c	Wed Feb 21 17:38:48 2001
-@@ -528,7 +528,7 @@
+--- src/tick/ftntick.c.orig	2004-08-22 16:19:13.000000000 -0400
++++ src/tick/ftntick.c
+@@ -528,7 +528,7 @@ int check_file(Tick *tic)
  	if(tic->size != st.st_size)
  	{
- 	    log("ERROR: wrong size for file %s: got %lu, expected %lu",
+ 	    logit("ERROR: wrong size for file %s: got %lu, expected %lu",
 -		name, st.st_size, tic->size                           );
-+		name, (unsigned long)st.st_size, tic->size);
++		name, (unsigned long)st.st_size, tic->size                           );
  	    return ERROR;
  	}
      }
diff --git a/comms/fidogate/patches/patch-ak b/comms/fidogate/patches/patch-ak
index 8845e049900..8a870a9b1a7 100644
--- a/comms/fidogate/patches/patch-ak
+++ b/comms/fidogate/patches/patch-ak
@@ -1,16 +1,6 @@
-$NetBSD: patch-ak,v 1.6 2003/10/18 12:04:54 cjep Exp $
+$NetBSD: patch-ak,v 1.7 2005/08/17 11:43:27 tv Exp $
 --- src/areafix/areafix.c.orig	2001-05-29 04:00:27.000000000 +1000
 +++ src/areafix/areafix.c	2003-10-10 18:43:07.000000000 +1000
-@@ -273,8 +273,7 @@
- 
- void areafix_auth_cmd(void)
- {
--    authorized = authorized_cmdline = authorized_new    =
--		 authorized_new     = authorized_delete = TRUE;
-+    authorized = authorized_cmdline = authorized_new = authorized_delete = TRUE;
- }
- 
- 
 @@ -770,7 +769,7 @@
  	mark = (lon_search(l, node) ? "*" : " ");
  
diff --git a/comms/fidogate/patches/patch-al b/comms/fidogate/patches/patch-al
index 83e71b6f95c..40f30fd6cfb 100644
--- a/comms/fidogate/patches/patch-al
+++ b/comms/fidogate/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.5 2004/08/23 15:18:02 tv Exp $
+$NetBSD: patch-al,v 1.6 2005/08/17 11:43:27 tv Exp $
 
---- src/common/log.c.orig	2003-02-16 10:38:56.000000000 -0500
+--- src/common/log.c.orig	2004-08-26 16:56:20.000000000 -0400
 +++ src/common/log.c
-@@ -137,7 +137,7 @@ void log(const char *fmt, ...)
+@@ -137,7 +137,7 @@ void logit(const char *fmt, ...)
  	if(fp)
  	{
  	    fprintf(fp, "%s %s ",
@@ -11,16 +11,3 @@ $NetBSD: patch-al,v 1.5 2004/08/23 15:18:02 tv Exp $
  	    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-ao b/comms/fidogate/patches/patch-ao
index 57d5ceb6247..7cf8f0e12b9 100644
--- a/comms/fidogate/patches/patch-ao
+++ b/comms/fidogate/patches/patch-ao
@@ -1,13 +1,13 @@
-$NetBSD: patch-ao,v 1.2 2004/08/23 15:18:02 tv Exp $
+$NetBSD: patch-ao,v 1.3 2005/08/17 11:43:27 tv Exp $
 
---- src/toss/ftnexpire.c.orig	2003-02-16 10:39:02.000000000 -0500
+--- src/toss/ftnexpire.c.orig	2004-08-22 16:19:14.000000000 -0400
 +++ 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                   );
++	  (long)now_sec, (long)max_sec, (long)exp_sec                   );
  
      /* Open old history for reading */
      if( (hi_o = fopen(history, R_MODE)) == NULL ) 
@@ -16,7 +16,7 @@ $NetBSD: patch-ao,v 1.2 2004/08/23 15:18:02 tv Exp $
      expired = t < exp_sec;
      debug(7, "msgid=%s  time=%ld  expired=%s",
 -	  msgid, t, expired ? "YES" : "NO"     );
-+	  msgid,(long) t, expired ? "YES" : "NO"     );
++	  msgid, (long)t, expired ? "YES" : "NO"     );
  
      /* Write if not expired */
      if(!expired) 
@@ -25,16 +25,16 @@ $NetBSD: patch-ao,v 1.2 2004/08/23 15:18:02 tv Exp $
  	
  	/* 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);
++	ret = fprintf(hi_n, "%s\t%ld\n", msgid, (long)t);
  	if (ret == ERROR || fflush(hi_n) == ERROR)
  	{
- 	    log("$ERROR: write to MSGID history failed");
+ 	    logit("$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",
+     logit("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);
++	(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 628326eeed8..c1ff0b8fbc4 100644
--- a/comms/fidogate/patches/patch-ap
+++ b/comms/fidogate/patches/patch-ap
@@ -1,31 +1,31 @@
-$NetBSD: patch-ap,v 1.2 2004/08/23 15:18:02 tv Exp $
+$NetBSD: patch-ap,v 1.3 2005/08/17 11:43:27 tv Exp $
 
---- src/toss/ftntoss.c.orig	2003-02-16 10:39:02.000000000 -0500
+--- src/toss/ftntoss.c.orig	2004-08-22 16:19:14.000000000 -0400
 +++ 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);
++    debug(4, "now=%ld max=%ld, old < %ld", (long)now_sec, (long)max_sec, (long)exp_sec);
      
      /* Open packet and read header */
      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",
+ 	logit("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,
++	    pkts_in, pkts_bytes/1024, (long)toss_delta,
  	    (double)pkts_bytes/1024./toss_delta                      );
      
      if(msgs_in)
 @@ -1954,7 +1954,7 @@ int main(int argc, char **argv)
- 	log("msgs processed: %ld in, %ld out (%ld mail, %ld echo)",
+ 	logit("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",
+ 	logit("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);
++	    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 0094e9f252b..f88fe33ddbc 100644
--- a/comms/fidogate/patches/patch-aq
+++ b/comms/fidogate/patches/patch-aq
@@ -1,6 +1,6 @@
-$NetBSD: patch-aq,v 1.2 2004/08/23 15:18:02 tv Exp $
+$NetBSD: patch-aq,v 1.3 2005/08/17 11:43:27 tv Exp $
 
---- src/toss/history.c.orig	2003-02-16 10:39:02.000000000 -0500
+--- src/toss/history.c.orig	2004-08-22 16:19:14.000000000 -0400
 +++ src/toss/history.c
 @@ -151,8 +151,8 @@ static int hi_write_t(time_t t, time_t m
      }
@@ -8,8 +8,26 @@ $NetBSD: patch-aq,v 1.2 2004/08/23 15:18:02 tv Exp $
      /* Write MSGID line to history text file */
 -    debug(7, "history: offset=%ld: %s %ld", offset, msgid, t);
 -    ret = fprintf(hi_file, "%s\t%ld\n", msgid, t);
-+    debug(7, "history: offset=%ld: %s %ld", offset, msgid, (long) t);
-+    ret = fprintf(hi_file, "%s\t%ld\n", msgid, (long) t);
++    debug(7, "history: offset=%ld: %s %ld", offset, msgid, (long)t);
++    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");
+ 	logit("$ERROR: write to MSGID history failed");
+@@ -280,7 +280,7 @@ int main(int argc, char *argv[])
+ 	    {
+ 		if(t)
+ 		{
+-		    debug(2, "new: %s (time=%ld)", m, t);
++		    debug(2, "new: %s (time=%ld)", m, (long)t);
+ 		    hi_write_t(t, 0, m);
+ 		}
+ 		else
+@@ -305,7 +305,7 @@ int main(int argc, char *argv[])
+ 	    {
+ 		if(t)
+ 		{
+-		    debug(2, "new: %s (time=%ld)", m, t);
++		    debug(2, "new: %s (time=%ld)", m, (long)t);
+ 		    hi_write_t(t, 0, m);
+ 		}
+ 		else
diff --git a/comms/fidogate/patches/patch-at b/comms/fidogate/patches/patch-at
deleted file mode 100644
index 2fe598e62cb..00000000000
--- a/comms/fidogate/patches/patch-at
+++ /dev/null
@@ -1,13 +0,0 @@
-$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())
-     {
--	L_flag = c_flag = B_flag = L_flag = S_flag = a_flag = u_flag = NULL;
-+	L_flag = c_flag = B_flag = S_flag = a_flag = u_flag = NULL;
-     }
-     
-     /*
diff --git a/comms/fidogate/patches/patch-au b/comms/fidogate/patches/patch-au
deleted file mode 100644
index c88b86ec717..00000000000
--- a/comms/fidogate/patches/patch-au
+++ /dev/null
@@ -1,13 +0,0 @@
-$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;
- 
-+#define log fido_log
-+
- char   *strerror		(int);
- void	log			(const char *, ...)
-     __attribute__ ((format (printf, 1, 2)));