Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package alpine for openSUSE:Factory checked in at 2021-09-21 21:12:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alpine (Old) and /work/SRC/openSUSE:Factory/.alpine.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alpine" Tue Sep 21 21:12:45 2021 rev:54 rq:920447 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/alpine/alpine.changes 2021-06-01 10:36:25.884707797 +0200 +++ /work/SRC/openSUSE:Factory/.alpine.new.1899/alpine.changes 2021-09-21 21:13:36.486670217 +0200 @@ -1,0 +2,17 @@ +Sun Sep 19 12:26:48 UTC 2021 - Jan Engelhardt <jeng...@inai.de> + +- Update to release 2.25 + * New configuration variable VAR_ssl-ciphers that allows users + to list the ciphers to use when connecting to a SSL + server. + * New hidden feature FEAT_enable-delete-before-writing to add + support for terminals that need lines to be deleted before + being written. + * Always follow ???suppress-asterisks-in-password-prompt??? setting + in the various password prompts. + * Fixed a memory corruption when alpine searches for a string + that is an incomplete utf8 string in a local folder. + * Fixed: When forwarding a message, replacing an attachment + might make Alpine re-attach the original attachment. + +------------------------------------------------------------------- Old: ---- alpine-2.24.tar.xz alpine-2.24.tar.xz.sig New: ---- alpine-2.25.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alpine.spec ++++++ --- /var/tmp/diff_new_pack.Spr0nC/_old 2021-09-21 21:13:37.458671317 +0200 +++ /var/tmp/diff_new_pack.Spr0nC/_new 2021-09-21 21:13:37.462671321 +0200 @@ -19,7 +19,7 @@ Name: alpine # For debugging only: %define build_vanilla 0 -Version: 2.24 +Version: 2.25 Release: 0 Summary: Mail User Agent License: Apache-2.0 @@ -28,7 +28,7 @@ #Git-Clone: https://repo.or.cz/alpine.git Source: http://alpine.x10host.com/alpine/release/src/alpine-%version.tar.xz -Source2: http://alpine.x10host.com/alpine/release/src/sig/alpine-%version.tar.xz.sig +#Source2: http://alpine.x10host.com/alpine/release/src/sig/alpine-%version.tar.xz.sig Source3: %name.png Source4: %name.desktop Source9: UPDATING.txt ++++++ UPDATING.txt ++++++ --- /var/tmp/diff_new_pack.Spr0nC/_old 2021-09-21 21:13:37.522671389 +0200 +++ /var/tmp/diff_new_pack.Spr0nC/_new 2021-09-21 21:13:37.522671389 +0200 @@ -2,9 +2,9 @@ Some features of Alpine do not exist in the release tarball but are only provided as patches (but by the same author..). So when there is a new -release, the OOT patches on the website get updated too. +release, the out-of-tree patches on the website get updated too. - version="2.24" + version="2.25" for i in WrtAcc colortext fancy fillpara fromheader insertpat maildir rules DelText; do wget -O- "http://alpine.x10host.com/alpine/patches/alpine-$version/$i.patch.gz"; | gzip -cd >"chappa-$i.patch"; done ++++++ alpine-2.24.tar.xz -> alpine-2.25.tar.xz ++++++ /work/SRC/openSUSE:Factory/alpine/alpine-2.24.tar.xz /work/SRC/openSUSE:Factory/.alpine.new.1899/alpine-2.25.tar.xz differ: char 26, line 1 ++++++ alpine-gcc44.diff ++++++ --- /var/tmp/diff_new_pack.Spr0nC/_old 2021-09-21 21:13:37.590671466 +0200 +++ /var/tmp/diff_new_pack.Spr0nC/_new 2021-09-21 21:13:37.590671466 +0200 @@ -1,13 +1,13 @@ --- - imap/src/osdep/unix/dummy.c | 14 ++++++++++++-- + imap/src/osdep/unix/dummy.c | 17 ++++++++++++----- pith/send.c | 1 + - 2 files changed, 13 insertions(+), 2 deletions(-) + 2 files changed, 13 insertions(+), 5 deletions(-) -Index: alpine-2.20/imap/src/osdep/unix/dummy.c +Index: alpine-2.25/imap/src/osdep/unix/dummy.c =================================================================== ---- alpine-2.20.orig/imap/src/osdep/unix/dummy.c -+++ alpine-2.20/imap/src/osdep/unix/dummy.c -@@ -734,6 +734,17 @@ long dummy_copy (MAILSTREAM *stream,char +--- alpine-2.25.orig/imap/src/osdep/unix/dummy.c ++++ alpine-2.25/imap/src/osdep/unix/dummy.c +@@ -735,6 +735,17 @@ long dummy_copy (MAILSTREAM *stream,char return NIL; } @@ -25,21 +25,24 @@ /* Dummy append message string * Accepts: mail stream -@@ -753,8 +764,7 @@ long dummy_append (MAILSTREAM *stream,ch +@@ -754,11 +765,7 @@ long dummy_append (MAILSTREAM *stream,ch /* append to INBOX? */ if (!compare_cstring (mailbox,"INBOX")) { /* yes, if no empty proto try creating */ -- if (!ts && !(*(ts = default_proto (NIL))->dtb->create) (ts,"INBOX")) -- ts = NIL; +- if (!ts){ +- ts = default_proto (NIL); +- if(!(*ts->dtb->create)(ts,"INBOX")) +- ts = NIL; +- } + ts = dummy_rewrite_code(ts); } else if (dummy_file (tmp,mailbox) && ((fd = open (tmp,O_RDONLY,NIL)) < 0)) { if ((e = errno) == ENOENT) /* failed, was it no such file? */ -Index: alpine-2.20/pith/send.c +Index: alpine-2.25/pith/send.c =================================================================== ---- alpine-2.20.orig/pith/send.c -+++ alpine-2.20/pith/send.c -@@ -4159,6 +4159,7 @@ set_parameter(PARAMETER **param, char *p +--- alpine-2.25.orig/pith/send.c ++++ alpine-2.25/pith/send.c +@@ -4165,6 +4165,7 @@ set_parameter(PARAMETER **param, char *p pm->value = cpystr(new_value); } } ++++++ chappa-DelText.patch ++++++ --- /var/tmp/diff_new_pack.Spr0nC/_old 2021-09-21 21:13:37.626671506 +0200 +++ /var/tmp/diff_new_pack.Spr0nC/_new 2021-09-21 21:13:37.626671506 +0200 @@ -4,10 +4,10 @@ pico/search.c | 8 ++++++-- 3 files changed, 57 insertions(+), 2 deletions(-) -Index: alpine-2.24/pico/basic.c +Index: alpine-2.25/pico/basic.c =================================================================== ---- alpine-2.24.orig/pico/basic.c -+++ alpine-2.24/pico/basic.c +--- alpine-2.25.orig/pico/basic.c ++++ alpine-2.25/pico/basic.c @@ -959,7 +959,57 @@ scrolldownline(int f, int n) return (scrollforw (1, FALSE)); } @@ -66,10 +66,10 @@ /* * Scroll to a position. -Index: alpine-2.24/pico/efunc.h +Index: alpine-2.25/pico/efunc.h =================================================================== ---- alpine-2.24.orig/pico/efunc.h -+++ alpine-2.24/pico/efunc.h +--- alpine-2.25.orig/pico/efunc.h ++++ alpine-2.25/pico/efunc.h @@ -59,6 +59,7 @@ extern unsigned char accent(UCS, UCS); extern unsigned char GetAccent(void); extern int forwpage(int, int); @@ -78,10 +78,10 @@ extern int scrollupline(int, int); extern int scrolldownline(int, int); extern int scrollto(int, int); -Index: alpine-2.24/pico/search.c +Index: alpine-2.25/pico/search.c =================================================================== ---- alpine-2.24.orig/pico/search.c -+++ alpine-2.24/pico/search.c +--- alpine-2.25.orig/pico/search.c ++++ alpine-2.25/pico/search.c @@ -73,7 +73,7 @@ EXTRAKEYS menu_srchpat[] = { {"^O", N_("End of Para"), (CTRL|'O')}, {"^U", N_("FullJustify"), (CTRL|'U')}, ++++++ chappa-WrtAcc.patch ++++++ --- /var/tmp/diff_new_pack.Spr0nC/_old 2021-09-21 21:13:37.650671533 +0200 +++ /var/tmp/diff_new_pack.Spr0nC/_new 2021-09-21 21:13:37.650671533 +0200 @@ -1,6 +1,6 @@ -diff -rc alpine-2.24/pico/basic.c alpine-2.24.WrtAcc/pico/basic.c -*** alpine-2.24/pico/basic.c 2020-10-10 00:24:28.180553991 -0600 ---- alpine-2.24.WrtAcc/pico/basic.c 2020-10-10 00:26:57.220352202 -0600 +diff -rc alpine-2.25/pico/basic.c alpine-2.25.WrtAcc/pico/basic.c +*** alpine-2.25/pico/basic.c 2021-09-18 09:02:36.386783561 -0600 +--- alpine-2.25.WrtAcc/pico/basic.c 2021-09-18 09:03:15.983056911 -0600 *************** *** 342,347 **** --- 342,530 ---- @@ -193,9 +193,9 @@ /* * go forword to the end of the current paragraph -diff -rc alpine-2.24/pico/composer.c alpine-2.24.WrtAcc/pico/composer.c -*** alpine-2.24/pico/composer.c 2020-10-10 00:24:28.180553991 -0600 ---- alpine-2.24.WrtAcc/pico/composer.c 2020-10-10 00:26:57.220352202 -0600 +diff -rc alpine-2.25/pico/composer.c alpine-2.25.WrtAcc/pico/composer.c +*** alpine-2.25/pico/composer.c 2021-09-18 09:02:36.386783561 -0600 +--- alpine-2.25.WrtAcc/pico/composer.c 2021-09-18 09:03:15.983056911 -0600 *************** *** 2015,2021 **** tbufp = &strng[ods.p_len]; @@ -229,12 +229,12 @@ case (CTRL|KEY_LEFT): /* word skip left */ if(ods.p_ind > 0) /* Scoot one char left if possible */ ods.p_ind--; -diff -rc alpine-2.24/pico/display.c alpine-2.24.WrtAcc/pico/display.c -*** alpine-2.24/pico/display.c 2020-10-10 00:24:28.180553991 -0600 ---- alpine-2.24.WrtAcc/pico/display.c 2020-10-10 00:26:57.220352202 -0600 +diff -rc alpine-2.25/pico/display.c alpine-2.25.WrtAcc/pico/display.c +*** alpine-2.25/pico/display.c 2021-09-18 09:02:36.386783561 -0600 +--- alpine-2.25.WrtAcc/pico/display.c 2021-09-18 09:03:16.279058955 -0600 *************** -*** 2196,2201 **** ---- 2196,2206 ---- +*** 2191,2196 **** +--- 2191,2201 ---- b = &buf[ucs4_strlen(buf)]; continue; @@ -247,7 +247,7 @@ case KEY_RIGHT : if(*b == '\0') *************** -*** 2314,2320 **** +*** 2309,2315 **** #endif default : @@ -255,7 +255,7 @@ /* look for match in extra_v */ for(i = 0; i < 12; i++) if(c && c == extra_v[i]){ ---- 2319,2325 ---- +--- 2314,2320 ---- #endif default : @@ -263,9 +263,9 @@ /* look for match in extra_v */ for(i = 0; i < 12; i++) if(c && c == extra_v[i]){ -diff -rc alpine-2.24/pico/ebind.h alpine-2.24.WrtAcc/pico/ebind.h -*** alpine-2.24/pico/ebind.h 2020-10-10 00:24:28.184554092 -0600 ---- alpine-2.24.WrtAcc/pico/ebind.h 2020-10-10 00:26:57.228352405 -0600 +diff -rc alpine-2.25/pico/ebind.h alpine-2.25.WrtAcc/pico/ebind.h +*** alpine-2.25/pico/ebind.h 2021-09-18 09:02:36.386783561 -0600 +--- alpine-2.25.WrtAcc/pico/ebind.h 2021-09-18 09:03:16.339059369 -0600 *************** *** 61,67 **** #ifdef MOUSE @@ -319,9 +319,9 @@ #endif #endif {CTRL|'A', gotobol}, -diff -rc alpine-2.24/pico/efunc.h alpine-2.24.WrtAcc/pico/efunc.h -*** alpine-2.24/pico/efunc.h 2020-10-10 00:24:28.180553991 -0600 ---- alpine-2.24.WrtAcc/pico/efunc.h 2020-10-10 00:26:57.240352712 -0600 +diff -rc alpine-2.25/pico/efunc.h alpine-2.25.WrtAcc/pico/efunc.h +*** alpine-2.25/pico/efunc.h 2021-09-18 09:02:36.386783561 -0600 +--- alpine-2.25.WrtAcc/pico/efunc.h 2021-09-18 09:03:16.383059672 -0600 *************** *** 54,59 **** --- 54,62 ---- @@ -334,9 +334,9 @@ extern int forwpage(int, int); extern int backpage(int, int); extern int scrollupline(int, int); -diff -rc alpine-2.24/pico/main.c alpine-2.24.WrtAcc/pico/main.c -*** alpine-2.24/pico/main.c 2020-10-10 00:24:28.180553991 -0600 ---- alpine-2.24.WrtAcc/pico/main.c 2020-10-10 00:26:57.280353731 -0600 +diff -rc alpine-2.25/pico/main.c alpine-2.25.WrtAcc/pico/main.c +*** alpine-2.25/pico/main.c 2021-09-18 09:02:36.386783561 -0600 +--- alpine-2.25.WrtAcc/pico/main.c 2021-09-18 09:03:16.423059949 -0600 *************** *** 458,463 **** --- 458,469 ---- ++++++ chappa-colortext.patch ++++++ --- /var/tmp/diff_new_pack.Spr0nC/_old 2021-09-21 21:13:37.666671552 +0200 +++ /var/tmp/diff_new_pack.Spr0nC/_new 2021-09-21 21:13:37.670671556 +0200 @@ -1,6 +1,6 @@ -diff -rc alpine-2.24/alpine/confscroll.c alpine-2.24.colortext/alpine/confscroll.c -*** alpine-2.24/alpine/confscroll.c 2020-10-10 00:24:28.216554908 -0600 ---- alpine-2.24.colortext/alpine/confscroll.c 2020-10-10 00:27:00.384432838 -0600 +diff -rc alpine-2.25/alpine/confscroll.c alpine-2.25.colortext/alpine/confscroll.c +*** alpine-2.25/alpine/confscroll.c 2021-09-18 09:02:36.346783285 -0600 +--- alpine-2.25.colortext/alpine/confscroll.c 2021-09-18 09:03:19.255079499 -0600 *************** *** 5248,5253 **** --- 5248,5256 ---- @@ -13,9 +13,9 @@ else if(var == &ps->vars[V_INIT_CMD_LIST]){ if(!revert) q_status_message(SM_ASYNC, 0, 3, -diff -rc alpine-2.24/pith/conf.c alpine-2.24.colortext/pith/conf.c -*** alpine-2.24/pith/conf.c 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.colortext/pith/conf.c 2020-10-10 00:27:00.388432939 -0600 +diff -rc alpine-2.25/pith/conf.c alpine-2.25.colortext/pith/conf.c +*** alpine-2.25/pith/conf.c 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.colortext/pith/conf.c 2021-09-18 09:03:19.267079582 -0600 *************** *** 233,238 **** --- 233,240 ---- @@ -28,8 +28,8 @@ CONF_TXT_T cf_text_quotereplstr[] = "Specifies the string to replace quotes with when viewing a message."; *************** -*** 587,592 **** ---- 589,596 ---- +*** 589,594 **** +--- 591,598 ---- #endif /* _WINDOWS */ {"composer-wrap-column", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, NULL, cf_text_fillcol}, @@ -39,8 +39,8 @@ NULL, cf_text_replystr}, {"reply-leadin", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, *************** -*** 862,867 **** ---- 866,873 ---- +*** 866,871 **** +--- 870,877 ---- {"incoming-unseen-background-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, {"signature-foreground-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, {"signature-background-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, @@ -50,8 +50,8 @@ {"prompt-background-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, {"header-general-foreground-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, *************** -*** 2111,2116 **** ---- 2117,2124 ---- +*** 2115,2120 **** +--- 2121,2128 ---- set_current_val(&vars[V_DICTIONARY], TRUE, TRUE); #endif /* _WINDOWS */ set_current_val(&vars[V_IMAGE_VIEWER], TRUE, TRUE); @@ -61,8 +61,8 @@ set_current_val(&vars[V_HISTORY], TRUE, TRUE); set_current_val(&vars[V_SMTP_SERVER], TRUE, TRUE); *************** -*** 6677,6682 **** ---- 6685,6691 ---- +*** 6684,6689 **** +--- 6692,6698 ---- set_color_val(&vars[V_IND_OP_FORE_COLOR], 0); set_color_val(&vars[V_INCUNSEEN_FORE_COLOR], 0); set_color_val(&vars[V_SIGNATURE_FORE_COLOR], 0); @@ -71,8 +71,8 @@ set_current_val(&ps->vars[V_INDEX_TOKEN_COLORS], TRUE, TRUE); set_current_val(&ps->vars[V_VIEW_HDR_COLORS], TRUE, TRUE); *************** -*** 7926,7931 **** ---- 7935,7942 ---- +*** 7933,7938 **** +--- 7942,7949 ---- return(h_config_scroll_margin); case V_DEADLETS : return(h_config_deadlets); @@ -82,8 +82,8 @@ return(h_config_composer_wrap_column); case V_TCPOPENTIMEO : *************** -*** 8107,8112 **** ---- 8118,8126 ---- +*** 8116,8121 **** +--- 8127,8135 ---- case V_SIGNATURE_FORE_COLOR : case V_SIGNATURE_BACK_COLOR : return(h_config_signature_color); @@ -93,12 +93,12 @@ case V_PROMPT_FORE_COLOR : case V_PROMPT_BACK_COLOR : return(h_config_prompt_color); -diff -rc alpine-2.24/pith/conf.h alpine-2.24.colortext/pith/conf.h -*** alpine-2.24/pith/conf.h 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.colortext/pith/conf.h 2020-10-10 00:27:00.388432939 -0600 +diff -rc alpine-2.25/pith/conf.h alpine-2.25.colortext/pith/conf.h +*** alpine-2.25/pith/conf.h 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.colortext/pith/conf.h 2021-09-18 09:03:19.283079692 -0600 *************** -*** 175,180 **** ---- 175,182 ---- +*** 176,181 **** +--- 176,183 ---- #define VAR_DICTIONARY vars[V_DICTIONARY].current_val.l #define GLO_DICTIONARY vars[V_DICTIONARY].global_val.l #endif /* _WINDOWS */ @@ -108,8 +108,8 @@ #define GLO_FILLCOL vars[V_FILLCOL].global_val.p #define VAR_DEADLETS vars[V_DEADLETS].current_val.p *************** -*** 474,479 **** ---- 476,483 ---- +*** 475,480 **** +--- 477,484 ---- #define GLO_SIGNATURE_FORE_COLOR vars[V_SIGNATURE_FORE_COLOR].global_val.p #define VAR_SIGNATURE_BACK_COLOR vars[V_SIGNATURE_BACK_COLOR].current_val.p #define GLO_SIGNATURE_BACK_COLOR vars[V_SIGNATURE_BACK_COLOR].global_val.p @@ -118,9 +118,9 @@ #define VAR_PROMPT_FORE_COLOR vars[V_PROMPT_FORE_COLOR].current_val.p #define VAR_PROMPT_BACK_COLOR vars[V_PROMPT_BACK_COLOR].current_val.p #define VAR_VIEW_HDR_COLORS vars[V_VIEW_HDR_COLORS].current_val.l -diff -rc alpine-2.24/pith/conftype.h alpine-2.24.colortext/pith/conftype.h -*** alpine-2.24/pith/conftype.h 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.colortext/pith/conftype.h 2020-10-10 00:27:00.388432939 -0600 +diff -rc alpine-2.25/pith/conftype.h alpine-2.25.colortext/pith/conftype.h +*** alpine-2.25/pith/conftype.h 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.colortext/pith/conftype.h 2021-09-18 09:03:19.315079913 -0600 *************** *** 83,88 **** --- 83,89 ---- @@ -132,8 +132,8 @@ , V_REPLY_INTRO , V_QUOTE_REPLACE_STRING *************** -*** 243,248 **** ---- 244,251 ---- +*** 244,249 **** +--- 245,252 ---- , V_INCUNSEEN_BACK_COLOR , V_SIGNATURE_FORE_COLOR , V_SIGNATURE_BACK_COLOR @@ -142,12 +142,12 @@ , V_PROMPT_FORE_COLOR , V_PROMPT_BACK_COLOR , V_HEADER_GENERAL_FORE_COLOR -diff -rc alpine-2.24/pith/mailview.c alpine-2.24.colortext/pith/mailview.c -*** alpine-2.24/pith/mailview.c 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.colortext/pith/mailview.c 2020-10-10 00:27:00.388432939 -0600 +diff -rc alpine-2.25/pith/mailview.c alpine-2.25.colortext/pith/mailview.c +*** alpine-2.25/pith/mailview.c 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.colortext/pith/mailview.c 2021-09-18 09:03:19.367080271 -0600 *************** -*** 638,643 **** ---- 638,651 ---- +*** 636,641 **** +--- 636,649 ---- if((flgs & FM_DISPLAY) && !(flgs & FM_NOCOLOR) && pico_usingcolor() @@ -163,8 +163,8 @@ && ps_global->VAR_SIGNATURE_BACK_COLOR){ gf_link_filter(gf_line_test, gf_line_test_opt(color_signature, &is_in_sig)); *************** -*** 2870,2875 **** ---- 2878,3067 ---- +*** 2868,2873 **** +--- 2876,3065 ---- return(color_pair); } @@ -355,9 +355,9 @@ /* * The argument fieldname is something like "Subject:..." or "Subject". -diff -rc alpine-2.24/pith/mailview.h alpine-2.24.colortext/pith/mailview.h -*** alpine-2.24/pith/mailview.h 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.colortext/pith/mailview.h 2020-10-10 00:27:00.388432939 -0600 +diff -rc alpine-2.25/pith/mailview.h alpine-2.25.colortext/pith/mailview.h +*** alpine-2.25/pith/mailview.h 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.colortext/pith/mailview.h 2021-09-18 09:03:19.379080355 -0600 *************** *** 30,35 **** --- 30,41 ---- @@ -391,12 +391,12 @@ /* * BUG: BELOW IS UNIX/PC ONLY since config'd browser means nothing to webpine -diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.colortext/pith/pine.hlp -*** alpine-2.24/pith/pine.hlp 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.colortext/pith/pine.hlp 2020-10-10 00:27:00.408433449 -0600 +diff -rc alpine-2.25/pith/pine.hlp alpine-2.25.colortext/pith/pine.hlp +*** alpine-2.25/pith/pine.hlp 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.colortext/pith/pine.hlp 2021-09-18 09:03:19.399080492 -0600 *************** -*** 4975,4980 **** ---- 4975,4981 ---- +*** 5134,5139 **** +--- 5134,5140 ---- <li><a href="h_config_print_cat">OPTION: <!--#echo var="VAR_personal-print-category"--></a> <li><a href="h_config_print_command">OPTION: <!--#echo var="VAR_personal-print-command"--></a> <li><a href="h_config_post_char_set">OPTION: <!--#echo var="VAR_posting-character-set"--></a> @@ -405,8 +405,8 @@ <li><a href="h_config_print_font_char_set">OPTION: Print-Font-Char-Set</a> <li><a href="h_config_print_font_name">OPTION: Print-Font-Name</a> *************** -*** 5003,5008 **** ---- 5004,5010 ---- +*** 5162,5167 **** +--- 5163,5169 ---- <li><a href="h_config_sending_filter">OPTION: <!--#echo var="VAR_sending-filters"--></a> <li><a href="h_config_sendmail_path">OPTION: <!--#echo var="VAR_sendmail-path"--></a> <li><a href="h_config_signature_color">OPTION: Signature Color</a> @@ -415,8 +415,8 @@ <li><a href="h_config_smtp_server">OPTION: <!--#echo var="VAR_smtp-server"--></a> <li><a href="h_config_sort_key">OPTION: <!--#echo var="VAR_sort-key"--></a> *************** -*** 24817,24822 **** ---- 24819,24861 ---- +*** 25004,25009 **** +--- 25006,25048 ---- <End of help on this topic> </BODY> </HTML> @@ -461,8 +461,8 @@ <HTML> <HEAD> *************** -*** 33438,33443 **** ---- 33477,33506 ---- +*** 33616,33621 **** +--- 33655,33684 ---- <P> <A HREF="h_color_setup">Descriptions of the available commands</A> @@ -493,9 +493,9 @@ <P> Look <A HREF="h_edit_nav_cmds">here</A> to see the available Editing and Navigation commands. -diff -rc alpine-2.24/pith/state.c alpine-2.24.colortext/pith/state.c -*** alpine-2.24/pith/state.c 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.colortext/pith/state.c 2020-10-10 00:27:00.408433449 -0600 +diff -rc alpine-2.25/pith/state.c alpine-2.25.colortext/pith/state.c +*** alpine-2.25/pith/state.c 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.colortext/pith/state.c 2021-09-18 09:03:19.403080521 -0600 *************** *** 144,149 **** --- 144,152 ---- @@ -508,12 +508,12 @@ if((*pps)->ui.homedir) fs_give((void **)&(*pps)->ui.homedir); -diff -rc alpine-2.24/pith/state.h alpine-2.24.colortext/pith/state.h -*** alpine-2.24/pith/state.h 2020-10-10 00:24:28.208554703 -0600 ---- alpine-2.24.colortext/pith/state.h 2020-10-10 00:27:00.420433755 -0600 +diff -rc alpine-2.25/pith/state.h alpine-2.25.colortext/pith/state.h +*** alpine-2.25/pith/state.h 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.colortext/pith/state.h 2021-09-18 09:03:19.407080548 -0600 *************** -*** 348,353 **** ---- 348,355 ---- +*** 349,354 **** +--- 349,356 ---- char *display_charmap; /* needs to be freed */ char *keyboard_charmap; /* needs to be freed */ void *input_cs; @@ -522,9 +522,9 @@ char *posting_charmap; /* needs to be freed */ -diff -rc alpine-2.24/pith/text.c alpine-2.24.colortext/pith/text.c -*** alpine-2.24/pith/text.c 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.colortext/pith/text.c 2020-10-10 00:27:00.420433755 -0600 +diff -rc alpine-2.25/pith/text.c alpine-2.25.colortext/pith/text.c +*** alpine-2.25/pith/text.c 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.colortext/pith/text.c 2021-09-18 09:03:19.415080603 -0600 *************** *** 171,176 **** --- 171,185 ---- ++++++ chappa-fancy.patch ++++++ ++++ 952 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/alpine/chappa-fancy.patch ++++ and /work/SRC/openSUSE:Factory/.alpine.new.1899/chappa-fancy.patch ++++++ chappa-fillpara.patch ++++++ --- /var/tmp/diff_new_pack.Spr0nC/_old 2021-09-21 21:13:37.706671597 +0200 +++ /var/tmp/diff_new_pack.Spr0nC/_new 2021-09-21 21:13:37.706671597 +0200 @@ -1,6 +1,6 @@ -diff -rc alpine-2.24/alpine/mailview.c alpine-2.24.fillpara/alpine/mailview.c -*** alpine-2.24/alpine/mailview.c 2020-10-10 00:24:28.216554908 -0600 ---- alpine-2.24.fillpara/alpine/mailview.c 2020-10-10 00:26:56.228326921 -0600 +diff -rc alpine-2.25/alpine/mailview.c alpine-2.25.fillpara/alpine/mailview.c +*** alpine-2.25/alpine/mailview.c 2021-09-18 09:02:36.350783312 -0600 +--- alpine-2.25.fillpara/alpine/mailview.c 2021-09-18 09:03:13.523039928 -0600 *************** *** 205,211 **** --- 205,219 ---- @@ -50,9 +50,9 @@ if(we_cancel) cancel_busy_cue(-1); -diff -rc alpine-2.24/pico/basic.c alpine-2.24.fillpara/pico/basic.c -*** alpine-2.24/pico/basic.c 2020-10-10 00:24:28.180553991 -0600 ---- alpine-2.24.fillpara/pico/basic.c 2020-10-10 00:26:56.228326921 -0600 +diff -rc alpine-2.25/pico/basic.c alpine-2.25.fillpara/pico/basic.c +*** alpine-2.25/pico/basic.c 2021-09-18 09:02:36.386783561 -0600 +--- alpine-2.25.fillpara/pico/basic.c 2021-09-18 09:03:13.523039928 -0600 *************** *** 26,34 **** * framing, are hard. @@ -323,9 +323,9 @@ curwp->w_dotp = lforw(curwp->w_dotp); curwp->w_doto = llength(curwp->w_dotp); -diff -rc alpine-2.24/pico/efunc.h alpine-2.24.fillpara/pico/efunc.h -*** alpine-2.24/pico/efunc.h 2020-10-10 00:24:28.180553991 -0600 ---- alpine-2.24.fillpara/pico/efunc.h 2020-10-10 00:26:56.228326921 -0600 +diff -rc alpine-2.25/pico/efunc.h alpine-2.25.fillpara/pico/efunc.h +*** alpine-2.25/pico/efunc.h 2021-09-18 09:02:36.386783561 -0600 +--- alpine-2.25.fillpara/pico/efunc.h 2021-09-18 09:03:13.527039955 -0600 *************** *** 253,262 **** extern int fillpara(int, int); @@ -355,9 +355,9 @@ #endif /* EFUNC_H */ + -diff -rc alpine-2.24/pico/line.c alpine-2.24.fillpara/pico/line.c -*** alpine-2.24/pico/line.c 2020-10-10 00:24:28.180553991 -0600 ---- alpine-2.24.fillpara/pico/line.c 2020-10-10 00:26:56.280328247 -0600 +diff -rc alpine-2.25/pico/line.c alpine-2.25.fillpara/pico/line.c +*** alpine-2.25/pico/line.c 2021-09-18 09:02:36.386783561 -0600 +--- alpine-2.25.fillpara/pico/line.c 2021-09-18 09:03:13.575040287 -0600 *************** *** 612,627 **** lisblank(LINE *line) @@ -389,9 +389,9 @@ return(FALSE); return(TRUE); -diff -rc alpine-2.24/pico/osdep/color.h alpine-2.24.fillpara/pico/osdep/color.h -*** alpine-2.24/pico/osdep/color.h 2020-10-10 00:24:28.180553991 -0600 ---- alpine-2.24.fillpara/pico/osdep/color.h 2020-10-10 00:26:56.292328552 -0600 +diff -rc alpine-2.25/pico/osdep/color.h alpine-2.25.fillpara/pico/osdep/color.h +*** alpine-2.25/pico/osdep/color.h 2021-09-18 09:02:36.386783561 -0600 +--- alpine-2.25.fillpara/pico/osdep/color.h 2021-09-18 09:03:13.579040315 -0600 *************** *** 33,38 **** --- 33,39 ---- @@ -402,9 +402,9 @@ #endif /* PICO_OSDEP_COLOR_INCLUDED */ -diff -rc alpine-2.24/pico/search.c alpine-2.24.fillpara/pico/search.c -*** alpine-2.24/pico/search.c 2020-10-10 00:24:28.180553991 -0600 ---- alpine-2.24.fillpara/pico/search.c 2020-10-10 00:26:56.304328858 -0600 +diff -rc alpine-2.25/pico/search.c alpine-2.25.fillpara/pico/search.c +*** alpine-2.25/pico/search.c 2021-09-18 09:02:36.386783561 -0600 +--- alpine-2.25.fillpara/pico/search.c 2021-09-18 09:03:13.579040315 -0600 *************** *** 36,41 **** --- 36,42 ---- @@ -483,9 +483,9 @@ + return(TRUE); + } + -diff -rc alpine-2.24/pico/word.c alpine-2.24.fillpara/pico/word.c -*** alpine-2.24/pico/word.c 2020-10-10 00:24:28.180553991 -0600 ---- alpine-2.24.fillpara/pico/word.c 2020-10-10 00:26:56.316329164 -0600 +diff -rc alpine-2.25/pico/word.c alpine-2.25.fillpara/pico/word.c +*** alpine-2.25/pico/word.c 2021-09-18 09:02:36.386783561 -0600 +--- alpine-2.25.fillpara/pico/word.c 2021-09-18 09:03:13.583040342 -0600 *************** *** 25,34 **** */ @@ -1229,12 +1229,12 @@ + return get_indent_raw_line(q, GLine, buf, buflen, k, plb); + } + -diff -rc alpine-2.24/pith/charconv/utf8.c alpine-2.24.fillpara/pith/charconv/utf8.c -*** alpine-2.24/pith/charconv/utf8.c 2020-10-10 00:24:28.208554703 -0600 ---- alpine-2.24.fillpara/pith/charconv/utf8.c 2020-10-10 00:26:56.320329266 -0600 +diff -rc alpine-2.25/pith/charconv/utf8.c alpine-2.25.fillpara/pith/charconv/utf8.c +*** alpine-2.25/pith/charconv/utf8.c 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.fillpara/pith/charconv/utf8.c 2021-09-18 09:03:13.583040342 -0600 *************** -*** 1066,1071 **** ---- 1066,1121 ---- +*** 1117,1122 **** +--- 1117,1172 ---- /* @@ -1291,12 +1291,12 @@ * Copy UTF-8 characters from src into dst. * This is intended to be used if you want to truncate a string at * the start instead of the end. For example, you have a long string -diff -rc alpine-2.24/pith/charconv/utf8.h alpine-2.24.fillpara/pith/charconv/utf8.h -*** alpine-2.24/pith/charconv/utf8.h 2020-10-10 00:24:28.208554703 -0600 ---- alpine-2.24.fillpara/pith/charconv/utf8.h 2020-10-10 00:26:56.328329469 -0600 +diff -rc alpine-2.25/pith/charconv/utf8.h alpine-2.25.fillpara/pith/charconv/utf8.h +*** alpine-2.25/pith/charconv/utf8.h 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.fillpara/pith/charconv/utf8.h 2021-09-18 09:03:13.583040342 -0600 *************** -*** 81,86 **** ---- 81,87 ---- +*** 82,87 **** +--- 82,88 ---- UCS *ucs4_strchr(UCS *s, UCS c); UCS *ucs4_strrchr(UCS *s, UCS c); unsigned utf8_width(char *); @@ -1304,9 +1304,9 @@ size_t utf8_to_width_rhs(char *, char *, size_t, unsigned); int utf8_snprintf(char *, size_t, char *, ...); size_t utf8_to_width(char *, char *, size_t, unsigned, unsigned *); -diff -rc alpine-2.24/pith/color.c alpine-2.24.fillpara/pith/color.c -*** alpine-2.24/pith/color.c 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.fillpara/pith/color.c 2020-10-10 00:26:56.344329877 -0600 +diff -rc alpine-2.25/pith/color.c alpine-2.25.fillpara/pith/color.c +*** alpine-2.25/pith/color.c 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.fillpara/pith/color.c 2021-09-18 09:03:13.583040342 -0600 *************** *** 21,27 **** #include "../pith/state.h" @@ -1517,9 +1517,9 @@ } -diff -rc alpine-2.24/pith/color.h alpine-2.24.fillpara/pith/color.h -*** alpine-2.24/pith/color.h 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.fillpara/pith/color.h 2020-10-10 00:26:56.364330387 -0600 +diff -rc alpine-2.25/pith/color.h alpine-2.25.fillpara/pith/color.h +*** alpine-2.25/pith/color.h 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.fillpara/pith/color.h 2021-09-18 09:03:13.583040342 -0600 *************** *** 22,27 **** --- 22,45 ---- @@ -1557,9 +1557,9 @@ int color_a_quote(long, char *, LT_INS_S **, void *); void free_spec_colors(SPEC_COLOR_S **); -diff -rc alpine-2.24/pith/filter.c alpine-2.24.fillpara/pith/filter.c -*** alpine-2.24/pith/filter.c 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.fillpara/pith/filter.c 2020-10-10 00:26:56.380330795 -0600 +diff -rc alpine-2.25/pith/filter.c alpine-2.25.fillpara/pith/filter.c +*** alpine-2.25/pith/filter.c 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.fillpara/pith/filter.c 2021-09-18 09:03:13.591040398 -0600 *************** *** 46,51 **** --- 46,52 ---- @@ -2185,9 +2185,9 @@ /* * this simple filter accumulates characters until a newline, offers it -diff -rc alpine-2.24/pith/filter.h alpine-2.24.fillpara/pith/filter.h -*** alpine-2.24/pith/filter.h 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.fillpara/pith/filter.h 2020-10-10 00:26:56.380330795 -0600 +diff -rc alpine-2.25/pith/filter.h alpine-2.25.fillpara/pith/filter.h +*** alpine-2.25/pith/filter.h 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.fillpara/pith/filter.h 2021-09-18 09:03:13.591040398 -0600 *************** *** 217,222 **** --- 217,223 ---- @@ -2198,9 +2198,9 @@ void *gf_url_hilite_opt(URL_HILITE_S *, HANDLE_S **, int); void free_filter_module_globals(void); -diff -rc alpine-2.24/pith/filttype.h alpine-2.24.fillpara/pith/filttype.h -*** alpine-2.24/pith/filttype.h 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.fillpara/pith/filttype.h 2020-10-10 00:26:56.384330897 -0600 +diff -rc alpine-2.25/pith/filttype.h alpine-2.25.fillpara/pith/filttype.h +*** alpine-2.25/pith/filttype.h 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.fillpara/pith/filttype.h 2021-09-18 09:03:13.591040398 -0600 *************** *** 36,41 **** --- 36,43 ---- @@ -2212,9 +2212,9 @@ void *opt; /* optional per instance data */ void *data; /* misc internal data pointer */ unsigned char queue[1 + GF_MAXBUF]; -diff -rc alpine-2.24/pith/mailview.c alpine-2.24.fillpara/pith/mailview.c -*** alpine-2.24/pith/mailview.c 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.fillpara/pith/mailview.c 2020-10-10 00:26:56.396331203 -0600 +diff -rc alpine-2.25/pith/mailview.c alpine-2.25.fillpara/pith/mailview.c +*** alpine-2.25/pith/mailview.c 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.fillpara/pith/mailview.c 2021-09-18 09:03:13.603040480 -0600 *************** *** 55,61 **** #include "../pith/escapes.h" @@ -2237,7 +2237,7 @@ #define FBUF_LEN (50) *************** -*** 640,646 **** +*** 638,644 **** && pico_usingcolor() && ps_global->VAR_SIGNATURE_FORE_COLOR && ps_global->VAR_SIGNATURE_BACK_COLOR){ @@ -2245,7 +2245,7 @@ } if((flgs & FM_DISPLAY) ---- 644,650 ---- +--- 642,648 ---- && pico_usingcolor() && ps_global->VAR_SIGNATURE_FORE_COLOR && ps_global->VAR_SIGNATURE_BACK_COLOR){ @@ -2254,7 +2254,7 @@ if((flgs & FM_DISPLAY) *************** -*** 648,655 **** +*** 646,653 **** && pico_usingcolor() && ps_global->VAR_QUOTE1_FORE_COLOR && ps_global->VAR_QUOTE1_BACK_COLOR){ @@ -2263,7 +2263,7 @@ if(!(flgs & FM_NOWRAP)){ wrapflags = (flgs & FM_DISPLAY) ? (GFW_HANDLES|GFW_SOFTHYPHEN) : GFW_NONE; ---- 652,661 ---- +--- 650,659 ---- && pico_usingcolor() && ps_global->VAR_QUOTE1_FORE_COLOR && ps_global->VAR_QUOTE1_BACK_COLOR){ @@ -2275,7 +2275,7 @@ if(!(flgs & FM_NOWRAP)){ wrapflags = (flgs & FM_DISPLAY) ? (GFW_HANDLES|GFW_SOFTHYPHEN) : GFW_NONE; *************** -*** 1465,1491 **** +*** 1463,1489 **** color_signature(long int linenum, char *line, LT_INS_S **ins, void *is_in_sig) { struct variable *vars = ps_global->vars; @@ -2303,7 +2303,7 @@ if(*in_sig_block != OUT_SIG_BLOCK && VAR_SIGNATURE_FORE_COLOR && VAR_SIGNATURE_BACK_COLOR && (col = new_color_pair(VAR_SIGNATURE_FORE_COLOR, ---- 1471,1558 ---- +--- 1469,1556 ---- color_signature(long int linenum, char *line, LT_INS_S **ins, void *is_in_sig) { struct variable *vars = ps_global->vars; @@ -2393,8 +2393,8 @@ && VAR_SIGNATURE_FORE_COLOR && VAR_SIGNATURE_BACK_COLOR && (col = new_color_pair(VAR_SIGNATURE_FORE_COLOR, *************** -*** 2045,2050 **** ---- 2112,2188 ---- +*** 2043,2048 **** +--- 2110,2186 ---- } @@ -2472,9 +2472,9 @@ #define UES_LEN 12 #define UES_MAX 32 -diff -rc alpine-2.24/pith/mailview.h alpine-2.24.fillpara/pith/mailview.h -*** alpine-2.24/pith/mailview.h 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.fillpara/pith/mailview.h 2020-10-10 00:26:56.404331406 -0600 +diff -rc alpine-2.25/pith/mailview.h alpine-2.25.fillpara/pith/mailview.h +*** alpine-2.25/pith/mailview.h 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.fillpara/pith/mailview.h 2021-09-18 09:03:13.603040480 -0600 *************** *** 146,151 **** --- 146,152 ---- @@ -2485,9 +2485,9 @@ int scroll_handle_start_color(char *, size_t, int *); int scroll_handle_end_color(char *, size_t, int *, int); int width_at_this_position(unsigned char *, unsigned long); -diff -rc alpine-2.24/pith/osdep/color.c alpine-2.24.fillpara/pith/osdep/color.c -*** alpine-2.24/pith/osdep/color.c 2020-10-10 00:24:28.208554703 -0600 ---- alpine-2.24.fillpara/pith/osdep/color.c 2020-10-10 00:26:56.416331712 -0600 +diff -rc alpine-2.25/pith/osdep/color.c alpine-2.25.fillpara/pith/osdep/color.c +*** alpine-2.25/pith/osdep/color.c 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.fillpara/pith/osdep/color.c 2021-09-18 09:03:13.611040536 -0600 *************** *** 32,38 **** @@ -3792,9 +3792,9 @@ + return allowed_qstr; + } + -diff -rc alpine-2.24/pith/osdep/color.h alpine-2.24.fillpara/pith/osdep/color.h -*** alpine-2.24/pith/osdep/color.h 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.fillpara/pith/osdep/color.h 2020-10-10 00:26:56.436332222 -0600 +diff -rc alpine-2.25/pith/osdep/color.h alpine-2.25.fillpara/pith/osdep/color.h +*** alpine-2.25/pith/osdep/color.h 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.fillpara/pith/osdep/color.h 2021-09-18 09:03:13.615040563 -0600 *************** *** 17,22 **** --- 17,40 ---- @@ -3845,12 +3845,12 @@ ! void record_quote_string (QSTRING_S *); #endif /* PITH_OSDEP_COLOR_INCLUDED */ -diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.fillpara/pith/pine.hlp -*** alpine-2.24/pith/pine.hlp 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.fillpara/pith/pine.hlp 2020-10-10 00:26:56.460332833 -0600 +diff -rc alpine-2.25/pith/pine.hlp alpine-2.25.fillpara/pith/pine.hlp +*** alpine-2.25/pith/pine.hlp 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.fillpara/pith/pine.hlp 2021-09-18 09:03:13.627040646 -0600 *************** -*** 8195,8200 **** ---- 8195,8240 ---- +*** 8354,8359 **** +--- 8354,8399 ---- "type the character ^". <P> @@ -3897,9 +3897,9 @@ <End of help on this topic> </BODY> </HTML> -diff -rc alpine-2.24/pith/reply.c alpine-2.24.fillpara/pith/reply.c -*** alpine-2.24/pith/reply.c 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.fillpara/pith/reply.c 2020-10-10 00:26:56.460332833 -0600 +diff -rc alpine-2.25/pith/reply.c alpine-2.25.fillpara/pith/reply.c +*** alpine-2.25/pith/reply.c 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.fillpara/pith/reply.c 2021-09-18 09:03:13.631040673 -0600 *************** *** 2838,2843 **** --- 2838,2846 ---- @@ -3929,9 +3929,9 @@ filters[filtcnt++].data = gf_line_test_opt(delete_quotes, &dq); } -diff -rc alpine-2.24/pith/state.c alpine-2.24.fillpara/pith/state.c -*** alpine-2.24/pith/state.c 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.fillpara/pith/state.c 2020-10-10 00:26:56.464332936 -0600 +diff -rc alpine-2.25/pith/state.c alpine-2.25.fillpara/pith/state.c +*** alpine-2.25/pith/state.c 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.fillpara/pith/state.c 2021-09-18 09:03:13.631040673 -0600 *************** *** 235,240 **** --- 235,242 ---- @@ -3943,12 +3943,12 @@ if((*pps)->atmts){ int i; -diff -rc alpine-2.24/pith/state.h alpine-2.24.fillpara/pith/state.h -*** alpine-2.24/pith/state.h 2020-10-10 00:24:28.208554703 -0600 ---- alpine-2.24.fillpara/pith/state.h 2020-10-10 00:26:56.468333038 -0600 +diff -rc alpine-2.25/pith/state.h alpine-2.25.fillpara/pith/state.h +*** alpine-2.25/pith/state.h 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.fillpara/pith/state.h 2021-09-18 09:03:13.631040673 -0600 *************** -*** 261,266 **** ---- 261,268 ---- +*** 262,267 **** +--- 262,269 ---- SPEC_COLOR_S *hdr_colors; /* list of configured colors for view */ SPEC_COLOR_S *index_token_colors; /* list of configured colors for index */ @@ -3957,9 +3957,9 @@ short init_context; struct { -diff -rc alpine-2.24/pith/text.c alpine-2.24.fillpara/pith/text.c -*** alpine-2.24/pith/text.c 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.fillpara/pith/text.c 2020-10-10 00:26:56.468333038 -0600 +diff -rc alpine-2.25/pith/text.c alpine-2.25.fillpara/pith/text.c +*** alpine-2.25/pith/text.c 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.fillpara/pith/text.c 2021-09-18 09:03:13.643040757 -0600 *************** *** 92,98 **** char *err, *charset; @@ -4069,7 +4069,7 @@ DELQ_S *dq; char *lp; ! int i, lines, not_a_quote = 0; - size_t len; + size_t len = 0; dq = (DELQ_S *) local; --- 574,580 ---- @@ -4077,7 +4077,7 @@ DELQ_S *dq; char *lp; ! int i, lines, not_a_quote = 0, code; - size_t len; + size_t len = 0; dq = (DELQ_S *) local; *************** ++++++ chappa-fromheader.patch ++++++ --- /var/tmp/diff_new_pack.Spr0nC/_old 2021-09-21 21:13:37.726671619 +0200 +++ /var/tmp/diff_new_pack.Spr0nC/_new 2021-09-21 21:13:37.726671619 +0200 @@ -1,6 +1,6 @@ -diff -rc alpine-2.24/alpine/send.c alpine-2.24.fromheader/alpine/send.c -*** alpine-2.24/alpine/send.c 2020-10-10 00:24:28.212554806 -0600 ---- alpine-2.24.fromheader/alpine/send.c 2020-10-10 00:26:58.004372183 -0600 +diff -rc alpine-2.25/alpine/send.c alpine-2.25.fromheader/alpine/send.c +*** alpine-2.25/alpine/send.c 2021-09-18 09:02:36.350783312 -0600 +--- alpine-2.25.fromheader/alpine/send.c 2021-09-18 09:03:16.987063842 -0600 *************** *** 908,914 **** 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE}, @@ -51,12 +51,12 @@ /* * Don't ever believe the sender that is there. -diff -rc alpine-2.24/pith/conf.c alpine-2.24.fromheader/pith/conf.c -*** alpine-2.24/pith/conf.c 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.fromheader/pith/conf.c 2020-10-10 00:26:58.004372183 -0600 +diff -rc alpine-2.25/pith/conf.c alpine-2.25.fromheader/pith/conf.c +*** alpine-2.25/pith/conf.c 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.fromheader/pith/conf.c 2021-09-18 09:03:16.991063870 -0600 *************** -*** 2984,2989 **** ---- 2984,2991 ---- +*** 2989,2994 **** +--- 2989,2996 ---- F_NO_FCC_ATTACH, h_config_no_fcc_attach, PREF_SEND, 0}, {"fcc-on-bounce", "Include Fcc When Bouncing Messages", F_FCC_ON_BOUNCE, h_config_fcc_on_bounce, PREF_SEND, 0}, @@ -65,12 +65,12 @@ {"mark-fcc-seen", NULL, F_MARK_FCC_SEEN, h_config_mark_fcc_seen, PREF_SEND, 0}, {"fcc-only-without-confirm", "Send to Fcc Only Without Confirming", -diff -rc alpine-2.24/pith/conftype.h alpine-2.24.fromheader/pith/conftype.h -*** alpine-2.24/pith/conftype.h 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.fromheader/pith/conftype.h 2020-10-10 00:26:58.004372183 -0600 +diff -rc alpine-2.25/pith/conftype.h alpine-2.25.fromheader/pith/conftype.h +*** alpine-2.25/pith/conftype.h 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.fromheader/pith/conftype.h 2021-09-18 09:03:16.991063870 -0600 *************** -*** 410,415 **** ---- 410,416 ---- +*** 412,417 **** +--- 412,418 ---- F_AUTO_REPLY_TO, F_VERBOSE_POST, F_FCC_ON_BOUNCE, @@ -78,12 +78,12 @@ F_SEND_WO_CONFIRM, F_USE_SENDER_NOT_X, F_BLANK_KEYMENU, -diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.fromheader/pith/pine.hlp -*** alpine-2.24/pith/pine.hlp 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.fromheader/pith/pine.hlp 2020-10-10 00:26:58.016372489 -0600 +diff -rc alpine-2.25/pith/pine.hlp alpine-2.25.fromheader/pith/pine.hlp +*** alpine-2.25/pith/pine.hlp 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.fromheader/pith/pine.hlp 2021-09-18 09:03:17.047064257 -0600 *************** -*** 30135,30140 **** ---- 30135,30156 ---- +*** 30313,30318 **** +--- 30313,30334 ---- <End of help on this topic> </BODY> </HTML> @@ -106,9 +106,9 @@ ====== h_config_use_sender_not_x ===== <HTML> <HEAD> -diff -rc alpine-2.24/pith/send.c alpine-2.24.fromheader/pith/send.c -*** alpine-2.24/pith/send.c 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.fromheader/pith/send.c 2020-10-10 00:26:58.016372489 -0600 +diff -rc alpine-2.25/pith/send.c alpine-2.25.fromheader/pith/send.c +*** alpine-2.25/pith/send.c 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.fromheader/pith/send.c 2021-09-18 09:03:17.047064257 -0600 *************** *** 53,59 **** /* name::type::canedit::writehdr::localcopy::rcptto */ @@ -143,9 +143,9 @@ pf->rcptto = pf_template[i].rcptto; pf->writehdr = pf_template[i].writehdr; pf->localcopy = pf_template[i].localcopy; -diff -rc alpine-2.24/pith/send.h alpine-2.24.fromheader/pith/send.h -*** alpine-2.24/pith/send.h 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.fromheader/pith/send.h 2020-10-10 00:26:58.016372489 -0600 +diff -rc alpine-2.25/pith/send.h alpine-2.25.fromheader/pith/send.h +*** alpine-2.25/pith/send.h 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.fromheader/pith/send.h 2021-09-18 09:03:17.087064532 -0600 *************** *** 159,164 **** --- 159,166 ---- ++++++ chappa-insertpat.patch ++++++ --- /var/tmp/diff_new_pack.Spr0nC/_old 2021-09-21 21:13:37.750671646 +0200 +++ /var/tmp/diff_new_pack.Spr0nC/_new 2021-09-21 21:13:37.754671651 +0200 @@ -1,9 +1,9 @@ -diff -rc alpine-2.24/pico/display.c alpine-2.24.insertpat/pico/display.c -*** alpine-2.24/pico/display.c 2020-10-10 00:24:28.180553991 -0600 ---- alpine-2.24.insertpat/pico/display.c 2020-10-10 00:26:59.856419380 -0600 +diff -rc alpine-2.25/pico/display.c alpine-2.25.insertpat/pico/display.c +*** alpine-2.25/pico/display.c 2021-09-18 09:02:36.386783561 -0600 +--- alpine-2.25.insertpat/pico/display.c 2021-09-18 09:03:18.847076682 -0600 *************** -*** 2205,2210 **** ---- 2205,2222 ---- +*** 2200,2205 **** +--- 2200,2217 ---- continue; @@ -22,9 +22,9 @@ case (CTRL|'G') : /* CTRL-G help */ if(term.t_mrow == 0 && km_popped == 0){ movecursor(term.t_nrow-2, 0); -diff -rc alpine-2.24/pico/search.c alpine-2.24.insertpat/pico/search.c -*** alpine-2.24/pico/search.c 2020-10-10 00:24:28.180553991 -0600 ---- alpine-2.24.insertpat/pico/search.c 2020-10-10 00:26:59.856419380 -0600 +diff -rc alpine-2.25/pico/search.c alpine-2.25.insertpat/pico/search.c +*** alpine-2.25/pico/search.c 2021-09-18 09:02:36.386783561 -0600 +--- alpine-2.25.insertpat/pico/search.c 2021-09-18 09:03:18.847076682 -0600 *************** *** 122,127 **** --- 122,131 ---- ++++++ chappa-maildir.patch ++++++ --- /var/tmp/diff_new_pack.Spr0nC/_old 2021-09-21 21:13:37.778671679 +0200 +++ /var/tmp/diff_new_pack.Spr0nC/_new 2021-09-21 21:13:37.778671679 +0200 @@ -1,9 +1,9 @@ -diff -rc alpine-2.24/alpine/alpine.c alpine-2.24.maildir/alpine/alpine.c -*** alpine-2.24/alpine/alpine.c 2020-10-10 00:24:28.216554908 -0600 ---- alpine-2.24.maildir/alpine/alpine.c 2020-10-10 00:26:49.964167282 -0600 +diff -rc alpine-2.25/alpine/alpine.c alpine-2.25.maildir/alpine/alpine.c +*** alpine-2.25/alpine/alpine.c 2021-09-18 09:02:36.346783285 -0600 +--- alpine-2.25.maildir/alpine/alpine.c 2021-09-18 09:03:10.599019743 -0600 *************** -*** 591,596 **** ---- 591,601 ---- +*** 597,602 **** +--- 597,607 ---- if(F_ON(F_MAILDROPS_PRESERVE_STATE, ps_global)) mail_parameters(NULL, SET_SNARFPRESERVE, (void *) TRUE); @@ -15,9 +15,9 @@ rvl = 0L; if(pine_state->VAR_NNTPRANGE){ if(!SVAR_NNTPRANGE(pine_state, rvl, tmp_20k_buf, SIZEOF_20KBUF)) -diff -rc alpine-2.24/alpine/confscroll.c alpine-2.24.maildir/alpine/confscroll.c -*** alpine-2.24/alpine/confscroll.c 2020-10-10 00:24:28.216554908 -0600 ---- alpine-2.24.maildir/alpine/confscroll.c 2020-10-10 00:26:49.968167384 -0600 +diff -rc alpine-2.25/alpine/confscroll.c alpine-2.25.maildir/alpine/confscroll.c +*** alpine-2.25/alpine/confscroll.c 2021-09-18 09:02:36.346783285 -0600 +--- alpine-2.25.maildir/alpine/confscroll.c 2021-09-18 09:03:10.603019770 -0600 *************** *** 5567,5572 **** --- 5567,5578 ---- @@ -33,11 +33,11 @@ else if(revert && standard_radio_var(ps, var)){ cur_rule_value(var, TRUE, FALSE); -diff -rc alpine-2.24/imap/src/c-client/mail.c alpine-2.24.maildir/imap/src/c-client/mail.c -*** alpine-2.24/imap/src/c-client/mail.c 2020-10-10 00:24:28.200554500 -0600 ---- alpine-2.24.maildir/imap/src/c-client/mail.c 2020-10-10 00:26:49.968167384 -0600 +diff -rc alpine-2.25/imap/src/c-client/mail.c alpine-2.25.maildir/imap/src/c-client/mail.c +*** alpine-2.25/imap/src/c-client/mail.c 2021-09-18 09:02:36.366783422 -0600 +--- alpine-2.25.maildir/imap/src/c-client/mail.c 2021-09-18 09:03:10.603019770 -0600 *************** -*** 1063,1069 **** +*** 1071,1077 **** MAILSTREAM *ts; char *s,*t,tmp[MAILTMPLEN]; size_t i; @@ -45,7 +45,7 @@ /* never allow names with newlines */ if ((s = strpbrk (mailbox,"\015\012")) != NULL) { MM_LOG ("Can't create mailbox with such a name",ERROR); ---- 1063,1069 ---- +--- 1071,1077 ---- MAILSTREAM *ts; char *s,*t,tmp[MAILTMPLEN]; size_t i; @@ -54,8 +54,8 @@ if ((s = strpbrk (mailbox,"\015\012")) != NULL) { MM_LOG ("Can't create mailbox with such a name",ERROR); *************** -*** 1087,1092 **** ---- 1087,1094 ---- +*** 1095,1100 **** +--- 1095,1102 ---- return NIL; } @@ -65,8 +65,8 @@ if ((mailbox[0] == '#') && ((mailbox[1] == 'd') || (mailbox[1] == 'D')) && ((mailbox[2] == 'r') || (mailbox[2] == 'R')) && *************** -*** 1117,1122 **** ---- 1119,1131 ---- +*** 1125,1130 **** +--- 1127,1139 ---- (((*mailbox == '{') || (*mailbox == '#')) && (stream = mail_open (NIL,mailbox,OP_PROTOTYPE | OP_SILENT)))) d = stream->dtb; @@ -80,12 +80,12 @@ else if ((*mailbox != '{') && (ts = default_proto (NIL))) d = ts->dtb; else { /* failed utterly */ sprintf (tmp,"Can't create mailbox %.80s: indeterminate format",mailbox); -diff -rc alpine-2.24/imap/src/c-client/mail.h alpine-2.24.maildir/imap/src/c-client/mail.h -*** alpine-2.24/imap/src/c-client/mail.h 2020-10-10 00:24:28.200554500 -0600 ---- alpine-2.24.maildir/imap/src/c-client/mail.h 2020-10-10 00:26:49.968167384 -0600 +diff -rc alpine-2.25/imap/src/c-client/mail.h alpine-2.25.maildir/imap/src/c-client/mail.h +*** alpine-2.25/imap/src/c-client/mail.h 2021-09-18 09:02:36.366783422 -0600 +--- alpine-2.25.maildir/imap/src/c-client/mail.h 2021-09-18 09:03:10.603019770 -0600 *************** -*** 383,388 **** ---- 383,392 ---- +*** 389,394 **** +--- 389,398 ---- #define SET_SCANCONTENTS (long) 573 #define GET_MHALLOWINBOX (long) 574 #define SET_MHALLOWINBOX (long) 575 @@ -96,9 +96,9 @@ /* Driver flags */ -diff -rc alpine-2.24/imap/src/osdep/unix/dummy.c alpine-2.24.maildir/imap/src/osdep/unix/dummy.c -*** alpine-2.24/imap/src/osdep/unix/dummy.c 2020-10-10 00:24:28.192554297 -0600 ---- alpine-2.24.maildir/imap/src/osdep/unix/dummy.c 2020-10-10 00:26:49.972167485 -0600 +diff -rc alpine-2.25/imap/src/osdep/unix/dummy.c alpine-2.25.maildir/imap/src/osdep/unix/dummy.c +*** alpine-2.25/imap/src/osdep/unix/dummy.c 2021-09-18 09:02:36.374783478 -0600 +--- alpine-2.25.maildir/imap/src/osdep/unix/dummy.c 2021-09-18 09:03:10.603019770 -0600 *************** *** 104,116 **** * Accepts: mailbox name @@ -180,7 +180,7 @@ + return maildir_delete(stream, tmp); + } if (!(s = dummy_file (tmp,mailbox))) { - sprintf (tmp,"Can't delete - invalid name: %.80s",s); + sprintf (tmp,"Can't delete - invalid name: %.80s",mailbox); MM_LOG (tmp,ERROR); *************** *** 543,554 **** @@ -253,9 +253,9 @@ return T; /* return success */ } -diff -rc alpine-2.24/imap/src/osdep/unix/maildir.c alpine-2.24.maildir/imap/src/osdep/unix/maildir.c -*** alpine-2.24/imap/src/osdep/unix/maildir.c 2020-10-10 00:26:50.012168504 -0600 ---- alpine-2.24.maildir/imap/src/osdep/unix/maildir.c 2020-10-10 00:26:49.972167485 -0600 +diff -rc alpine-2.25/imap/src/osdep/unix/maildir.c alpine-2.25.maildir/imap/src/osdep/unix/maildir.c +*** alpine-2.25/imap/src/osdep/unix/maildir.c 2021-09-18 09:03:10.715020543 -0600 +--- alpine-2.25.maildir/imap/src/osdep/unix/maildir.c 2021-09-18 09:03:10.607019798 -0600 *************** *** 0 **** --- 1,2671 ---- @@ -2930,9 +2930,9 @@ + LOCAL->uidtempfile = cpystr(tmp); + } + } -diff -rc alpine-2.24/imap/src/osdep/unix/maildir.h alpine-2.24.maildir/imap/src/osdep/unix/maildir.h -*** alpine-2.24/imap/src/osdep/unix/maildir.h 2020-10-10 00:26:50.012168504 -0600 ---- alpine-2.24.maildir/imap/src/osdep/unix/maildir.h 2020-10-10 00:26:49.972167485 -0600 +diff -rc alpine-2.25/imap/src/osdep/unix/maildir.h alpine-2.25.maildir/imap/src/osdep/unix/maildir.h +*** alpine-2.25/imap/src/osdep/unix/maildir.h 2021-09-18 09:03:10.715020543 -0600 +--- alpine-2.25.maildir/imap/src/osdep/unix/maildir.h 2021-09-18 09:03:10.607019798 -0600 *************** *** 0 **** --- 1,226 ---- @@ -3162,9 +3162,9 @@ + void maildir_assign_uid(MAILSTREAM *stream, unsigned long msgno, unsigned long uid); + void maildir_uid_renew_tempfile(MAILSTREAM *stream); + -diff -rc alpine-2.24/imap/src/osdep/unix/Makefile alpine-2.24.maildir/imap/src/osdep/unix/Makefile -*** alpine-2.24/imap/src/osdep/unix/Makefile 2020-10-10 00:24:28.196554399 -0600 ---- alpine-2.24.maildir/imap/src/osdep/unix/Makefile 2020-10-10 00:26:49.976167588 -0600 +diff -rc alpine-2.25/imap/src/osdep/unix/Makefile alpine-2.25.maildir/imap/src/osdep/unix/Makefile +*** alpine-2.25/imap/src/osdep/unix/Makefile 2021-09-18 09:02:36.374783478 -0600 +--- alpine-2.25.maildir/imap/src/osdep/unix/Makefile 2021-09-18 09:03:10.607019798 -0600 *************** *** 146,152 **** # However, mh needs to be before any sysinbox formats (such as mmdf or unix) @@ -3226,9 +3226,9 @@ # OS-dependent -diff -rc alpine-2.24/imap/src/osdep/unix/os_cyg.h alpine-2.24.maildir/imap/src/osdep/unix/os_cyg.h -*** alpine-2.24/imap/src/osdep/unix/os_cyg.h 2020-10-10 00:24:28.192554297 -0600 ---- alpine-2.24.maildir/imap/src/osdep/unix/os_cyg.h 2020-10-10 00:26:49.976167588 -0600 +diff -rc alpine-2.25/imap/src/osdep/unix/os_cyg.h alpine-2.25.maildir/imap/src/osdep/unix/os_cyg.h +*** alpine-2.25/imap/src/osdep/unix/os_cyg.h 2021-09-18 09:02:36.374783478 -0600 +--- alpine-2.25.maildir/imap/src/osdep/unix/os_cyg.h 2021-09-18 09:03:10.655020130 -0600 *************** *** 47,52 **** --- 47,53 ---- @@ -3239,12 +3239,12 @@ #define geteuid Geteuid uid_t Geteuid (void); -diff -rc alpine-2.24/pith/conf.c alpine-2.24.maildir/pith/conf.c -*** alpine-2.24/pith/conf.c 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.maildir/pith/conf.c 2020-10-10 00:26:49.976167588 -0600 +diff -rc alpine-2.25/pith/conf.c alpine-2.25.maildir/pith/conf.c +*** alpine-2.25/pith/conf.c 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.maildir/pith/conf.c 2021-09-18 09:03:10.663020184 -0600 *************** -*** 453,458 **** ---- 453,461 ---- +*** 455,460 **** +--- 455,463 ---- CONF_TXT_T cf_text_newsrc_path[] = "Full path and name of NEWSRC file"; @@ -3255,8 +3255,8 @@ /*---------------------------------------------------------------------- These are the variables that control a number of pine functions. They *************** -*** 657,662 **** ---- 660,669 ---- +*** 659,664 **** +--- 662,671 ---- NULL, cf_text_news_active}, {"news-spool-directory", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, NULL, cf_text_news_spooldir}, @@ -3268,8 +3268,8 @@ NULL, cf_text_upload_cmd}, {"upload-command-prefix", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, *************** -*** 2392,2397 **** ---- 2399,2410 ---- +*** 2396,2401 **** +--- 2403,2414 ---- mail_parameters(NULL, SET_NEWSSPOOL, (void *)VAR_NEWS_SPOOL_DIR); @@ -3283,8 +3283,8 @@ set_current_val(&vars[V_DEFAULT_SAVE_FOLDER], TRUE, TRUE); if(!VAR_DEFAULT_SAVE_FOLDER || !VAR_DEFAULT_SAVE_FOLDER[0]) *************** -*** 3030,3035 **** ---- 3043,3052 ---- +*** 3035,3040 **** +--- 3048,3057 ---- F_SORT_DEFAULT_SAVE_ALPHA, h_config_sort_save_alpha, PREF_FLDR, 0}, {"vertical-folder-list", "Use Vertical Folder List", F_VERTICAL_FOLDER_LIST, h_config_vertical_list, PREF_FLDR, 0}, @@ -3296,7 +3296,7 @@ /* Addr book */ {"combined-addrbook-display", "Combined Address Book Display", *************** -*** 7209,7215 **** +*** 7216,7222 **** int just_flip_value, EditWhich ew) { char **vp, *p, **lval, ***alval; @@ -3304,7 +3304,7 @@ char *err; long l; ---- 7226,7232 ---- +--- 7233,7239 ---- int just_flip_value, EditWhich ew) { char **vp, *p, **lval, ***alval; @@ -3313,8 +3313,8 @@ long l; *************** -*** 7262,7267 **** ---- 7279,7291 ---- +*** 7269,7274 **** +--- 7286,7298 ---- break; @@ -3329,8 +3329,8 @@ case F_DATES_TO_LOCAL : clear_index_cache(ps->mail_stream, 0); *************** -*** 8062,8067 **** ---- 8086,8095 ---- +*** 8071,8076 **** +--- 8095,8104 ---- return(h_config_newmailwidth); case V_NEWSRC_PATH : return(h_config_newsrc_path); @@ -3341,12 +3341,12 @@ case V_BROWSER : return(h_config_browser); case V_HISTORY : -diff -rc alpine-2.24/pith/conf.h alpine-2.24.maildir/pith/conf.h -*** alpine-2.24/pith/conf.h 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.maildir/pith/conf.h 2020-10-10 00:26:49.976167588 -0600 +diff -rc alpine-2.25/pith/conf.h alpine-2.25.maildir/pith/conf.h +*** alpine-2.25/pith/conf.h 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.maildir/pith/conf.h 2021-09-18 09:03:10.663020184 -0600 *************** -*** 264,269 **** ---- 264,273 ---- +*** 265,270 **** +--- 265,274 ---- #define GLO_NEWS_ACTIVE_PATH vars[V_NEWS_ACTIVE_PATH].global_val.p #define VAR_NEWS_SPOOL_DIR vars[V_NEWS_SPOOL_DIR].current_val.p #define GLO_NEWS_SPOOL_DIR vars[V_NEWS_SPOOL_DIR].global_val.p @@ -3357,9 +3357,9 @@ #define VAR_DISABLE_DRIVERS vars[V_DISABLE_DRIVERS].current_val.l #define VAR_DISABLE_AUTHS vars[V_DISABLE_AUTHS].current_val.l #define VAR_REMOTE_ABOOK_METADATA vars[V_REMOTE_ABOOK_METADATA].current_val.p -diff -rc alpine-2.24/pith/conftype.h alpine-2.24.maildir/pith/conftype.h -*** alpine-2.24/pith/conftype.h 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.maildir/pith/conftype.h 2020-10-10 00:26:49.980167690 -0600 +diff -rc alpine-2.25/pith/conftype.h alpine-2.25.maildir/pith/conftype.h +*** alpine-2.25/pith/conftype.h 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.maildir/pith/conftype.h 2021-09-18 09:03:10.667020211 -0600 *************** *** 118,123 **** --- 118,126 ---- @@ -3373,8 +3373,8 @@ , V_UPLOAD_CMD_PREFIX , V_DOWNLOAD_CMD *************** -*** 406,411 **** ---- 409,417 ---- +*** 408,413 **** +--- 411,419 ---- F_PASS_C1_CONTROL_CHARS, F_SINGLE_FOLDER_LIST, F_VERTICAL_FOLDER_LIST, @@ -3384,9 +3384,9 @@ F_TAB_CHK_RECENT, F_AUTO_REPLY_TO, F_VERBOSE_POST, -diff -rc alpine-2.24/pith/init.c alpine-2.24.maildir/pith/init.c -*** alpine-2.24/pith/init.c 2020-10-10 00:24:28.208554703 -0600 ---- alpine-2.24.maildir/pith/init.c 2020-10-10 00:26:49.980167690 -0600 +diff -rc alpine-2.25/pith/init.c alpine-2.25.maildir/pith/init.c +*** alpine-2.25/pith/init.c 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.maildir/pith/init.c 2021-09-18 09:03:10.671020240 -0600 *************** *** 408,413 **** --- 408,416 ---- @@ -3399,9 +3399,9 @@ && strcmp(filename, folder_base)){ #endif #endif -diff -rc alpine-2.24/pith/pattern.c alpine-2.24.maildir/pith/pattern.c -*** alpine-2.24/pith/pattern.c 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.maildir/pith/pattern.c 2020-10-10 00:26:49.984167792 -0600 +diff -rc alpine-2.25/pith/pattern.c alpine-2.25.maildir/pith/pattern.c +*** alpine-2.25/pith/pattern.c 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.maildir/pith/pattern.c 2021-09-18 09:03:10.675020267 -0600 *************** *** 49,55 **** #include "../pith/icache.h" @@ -3422,8 +3422,8 @@ /* * Internal prototypes *************** -*** 5485,5490 **** ---- 5487,5501 ---- +*** 5488,5493 **** +--- 5490,5504 ---- break; case '#': @@ -3440,7 +3440,7 @@ match++; *************** -*** 7905,7911 **** +*** 7908,7914 **** int we_cancel = 0, width; CONTEXT_S *save_context = NULL; char buf[MAX_SCREEN_COLS+1], sbuf[MAX_SCREEN_COLS+1]; @@ -3448,7 +3448,7 @@ #define FILTMSG_MAX 30 if(!stream) ---- 7916,7922 ---- +--- 7919,7925 ---- int we_cancel = 0, width; CONTEXT_S *save_context = NULL; char buf[MAX_SCREEN_COLS+1], sbuf[MAX_SCREEN_COLS+1]; @@ -3457,8 +3457,8 @@ if(!stream) *************** -*** 7939,7944 **** ---- 7950,7965 ---- +*** 7942,7947 **** +--- 7953,7968 ---- if(F_OFF(F_QUELL_FILTER_MSGS, ps_global)) we_cancel = busy_cue(buf, NULL, 0); @@ -3476,8 +3476,8 @@ && !(save_context = default_save_context(ps_global->context_list))) save_context = ps_global->context_list; *************** -*** 8002,8007 **** ---- 8023,8033 ---- +*** 8005,8010 **** +--- 8026,8036 ---- if(we_cancel) cancel_busy_cue(buf[0] ? 0 : -1); @@ -3489,12 +3489,12 @@ return(buf[0] != '\0'); } -diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.maildir/pith/pine.hlp -*** alpine-2.24/pith/pine.hlp 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.maildir/pith/pine.hlp 2020-10-10 00:26:49.996168098 -0600 +diff -rc alpine-2.25/pith/pine.hlp alpine-2.25.maildir/pith/pine.hlp +*** alpine-2.25/pith/pine.hlp 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.maildir/pith/pine.hlp 2021-09-18 09:03:10.691020378 -0600 *************** -*** 23452,23457 **** ---- 23452,23553 ---- +*** 23639,23644 **** +--- 23639,23740 ---- <End of help on this topic> </BODY> </HTML> @@ -3598,8 +3598,8 @@ <HTML> <HEAD> *************** -*** 31683,31688 **** ---- 31779,31827 ---- +*** 31861,31866 **** +--- 31957,32005 ---- <P> <End of help on this topic> </BODY> @@ -3649,9 +3649,9 @@ </HTML> ====== h_config_verbose_post ===== <HTML> -diff -rc alpine-2.24/pith/send.c alpine-2.24.maildir/pith/send.c -*** alpine-2.24/pith/send.c 2020-10-10 00:24:28.204554602 -0600 ---- alpine-2.24.maildir/pith/send.c 2020-10-10 00:26:49.996168098 -0600 +diff -rc alpine-2.25/pith/send.c alpine-2.25.maildir/pith/send.c +*** alpine-2.25/pith/send.c 2021-09-18 09:02:36.390783589 -0600 +--- alpine-2.25.maildir/pith/send.c 2021-09-18 09:03:10.695020405 -0600 *************** *** 47,52 **** --- 47,55 ---- @@ -3680,9 +3680,9 @@ if(!(IS_REMOTE(tmp) || is_absolute_path(tmp))){ /* * The mbox is relative to the home directory. -diff -rc alpine-2.24/README.maildir alpine-2.24.maildir/README.maildir -*** alpine-2.24/README.maildir 2020-10-10 00:26:50.012168504 -0600 ---- alpine-2.24.maildir/README.maildir 2020-10-10 00:26:49.996168098 -0600 +diff -rc alpine-2.25/README.maildir alpine-2.25.maildir/README.maildir +*** alpine-2.25/README.maildir 2021-09-18 09:03:10.719020571 -0600 +--- alpine-2.25.maildir/README.maildir 2021-09-18 09:03:10.695020405 -0600 *************** *** 0 **** --- 1,149 ---- ++++++ chappa-rules.patch ++++++ ++++ 1038 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/alpine/chappa-rules.patch ++++ and /work/SRC/openSUSE:Factory/.alpine.new.1899/chappa-rules.patch ++++++ pico-fix-spurious-undef-warnings.diff ++++++ --- /var/tmp/diff_new_pack.Spr0nC/_old 2021-09-21 21:13:37.822671728 +0200 +++ /var/tmp/diff_new_pack.Spr0nC/_new 2021-09-21 21:13:37.822671728 +0200 @@ -5,11 +5,11 @@ pico/osdep/shell.c | 3 +-- 4 files changed, 25 insertions(+), 2 deletions(-) -Index: alpine-2.23/imap/src/c-client/mail.h +Index: alpine-2.25/imap/src/c-client/mail.h =================================================================== ---- alpine-2.23.orig/imap/src/c-client/mail.h -+++ alpine-2.23/imap/src/c-client/mail.h -@@ -1921,6 +1921,14 @@ long INWAIT (long seconds); +--- alpine-2.25.orig/imap/src/c-client/mail.h ++++ alpine-2.25/imap/src/c-client/mail.h +@@ -1942,6 +1942,14 @@ long INWAIT (long seconds); int PSOUT (char *s); int PSOUTR (SIZEDTEXT *s); int PFLUSH (void); @@ -24,11 +24,11 @@ /* XOAUTH2 and AUTHBEARER Client-Side Support */ -Index: alpine-2.23/imap/src/osdep/unix/os_slx.h +Index: alpine-2.25/imap/src/osdep/unix/os_slx.h =================================================================== ---- alpine-2.23.orig/imap/src/osdep/unix/os_slx.h -+++ alpine-2.23/imap/src/osdep/unix/os_slx.h -@@ -69,3 +69,11 @@ int portable_utime (char *file,time_t ti +--- alpine-2.25.orig/imap/src/osdep/unix/os_slx.h ++++ alpine-2.25/imap/src/osdep/unix/os_slx.h +@@ -70,3 +70,11 @@ int portable_utime (char *file,time_t ti #include "ftl.h" #include "nl.h" #include "tcp.h" @@ -40,10 +40,10 @@ + */ +#define if(x) if((x)) +#define while(x) while((x)) -Index: alpine-2.23/include/system.h +Index: alpine-2.25/include/system.h =================================================================== ---- alpine-2.23.orig/include/system.h -+++ alpine-2.23/include/system.h +--- alpine-2.25.orig/include/system.h ++++ alpine-2.25/include/system.h @@ -389,4 +389,12 @@ typedef int gid_t; # define LOCAL_PASSWD_CACHE #endif @@ -57,15 +57,15 @@ +#define if(x) if((x)) +#define while(x) while((x)) #endif /* _SYSTEM_INCLUDED */ -Index: alpine-2.23/pico/osdep/shell.c +Index: alpine-2.25/pico/osdep/shell.c =================================================================== ---- alpine-2.23.orig/pico/osdep/shell.c -+++ alpine-2.23/pico/osdep/shell.c +--- alpine-2.25.orig/pico/osdep/shell.c ++++ alpine-2.25/pico/osdep/shell.c @@ -98,7 +98,6 @@ bktoshell(int f, int n) if(gmode&MDSPWN){ char *shell; -- int dummy; +- int dummy = 1; vttidy(); movecursor(0, 0);
