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-01-18 11:28:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alpine (Old) and /work/SRC/openSUSE:Factory/.alpine.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alpine" Mon Jan 18 11:28:12 2021 rev:50 rq:863398 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/alpine/alpine.changes 2020-10-05 19:43:02.333781301 +0200 +++ /work/SRC/openSUSE:Factory/.alpine.new.28504/alpine.changes 2021-01-18 11:31:55.248658964 +0100 @@ -1,0 +2,7 @@ +Fri Jan 15 12:04:04 UTC 2021 - Jan Engelhardt <jeng...@inai.de> + +- Update to release 2.24 + * A few crash fixes + * Implementation of XOAUTH2 for Yahoo! Mail. + +------------------------------------------------------------------- @@ -10,0 +18,4 @@ + * Alpine does not generate Sender or X-X-Sender by default by + enabling [X] Disable Sender as the default. + * Alpine does not disclose User Agent by default by enabling + [X] Suppress User Agent by default. Old: ---- alpine-2.23.2.tar.xz New: ---- alpine-2.24.tar.xz alpine-2.24.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alpine.spec ++++++ --- /var/tmp/diff_new_pack.qyIWe9/_old 2021-01-18 11:31:59.688663338 +0100 +++ /var/tmp/diff_new_pack.qyIWe9/_new 2021-01-18 11:31:59.688663338 +0100 @@ -1,7 +1,7 @@ # # spec file for package alpine # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ Name: alpine # For debugging only: %define build_vanilla 0 -Version: 2.23.2 +Version: 2.24 Release: 0 Summary: Mail User Agent License: Apache-2.0 @@ -27,10 +27,10 @@ URL: http://alpine.x10host.com/alpine/ #Git-Clone: https://repo.or.cz/alpine.git -#Source: http://alpine.x10host.com/alpine/release/src/%name-%version.tar.xz -Source: %name-%version.tar.xz -Source1: %name.png -Source2: %name.desktop +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 +Source3: %name.png +Source4: %name.desktop Source9: UPDATING.txt Patch2: make-use-of-strncat-safer.diff Patch3: operation-may-be-undefined-warning.diff @@ -208,8 +208,8 @@ # When called as alpinef, alpine uses function keys instead of Control keys: # ln %{buildroot}/%{_bindir}/alpine %{buildroot}/%{_bindir}/alpinef -install -D -m644 %{SOURCE1} %{buildroot}/%{_datadir}/pixmaps/%name.png -install -D -m644 %{SOURCE2} %{buildroot}/%{_datadir}/applications/%name.desktop +install -D -m644 %{SOURCE3} %{buildroot}/%{_datadir}/pixmaps/%name.png +install -D -m644 %{SOURCE4} %{buildroot}/%{_datadir}/applications/%name.desktop %suse_update_desktop_file %name : ln -sf alpine %{buildroot}/%{_bindir}/pine ++++++ UPDATING.txt ++++++ --- /var/tmp/diff_new_pack.qyIWe9/_old 2021-01-18 11:31:59.748663397 +0100 +++ /var/tmp/diff_new_pack.qyIWe9/_new 2021-01-18 11:31:59.748663397 +0100 @@ -4,8 +4,9 @@ provided as patches (but by the same author..). So when there is a new release, the OOT patches on the website get updated too. + version="2.24" for i in WrtAcc colortext fancy fillpara fromheader insertpat maildir rules; do - wget -O- http://alpine.x10host.com/alpine/patches/alpine-2.22/$i.patch.gz | gzip -cd >chappa-$i.patch; + wget -O- "http://alpine.x10host.com/alpine/patches/alpine-$version/$i.patch.gz"; | gzip -cd >"chappa-$i.patch"; done These do not necessarily apply cleanly, so they also need to be ++++++ alpine-2.23.2.tar.xz -> alpine-2.24.tar.xz ++++++ /work/SRC/openSUSE:Factory/alpine/alpine-2.23.2.tar.xz /work/SRC/openSUSE:Factory/.alpine.new.28504/alpine-2.24.tar.xz differ: char 13, line 1 ++++++ alpine-timestamp.patch ++++++ --- /var/tmp/diff_new_pack.qyIWe9/_old 2021-01-18 11:31:59.812663460 +0100 +++ /var/tmp/diff_new_pack.qyIWe9/_new 2021-01-18 11:31:59.812663460 +0100 @@ -2,11 +2,11 @@ alpine/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: alpine-2.22/alpine/Makefile.am +Index: alpine-2.24/alpine/Makefile.am =================================================================== ---- alpine-2.22.orig/alpine/Makefile.am -+++ alpine-2.22/alpine/Makefile.am -@@ -50,5 +50,5 @@ AM_LDFLAGS = `cat @top_srcdir@/c-client/ +--- alpine-2.24.orig/alpine/Makefile.am ++++ alpine-2.24/alpine/Makefile.am +@@ -50,6 +50,6 @@ AM_LDFLAGS = `cat @top_srcdir@/c-client/ CLEANFILES = date.c date.c: @@ -14,3 +14,4 @@ - echo "char hoststamp[]="\"$(ALPINE_HOSTSTAMP)\"";" >> date.c + echo "char datestamp[]="\"today\"";" > date.c + echo "char hoststamp[]="\"sand\"";" >> date.c + echo "char configoptions[]="\"`../config.status --config`\"";" >> date.c ++++++ chappa-WrtAcc.patch ++++++ --- /var/tmp/diff_new_pack.qyIWe9/_old 2021-01-18 11:31:59.852663500 +0100 +++ /var/tmp/diff_new_pack.qyIWe9/_new 2021-01-18 11:31:59.852663500 +0100 @@ -1,6 +1,6 @@ -diff -rc alpine-2.23/pico/basic.c alpine-2.23.WrtAcc/pico/basic.c -*** alpine-2.23/pico/basic.c 2020-06-18 15:19:23.437319046 -0600 ---- alpine-2.23.WrtAcc/pico/basic.c 2020-06-18 16:08:12.541589518 -0600 +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 *************** *** 342,347 **** --- 342,530 ---- @@ -193,9 +193,9 @@ /* * go forword to the end of the current paragraph -diff -rc alpine-2.23/pico/composer.c alpine-2.23.WrtAcc/pico/composer.c -*** alpine-2.23/pico/composer.c 2020-06-18 15:19:23.437319046 -0600 ---- alpine-2.23.WrtAcc/pico/composer.c 2020-06-18 16:08:12.545589528 -0600 +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 *************** *** 2015,2021 **** tbufp = &strng[ods.p_len]; @@ -229,9 +229,9 @@ 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.23/pico/display.c alpine-2.23.WrtAcc/pico/display.c -*** alpine-2.23/pico/display.c 2020-06-18 15:19:23.437319046 -0600 ---- alpine-2.23.WrtAcc/pico/display.c 2020-06-18 16:08:12.545589528 -0600 +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 *************** *** 2196,2201 **** --- 2196,2206 ---- @@ -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.23/pico/ebind.h alpine-2.23.WrtAcc/pico/ebind.h -*** alpine-2.23/pico/ebind.h 2020-06-18 15:19:23.437319046 -0600 ---- alpine-2.23.WrtAcc/pico/ebind.h 2020-06-18 16:08:12.545589528 -0600 +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 *************** *** 61,67 **** #ifdef MOUSE @@ -319,9 +319,9 @@ #endif #endif {CTRL|'A', gotobol}, -diff -rc alpine-2.23/pico/efunc.h alpine-2.23.WrtAcc/pico/efunc.h -*** alpine-2.23/pico/efunc.h 2020-06-18 15:19:23.437319046 -0600 ---- alpine-2.23.WrtAcc/pico/efunc.h 2020-06-18 16:08:12.545589528 -0600 +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 *************** *** 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.23/pico/main.c alpine-2.23.WrtAcc/pico/main.c -*** alpine-2.23/pico/main.c 2020-06-18 15:19:23.437319046 -0600 ---- alpine-2.23.WrtAcc/pico/main.c 2020-06-18 16:08:12.545589528 -0600 +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 *************** *** 458,463 **** --- 458,469 ---- ++++++ chappa-colortext.patch ++++++ --- /var/tmp/diff_new_pack.qyIWe9/_old 2021-01-18 11:31:59.876663523 +0100 +++ /var/tmp/diff_new_pack.qyIWe9/_new 2021-01-18 11:31:59.876663523 +0100 @@ -1,9 +1,9 @@ -diff -rc alpine-2.23/alpine/confscroll.c alpine-2.23.colortext/alpine/confscroll.c -*** alpine-2.23/alpine/confscroll.c 2020-06-18 15:19:23.465318999 -0600 ---- alpine-2.23.colortext/alpine/confscroll.c 2020-06-18 16:08:14.821595407 -0600 +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 *************** -*** 5227,5232 **** ---- 5227,5235 ---- +*** 5248,5253 **** +--- 5248,5256 ---- clear_index_cache(ps->mail_stream, 0); } @@ -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.23/pith/conf.c alpine-2.23.colortext/pith/conf.c -*** alpine-2.23/pith/conf.c 2020-06-18 15:19:23.461319005 -0600 ---- alpine-2.23.colortext/pith/conf.c 2020-06-18 16:08:14.821595407 -0600 +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 *************** *** 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."; *************** -*** 583,588 **** ---- 585,592 ---- +*** 587,592 **** +--- 589,596 ---- #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, *************** -*** 856,861 **** ---- 860,867 ---- +*** 862,867 **** +--- 866,873 ---- {"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}, *************** -*** 2057,2062 **** ---- 2063,2070 ---- +*** 2111,2116 **** +--- 2117,2124 ---- 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); *************** -*** 6623,6628 **** ---- 6631,6637 ---- +*** 6677,6682 **** +--- 6685,6691 ---- 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); *************** -*** 7841,7846 **** ---- 7850,7857 ---- +*** 7926,7931 **** +--- 7935,7942 ---- 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 : *************** -*** 8020,8025 **** ---- 8031,8039 ---- +*** 8107,8112 **** +--- 8118,8126 ---- 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.23/pith/conf.h alpine-2.23.colortext/pith/conf.h -*** alpine-2.23/pith/conf.h 2020-06-18 15:19:23.461319005 -0600 ---- alpine-2.23.colortext/pith/conf.h 2020-06-18 16:08:14.821595407 -0600 +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 *************** -*** 171,176 **** ---- 171,178 ---- +*** 175,180 **** +--- 175,182 ---- #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 *************** -*** 472,477 **** ---- 474,481 ---- +*** 474,479 **** +--- 476,483 ---- #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.23/pith/conftype.h alpine-2.23.colortext/pith/conftype.h -*** alpine-2.23/pith/conftype.h 2020-06-18 15:19:23.461319005 -0600 ---- alpine-2.23.colortext/pith/conftype.h 2020-06-18 16:08:14.821595407 -0600 +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 *************** *** 83,88 **** --- 83,89 ---- @@ -142,9 +142,9 @@ , V_PROMPT_FORE_COLOR , V_PROMPT_BACK_COLOR , V_HEADER_GENERAL_FORE_COLOR -diff -rc alpine-2.23/pith/mailview.c alpine-2.23.colortext/pith/mailview.c -*** alpine-2.23/pith/mailview.c 2020-06-18 15:19:23.461319005 -0600 ---- alpine-2.23.colortext/pith/mailview.c 2020-06-18 16:08:14.821595407 -0600 +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 *************** *** 638,643 **** --- 638,651 ---- @@ -355,9 +355,9 @@ /* * The argument fieldname is something like "Subject:..." or "Subject". -diff -rc alpine-2.23/pith/mailview.h alpine-2.23.colortext/pith/mailview.h -*** alpine-2.23/pith/mailview.h 2020-06-18 15:19:23.461319005 -0600 ---- alpine-2.23.colortext/pith/mailview.h 2020-06-18 16:08:14.821595407 -0600 +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 *************** *** 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.23/pith/pine.hlp alpine-2.23.colortext/pith/pine.hlp -*** alpine-2.23/pith/pine.hlp 2020-06-18 15:19:23.461319005 -0600 ---- alpine-2.23.colortext/pith/pine.hlp 2020-06-18 16:08:14.825595417 -0600 +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 *************** -*** 4683,4688 **** ---- 4683,4689 ---- +*** 4975,4980 **** +--- 4975,4981 ---- <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> *************** -*** 4711,4716 **** ---- 4712,4718 ---- +*** 5003,5008 **** +--- 5004,5010 ---- <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> *************** -*** 24379,24384 **** ---- 24381,24423 ---- +*** 24817,24822 **** +--- 24819,24861 ---- <End of help on this topic> </BODY> </HTML> @@ -461,8 +461,8 @@ <HTML> <HEAD> *************** -*** 33000,33005 **** ---- 33039,33068 ---- +*** 33438,33443 **** +--- 33477,33506 ---- <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.23/pith/state.c alpine-2.23.colortext/pith/state.c -*** alpine-2.23/pith/state.c 2020-06-18 15:19:23.461319005 -0600 ---- alpine-2.23.colortext/pith/state.c 2020-06-18 16:08:14.825595417 -0600 +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 *************** *** 144,149 **** --- 144,152 ---- @@ -508,12 +508,12 @@ if((*pps)->ui.homedir) fs_give((void **)&(*pps)->ui.homedir); -diff -rc alpine-2.23/pith/state.h alpine-2.23.colortext/pith/state.h -*** alpine-2.23/pith/state.h 2020-06-18 15:19:23.461319005 -0600 ---- alpine-2.23.colortext/pith/state.h 2020-06-18 16:08:14.825595417 -0600 +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 *************** -*** 347,352 **** ---- 347,354 ---- +*** 348,353 **** +--- 348,355 ---- 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.23/pith/text.c alpine-2.23.colortext/pith/text.c -*** alpine-2.23/pith/text.c 2020-06-18 15:19:23.461319005 -0600 ---- alpine-2.23.colortext/pith/text.c 2020-06-18 16:08:14.825595417 -0600 +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 *************** *** 171,176 **** --- 171,185 ---- ++++++ chappa-fancy.patch ++++++ ++++ 1572 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/alpine/chappa-fancy.patch ++++ and /work/SRC/openSUSE:Factory/.alpine.new.28504/chappa-fancy.patch ++++++ chappa-fillpara.patch ++++++ ++++ 606 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/alpine/chappa-fillpara.patch ++++ and /work/SRC/openSUSE:Factory/.alpine.new.28504/chappa-fillpara.patch ++++++ chappa-fromheader.patch ++++++ --- /var/tmp/diff_new_pack.qyIWe9/_old 2021-01-18 11:31:59.944663590 +0100 +++ /var/tmp/diff_new_pack.qyIWe9/_new 2021-01-18 11:31:59.948663594 +0100 @@ -1,8 +1,8 @@ -diff -rc alpine-2.23/alpine/send.c alpine-2.23.fromheader/alpine/send.c -*** alpine-2.23/alpine/send.c 2020-06-18 15:19:23.465318999 -0600 ---- alpine-2.23.fromheader/alpine/send.c 2020-06-18 16:08:13.005590716 -0600 +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 *************** -*** 909,915 **** +*** 908,914 **** 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE}, {"From : ", "From", h_composer_from, 10, 0, NULL, build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL, abook_nickname_complete, @@ -10,7 +10,7 @@ {"Reply-To: ", "Reply To", h_composer_reply_to, 10, 0, NULL, build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL, abook_nickname_complete, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, KS_TOADDRBOOK}, ---- 909,915 ---- +--- 908,914 ---- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE}, {"From : ", "From", h_composer_from, 10, 0, NULL, build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL, abook_nickname_complete, @@ -19,8 +19,8 @@ build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL, abook_nickname_complete, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, KS_TOADDRBOOK}, *************** -*** 2368,2373 **** ---- 2368,2378 ---- +*** 2372,2377 **** +--- 2372,2382 ---- he->rich_header = 0; } } @@ -33,7 +33,7 @@ he_from = he; break; *************** -*** 3105,3111 **** +*** 3109,3115 **** if(outgoing->return_path) mail_free_address(&outgoing->return_path); @@ -41,7 +41,7 @@ /* * Don't ever believe the sender that is there. ---- 3110,3118 ---- +--- 3114,3122 ---- if(outgoing->return_path) mail_free_address(&outgoing->return_path); @@ -51,12 +51,12 @@ /* * Don't ever believe the sender that is there. -diff -rc alpine-2.23/pith/conf.c alpine-2.23.fromheader/pith/conf.c -*** alpine-2.23/pith/conf.c 2020-06-18 15:19:23.461319005 -0600 ---- alpine-2.23.fromheader/pith/conf.c 2020-06-18 16:08:13.005590716 -0600 +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 *************** -*** 2930,2935 **** ---- 2930,2937 ---- +*** 2984,2989 **** +--- 2984,2991 ---- 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,9 +65,9 @@ {"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.23/pith/conftype.h alpine-2.23.fromheader/pith/conftype.h -*** alpine-2.23/pith/conftype.h 2020-06-18 15:19:23.461319005 -0600 ---- alpine-2.23.fromheader/pith/conftype.h 2020-06-18 16:08:13.009590727 -0600 +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 *************** *** 410,415 **** --- 410,416 ---- @@ -78,12 +78,12 @@ F_SEND_WO_CONFIRM, F_USE_SENDER_NOT_X, F_BLANK_KEYMENU, -diff -rc alpine-2.23/pith/pine.hlp alpine-2.23.fromheader/pith/pine.hlp -*** alpine-2.23/pith/pine.hlp 2020-06-18 15:19:23.461319005 -0600 ---- alpine-2.23.fromheader/pith/pine.hlp 2020-06-18 16:08:13.017590747 -0600 +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 *************** -*** 29697,29702 **** ---- 29697,29718 ---- +*** 30135,30140 **** +--- 30135,30156 ---- <End of help on this topic> </BODY> </HTML> @@ -106,9 +106,9 @@ ====== h_config_use_sender_not_x ===== <HTML> <HEAD> -diff -rc alpine-2.23/pith/send.c alpine-2.23.fromheader/pith/send.c -*** alpine-2.23/pith/send.c 2020-06-18 15:19:23.461319005 -0600 ---- alpine-2.23.fromheader/pith/send.c 2020-06-18 16:08:13.017590747 -0600 +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 *************** *** 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.23/pith/send.h alpine-2.23.fromheader/pith/send.h -*** alpine-2.23/pith/send.h 2020-06-18 15:19:23.461319005 -0600 ---- alpine-2.23.fromheader/pith/send.h 2020-06-18 16:08:13.017590747 -0600 +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 *************** *** 159,164 **** --- 159,166 ---- ++++++ chappa-insertpat.patch ++++++ --- /var/tmp/diff_new_pack.qyIWe9/_old 2021-01-18 11:31:59.968663614 +0100 +++ /var/tmp/diff_new_pack.qyIWe9/_new 2021-01-18 11:31:59.972663618 +0100 @@ -1,6 +1,6 @@ -diff -rc alpine-2.23/pico/display.c alpine-2.23.insertpat/pico/display.c -*** alpine-2.23/pico/display.c 2020-06-18 15:19:23.437319046 -0600 ---- alpine-2.23.insertpat/pico/display.c 2020-06-18 16:08:14.569594756 -0600 +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 *************** *** 2205,2210 **** --- 2205,2222 ---- @@ -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.23/pico/search.c alpine-2.23.insertpat/pico/search.c -*** alpine-2.23/pico/search.c 2020-06-18 15:19:23.437319046 -0600 ---- alpine-2.23.insertpat/pico/search.c 2020-06-18 16:08:14.569594756 -0600 +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 *************** *** 122,127 **** --- 122,131 ---- ++++++ chappa-maildir.patch ++++++ --- /var/tmp/diff_new_pack.qyIWe9/_old 2021-01-18 11:32:00.004663649 +0100 +++ /var/tmp/diff_new_pack.qyIWe9/_new 2021-01-18 11:32:00.004663649 +0100 @@ -1,9 +1,9 @@ -diff -rc alpine-2.23/alpine/alpine.c alpine-2.23.maildir/alpine/alpine.c -*** alpine-2.23/alpine/alpine.c 2020-06-18 15:19:23.469318992 -0600 ---- alpine-2.23.maildir/alpine/alpine.c 2020-06-18 16:08:07.725577079 -0600 +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 *************** -*** 597,602 **** ---- 597,607 ---- +*** 591,596 **** +--- 591,601 ---- if(F_ON(F_MAILDROPS_PRESERVE_STATE, ps_global)) mail_parameters(NULL, SET_SNARFPRESERVE, (void *) TRUE); @@ -15,12 +15,12 @@ rvl = 0L; if(pine_state->VAR_NNTPRANGE){ if(!SVAR_NNTPRANGE(pine_state, rvl, tmp_20k_buf, SIZEOF_20KBUF)) -diff -rc alpine-2.23/alpine/confscroll.c alpine-2.23.maildir/alpine/confscroll.c -*** alpine-2.23/alpine/confscroll.c 2020-06-18 15:19:23.465318999 -0600 ---- alpine-2.23.maildir/alpine/confscroll.c 2020-06-18 16:08:07.729577089 -0600 +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 *************** -*** 5546,5551 **** ---- 5546,5557 ---- +*** 5567,5572 **** +--- 5567,5578 ---- (void *)var->current_val.p); } #endif @@ -33,11 +33,11 @@ else if(revert && standard_radio_var(ps, var)){ cur_rule_value(var, TRUE, FALSE); -diff -rc alpine-2.23/imap/src/c-client/mail.c alpine-2.23.maildir/imap/src/c-client/mail.c -*** alpine-2.23/imap/src/c-client/mail.c 2020-06-18 15:19:23.457319012 -0600 ---- alpine-2.23.maildir/imap/src/c-client/mail.c 2020-06-18 16:08:07.729577089 -0600 +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 *************** -*** 1053,1059 **** +*** 1063,1069 **** 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); ---- 1053,1059 ---- +--- 1063,1069 ---- 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); *************** -*** 1077,1082 **** ---- 1077,1084 ---- +*** 1087,1092 **** +--- 1087,1094 ---- return NIL; } @@ -65,8 +65,8 @@ if ((mailbox[0] == '#') && ((mailbox[1] == 'd') || (mailbox[1] == 'D')) && ((mailbox[2] == 'r') || (mailbox[2] == 'R')) && *************** -*** 1107,1112 **** ---- 1109,1121 ---- +*** 1117,1122 **** +--- 1119,1131 ---- (((*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.23/imap/src/c-client/mail.h alpine-2.23.maildir/imap/src/c-client/mail.h -*** alpine-2.23/imap/src/c-client/mail.h 2020-06-18 15:19:23.457319012 -0600 ---- alpine-2.23.maildir/imap/src/c-client/mail.h 2020-06-18 16:08:07.729577089 -0600 +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 *************** -*** 379,384 **** ---- 379,388 ---- +*** 383,388 **** +--- 383,392 ---- #define SET_SCANCONTENTS (long) 573 #define GET_MHALLOWINBOX (long) 574 #define SET_MHALLOWINBOX (long) 575 @@ -96,11 +96,11 @@ /* Driver flags */ -diff -rc alpine-2.23/imap/src/osdep/unix/dummy.c alpine-2.23.maildir/imap/src/osdep/unix/dummy.c -*** alpine-2.23/imap/src/osdep/unix/dummy.c 2020-06-18 15:19:23.449319026 -0600 ---- alpine-2.23.maildir/imap/src/osdep/unix/dummy.c 2020-06-18 16:08:07.729577089 -0600 +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 *************** -*** 103,115 **** +*** 104,116 **** * Accepts: mailbox name * Returns: our driver if name is valid, NIL otherwise */ @@ -114,7 +114,7 @@ /* indeterminate clearbox INBOX */ if (!*s) return &dummydriver; else if (!stat (s,&sbuf)) switch (sbuf.st_mode & S_IFMT) { ---- 103,121 ---- +--- 104,122 ---- * Accepts: mailbox name * Returns: our driver if name is valid, NIL otherwise */ @@ -135,7 +135,7 @@ if (!*s) return &dummydriver; else if (!stat (s,&sbuf)) switch (sbuf.st_mode & S_IFMT) { *************** -*** 118,125 **** +*** 119,126 **** return &dummydriver; } /* blackbox INBOX does not exist yet */ @@ -144,7 +144,7 @@ return NIL; } ---- 124,132 ---- +--- 125,133 ---- return &dummydriver; } /* blackbox INBOX does not exist yet */ @@ -155,8 +155,8 @@ } *************** -*** 452,457 **** ---- 459,466 ---- +*** 453,458 **** +--- 460,467 ---- { char *s,tmp[MAILTMPLEN]; long ret = NIL; @@ -166,8 +166,8 @@ if (!(compare_cstring (mailbox,"INBOX") && (s = dummy_file (tmp,mailbox)))) { sprintf (tmp,"Can't create %.80s: invalid name",mailbox); *************** -*** 517,522 **** ---- 526,539 ---- +*** 518,523 **** +--- 527,540 ---- { struct stat sbuf; char *s,tmp[MAILTMPLEN]; @@ -183,7 +183,7 @@ sprintf (tmp,"Can't delete - invalid name: %.80s",s); MM_LOG (tmp,ERROR); *************** -*** 542,553 **** +*** 543,554 **** long dummy_rename (MAILSTREAM *stream,char *old,char *newname) { struct stat sbuf; @@ -196,7 +196,7 @@ MM_LOG (mbx,ERROR); return NIL; } ---- 559,581 ---- +--- 560,582 ---- long dummy_rename (MAILSTREAM *stream,char *old,char *newname) { struct stat sbuf; @@ -221,7 +221,7 @@ return NIL; } *************** -*** 563,576 **** +*** 564,577 **** } } /* rename of non-ex INBOX creates dest */ @@ -236,7 +236,7 @@ return T; /* return success */ } ---- 591,606 ---- +--- 592,607 ---- } } /* rename of non-ex INBOX creates dest */ @@ -253,9 +253,9 @@ return T; /* return success */ } -diff -rc alpine-2.23/imap/src/osdep/unix/maildir.c alpine-2.23.maildir/imap/src/osdep/unix/maildir.c -*** alpine-2.23/imap/src/osdep/unix/maildir.c 2020-06-18 16:08:07.773577203 -0600 ---- alpine-2.23.maildir/imap/src/osdep/unix/maildir.c 2020-06-18 16:08:07.733577099 -0600 +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 *************** *** 0 **** --- 1,2671 ---- @@ -2930,9 +2930,9 @@ + LOCAL->uidtempfile = cpystr(tmp); + } + } -diff -rc alpine-2.23/imap/src/osdep/unix/maildir.h alpine-2.23.maildir/imap/src/osdep/unix/maildir.h -*** alpine-2.23/imap/src/osdep/unix/maildir.h 2020-06-18 16:08:07.777577213 -0600 ---- alpine-2.23.maildir/imap/src/osdep/unix/maildir.h 2020-06-18 16:08:07.733577099 -0600 +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 *************** *** 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.23/imap/src/osdep/unix/Makefile alpine-2.23.maildir/imap/src/osdep/unix/Makefile -*** alpine-2.23/imap/src/osdep/unix/Makefile 2020-06-18 15:19:23.453319019 -0600 ---- alpine-2.23.maildir/imap/src/osdep/unix/Makefile 2020-06-18 16:08:07.733577099 -0600 +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 *************** *** 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.23/imap/src/osdep/unix/os_cyg.h alpine-2.23.maildir/imap/src/osdep/unix/os_cyg.h -*** alpine-2.23/imap/src/osdep/unix/os_cyg.h 2020-06-18 15:19:23.449319026 -0600 ---- alpine-2.23.maildir/imap/src/osdep/unix/os_cyg.h 2020-06-18 16:08:07.733577099 -0600 +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 *************** *** 47,52 **** --- 47,53 ---- @@ -3239,12 +3239,12 @@ #define geteuid Geteuid uid_t Geteuid (void); -diff -rc alpine-2.23/pith/conf.c alpine-2.23.maildir/pith/conf.c -*** alpine-2.23/pith/conf.c 2020-06-18 15:19:23.461319005 -0600 ---- alpine-2.23.maildir/pith/conf.c 2020-06-18 16:08:07.737577110 -0600 +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 *************** -*** 449,454 **** ---- 449,457 ---- +*** 453,458 **** +--- 453,461 ---- 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 *************** -*** 653,658 **** ---- 656,665 ---- +*** 657,662 **** +--- 660,669 ---- 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, *************** -*** 2338,2343 **** ---- 2345,2356 ---- +*** 2392,2397 **** +--- 2399,2410 ---- 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]) *************** -*** 2976,2981 **** ---- 2989,2998 ---- +*** 3030,3035 **** +--- 3043,3052 ---- 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", *************** -*** 7124,7130 **** +*** 7209,7215 **** int just_flip_value, EditWhich ew) { char **vp, *p, **lval, ***alval; @@ -3304,7 +3304,7 @@ char *err; long l; ---- 7141,7147 ---- +--- 7226,7232 ---- int just_flip_value, EditWhich ew) { char **vp, *p, **lval, ***alval; @@ -3313,8 +3313,8 @@ long l; *************** -*** 7177,7182 **** ---- 7194,7206 ---- +*** 7262,7267 **** +--- 7279,7291 ---- break; @@ -3329,8 +3329,8 @@ case F_DATES_TO_LOCAL : clear_index_cache(ps->mail_stream, 0); *************** -*** 7975,7980 **** ---- 7999,8008 ---- +*** 8062,8067 **** +--- 8086,8095 ---- 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.23/pith/conf.h alpine-2.23.maildir/pith/conf.h -*** alpine-2.23/pith/conf.h 2020-06-18 15:19:23.461319005 -0600 ---- alpine-2.23.maildir/pith/conf.h 2020-06-18 16:08:07.737577110 -0600 +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 *************** -*** 260,265 **** ---- 260,269 ---- +*** 264,269 **** +--- 264,273 ---- #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.23/pith/conftype.h alpine-2.23.maildir/pith/conftype.h -*** alpine-2.23/pith/conftype.h 2020-06-18 15:19:23.461319005 -0600 ---- alpine-2.23.maildir/pith/conftype.h 2020-06-18 16:08:07.737577110 -0600 +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 *************** *** 118,123 **** --- 118,126 ---- @@ -3384,9 +3384,9 @@ F_TAB_CHK_RECENT, F_AUTO_REPLY_TO, F_VERBOSE_POST, -diff -rc alpine-2.23/pith/init.c alpine-2.23.maildir/pith/init.c -*** alpine-2.23/pith/init.c 2020-06-18 15:19:23.465318999 -0600 ---- alpine-2.23.maildir/pith/init.c 2020-06-18 16:08:07.737577110 -0600 +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 *************** *** 408,413 **** --- 408,416 ---- @@ -3399,9 +3399,9 @@ && strcmp(filename, folder_base)){ #endif #endif -diff -rc alpine-2.23/pith/pattern.c alpine-2.23.maildir/pith/pattern.c -*** alpine-2.23/pith/pattern.c 2020-06-18 15:19:23.461319005 -0600 ---- alpine-2.23.maildir/pith/pattern.c 2020-06-18 16:08:07.741577120 -0600 +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 *************** *** 49,55 **** #include "../pith/icache.h" @@ -3489,12 +3489,12 @@ return(buf[0] != '\0'); } -diff -rc alpine-2.23/pith/pine.hlp alpine-2.23.maildir/pith/pine.hlp -*** alpine-2.23/pith/pine.hlp 2020-06-18 15:19:23.461319005 -0600 ---- alpine-2.23.maildir/pith/pine.hlp 2020-06-18 16:08:07.749577141 -0600 +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 *************** -*** 23014,23019 **** ---- 23014,23115 ---- +*** 23452,23457 **** +--- 23452,23553 ---- <End of help on this topic> </BODY> </HTML> @@ -3598,8 +3598,8 @@ <HTML> <HEAD> *************** -*** 31245,31250 **** ---- 31341,31389 ---- +*** 31683,31688 **** +--- 31779,31827 ---- <P> <End of help on this topic> </BODY> @@ -3649,9 +3649,9 @@ </HTML> ====== h_config_verbose_post ===== <HTML> -diff -rc alpine-2.23/pith/send.c alpine-2.23.maildir/pith/send.c -*** alpine-2.23/pith/send.c 2020-06-18 15:19:23.461319005 -0600 ---- alpine-2.23.maildir/pith/send.c 2020-06-18 16:08:07.761577172 -0600 +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 *************** *** 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.23/README.maildir alpine-2.23.maildir/README.maildir -*** alpine-2.23/README.maildir 2020-06-18 16:08:07.777577213 -0600 ---- alpine-2.23.maildir/README.maildir 2020-06-18 16:08:07.761577172 -0600 +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 *************** *** 0 **** --- 1,149 ---- ++++++ chappa-rules.patch ++++++ ++++ 12354 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/alpine/chappa-rules.patch ++++ and /work/SRC/openSUSE:Factory/.alpine.new.28504/chappa-rules.patch
