From 71211cf7b9744b799ce3b248ffda0681a57d12bb Mon Sep 17 00:00:00 2001 From: Sebastian Jaenicke Date: Fri, 26 Nov 2004 03:00:55 +0000 Subject: [PATCH] Sebastian Jaenicke: updated slrn (0.9.8.1 + patches) [2004110823131129155] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4844 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/tsa/slrn/slrn-0.9.8.0-mime.patch | 30 ---- package/tsa/slrn/slrn-0.9.8.0-post.patch | 31 ---- package/tsa/slrn/slrn-0.9.8.0-ranges.patch | 46 ------ package/tsa/slrn/slrn-0.9.8.1-fetch.patch | 30 ++++ package/tsa/slrn/slrn-0.9.8.1-lastchar2.patch | 150 ++++++++++++++++++ package/tsa/slrn/slrn.desc | 4 +- 6 files changed, 182 insertions(+), 109 deletions(-) delete mode 100644 package/tsa/slrn/slrn-0.9.8.0-mime.patch delete mode 100644 package/tsa/slrn/slrn-0.9.8.0-post.patch delete mode 100644 package/tsa/slrn/slrn-0.9.8.0-ranges.patch create mode 100644 package/tsa/slrn/slrn-0.9.8.1-fetch.patch create mode 100644 package/tsa/slrn/slrn-0.9.8.1-lastchar2.patch diff --git a/package/tsa/slrn/slrn-0.9.8.0-mime.patch b/package/tsa/slrn/slrn-0.9.8.0-mime.patch deleted file mode 100644 index 8566c84af..000000000 --- a/package/tsa/slrn/slrn-0.9.8.0-mime.patch +++ /dev/null @@ -1,30 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/tsa/slrn/slrn-0.9.8.0-mime.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- slrn/src/mime.c~ 2002-11-01 13:32:34.000000000 +0100 -+++ slrn/src/mime.c 2003-11-21 18:39:34.000000000 +0100 -@@ -650,7 +650,7 @@ - l = a->lines; - - /* skip header and separator */ -- while (((l != NULL) && (l->flags & HEADER_LINE)) || l->buf[0] == '\0') -+ while ((l != NULL) && ((l->flags & HEADER_LINE) || l->buf[0] == '\0')) - l = l->next; - - if (l == NULL) return; diff --git a/package/tsa/slrn/slrn-0.9.8.0-post.patch b/package/tsa/slrn/slrn-0.9.8.0-post.patch deleted file mode 100644 index 272b5e724..000000000 --- a/package/tsa/slrn/slrn-0.9.8.0-post.patch +++ /dev/null @@ -1,31 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/tsa/slrn/slrn-0.9.8.0-post.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- slrn-0.9.8.0/src/post.c 2003-07-31 19:21:18.000000000 +0200 -+++ slrn/src/post.c 2003-09-04 23:56:33.000000000 +0200 -@@ -1233,6 +1234,9 @@ - - va_start(ap, fmt); - Slrn_Post_Obj->po_vprintf(fmt, ap); -+ va_end(ap); -+ -+ va_start(ap, fmt); - vfprintf(fcc_fp, fmt, ap); - va_end(ap); - } diff --git a/package/tsa/slrn/slrn-0.9.8.0-ranges.patch b/package/tsa/slrn/slrn-0.9.8.0-ranges.patch deleted file mode 100644 index 793fab0a3..000000000 --- a/package/tsa/slrn/slrn-0.9.8.0-ranges.patch +++ /dev/null @@ -1,46 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/tsa/slrn/slrn-0.9.8.0-ranges.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- slrn-0.9.8.0/src/ranges.c 2003-08-02 01:19:39.000000000 +0200 -+++ slrn/src/ranges.c 2003-09-02 14:45:34.000000000 +0200 -@@ -264,13 +264,17 @@ - do - { - /* skip ranges that don't intersect at all */ -- if (b != NULL) -- while ((a != NULL) && (a->max < b->min)) -- a = a->next; -- -- if (a != NULL) -- while ((b != NULL) && (b->max < a->min)) -- b = b->next; -+ do -+ { -+ if (b != NULL) -+ while ((a != NULL) && (a->max < b->min)) -+ a = a->next; -+ -+ if (a != NULL) -+ while ((b != NULL) && (b->max < a->min)) -+ b = b->next; -+ } -+ while ((a!=NULL) && (b!=NULL) && (a->max < b->min)); - - /* append a range containing the next intersection */ - if ((a!=NULL) && (b!=NULL)) diff --git a/package/tsa/slrn/slrn-0.9.8.1-fetch.patch b/package/tsa/slrn/slrn-0.9.8.1-fetch.patch new file mode 100644 index 000000000..a6aa030f6 --- /dev/null +++ b/package/tsa/slrn/slrn-0.9.8.1-fetch.patch @@ -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/package/tsa/slrn/slrn-0.9.8.1-lastchar2.patch b/package/tsa/slrn/slrn-0.9.8.1-lastchar2.patch new file mode 100644 index 000000000..1e02ad3b9 --- /dev/null +++ b/package/tsa/slrn/slrn-0.9.8.1-lastchar2.patch @@ -0,0 +1,150 @@ +diff -ru 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-11-05 23:01:51.391610936 +0100 +@@ -3,7 +3,7 @@ + This file is part of SLRN. + + Copyright (c) 1994, 1999 John E. Davis +- Copyright (c) 2001-2003 Thomas Schultz ++ Copyright (c) 2001-2004 Thomas Schultz + + 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,10 @@ + if ((p == pmax) || (p == vline)) + continue; + +- vline[vlen-1] = 0; /* kill \n and NULL terminate */ ++ if (vline[vlen-1] == '\n') ++ vline[vlen-1] = 0; ++ else ++ vline[vlen] = 0; + + if (-1 == add_group (vline, (unsigned int) (p - vline), + ((ch == '!') ? GROUP_UNSUBSCRIBED : 0), 0, 0)) +diff -ru 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-11-05 23:02:09.519855024 +0100 +@@ -1165,8 +1165,11 @@ + 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; ++ else ++ line[vlen] = 0; + + if (header) + { +diff -ru 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-11-05 23:02:53.936102728 +0100 +@@ -467,7 +467,10 @@ + linenum = 0; + while ((NULL != (vline = vgets (vp, &vlen))) && (*vline != '\n')) + { +- vline[vlen-1] = 0; ++ if (vline[vlen-1] == '\n') ++ vline[vlen-1] = 0; ++ else ++ vline[vlen] = 0; + linenum++; + if (0 == slrn_case_strncmp ((unsigned char *)vline, + (unsigned char *) "Cc: ", 4)) +@@ -540,7 +543,10 @@ + + while ((NULL != (vline = vgets (vp, &vlen))) && (*vline != '\n')) + { +- vline[vlen-1] = 0; ++ if (vline[vlen-1] == '\n') ++ vline[vlen-1] = 0; ++ else ++ vline[vlen] = 0; + linenum++; + if (linenum == cc_line) continue; + if (is_empty_header (vline)) continue; +@@ -593,7 +599,10 @@ + + while (NULL != (vline = vgets (vp, &vlen))) + { +- vline[vlen-1] = 0; ++ if (vline[vlen-1] == '\n') ++ vline[vlen-1] = 0; ++ else ++ vline[vlen] = 0; + fputs (vline, pp); + fputs ("\n", pp); + } +@@ -1411,8 +1420,11 @@ + 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 */ ++ else ++ linep[vlen] = 0; + + if (header) + { +diff -ru 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-11-05 23:03:18.859313824 +0100 +@@ -3273,7 +3273,10 @@ + + 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 */ ++ else ++ vline[vlen] = 0; + group->headers = slrn_ranges_from_newsrc_line (vline); + } + +@@ -3382,7 +3385,10 @@ + 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; ++ else ++ vline[vlen] = 0; + + r = slrn_ranges_from_newsrc_line (p+1); + group->requests = slrn_ranges_merge (group->requests, r); +diff -ru 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-11-05 23:04:17.628379568 +0100 +@@ -1757,7 +1757,10 @@ + + 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 */ ++ else ++ vline[vlen] = 0; + retval = slrn_ranges_from_newsrc_line (vline); + } + +@@ -1787,8 +1790,11 @@ + 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; ++ else ++ vline[vlen] = 0; + + retval = slrn_ranges_from_newsrc_line (p+1); + break; diff --git a/package/tsa/slrn/slrn.desc b/package/tsa/slrn/slrn.desc index e5718da52..c5e79035f 100644 --- a/package/tsa/slrn/slrn.desc +++ b/package/tsa/slrn/slrn.desc @@ -38,8 +38,8 @@ [L] OpenSource [S] Stable -[V] 0.9.8.0 +[V] 0.9.8.1 [P] X -?---5---9 190.900 -[D] 819608956 slrn-0.9.8.0.tar.bz2 http://dl.sourceforge.net/sourceforge/slrn/ +[D] 2716540591 slrn-0.9.8.1.tar.bz2 http://dl.sourceforge.net/sourceforge/slrn/