diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index fba7f0ef7..3248a7b11 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -11,6 +11,7 @@ - Daniel Pischl: updated icewm - Juergen Sawinski: multiple package additions/updates for the jsaw repository - added the TeX -> HTML generator TeX4ht now used for the rock-handbook + - Sebastian Jaenicke: slrn *) 2003-08-26 (2.0.0-rc1 - 2.0.0-rc2) diff --git a/package/tsa/slrn/collapse_subthread.patch b/package/tsa/slrn/collapse_subthread.patch deleted file mode 100644 index ddec3fb4d..000000000 --- a/package/tsa/slrn/collapse_subthread.patch +++ /dev/null @@ -1,218 +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/collapse_subthread.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# 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 Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./src/art.c Fri Sep 13 19:52:44 2002 -+++ ./src/art.c Sat Sep 14 14:39:25 2002 -@@ -4575,9 +4575,81 @@ - - /*}}}*/ - -+void slrn_uncollapse_this_subthread (Slrn_Header_Type *h, int sync_linenum) /*{{{*/ -+{ -+ Slrn_Header_Type *child; -+ int back = 0; -+ -+ while ((h->parent != NULL) && (h->prev != NULL) && (h->sister == NULL)) -+ { -+ /* Special case: rightmost child has no "sister" reference, so we -+ * check backwards for a sister reference in the leftmost child -+ * (h->parent->child is guaranteed as not NULL). -+ */ -+ if (h->parent->child->sister != NULL) break; -+ -+ h = h->prev; -+ back++; -+ } -+ -+ if ((child = h->child) == NULL) return; -+ if (0 == (child->flags & HEADER_HIDDEN)) return; -+ -+ for_this_family (child, uncollapse_header); -+ -+ if (sync_linenum) -+ { -+ Slrn_Full_Screen_Update = 1; -+ Slrn_Current_Header = h; -+ Slrn_Header_Window.current_line = (SLscroll_Type *) h; -+ Slrn_Header_Window.line_num -= back; -+ Slrn_Header_Window.num_lines += h->num_children; -+ } -+ -+ _art_Threads_Collapsed = -1; -+} -+ -+/*}}}*/ -+ -+void slrn_collapse_this_subthread (Slrn_Header_Type *h, int sync_linenum) /*{{{*/ -+{ -+ Slrn_Header_Type *child; -+ int back = 0; -+ -+ while ((h->parent != NULL) && (h->prev != NULL) && (h->sister == NULL)) -+ { -+ /* Special case: rightmost child has no "sister" reference, so we -+ * check backwards for a sister reference in the leftmost child -+ * (h->parent->child is guaranteed as not NULL). -+ */ -+ if (h->parent->child->sister != NULL) break; -+ -+ h = h->prev; -+ back++; -+ } -+ -+ if ((child = h->child) == NULL) return; -+ if (child->flags & HEADER_HIDDEN) return; -+ -+ for_this_family (child, collapse_header); -+ -+ if (sync_linenum) -+ { -+ Slrn_Full_Screen_Update = 1; -+ Slrn_Current_Header = h; -+ Slrn_Header_Window.current_line = (SLscroll_Type *) h; -+ Slrn_Header_Window.line_num -= back; -+ Slrn_Header_Window.num_lines -= h->num_children; -+ } -+ -+ _art_Threads_Collapsed = -1; /* uncertain */ -+} -+ -+/*}}}*/ -+ - static void toggle_collapse_threads (void) /*{{{*/ - { -- if (Slrn_Prefix_Arg_Ptr != NULL) -+ if ((Slrn_Prefix_Arg_Ptr != NULL) && (*Slrn_Prefix_Arg_Ptr == 1)) - { - if (_art_Threads_Collapsed == 1) - { -@@ -4586,6 +4658,15 @@ - else slrn_collapse_threads (0); - Slrn_Prefix_Arg_Ptr = NULL; - } -+ else if ((Slrn_Prefix_Arg_Ptr != NULL) && (*Slrn_Prefix_Arg_Ptr == 2)) -+ { -+ if (0 == slrn_is_subthread_collapsed (Slrn_Current_Header)) -+ slrn_collapse_this_subthread (Slrn_Current_Header, 0); -+ else -+ slrn_uncollapse_this_subthread (Slrn_Current_Header, 0); -+ -+ find_non_hidden_header (); -+ } - else - { - if (0 == slrn_is_thread_collapsed (Slrn_Current_Header)) -@@ -4610,6 +4691,13 @@ - { - if (h == NULL) return 1; - while (h->parent != NULL) h = h->parent; -+ if (h->child == NULL) return 0; -+ return (h->child->flags & HEADER_HIDDEN); -+} -+ -+int slrn_is_subthread_collapsed (Slrn_Header_Type *h) -+{ -+ if (h == NULL) return 1; - if (h->child == NULL) return 0; - return (h->child->flags & HEADER_HIDDEN); - } -diff -ur slrn/src/art.h slrn.subthreads/src/art.h ---- slrn/src/art.h Fri Sep 13 19:52:44 2002 -+++ slrn.subthreads/src/art.h Fri Sep 13 19:54:52 2002 -@@ -226,6 +226,7 @@ - extern void slrn_uncollapse_this_thread (Slrn_Header_Type *, int); - extern unsigned int slrn_thread_size (Slrn_Header_Type *); - extern int slrn_is_thread_collapsed (Slrn_Header_Type *); -+extern int slrn_is_subthread_collapsed (Slrn_Header_Type *); - - extern int slrn_next_unread_header (void); - extern int slrn_goto_num_tagged_header (int *); -diff -ur slrn/src/help.c slrn.subthreads/src/help.c ---- slrn/src/help.c Fri Sep 13 19:52:44 2002 -+++ slrn.subthreads/src/help.c Fri Sep 13 19:54:52 2002 -@@ -135,6 +135,7 @@ - N_("Header window commands:"), - N_(" ESC t Collapse / Uncollapse thread."), - N_(" ESC 1 ESC t Collapse / Uncollapse all threads."), -+ N_(" ESC 2 ESC t Collapse / Uncollapse current sub-thread."), - N_(" ESC a Toggle between header display formats."), - N_(" ESC s Select threading and sorting method."), - N_("Miscellaneous actions:"), -diff -ur slrn/src/interp.c slrn.subthreads/src/interp.c ---- slrn/src/interp.c Fri Sep 13 19:52:45 2002 -+++ slrn.subthreads/src/interp.c Fri Sep 13 19:54:52 2002 -@@ -983,6 +983,18 @@ - slrn_uncollapse_this_thread (Slrn_Current_Header, 1); - } - -+static void collapse_subthread (void) -+{ -+ if (0 == check_article_mode()) -+ slrn_collapse_this_subthread (Slrn_Current_Header, 1); -+} -+ -+static void uncollapse_subthread (void) -+{ -+ if (0 == check_article_mode()) -+ slrn_uncollapse_this_subthread (Slrn_Current_Header, 1); -+} -+ - static int thread_size (void) - { - if (check_article_mode ()) return -1; -@@ -1001,6 +1013,12 @@ - return slrn_is_thread_collapsed (Slrn_Current_Header); - } - -+static int is_subthread_collapsed (void) -+{ -+ if (check_article_mode ()) return -1; -+ return slrn_is_subthread_collapsed (Slrn_Current_Header); -+} -+ - static int header_down (int *num) /*{{{*/ - { - if ((-1 == check_article_mode ()) -@@ -1429,6 +1447,7 @@ - MAKE_INTRINSIC_S("call", slrn_call_command, SLANG_VOID_TYPE), - MAKE_INTRINSIC_0("collapse_thread", collapse_thread, SLANG_VOID_TYPE), - MAKE_INTRINSIC_0("collapse_threads", collapse_threads, SLANG_VOID_TYPE), -+ MAKE_INTRINSIC_0("collapse_subthread", collapse_subthread, SLANG_VOID_TYPE), - MAKE_INTRINSIC_0("current_newsgroup", current_group_name, SLANG_STRING_TYPE), - MAKE_INTRINSIC_S("datestring_to_unixtime", slrn_date_to_order_parm, SLANG_INT_TYPE), - MAKE_INTRINSIC_SSS("definekey", definekey, SLANG_VOID_TYPE), -@@ -1464,6 +1483,7 @@ - MAKE_INTRINSIC_0("is_article_window_zoomed", slrn_is_article_win_zoomed, SLANG_INT_TYPE), - MAKE_INTRINSIC_0("is_group_mode", is_group_mode, SLANG_INT_TYPE), - MAKE_INTRINSIC_0("is_thread_collapsed", is_thread_collapsed, SLANG_INT_TYPE), -+ MAKE_INTRINSIC_0("is_subthread_collapsed", is_subthread_collapsed, SLANG_INT_TYPE), - MAKE_INTRINSIC_S("make_home_filename", make_home_filename, SLANG_VOID_TYPE), - MAKE_INTRINSIC_0("next_tagged_header", slrn_next_tagged_header, SLANG_INT_TYPE), - MAKE_INTRINSIC_S("pipe_article", pipe_article_cmd, SLANG_VOID_TYPE), -@@ -1518,6 +1538,7 @@ - MAKE_INTRINSIC_S("tt_send", tt_send, SLANG_VOID_TYPE), - MAKE_INTRINSIC_0("uncollapse_thread", uncollapse_thread, SLANG_VOID_TYPE), - MAKE_INTRINSIC_0("uncollapse_threads", uncollapse_threads, SLANG_VOID_TYPE), -+ MAKE_INTRINSIC_0("uncollapse_subthread", uncollapse_subthread, SLANG_VOID_TYPE), - MAKE_INTRINSIC_SS("undefinekey", undefinekey, SLANG_VOID_TYPE), - MAKE_INTRINSIC_I("ungetkey", ungetkey, SLANG_VOID_TYPE), - MAKE_INTRINSIC_SS("unregister_hook", slrn_unregister_hook_by_name, SLANG_INT_TYPE), diff --git a/package/tsa/slrn/link_subjects.patch b/package/tsa/slrn/link_subjects.patch deleted file mode 100644 index 15eb77f5f..000000000 --- a/package/tsa/slrn/link_subjects.patch +++ /dev/null @@ -1,56 +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/link_subjects.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# 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 Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./src/art_sort.c Mon Mar 11 15:22:35 2002 -+++ ./src/art_sort.c Thu Mar 14 19:02:45 2002 -@@ -526,7 +526,7 @@ - { - Slrn_Header_Type *rjh = relatives[j].h; - -- if (Slrn_New_Subject_Breaks_Threads -+ if ((Slrn_New_Subject_Breaks_Threads & 1) - && (rih->subject != NULL) - && (rjh->subject != NULL) - && (0 != _art_subject_cmp (rih->subject, rjh->subject))) -@@ -877,7 +877,7 @@ - { - Slrn_Header_Type *child, *last_child, *rparent; - -- if (Slrn_New_Subject_Breaks_Threads -+ if ((Slrn_New_Subject_Breaks_Threads & 1) - && (h->subject != NULL) - && (ref->subject != NULL) - && (0 != _art_subject_cmp (h->subject, ref->subject))) -@@ -921,8 +921,11 @@ - - /* Now perform sort on subject to catch those that have fallen through the - * cracks, i.e., no references */ -- slrn_message_now (_("Linking articles with identical subjects ...")); -- link_same_subjects (); -+ if (!(Slrn_New_Subject_Breaks_Threads & 2)) -+ { -+ slrn_message_now (_("Linking articles with identical subjects ...")); -+ link_same_subjects (); -+ } - - /* Now link up others as sisters */ - h = Slrn_First_Header; diff --git a/package/tsa/slrn/mem_leak.patch b/package/tsa/slrn/mem_leak.patch deleted file mode 100644 index c8cd57660..000000000 --- a/package/tsa/slrn/mem_leak.patch +++ /dev/null @@ -1,157 +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/mem_leak.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# 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 Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./src/score.c Wed Mar 13 13:52:00 2002 -+++ ./src/score.c Fri Apr 5 23:20:20 2002 -@@ -550,6 +550,19 @@ - - char *Slrn_Scorefile_Open = NULL; - -+static void free_srt (Score_Regexp_Type *srt) -+{ -+ while (srt != NULL) -+ { -+ Score_Regexp_Type *srt_next = srt->next; -+ if ((srt->header_type == SCORE_SUB_AND) || -+ (srt->header_type == SCORE_SUB_OR)) -+ free_srt (srt->search.srt); -+ SLFREE (srt); -+ srt = srt_next; -+ } -+} -+ - static void free_group_chain (void) - { - Score_Regexp_Type *srt; -@@ -558,13 +571,11 @@ - { - Score_Type *next = Score_Root->next; - srt = &Score_Root->regexp_list; -- srt = srt->next; /* first not malloced */ -- while (srt != NULL) -- { -- Score_Regexp_Type *srt_next = srt->next; -- SLFREE (srt); -- srt = srt_next; -- } -+ /* first not malloced; free subscores only: */ -+ if ((srt->header_type == SCORE_SUB_AND) || -+ (srt->header_type == SCORE_SUB_OR)) -+ free_srt (srt->search.srt); -+ free_srt (srt->next); - SLFREE (Score_Root); - Score_Root = next; - } -@@ -837,6 +848,21 @@ - } - - -+static void free_psrt (PScore_Regexp_Type *r) -+{ -+ while (r != NULL) -+ { -+ PScore_Regexp_Type *rnext = r->next; -+ -+ if ((r->header_type == SCORE_SUB_AND) || -+ (r->header_type == SCORE_SUB_OR)) -+ free_psrt (r->ireg.psrt); -+ else if ((r->flags & USE_INTEGER) == 0) -+ slrn_free ((char *) r->ireg.regexp_str); -+ SLFREE (r); -+ r = rnext; -+ } -+} - - static void free_group_scores (void) - { -@@ -857,30 +883,14 @@ - while (pst != NULL) - { - PScore_Type *pnext = pst->next; -- PScore_Regexp_Type *r = pst->pregexp_list; - -- while (r != NULL) -- { -- PScore_Regexp_Type *rnext = r->next; -- -- if ((r->flags & USE_INTEGER) == 0) -- slrn_free ((char *) r->ireg.regexp_str); -- SLFREE (r); -- r = rnext; -- } -+ free_psrt (pst->pregexp_list); - slrn_free ((char *) pst->description); - SLFREE (pst); -+ - pst = pnext; - } - -- while (Scorefile_Names != NULL) -- { -- Scorefile_Name_Type *next = Scorefile_Names->next; -- slrn_free ((char *) Scorefile_Names->filename); -- slrn_free ((char *) Scorefile_Names); -- Scorefile_Names = next; -- } -- - SLFREE (Group_Score_Root); - Group_Score_Root = gnext; - } -@@ -1177,7 +1187,7 @@ - ret = add_group_regexp (psrt, lp + 5, lp, SCORE_BYTES, not_flag); - else if (!slrn_case_strncmp (lp, (unsigned char *)"Message-Id:", 11)) - ret = add_group_regexp (psrt, lp + 10, lp, SCORE_MESSAGE_ID, not_flag); -- else if (!slrn_case_strncmp (lp, (unsigned char *)"{:", 1)) -+ else if (!slrn_case_strncmp (lp, (unsigned char *)"{:", 2)) - { - if (lp[2] ==':') - { -@@ -1191,6 +1201,7 @@ - } - else if (!slrn_case_strncmp (lp, (unsigned char *)"}", 1)) - { -+ SLFREE (psrt); - if (sub_psrt != NULL) - return 0; - else -@@ -1205,6 +1216,7 @@ - while (*lpp && (*lpp != ':')) lpp++; - if (*lpp != ':') - { -+ SLFREE (psrt); - score_error (_("Missing COLON."), line, *linenum, file); - return -1; - } -@@ -1298,6 +1310,13 @@ - free_group_scores (); - } - free_group_chain (); -+ while (Scorefile_Names != NULL) -+ { -+ Scorefile_Name_Type *next = Scorefile_Names->next; -+ slrn_free ((char *) Scorefile_Names->filename); -+ slrn_free ((char *) Scorefile_Names); -+ Scorefile_Names = next; -+ } - - sc.today = get_today (); - sc.score = 0; diff --git a/package/tsa/slrn/po.patch b/package/tsa/slrn/po.patch deleted file mode 100644 index 1e100f676..000000000 --- a/package/tsa/slrn/po.patch +++ /dev/null @@ -1,735 +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/po.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# 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 Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./po/fr.po Wed Mar 13 14:19:19 2002 -+++ ./po/fr.po Sun Mar 17 19:10:05 2002 -@@ -597,12 +597,12 @@ - #: src/art.c:7351 - #, c-format - msgid "Num Killed: %u, Num High: %u, Num Low: %u, Num GroupLens Rated: %d" --msgstr "Nb tuИs : %u, nb haut : %u, nb bas : u, nb notИs par GroupLens : %d" -+msgstr "Nb tuИs : %u, nb haut : %u, nb bas : %u, nb notИs par GroupLens : %d" - - #: src/art.c:7357 - #, c-format - msgid "Num Killed: %u, Num High: %u, Num Low: %u" --msgstr "Nb tuИs : %s, nb haut : %u, nb bas : %u" -+msgstr "Nb tuИs : %u, nb haut : %u, nb bas : %u" - - #: src/art.c:7558 - msgid "" -@@ -3257,27 +3257,19 @@ - "them.\n" - msgstr "" - "Utilisation : slrn [--inews] [--nntp ...] [--spool] OPTIONS\n" --"-n Ne pas vИrifier les nouveaux forums. Ceci rИsulte en " --"gИnИral\n" -+"-n Ne pas vИrifier les nouveaux forums. Ceci rИsulte en gИnИral\n" - " en un dИmarrage plus rapide.\n" - "-f fichier-newsrc Nom du fichier newsrc Ю utiliser.\n" - "-C Utiliser les couleurs.\n" --"-create CrИer un fichier newsrc en obtenant la liste des forums du " --"serveur.\n" --"-d Obtenir de nouvelles descriptions au format texte de chaque " --"forum du serveur.\n" --" Note : ceci peut prendre BEAUCOUP de temps pour rИcupИrer " --"cette information.\n" -+"-create CrИer un fichier newsrc en obtenant la liste des forums du serveur.\n" -+"-d Obtenir de nouvelles descriptions au format texte de chaque forum du serveur.\n" -+" Note : ceci peut prendre BEAUCOUP de temps pour rИcupИrer cette information.\n" - " Le fichier rИsultant peut faire plusieurs kilo-octets !\n" --"-i fichier-init Nom du fichier d'initialisation Ю utiliser (.slrnrc par " --"dИfaut)\n" --"-Dnom Ajouter 'nom' Ю la liste des marques de prИtraitement " --"prИdИfinies.\n" -+"-i fichier-init Nom du fichier d'initialisation Ю utiliser (%s par dИfaut)\n" -+"-Dnom Ajouter 'nom' Ю la liste des marques de prИtraitement prИdИfinies.\n" - "-k Ne pas traiter le fichier de score.\n" --"-k0 Traiter le fichier de score mais dИsactiver les scores " --"chers.\n" --"-a Utiliser le fichier active pour obtenir les nouveaux " --"articles.\n" -+"-k0 Traiter le fichier de score mais dИsactiver les scores chers.\n" -+"-a Utiliser le fichier active pour obtenir les nouveaux articles.\n" - "-m Forcer le rapport de la souris XTerm.\n" - "--help Affiche ce message.\n" - "--version Montre la version et les capacitИs supportИes.\n" -@@ -4147,7 +4139,7 @@ - "%sFile not opened: %s" - msgstr "" - "%s : ligne %d\n" --"%dfichier non ouvert : %s" -+"%sfichier non ouvert : %s" - - #: src/util.c:340 - msgid "File name too long." -diff -ur slrn-0.9.7.4/po/ko.po slrn/po/ko.po ---- slrn-0.9.7.4/po/ko.po Wed Mar 13 14:19:21 2002 -+++ slrn/po/ko.po Sun Mar 17 22:27:40 2002 -@@ -6,7 +6,7 @@ - msgstr "" - "Project-Id-Version: 0.9.7.3\n" - "POT-Creation-Date: 2002-03-13 14:15+0100\n" --"PO-Revision-Date: 2002-03-05 22:53+300\n" -+"PO-Revision-Date: 2002-03-17 22:47+300\n" - "Last-Translator: Im Eunjea \n" - "Language-Team: Im Eunjea \n" - "MIME-Version: 1.0\n" -@@ -1236,7 +1236,7 @@ - #: src/grplens.c:1000 src/grplens.c:1026 - #, c-format - msgid "Error processing line %u of %s" --msgstr "%sюг %u╧Ьб╟аыю╩ цЁ╦╝аъ ©ю╥Ы" -+msgstr "%u ╧Ьб╟ аыю╩ цЁ╦╝аъ ©ю╥Ы: %s" - - #: src/grplens.c:1050 - #, c-format -@@ -2970,7 +2970,7 @@ - #: src/score.c:1109 - #, c-format - msgid "%s has expired score on line %d" --msgstr "%dб╟ аыюг %s╢б ╦╦╠Б╣й" -+msgstr "%s ╢б ╦╦╠Б╣й, %d б╟ аы" - - #: src/score.c:1122 - msgid "Bad group regular expression." -@@ -3555,7 +3555,7 @@ - #: src/slrnpull.c:1564 - #, c-format - msgid "chmod 0%o failed on %s." --msgstr "%sюг chmod 0%o ╫гфп" -+msgstr "chmod 0%o ╫гфп: %s" - - #: src/slrnpull.c:1588 - msgid "Server does not permit posting at this time." -diff -ur slrn-0.9.7.4/po/nl.po slrn/po/nl.po ---- slrn-0.9.7.4/po/nl.po Wed Mar 13 14:19:21 2002 -+++ slrn/po/nl.po Sun Mar 17 19:13:16 2002 -@@ -2450,7 +2450,7 @@ - msgstr "Autorisatie vereist, maar kan geen gebruikersnaam / wachtwoord vinden." - - #: src/nntplib.c:419 --#, c-format -+#, c-format, fuzzy - msgid "Authenticating %s ..." - msgstr "Autoriseren ..." - -@@ -3902,7 +3902,7 @@ - msgstr "SSL_connect" - - #: src/spool.c:793 --#, c-format -+#, c-format, fuzzy - msgid "Unable to open directory %s" - msgstr "Kan geen directory openen" - -diff -ur slrn-0.9.7.4/po/pl.po slrn/po/pl.po ---- slrn-0.9.7.4/po/pl.po Wed Mar 13 14:19:22 2002 -+++ slrn/po/pl.po Mon Mar 18 19:03:00 2002 -@@ -3426,7 +3426,7 @@ - #: src/slrnpull.c:528 - #, c-format - msgid "Unable to open active groups file %s" --msgstr "BЁ╠d zamkniЙcia pliku active %s." -+msgstr "Nie mogЙ otworzyФ pliku active %s." - - #: src/slrnpull.c:564 - #, c-format -diff -ur slrn-0.9.7.4/po/ru.po slrn/po/ru.po ---- slrn-0.9.7.4/po/ru.po Wed Mar 13 14:19:23 2002 -+++ slrn/po/ru.po Tue Mar 19 14:31:02 2002 -@@ -74,7 +74,7 @@ - # src/art.c:1083 - #: src/art.c:1056 - msgid "Browse (^G aborts): " --msgstr "Просмотреть (^G прервать):" -+msgstr "Просмотреть (^G прервать): " - - # src/art.c:1084 src/art.c:4020 - # src/art.c:1085 src/art.c:4021 -@@ -130,15 +130,14 @@ - #: src/art.c:1298 - #, c-format - msgid "At end of article, press %s for next group." --msgstr "Конец статьи, нажмите %s для перехода к следующей группе." -+msgstr "Конец статьи, нажмите %s для следующей группы." - - # src/art.c:1327 - # src/art.c:1328 - #: src/art.c:1301 - #, c-format - msgid "At end of article, press %s for next unread article." --msgstr "" --"Конец статьи, нажмите %s для перехода к следующей непрочитанной статье." -+msgstr "Конец статьи, нажмите %s для следующей непрочитанной статьи." - - # src/art.c:2009 - # src/art.c:2010 -@@ -188,22 +187,22 @@ - #: src/art.c:2142 - #, c-format - msgid "#%2d/%-2d: Read %4d/%-4d lines (%s) at %.2fkB/sec" --msgstr "" -+msgstr "#%2d/%-2d: Прочитано %4d/%-4d строк (%s) при %.2fКб/сек" - - #: src/art.c:2146 - #, c-format - msgid "#%2d/%-2d: Read %4d/%-4d lines (%s)" --msgstr "" -+msgstr "#%2d/%-2d: Прочитано %4d/%-4d строк (%s)" - - #: src/art.c:2152 - #, c-format - msgid "[%d] Read %d/%d lines so far at %.2fkB/sec" --msgstr "" -+msgstr "[%d] Прочитано %d/%d строк до сих пор при %.2fКб/сек" - - #: src/art.c:2155 - #, c-format - msgid "[%d] Read %d/%d lines so far" --msgstr "" -+msgstr "[%d] Прочитано %d/%d строк до сих пор" - - # src/art.c:2233 - # src/art.c:2234 -@@ -221,7 +220,7 @@ - # src/art.c:2543 - #: src/art.c:2504 - msgid "This operation requires an article" --msgstr "Требуется статья для выполнения этого действия." -+msgstr "Требуется статья для этого действия." - - # src/art.c:2650 - # src/art.c:2651 -@@ -364,28 +363,26 @@ - # src/art.c:3541 - #: src/art.c:3502 - msgid "No previous unread articles." --msgstr "Отсутствуют предыдущие непрочитанные статьи." -+msgstr "Нет предыдущих непрочитанных статей." - - # src/art.c:3584 - # src/art.c:3585 - #: src/art.c:3546 - msgid "No following unread articles." --msgstr "Отсутствуют последующие непрочитанные статьи." -+msgstr "Нет последующих непрочитанных статей." - - # src/art.c:3620 - # src/art.c:3621 - #: src/art.c:3582 - #, c-format - msgid "No following unread articles. Press %s for next group." --msgstr "" --"Отсутствуют последующие непрочитанные статьи. Нажмите %s, для перехода к " --"следующей группе." -+msgstr "Нет последующих непрочитанных статей. Нажмите %s, для следующей группы." - - # src/art.c:3651 - # src/art.c:3652 - #: src/art.c:3613 - msgid "No more high scoring articles." --msgstr "Больше нет статей с высоким score." -+msgstr "Больше нет статей с высоким баллом." - - # src/group.c:1766 - # src/group.c:1766 -@@ -456,13 +453,13 @@ - #: src/art.c:4066 - #, c-format - msgid "decoding %10s (%3d/%3d) %s" --msgstr "Декодирование %10s (%3d/%3d) %s" -+msgstr "декодирование %10s (%3d/%3d) %s" - - # src/art.c:4133 - # src/art.c:4134 - #: src/art.c:4082 - msgid "Filename buffer not large enough." --msgstr "Буфер для имени файла недостаточно большой." -+msgstr "Недостаточный буфер для имени файла." - - # src/art.c:4137 - # src/art.c:4138 -@@ -496,7 +493,7 @@ - #: src/art.c:4116 - #, c-format - msgid "error decoding %s: %s" --msgstr "Ошибка декодирования %s: %s" -+msgstr "ошибка декодирования %s: %s" - - # src/art.c:4191 - # src/art.c:4192 -@@ -584,83 +581,73 @@ - # src/group.c:1766 - # src/group.c:1766 - #: src/art.c:4590 --#, fuzzy - msgid "Subject search " --msgstr "Тема: " -+msgstr "Поиск по теме " - - # src/art.c:5491 - # src/art.c:5495 - #: src/art.c:4590 --#, fuzzy - msgid "Author search " --msgstr " поиск " -+msgstr "Поиск по автору " - - # src/art.c:5492 src/group.c:1223 - # src/art.c:5496 src/group.c:1223 - #: src/art.c:4591 --#, fuzzy - msgid "(forward)" --msgstr "отсюда к концу" -+msgstr "(к концу)" - - # src/art.c:5492 src/group.c:1223 - # src/art.c:5496 src/group.c:1223 - #: src/art.c:4591 --#, fuzzy - msgid "(backward)" --msgstr "отсюда к началу" -+msgstr "(к началу)" - - # src/art.c:5671 - # src/art.c:5680 - #: src/art.c:4777 src/slrnpull.c:1182 --#, fuzzy, c-format -+#, c-format - msgid "Score %d killed article %s\n" --msgstr "" --"Score %d уничтоженной статьи %s\n" --"Группа: %s\n" --"От: %s\n" --"Тема: %s\n" --"\n" -+msgstr "Балл %d уничтоженной статьи %s\n" - - # src/decode.c:170 - # src/decode.c:170 - #: src/art.c:4781 src/slrnpull.c:1186 --#, fuzzy, c-format -+#, c-format - msgid " Score %c%5i: %s (%s:%i)\n" --msgstr "создание %s (%s)\n" -+msgstr " Балл %c%5i: %s (%s:%i)\n" - - #: src/art.c:4785 src/slrnpull.c:1190 - #, c-format - msgid " Score %c%5i: %s:%i\n" --msgstr "" -+msgstr " Балл %c%5i: %s:%i\n" - - # src/art.c:5671 - # src/art.c:5680 - #: src/art.c:4790 src/slrnpull.c:1195 --#, fuzzy, c-format -+#, c-format - msgid "" - " Newsgroup: %s\n" - " From: %s\n" - " Subject: %s\n" - "\n" - msgstr "" --"Score %d уничтоженной статьи %s\n" --"Группа: %s\n" --"От: %s\n" --"Тема: %s\n" -+" Группа: %s\n" -+" От: %s\n" -+" Тема: %s\n" - "\n" - - # src/art.c:5723 - # src/art.c:5732 - #: src/art.c:4855 - msgid "Scoring articles ..." --msgstr "Scoring статей ..." -+msgstr "Установка баллов статей ..." - - # src/art.c:5736 - # src/art.c:5745 - #: src/art.c:4868 - #, c-format - msgid "Scoring articles: %2d%%, Killed: %u, High: %u, Low: %u" --msgstr "Scoring статьи: %2d%%, уничтоженные: %u, высокий: %u, низкий: %u" -+msgstr "Статьи по баллу: %2d%%, уничтоженные: %u, высокий: %u, низкий: %u" - - # src/art.c:5771 - # src/art.c:5780 -@@ -678,7 +665,7 @@ - # src/art.c:5874 - #: src/art.c:5003 - msgid "This article is matched by the following scores" --msgstr "Эта статья удовлетворяет следующим score" -+msgstr "Эта статья удовлетворяет следующим баллам" - - # src/art.c:5965 - # src/art.c:5974 -@@ -835,8 +822,7 @@ - #: src/art.c:7351 - #, c-format - msgid "Num Killed: %u, Num High: %u, Num Low: %u, Num GroupLens Rated: %d" --msgstr "" --"Число удаленных: %u, с высоким: %u, с низким: %u, оцененных из GroupLens: %d" -+msgstr "Число удаленных: %u, с высоким: %u, с низким: %u, по оценке GroupLens: %d" - - # src/art.c:8246 - # src/art.c:8255 -@@ -891,14 +877,13 @@ - # src/art.c:9412 - #: src/art.c:8514 - msgid "Spoilers visible!" --msgstr "Spoilers видимый!" -+msgstr "Spoilers видим!" - - # src/art.c:4489 - # src/art.c:4490 - #: src/art_sort.c:330 --#, fuzzy - msgid "slrn_sort_headers(): memory allocation failure." --msgstr "sort_headers(): ошибка распределения памяти." -+msgstr "slrn_sort_headers(): ошибка распределения памяти." - - # src/art.c:5091 - # src/art.c:5092 -@@ -909,9 +894,8 @@ - # src/art.c:5030 - # src/art.c:5031 - #: src/art_sort.c:799 --#, fuzzy - msgid "Internal Error in fixup_threads()." --msgstr "Внутренняя ошибка." -+msgstr "Внутренняя ошибка в fixup_threads()." - - # src/art.c:5324 - # src/art.c:5325 -@@ -945,7 +929,7 @@ - #: src/art_sort.c:1024 - #, c-format - msgid "Can't sort according to `%s'" --msgstr "" -+msgstr "Сортировка невозможна в соответствие с `%s'" - - # src/chkslang.c:57 - # src/chkslang.c:58 -@@ -1021,13 +1005,13 @@ - #: src/chmap.c:147 src/chmap.c:154 - #, c-format - msgid "File error: %s --- message not posted." --msgstr "Ошибка работы с файлом: %s --- сообщение не было отправлено." -+msgstr "Ошибка работы с файлом: %s --- сообщение не отправлено." - - # src/chmap.c:171 - # src/chmap.c:171 - #: src/chmap.c:166 - msgid "Write Error. Disk Full? --- message not posted." --msgstr "Ошибка записи. Диск переполнен? --- сообщение не было отправлено." -+msgstr "Ошибка записи. Диск переполнен? --- сообщение не отправлено." - - # src/chmap.c:201 - # src/chmap.c:201 -@@ -1153,13 +1137,13 @@ - # src/editscore.c:76 - #: src/editscore.c:76 - msgid "A Score file has not been specified." --msgstr "Файл score не был определен." -+msgstr "Файл Score не был определен." - - # src/editscore.c:86 - # src/editscore.c:86 - #: src/editscore.c:86 - msgid "Pick Score type: Subject, From, References, Edit, Cancel" --msgstr "Выбор Score: Тема, От, Ссылки, Редактировать, Прервать" -+msgstr "Выбор типа балла: Тема, От, Ссылки, Редактировать, Прервать" - - # src/editscore.c:103 - # src/editscore.c:103 -@@ -1191,7 +1175,7 @@ - # src/group.c:387 src/group.c:1142 - #: src/group.c:388 src/group.c:1147 - msgid " - dropping it" --msgstr " - опускается" -+msgstr " - отбрасывается" - - # src/group.c:394 - # src/group.c:394 -@@ -1217,7 +1201,7 @@ - # src/group.c:927 - #: src/group.c:928 - msgid "No articles to read." --msgstr "Отсутствуют статьи для чтения." -+msgstr "Нет статей для чтения." - - # src/group.c:949 - # src/group.c:949 -@@ -1273,13 +1257,13 @@ - # src/art.c:5496 src/group.c:1223 - #: src/group.c:1230 - msgid "Forward" --msgstr "отсюда к концу" -+msgstr "К концу" - - # src/art.c:5492 src/group.c:1223 - # src/art.c:5496 src/group.c:1223 - #: src/group.c:1230 - msgid "Backward" --msgstr "отсюда к началу" -+msgstr "К началу" - - # src/group.c:1224 - # src/group.c:1224 -@@ -1317,7 +1301,7 @@ - # src/group.c:1437 - #: src/group.c:1444 - msgid "Subscribe pattern: " --msgstr "Подписаться по шаблону" -+msgstr "Подписаться по шаблону: " - - # src/group.c:1466 - # src/group.c:1466 -@@ -1361,7 +1345,7 @@ - # src/group.c:1724 - #: src/group.c:1731 - msgid "No unread articles." --msgstr "Отсутствуют непрочитанные статьи." -+msgstr "Нет непрочитанных статей." - - # src/group.c:1736 src/post.c:1114 - # src/group.c:1736 src/post.c:1114 -@@ -1385,7 +1369,7 @@ - # src/group.c:1761 - #: src/group.c:1768 - msgid "Followup-To: " --msgstr "Ответ-В:" -+msgstr "Ответ-в:" - - # src/group.c:1780 - # src/group.c:1780 -@@ -1402,37 +1386,37 @@ - # src/group.c:1787 - #: src/group.c:1794 - msgid "Select scoring mode: Full, Simple, None, Cancel" --msgstr "Выберите scoring режим: ПоЛный, ПроСтой, Никакого, Прервать" -+msgstr "Выберите режим установки баллов: ПоЛный, ПроСтой, Никакого, Прервать" - - # src/group.c:1795 - # src/group.c:1795 - #: src/group.c:1802 - msgid "Full Header Scoring enabled." --msgstr "Включен scoring при полных заголовках." -+msgstr "Включена установка баллов при полных заголовках." - - # src/group.c:1800 - # src/group.c:1800 - #: src/group.c:1807 - msgid "Expensive Scoring disabled." --msgstr "Высокий scoring выключен." -+msgstr "Система высоких баллов выключена." - - # src/group.c:1805 - # src/group.c:1805 - #: src/group.c:1812 - msgid "Scoring disabled." --msgstr "Scoring выключен." -+msgstr "Установка баллов выключена." - - # src/group.c:1823 - # src/group.c:1823 - #: src/group.c:1830 - msgid "No changes need to be saved." --msgstr "Отсутствуют изменения для сохранения." -+msgstr "Нет изменений для сохранения." - - # src/group.c:2014 - # src/group.c:2014 - #: src/group.c:2025 - msgid "Unable to create group keymap!" --msgstr "Невозможно создать расскладку клавиатуры 'Group'!" -+msgstr "Невозможно создать расскладку клавиатуры для групп!" - - # src/group.c:2172 - # src/group.c:2172 -@@ -1482,7 +1466,7 @@ - # src/group.c:2330 - #: src/group.c:2341 - msgid "Checking for new groups ..." --msgstr "Проверка на наличие новых групп ..." -+msgstr "Проверка на новые группы ..." - - # src/group.c:2388 src/slrnpull.c:2092 - # src/group.c:2388 src/slrnpull.c:2092 -@@ -1555,13 +1539,13 @@ - "* The autosave file of %s is newer than the file itself.\n" - msgstr "" - "\n" --"* Файл, сохраненный автоматически, новее самого файла.\n" -+"* Автокопия файла %s новее, чем сам файл.\n" - - # src/group.c:2621 - # src/group.c:2621 - #: src/group.c:2632 - msgid "Do you want to restore your newsrc from the autosave version" --msgstr "Вы хотите восстановить Ваш newsrc из автоматически сохраненной версии" -+msgstr "Вы хотите восстановить Ваш newsrc из автосохраненной версии" - - # src/group.c:2682 src/post.c:1298 src/slrnpull.c:1528 - # src/group.c:2682 src/post.c:1298 src/slrnpull.c:1528 -@@ -1621,7 +1605,7 @@ - #: src/group.c:2935 - #, c-format - msgid "Write to %s failed! Disk Full?" --msgstr "Ошибка записи в %s. Диск переполнен?" -+msgstr "Ошибка записи в %s! Диск переполнен?" - - # src/group.c:2939 - # src/group.c:2939 -@@ -1636,7 +1620,7 @@ - # src/group.c:3111 - #: src/group.c:3122 - msgid "-%D-News Groups: %s %-20g -- %L (%P)" --msgstr "[-%D-] Группы с: %s %-20g -- %L (%P)" -+msgstr "[-%D-] Группы от: %s %-20g -- %L (%P)" - - # src/group.c:3143 src/group.c:3181 src/interp.c:360 - # src/group.c:3143 src/group.c:3181 src/interp.c:360 -@@ -1660,7 +1644,7 @@ - # src/grplens.c:194 - #: src/grplens.c:194 - msgid "User is Unregistered" --msgstr "Пользователь незарегистрирован" -+msgstr "Пользователь не зарегистрирован" - - # src/grplens.c:195 - # src/grplens.c:195 -@@ -1672,7 +1656,7 @@ - # src/grplens.c:196 - #: src/grplens.c:196 - msgid "Service Unavailable" --msgstr "Сервис недоступен" -+msgstr "Сервис не доступен" - - # src/grplens.c:197 - # src/grplens.c:197 -@@ -1812,7 +1796,7 @@ - # src/help.c:43 - #: src/help.c:43 - msgid " Questions not covered by the documentation can be posted to" --msgstr " Вопросы, нерасмотренные в документации, могут быть заданы в:" -+msgstr " Нерасмотренные в документации вопросы могут быть заданы в" - - # src/help.c:44 - # src/help.c:44 -@@ -1847,7 +1831,7 @@ - msgid "" - " Note: The keys are case sensitive! That is, 's' and 'S' are not the same." - msgstr "" --" Замечание: клавиши чувствительны к регистру! 'S' и 's' - не одно и то же." -+" Замечание: клавиши чувствительны к регистру! 'S' и 's' - не равноправны." - - # src/help.c:56 - # src/help.c:56 -@@ -2717,7 +2701,7 @@ - # src/help.c:210 - #: src/help.c:210 - msgid " ESC 1 L Hide unsubscribed groups." --msgstr " ESC 1 L Серыть невыписанные группы." -+msgstr " ESC 1 L Скрыть невыписанные группы." - - # src/help.c:211 - # src/help.c:211 -@@ -2857,14 +2841,13 @@ - #: src/interp.c:452 - #, c-format - msgid "Array must contain at least one, at most %d elements." --msgstr "" -+msgstr "Множество должно содержать не менее одного и не более %d элементов." - - # src/slrn.c:1156 - # src/slrn.c:1160 - #: src/interp.c:460 --#, fuzzy - msgid "Failed to allocate memory." --msgstr "Ошибка выбора таблицы символов." -+msgstr "Ошибка распределения памяти." - - # src/interp.c:457 - # src/interp.c:457 -@@ -3067,7 +3050,7 @@ - #. 1011 - #: src/menu.c:205 - msgid "Custom sorting (see manual)" --msgstr "" -+msgstr "Выборочная сортировка (смотрите руководство)" - - # src/menu.c:211 - # src/menu.c:211 -@@ -4013,9 +3996,9 @@ - # src/post.c:868 - # src/post.c:868 - #: src/post.c:880 --#, fuzzy, c-format -+#, c-format - msgid "%s Failed post saved in %s" --msgstr "Ошибка оправки статьи из %s" -+msgstr "%s Ошибка оправки статьи из %s" - - # src/post.c:931 src/post.c:964 - # src/post.c:931 src/post.c:964 -@@ -4117,16 +4100,14 @@ - # src/post.c:1089 - # src/post.c:1089 - #: src/post.c:1104 --#, fuzzy - msgid "post_file_hook returned error." --msgstr "post_file_hook возвратил ошибку. %s не отправлено." -+msgstr "post_file_hook возвратил ошибку." - - # src/group.c:394 - # src/group.c:394 - #: src/post.c:1126 --#, fuzzy - msgid "Could not reach server." --msgstr "Невозможно войти в группу %s." -+msgstr "Сервер не доступен." - - # src/post.c:1239 - # src/post.c:1239 -@@ -4614,7 +4595,7 @@ - #: src/slrn.c:1181 - #, c-format - msgid "Could not read specified config file %s\n" --msgstr "" -+msgstr "Невозможно считать особый конфигурационный файл %s\n" - - # src/slrn.c:1141 - # src/slrn.c:1145 -@@ -5572,7 +5553,7 @@ - "%sToo many expressions specified." - msgstr "" - "%s: строка %d:\n" --"Слишком много выражений определено." -+"%sОпределено слишком много выражений." - - # src/startup.c:765 - # src/startup.c:765 diff --git a/package/tsa/slrn/popup_win.patch b/package/tsa/slrn/popup_win.patch deleted file mode 100644 index 50c21a878..000000000 --- a/package/tsa/slrn/popup_win.patch +++ /dev/null @@ -1,33 +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/popup_win.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# 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 Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./src/menu.c Wed Mar 13 14:04:23 2002 -+++ ./src/menu.c Wed Apr 3 20:11:15 2002 -@@ -915,7 +915,7 @@ - tab++; - len += 8; - } -- if (NULL == (curr->data = slrn_malloc (len, 1, 1))) -+ if (NULL == (curr->data = slrn_malloc (len+1, 1, 1))) - { - free_select_list (root, 1); - return -1; diff --git a/package/tsa/slrn/slrn.desc b/package/tsa/slrn/slrn.desc index a13019857..ee92a78c6 100644 --- a/package/tsa/slrn/slrn.desc +++ b/package/tsa/slrn/slrn.desc @@ -38,8 +38,8 @@ [L] OpenSource [S] Stable -[V] 0.9.7.4 +[V] 0.9.8.0 [P] X -----5---9 796.000 -[D] 1763996855 slrn-0.9.7.4.tar.bz2 http://dl.sourceforge.net/sourceforge/slrn/ +[D] 819608956 slrn-0.9.8.0.tar.bz2 http://dl.sourceforge.net/sourceforge/slrn/ diff --git a/package/tsa/slrn/strcasecmp.patch b/package/tsa/slrn/strcasecmp.patch deleted file mode 100644 index 48c1e406c..000000000 --- a/package/tsa/slrn/strcasecmp.patch +++ /dev/null @@ -1,55 +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/strcasecmp.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# 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 Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./src/art_sort.c Mon Mar 11 15:22:35 2002 -+++ ./src/art_sort.c Wed Mar 13 21:32:41 2002 -@@ -1011,14 +1011,22 @@ - - while (-1 != SLextract_list_element (sort_order, nth, ',', buf, sizeof(buf))) - { -- if (! strcasecmp(buf, "Subject")) add_sort_function(header_subject_cmp, isupper(buf[0])); -- else if (! strcasecmp(buf, "Score")) add_sort_function(header_score_cmp, isupper(buf[0])); -- else if (! strcasecmp(buf, "Highscore")) add_sort_function(header_highscore_cmp, isupper(buf[0])); -- else if (! strcasecmp(buf, "Date")) add_sort_function(header_date_cmp, isupper(buf[0])); -- else if (! strcasecmp(buf, "Author")) add_sort_function(header_author_cmp, isupper(buf[0])); -- else if (! strcasecmp(buf, "Lines")) add_sort_function(header_lines_cmp, isupper(buf[0])); -- else if (! strcasecmp(buf, "Number")) add_sort_function(header_num_cmp, isupper(buf[0])); -- else if (! strcasecmp(buf, "Id")) add_sort_function(header_msgid_cmp, isupper(buf[0])); -+ if (! slrn_case_strcmp((unsigned char*)buf, (unsigned char*)"Subject")) -+ add_sort_function(header_subject_cmp, isupper(buf[0])); -+ else if (! slrn_case_strcmp((unsigned char*)buf, (unsigned char*)"Score")) -+ add_sort_function(header_score_cmp, isupper(buf[0])); -+ else if (! slrn_case_strcmp((unsigned char*)buf, (unsigned char*)"Highscore")) -+ add_sort_function(header_highscore_cmp, isupper(buf[0])); -+ else if (! slrn_case_strcmp((unsigned char*)buf, (unsigned char*)"Date")) -+ add_sort_function(header_date_cmp, isupper(buf[0])); -+ else if (! slrn_case_strcmp((unsigned char*)buf, (unsigned char*)"Author")) -+ add_sort_function(header_author_cmp, isupper(buf[0])); -+ else if (! slrn_case_strcmp((unsigned char*)buf, (unsigned char*)"Lines")) -+ add_sort_function(header_lines_cmp, isupper(buf[0])); -+ else if (! slrn_case_strcmp((unsigned char*)buf, (unsigned char*)"Number")) -+ add_sort_function(header_num_cmp, isupper(buf[0])); -+ else if (! slrn_case_strcmp((unsigned char*)buf, (unsigned char*)"Id")) -+ add_sort_function(header_msgid_cmp, isupper(buf[0])); - else /* Nonexistant sorting method */ - { - slrn_error(_("Can't sort according to `%s'"), buf);