Added two bugfix patches from upstream.

4 files changed, 175 insertions, 2 deletions

diff --git a/net-news/slrn/ChangeLog b/net-news/slrn/ChangeLog
index 5abb66a758c8..aab38de84d48 100644
--- a/net-news/slrn/ChangeLog
+++ b/net-news/slrn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-news/slrn
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/slrn/ChangeLog,v 1.30 2004/10/09 21:14:10 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/slrn/ChangeLog,v 1.31 2004/10/17 01:51:11 swegener Exp $
+
+  17 Oct 2004; Sven Wegener <swegener@gentoo.org>
+  +files/0.9.8.1/slrn-0.9.8.1-fetch.diff,
+  +files/0.9.8.1/slrn-0.9.8.1-lastchar.diff, slrn-0.9.8.1.ebuild:
+  Added two bugfix patches from upstream.
 
 *slrn-0.9.8.1 (09 Oct 2004)
 
diff --git a/net-news/slrn/files/0.9.8.1/slrn-0.9.8.1-fetch.diff b/net-news/slrn/files/0.9.8.1/slrn-0.9.8.1-fetch.diff
new file mode 100644
index 000000000000..a6aa030f6528
--- /dev/null
+++ b/net-news/slrn/files/0.9.8.1/slrn-0.9.8.1-fetch.diff
@@ -0,0 +1,30 @@
+--- slrn-0.9.8.1/src/slrnpull.c	2004-02-28 23:08:17.000000000 +0100
++++ slrn/src/slrnpull.c	2004-10-10 01:42:31.000000000 +0200
+@@ -1647,7 +1647,7 @@
+ 	    || (((unsigned int)server_max <= gmax) && (gmin <= gmax)))
+ 	  {
+ 	     log_message (_("%s: no new articles available."), g->name);
+-	     return 0;
++	     goto fetch_marked_bodies;
+ 	  }
+ 	
+ 	Num_Duplicates = 0;
+@@ -1667,7 +1667,7 @@
+ 	     g->max = g->server_max;
+ 	     log_message (_("%s: No new articles available."), g->name);
+ 	     slrn_free ((char *) numbers);
+-	     return 0;
++	     goto fetch_marked_bodies;
+ 	  }
+ 	
+ 	log_message (_("%s: %u articles available."), g->name, num_numbers - i);
+@@ -1716,7 +1716,8 @@
+      }
+ 
+    /* Now, fetch marked article bodies. */
+-   
++
++   fetch_marked_bodies:
+    /* Don't request bodies that are no longer there. */
+    if (server_min > 1)
+      g->requests = slrn_ranges_remove (g->requests, 1, server_min-1);
diff --git a/net-news/slrn/files/0.9.8.1/slrn-0.9.8.1-lastchar.diff b/net-news/slrn/files/0.9.8.1/slrn-0.9.8.1-lastchar.diff
new file mode 100644
index 000000000000..04e8b59a6f21
--- /dev/null
+++ b/net-news/slrn/files/0.9.8.1/slrn-0.9.8.1-lastchar.diff
@@ -0,0 +1,130 @@
+diff -ur slrn-0.9.8.1.orig/src/group.c slrn-0.9.8.1/src/group.c
+--- slrn-0.9.8.1.orig/src/group.c	2004-08-15 23:09:31.000000000 +0200
++++ slrn-0.9.8.1/src/group.c	2004-10-14 14:53:47.788281512 +0200
+@@ -3,7 +3,7 @@
+  This file is part of SLRN.
+ 
+  Copyright (c) 1994, 1999 John E. Davis <davis@space.mit.edu>
+- Copyright (c) 2001-2003 Thomas Schultz <tststs@gmx.de>
++ Copyright (c) 2001-2004 Thomas Schultz <tststs@gmx.de>
+ 
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by the Free
+@@ -2605,7 +2605,8 @@
+ 	if ((p == pmax) || (p == vline))
+ 	  continue;
+      
+-	vline[vlen-1] = 0;	       /* kill \n and NULL terminate */
++	if (vline[vlen-1] == '\n')
++	  vline[vlen-1] = 0;
+ 
+ 	if (-1 == add_group (vline, (unsigned int) (p - vline),
+ 			     ((ch == '!') ? GROUP_UNSUBSCRIBED : 0), 0, 0))
+diff -ur slrn-0.9.8.1.orig/src/misc.c slrn-0.9.8.1/src/misc.c
+--- slrn-0.9.8.1.orig/src/misc.c	2004-09-27 23:30:35.000000000 +0200
++++ slrn-0.9.8.1/src/misc.c	2004-10-14 14:53:47.839273760 +0200
+@@ -1165,8 +1165,9 @@
+ 	     if (vlen == 0) continue;
+ 	     
+ 	     line = slrn_safe_malloc (vlen+512); /* add some for MIME overhead */
+-	     slrn_strncpy (line, vline, vlen);
+-	     line[vlen-1] = 0;		/* kill \n and NULL terminate */
++	     strncpy (line, vline, vlen);
++	     if (line[vlen-1] == '\n')
++	       line[vlen-1] = 0;
+ 
+ 	     if (header)
+ 	       {
+diff -ur slrn-0.9.8.1.orig/src/post.c slrn-0.9.8.1/src/post.c
+--- slrn-0.9.8.1.orig/src/post.c	2004-09-28 11:05:54.000000000 +0200
++++ slrn-0.9.8.1/src/post.c	2004-10-14 14:53:47.888266312 +0200
+@@ -467,7 +467,8 @@
+    linenum = 0;
+    while ((NULL != (vline = vgets (vp, &vlen))) && (*vline != '\n'))
+      {
+-	vline[vlen-1] = 0;
++	if (vline[vlen-1] == '\n')
++	  vline[vlen-1] = 0;
+ 	linenum++;
+ 	if (0 == slrn_case_strncmp ((unsigned char *)vline,
+ 				    (unsigned char *) "Cc: ", 4))
+@@ -540,7 +541,8 @@
+ 
+    while ((NULL != (vline = vgets (vp, &vlen))) && (*vline != '\n'))
+      {
+-	vline[vlen-1] = 0;
++	if (vline[vlen-1] == '\n')
++	  vline[vlen-1] = 0;
+ 	linenum++;
+ 	if (linenum == cc_line) continue;
+ 	if (is_empty_header (vline)) continue;
+@@ -593,7 +595,8 @@
+ 
+    while (NULL != (vline = vgets (vp, &vlen)))
+      {
+-	vline[vlen-1] = 0;
++	if (vline[vlen-1] == '\n')
++	  vline[vlen-1] = 0;
+ 	fputs (vline, pp);
+ 	fputs ("\n", pp);
+      }
+@@ -1411,8 +1414,9 @@
+ 	if (vlen == 0) continue;
+ 
+ 	linep = slrn_safe_malloc (vlen+512); /* add some for MIME overhead */
+-	slrn_strncpy (linep, vline, vlen);
+-	linep[vlen-1] = 0;	/* kill \n and NULL terminate */
++	strncpy (linep, vline, vlen);
++	if (linep[vlen-1] == '\n')
++	  linep[vlen-1] = 0;	/* kill \n and NULL terminate */
+ 	
+ 	if (header)
+ 	  {
+diff -ur slrn-0.9.8.1.orig/src/slrnpull.c slrn-0.9.8.1/src/slrnpull.c
+--- slrn-0.9.8.1.orig/src/slrnpull.c	2004-02-28 23:08:17.000000000 +0100
++++ slrn-0.9.8.1/src/slrnpull.c	2004-10-14 14:53:47.940258408 +0200
+@@ -3273,7 +3273,8 @@
+ 	
+ 	if (NULL != (vline = vgets (vp, &vlen)))
+ 	  {
+-	     vline[vlen] = 0; /* make sure line is NULL terminated */
++	     if (vline[vlen-1] == '\n')
++	       vline[vlen-1] = 0; /* make sure line is NULL terminated */
+ 	     group->headers = slrn_ranges_from_newsrc_line (vline);
+ 	  }
+ 	
+@@ -3382,7 +3383,8 @@
+ 	     if (NULL == (group = find_group_type (vline)))
+ 	       continue;
+ 	     
+-	     vline[vlen-1] = 0;	       /* kill \n and NULL terminate */
++	     if (vline[vlen-1] == '\n')
++	       vline[vlen-1] = 0;
+ 	     
+ 	     r = slrn_ranges_from_newsrc_line (p+1);
+ 	     group->requests = slrn_ranges_merge (group->requests, r);
+diff -ur slrn-0.9.8.1.orig/src/spool.c slrn-0.9.8.1/src/spool.c
+--- slrn-0.9.8.1.orig/src/spool.c	2004-08-15 22:48:13.000000000 +0200
++++ slrn-0.9.8.1/src/spool.c	2004-10-14 14:53:47.988251112 +0200
+@@ -1757,7 +1757,8 @@
+    
+    if (NULL != (vline = vgets (vp, &vlen)))
+      {
+-	vline[vlen] = 0; /* make sure line is NULL terminated */
++	if (vline[vlen-1] == '\n')
++	  vline[vlen-1] = 0; /* make sure line is NULL terminated */
+ 	retval = slrn_ranges_from_newsrc_line (vline);
+      }
+    
+@@ -1787,8 +1788,9 @@
+ 	if ((p == pmax) || (p == vline) ||
+ 	    (strncmp(vline, group, (p-vline))))
+ 	  continue;
+-     
+-	vline[vlen-1] = 0;	       /* kill \n and NULL terminate */
++
++	if (vline[vlen-1] == '\n')
++	  vline[vlen-1] = 0;
+ 	
+ 	retval = slrn_ranges_from_newsrc_line (p+1);
+ 	break;
diff --git a/net-news/slrn/slrn-0.9.8.1.ebuild b/net-news/slrn/slrn-0.9.8.1.ebuild
index 64eefbd438f6..66b40d1faae2 100644
--- a/net-news/slrn/slrn-0.9.8.1.ebuild
+++ b/net-news/slrn/slrn-0.9.8.1.ebuild
@@ -1,9 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/slrn/slrn-0.9.8.1.ebuild,v 1.1 2004/10/09 21:14:10 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/slrn/slrn-0.9.8.1.ebuild,v 1.2 2004/10/17 01:51:11 swegener Exp $
 
 inherit eutils
 
+# Upstream patches from http://slrn.sourceforge.net/patches/
+# ${FILESDIR}/${PV}/${P}-<name>.diff
+SLRN_PATCHES="fetch lastchar"
+
 DESCRIPTION="s-lang Newsreader"
 HOMEPAGE="http://slrn.sourceforge.net/"
 SRC_URI="mirror://sourceforge/slrn/${P}.tar.bz2"
@@ -25,6 +29,10 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	for i in ${SLRN_PATCHES} ; do
+		epatch ${FILESDIR}/${PV}/${P}-${i}.diff
+	done
+
 	use unicode && epatch ${FILESDIR}/0.9.8.0/slrn-0.9.8.0-utf8.patch
 }