Update to 5.1.5

6 files changed, 96 insertions, 4 deletions

diff --git a/news/fidogate-ds/Makefile b/news/fidogate-ds/Makefile
index 886b2641d16e..9f3e04eb9a35 100644
--- a/news/fidogate-ds/Makefile
+++ b/news/fidogate-ds/Makefile
@@ -5,7 +5,7 @@
 #
 
 PORTNAME=		fidogate
-PORTVERSION=		5.1.4
+PORTVERSION=		5.1.5
 CATEGORIES=		news mail
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rusfidogate
diff --git a/news/fidogate-ds/distinfo b/news/fidogate-ds/distinfo
index 6e4b9b92df41..964e02533862 100644
--- a/news/fidogate-ds/distinfo
+++ b/news/fidogate-ds/distinfo
@@ -1,3 +1,3 @@
-MD5 (fidogate5.1.4ds.tar.bz2) = cbae8af47bcc930e47aabce381bd5dd3
-SHA256 (fidogate5.1.4ds.tar.bz2) = cdd2a6a52cf609a5edb157822615fe759010968c772e38ff675008f72ef00756
-SIZE (fidogate5.1.4ds.tar.bz2) = 697548
+MD5 (fidogate5.1.5ds.tar.bz2) = 3adca26d5217736b70dc81ea7256cf28
+SHA256 (fidogate5.1.5ds.tar.bz2) = e5fba32cfbfaed9e86553f19c9327076ac23ded1f8cce509bf82d898dca3d0a3
+SIZE (fidogate5.1.5ds.tar.bz2) = 697888
diff --git a/news/fidogate-ds/files/patch-areas.c b/news/fidogate-ds/files/patch-areas.c
new file mode 100644
index 000000000000..51dc040d284d
--- /dev/null
+++ b/news/fidogate-ds/files/patch-areas.c
@@ -0,0 +1,20 @@
+Index: src/common/areas.c
+===================================================================
+RCS file: /cvsroot/rusfidogate/fidogate-sta/src/common/areas.c,v
+retrieving revision 5.2
+retrieving revision 5.3
+diff -u -r5.2 -r5.3
+--- src/common/areas.c	14 Oct 2006 08:52:55 -0000	5.2
++++ src/common/areas.c	20 Oct 2006 12:13:18 -0000	5.3
+@@ -67,9 +67,9 @@
+ 	debug(8, "config: AreasXlate %s", cf);
+ 	
+ 	/* Chars in area name */
+-	x_a = xstrtok(cf  , " \t");
++	x_a = (unsigned char *)xstrtok(cf  , " \t");
+ 	/* Chars in newsgroup name */
+-	x_g = xstrtok(NULL, " \t");
++	x_g = (unsigned char *)xstrtok(NULL, " \t");
+ 	if(!x_a || !x_g)
+ 	    return;
+ 
diff --git a/news/fidogate-ds/files/patch-ftntoss.c b/news/fidogate-ds/files/patch-ftntoss.c
new file mode 100644
index 000000000000..fa9e873dc5ac
--- /dev/null
+++ b/news/fidogate-ds/files/patch-ftntoss.c
@@ -0,0 +1,30 @@
+Index: src/toss/ftntoss.c
+===================================================================
+RCS file: /cvsroot/rusfidogate/fidogate-sta/src/toss/ftntoss.c,v
+retrieving revision 5.2
+retrieving revision 5.4
+diff -u -r5.2 -r5.4
+--- src/toss/ftntoss.c	23 Nov 2005 23:12:22 -0000	5.2
++++ src/toss/ftntoss.c	31 Oct 2006 15:12:10 -0000	5.4
+@@ -927,7 +927,7 @@
+ 	}
+ 
+ 	a = uplinks_line_get(TRUE, &msg->node_from);
+-	if(a->options)
++	if(a != NULL && a->options != NULL)
+ 	    BUF_COPY5(autocreate_cmd, areaname, " ",
+ 		      autocreate_line, " ", a->options);
+ 	else
+@@ -1036,9 +1036,9 @@
+ 
+ 	    /* Compute CRC for strings from, to, subject */
+ 	    crc32_init();
+-	    crc32_compute(msg->name_from, strlen(msg->name_from));
+-	    crc32_compute(msg->name_to  , strlen(msg->name_to  ));
+-	    crc32_compute(msg->subject  , strlen(msg->subject  ));
++	    crc32_compute((unsigned char *)msg->name_from, strlen(msg->name_from));
++	    crc32_compute((unsigned char *)msg->name_to  , strlen(msg->name_to  ));
++	    crc32_compute((unsigned char *)msg->subject  , strlen(msg->subject  ));
+ 
+ 	    str_printf(buffer, sizeof(buffer), "%s NOMSGID: %s %s %08lx",
+ 		       area->area, znfp1(&msg->node_orig),
diff --git a/news/fidogate-ds/files/patch-msgid.c b/news/fidogate-ds/files/patch-msgid.c
new file mode 100644
index 000000000000..b73aaea17780
--- /dev/null
+++ b/news/fidogate-ds/files/patch-msgid.c
@@ -0,0 +1,21 @@
+Index: src/common/msgid.c
+===================================================================
+RCS file: /cvsroot/rusfidogate/fidogate-sta/src/common/msgid.c,v
+retrieving revision 5.1
+retrieving revision 5.2
+diff -u -r5.1 -r5.2
+--- src/common/msgid.c	10 Dec 2004 19:09:58 -0000	5.1
++++ src/common/msgid.c	31 Oct 2006 15:12:10 -0000	5.2
+@@ -265,9 +265,9 @@
+      * Compute CRC for strings from, to, subject
+      */
+     crc32_init();
+-    crc32_compute(msg->name_from, strlen(msg->name_from));
+-    crc32_compute(msg->name_to  , strlen(msg->name_to  ));
+-    crc32_compute(msg->subject  , strlen(msg->subject  ));
++    crc32_compute((unsigned char *)msg->name_from, strlen(msg->name_from));
++    crc32_compute((unsigned char *)msg->name_to  , strlen(msg->name_to  ));
++    crc32_compute((unsigned char *)msg->subject  , strlen(msg->subject  ));
+ 
+     return s_printf("<NOMSGID_%d=3A%d=2F%d.%d_%s_%08lx@%s>",
+ 		    msg->node_orig.zone, msg->node_orig.net,
diff --git a/news/fidogate-ds/files/patch-packet.h b/news/fidogate-ds/files/patch-packet.h
new file mode 100644
index 000000000000..6ae765ad6b84
--- /dev/null
+++ b/news/fidogate-ds/files/patch-packet.h
@@ -0,0 +1,21 @@
+Index: src/include/packet.h
+===================================================================
+RCS file: /cvsroot/rusfidogate/fidogate-sta/src/include/packet.h,v
+retrieving revision 5.2
+retrieving revision 5.3
+diff -u -r5.2 -r5.3
+--- src/include/packet.h	14 Oct 2006 08:52:55 -0000	5.2
++++ src/include/packet.h	31 Oct 2006 15:12:10 -0000	5.3
+@@ -95,9 +95,9 @@
+     int attr;					/* Attribute flags */
+     int cost;					/* Cost */
+     time_t date;				/* Date */
+-    unsigned char name_to[MSG_MAXNAME];		/* To name */
+-    unsigned char name_from[MSG_MAXNAME];	/* From name */
+-    unsigned char subject[MSG_MAXSUBJ];		/* Subject */
++    char name_to[MSG_MAXNAME];			/* To name */
++    char name_from[MSG_MAXNAME];		/* From name */
++    char subject[MSG_MAXSUBJ];			/* Subject */
+ 
+     char *area;					/* EchoMail area or NULL */
+ }