Hello community, here is the log from the commit of package alpine for openSUSE:Factory checked in at 2020-09-08 22:48:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alpine (Old) and /work/SRC/openSUSE:Factory/.alpine.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alpine" Tue Sep 8 22:48:40 2020 rev:48 rq:832801 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/alpine/alpine.changes 2020-06-18 10:28:56.208971430 +0200 +++ /work/SRC/openSUSE:Factory/.alpine.new.3399/alpine.changes 2020-09-08 22:49:10.387570267 +0200 @@ -1,0 +2,12 @@ +Mon Sep 7 13:44:51 UTC 2020 - Jan Engelhardt <jeng...@inai.de> + +- Update to release 2.23 + * Implementation of XOAUTH2 authentication support for Outlook. + * Add support for the OAUTHBEARER authentication method in Gmail. + * Support for the SASL-IR IMAP extension. + * Alpine can pass an HTML message to an external web browser, + by using the "External" command in the ATTACHMENT INDEX + screen. +- Drop extern.diff (merged) + +------------------------------------------------------------------- Old: ---- alpine-2.22.tar.xz extern.diff New: ---- alpine-2.23.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alpine.spec ++++++ --- /var/tmp/diff_new_pack.JekRvC/_old 2020-09-08 22:49:18.031573989 +0200 +++ /var/tmp/diff_new_pack.JekRvC/_new 2020-09-08 22:49:18.039573992 +0200 @@ -19,16 +19,15 @@ Name: alpine # For debugging only: %define build_vanilla 0 +Version: 2.23 +Release: 0 Summary: Mail User Agent License: Apache-2.0 Group: Productivity/Networking/Email/Clients -Version: 2.22 -Release: 0 URL: http://alpine.x10host.com/alpine/ # direct download does not work for openSUSE:Factory -# Source: http://patches.freeiz.com/alpine/release/src/%name-%version.tar.xz -Source: %name-%version.tar.xz +Source: http://alpine.x10host.com/alpine/release/src/%name-%version.tar.xz Source1: %name.png Source2: %name.desktop Source9: UPDATING.txt @@ -41,7 +40,6 @@ Patch20: pine-expression-warnings.diff Patch60: signal-and-panic-improvements.diff Patch61: return-values.diff -Patch62: extern.diff # # Eduardo Chappa's patches. # http://patches.freeiz.com/alpine/ @@ -110,7 +108,7 @@ %prep %setup -q -%if !%{build_vanilla} +%if !0%{?build_vanilla} # # This is here to support checking if any patches add new warnings: # @@ -145,8 +143,7 @@ %patch20 -p1 %patch60 -p1 %patch61 -p1 -%patch62 -p1 -%endif # End of "if !{build_vanilla}" +%endif %build # @@ -202,7 +199,7 @@ # # imap does not use CFLAGS from configure, needs EXTRACFLAGS/EXTRALDFLAGS: # -make %{?_smp_mflags} EXTRACFLAGS="$CFLAGS" EXTRALDFLAGS="$EXTRALDFLAGS" +%make_build EXTRACFLAGS="$CFLAGS" EXTRALDFLAGS="$EXTRALDFLAGS" %install %make_install ++++++ alpine-2.22.tar.xz -> alpine-2.23.tar.xz ++++++ /work/SRC/openSUSE:Factory/alpine/alpine-2.22.tar.xz /work/SRC/openSUSE:Factory/.alpine.new.3399/alpine-2.23.tar.xz differ: char 26, line 1 ++++++ chappa-WrtAcc.patch ++++++ --- /var/tmp/diff_new_pack.JekRvC/_old 2020-09-08 22:49:18.243574091 +0200 +++ /var/tmp/diff_new_pack.JekRvC/_new 2020-09-08 22:49:18.243574091 +0200 @@ -1,6 +1,6 @@ -diff -rc alpine-2.22/pico/basic.c alpine-2.22.WrtAcc/pico/basic.c -*** alpine-2.22/pico/basic.c 2020-01-19 01:32:18.272513938 -0700 ---- alpine-2.22.WrtAcc/pico/basic.c 2020-01-19 01:34:53.223471368 -0700 +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 *************** *** 342,347 **** --- 342,530 ---- @@ -193,9 +193,9 @@ /* * go forword to the end of the current paragraph -diff -rc alpine-2.22/pico/composer.c alpine-2.22.WrtAcc/pico/composer.c -*** alpine-2.22/pico/composer.c 2020-01-19 01:32:18.262514139 -0700 ---- alpine-2.22.WrtAcc/pico/composer.c 2020-01-19 01:34:53.224471360 -0700 +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 *************** *** 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.22/pico/display.c alpine-2.22.WrtAcc/pico/display.c -*** alpine-2.22/pico/display.c 2020-01-19 01:32:18.428510798 -0700 ---- alpine-2.22.WrtAcc/pico/display.c 2020-01-19 01:34:53.225471353 -0700 +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 *************** *** 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.22/pico/ebind.h alpine-2.22.WrtAcc/pico/ebind.h -*** alpine-2.22/pico/ebind.h 2020-01-19 01:32:18.369511986 -0700 ---- alpine-2.22.WrtAcc/pico/ebind.h 2020-01-19 01:34:53.226471345 -0700 +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 *************** *** 61,67 **** #ifdef MOUSE @@ -319,9 +319,9 @@ #endif #endif {CTRL|'A', gotobol}, -diff -rc alpine-2.22/pico/efunc.h alpine-2.22.WrtAcc/pico/efunc.h -*** alpine-2.22/pico/efunc.h 2020-01-19 01:32:18.308513213 -0700 ---- alpine-2.22.WrtAcc/pico/efunc.h 2020-01-19 01:34:53.226471345 -0700 +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 *************** *** 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.22/pico/main.c alpine-2.22.WrtAcc/pico/main.c -*** alpine-2.22/pico/main.c 2020-01-19 01:32:18.322512932 -0700 ---- alpine-2.22.WrtAcc/pico/main.c 2020-01-19 01:34:53.226471345 -0700 +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 *************** *** 458,463 **** --- 458,469 ---- ++++++ chappa-colortext.patch ++++++ --- /var/tmp/diff_new_pack.JekRvC/_old 2020-09-08 22:49:18.271574105 +0200 +++ /var/tmp/diff_new_pack.JekRvC/_new 2020-09-08 22:49:18.271574105 +0200 @@ -1,9 +1,9 @@ -diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.colortext/alpine/confscroll.c -*** alpine-2.22/alpine/confscroll.c 2020-01-19 01:32:20.190475483 -0700 ---- alpine-2.22.colortext/alpine/confscroll.c 2020-01-19 01:34:56.906444203 -0700 +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 *************** -*** 5228,5233 **** ---- 5228,5236 ---- +*** 5227,5232 **** +--- 5227,5235 ---- clear_index_cache(ps->mail_stream, 0); } @@ -13,12 +13,12 @@ else if(var == &ps->vars[V_INIT_CMD_LIST]){ if(!revert) q_status_message(SM_ASYNC, 0, 3, -diff -rc alpine-2.22/pith/conf.c alpine-2.22.colortext/pith/conf.c -*** alpine-2.22/pith/conf.c 2020-01-19 01:32:18.678505766 -0700 ---- alpine-2.22.colortext/pith/conf.c 2020-01-19 01:34:56.908444189 -0700 +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 *************** -*** 231,236 **** ---- 231,238 ---- +*** 233,238 **** +--- 233,240 ---- CONF_TXT_T cf_text_fillcol[] = "Specifies the column of the screen where the composer should wrap."; @@ -28,8 +28,8 @@ CONF_TXT_T cf_text_quotereplstr[] = "Specifies the string to replace quotes with when viewing a message."; *************** -*** 577,582 **** ---- 579,586 ---- +*** 583,588 **** +--- 585,592 ---- #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, *************** -*** 844,849 **** ---- 848,855 ---- +*** 856,861 **** +--- 860,867 ---- {"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}, *************** -*** 2035,2040 **** ---- 2041,2048 ---- +*** 2057,2062 **** +--- 2063,2070 ---- 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); *************** -*** 6599,6604 **** ---- 6607,6613 ---- +*** 6623,6628 **** +--- 6631,6637 ---- 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); *************** -*** 7787,7792 **** ---- 7796,7803 ---- +*** 7841,7846 **** +--- 7850,7857 ---- 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 : *************** -*** 7956,7961 **** ---- 7967,7975 ---- +*** 8020,8025 **** +--- 8031,8039 ---- 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.22/pith/conf.h alpine-2.22.colortext/pith/conf.h -*** alpine-2.22/pith/conf.h 2020-01-19 01:32:19.489489496 -0700 ---- alpine-2.22.colortext/pith/conf.h 2020-01-19 01:34:56.909444181 -0700 +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 *************** -*** 165,170 **** ---- 165,172 ---- +*** 171,176 **** +--- 171,178 ---- #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 *************** -*** 466,471 **** ---- 468,475 ---- +*** 472,477 **** +--- 474,481 ---- #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.22/pith/conftype.h alpine-2.22.colortext/pith/conftype.h -*** alpine-2.22/pith/conftype.h 2020-01-19 01:32:18.702505283 -0700 ---- alpine-2.22.colortext/pith/conftype.h 2020-01-19 01:34:56.910444174 -0700 +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 *************** *** 83,88 **** --- 83,89 ---- @@ -132,8 +132,8 @@ , V_REPLY_INTRO , V_QUOTE_REPLACE_STRING *************** -*** 238,243 **** ---- 239,246 ---- +*** 243,248 **** +--- 244,251 ---- , V_INCUNSEEN_BACK_COLOR , V_SIGNATURE_FORE_COLOR , V_SIGNATURE_BACK_COLOR @@ -142,9 +142,9 @@ , V_PROMPT_FORE_COLOR , V_PROMPT_BACK_COLOR , V_HEADER_GENERAL_FORE_COLOR -diff -rc alpine-2.22/pith/mailview.c alpine-2.22.colortext/pith/mailview.c -*** alpine-2.22/pith/mailview.c 2020-01-19 01:32:18.803503250 -0700 ---- alpine-2.22.colortext/pith/mailview.c 2020-01-19 01:34:56.911444167 -0700 +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 *************** *** 638,643 **** --- 638,651 ---- @@ -355,9 +355,9 @@ /* * The argument fieldname is something like "Subject:..." or "Subject". -diff -rc alpine-2.22/pith/mailview.h alpine-2.22.colortext/pith/mailview.h -*** alpine-2.22/pith/mailview.h 2020-01-19 01:32:19.614486993 -0700 ---- alpine-2.22.colortext/pith/mailview.h 2020-01-19 01:34:56.911444167 -0700 +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 *************** *** 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.22/pith/pine.hlp alpine-2.22.colortext/pith/pine.hlp -*** alpine-2.22/pith/pine.hlp 2020-01-19 01:32:19.035498584 -0700 ---- alpine-2.22.colortext/pith/pine.hlp 2020-01-19 01:34:56.924444072 -0700 +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 *************** -*** 4601,4606 **** ---- 4601,4607 ---- +*** 4683,4688 **** +--- 4683,4689 ---- <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> *************** -*** 4629,4634 **** ---- 4630,4636 ---- +*** 4711,4716 **** +--- 4712,4718 ---- <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> *************** -*** 24262,24267 **** ---- 24264,24306 ---- +*** 24379,24384 **** +--- 24381,24423 ---- <End of help on this topic> </BODY> </HTML> @@ -461,8 +461,8 @@ <HTML> <HEAD> *************** -*** 32864,32869 **** ---- 32903,32932 ---- +*** 33000,33005 **** +--- 33039,33068 ---- <P> <A HREF="h_color_setup">Descriptions of the available commands</A> @@ -493,14 +493,14 @@ <P> Look <A HREF="h_edit_nav_cmds">here</A> to see the available Editing and Navigation commands. -diff -rc alpine-2.22/pith/state.c alpine-2.22.colortext/pith/state.c -*** alpine-2.22/pith/state.c 2020-01-19 01:32:18.700505323 -0700 ---- alpine-2.22.colortext/pith/state.c 2020-01-19 01:34:56.926444057 -0700 -*************** -*** 138,143 **** ---- 138,146 ---- - if((*pps)->folders_dir != NULL) - fs_give((void **)&(*pps)->folders_dir); +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 +*************** +*** 144,149 **** +--- 144,152 ---- + if((*pps)->html_dir_list != NULL) + free_html_log(&(*pps)->html_dir_list); + if((*pps)->paterror == 0) + regfree(&(*pps)->colorpat); @@ -508,12 +508,12 @@ if((*pps)->ui.homedir) fs_give((void **)&(*pps)->ui.homedir); -diff -rc alpine-2.22/pith/state.h alpine-2.22.colortext/pith/state.h -*** alpine-2.22/pith/state.h 2020-01-19 01:32:18.561508121 -0700 ---- alpine-2.22.colortext/pith/state.h 2020-01-19 01:34:56.926444057 -0700 +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 *************** -*** 340,345 **** ---- 340,347 ---- +*** 347,352 **** +--- 347,354 ---- 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.22/pith/text.c alpine-2.22.colortext/pith/text.c -*** alpine-2.22/pith/text.c 2020-01-19 01:32:19.317492939 -0700 ---- alpine-2.22.colortext/pith/text.c 2020-01-19 01:34:56.927444050 -0700 +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 *************** *** 171,176 **** --- 171,185 ---- ++++++ chappa-fancy.patch ++++++ ++++ 917 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/alpine/chappa-fancy.patch ++++ and /work/SRC/openSUSE:Factory/.alpine.new.3399/chappa-fancy.patch ++++++ chappa-fillpara.patch ++++++ ++++ 652 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/alpine/chappa-fillpara.patch ++++ and /work/SRC/openSUSE:Factory/.alpine.new.3399/chappa-fillpara.patch ++++++ chappa-fromheader.patch ++++++ --- /var/tmp/diff_new_pack.JekRvC/_old 2020-09-08 22:49:18.375574156 +0200 +++ /var/tmp/diff_new_pack.JekRvC/_new 2020-09-08 22:49:18.375574156 +0200 @@ -1,6 +1,6 @@ -diff -rc alpine-2.22/alpine/send.c alpine-2.22.fromheader/alpine/send.c -*** alpine-2.22/alpine/send.c 2020-01-19 01:32:20.126476758 -0700 ---- alpine-2.22.fromheader/alpine/send.c 2020-01-19 01:34:53.915466200 -0700 +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 *************** *** 909,915 **** 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE}, @@ -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}, *************** -*** 2364,2369 **** ---- 2364,2374 ---- +*** 2368,2373 **** +--- 2368,2378 ---- he->rich_header = 0; } } @@ -33,7 +33,7 @@ he_from = he; break; *************** -*** 3101,3107 **** +*** 3105,3111 **** if(outgoing->return_path) mail_free_address(&outgoing->return_path); @@ -41,7 +41,7 @@ /* * Don't ever believe the sender that is there. ---- 3106,3114 ---- +--- 3110,3118 ---- 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.22/pith/conf.c alpine-2.22.fromheader/pith/conf.c -*** alpine-2.22/pith/conf.c 2020-01-19 01:32:18.678505766 -0700 ---- alpine-2.22.fromheader/pith/conf.c 2020-01-19 01:34:53.918466178 -0700 +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 *************** -*** 2908,2913 **** ---- 2908,2915 ---- +*** 2930,2935 **** +--- 2930,2937 ---- 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.22/pith/conftype.h alpine-2.22.fromheader/pith/conftype.h -*** alpine-2.22/pith/conftype.h 2020-01-19 01:32:18.702505283 -0700 ---- alpine-2.22.fromheader/pith/conftype.h 2020-01-19 01:34:53.919466170 -0700 +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 *************** -*** 404,409 **** ---- 404,410 ---- +*** 410,415 **** +--- 410,416 ---- 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.22/pith/pine.hlp alpine-2.22.fromheader/pith/pine.hlp -*** alpine-2.22/pith/pine.hlp 2020-01-19 01:32:19.035498584 -0700 ---- alpine-2.22.fromheader/pith/pine.hlp 2020-01-19 01:34:53.931466081 -0700 +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 *************** -*** 29530,29535 **** ---- 29530,29551 ---- +*** 29697,29702 **** +--- 29697,29718 ---- <End of help on this topic> </BODY> </HTML> @@ -106,9 +106,9 @@ ====== h_config_use_sender_not_x ===== <HTML> <HEAD> -diff -rc alpine-2.22/pith/send.c alpine-2.22.fromheader/pith/send.c -*** alpine-2.22/pith/send.c 2020-01-19 01:32:18.956500171 -0700 ---- alpine-2.22.fromheader/pith/send.c 2020-01-19 01:34:53.934466058 -0700 +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 *************** *** 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.22/pith/send.h alpine-2.22.fromheader/pith/send.h -*** alpine-2.22/pith/send.h 2020-01-19 01:32:19.354492198 -0700 ---- alpine-2.22.fromheader/pith/send.h 2020-01-19 01:34:53.934466058 -0700 +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 *************** *** 159,164 **** --- 159,166 ---- ++++++ chappa-insertpat.patch ++++++ --- /var/tmp/diff_new_pack.JekRvC/_old 2020-09-08 22:49:18.403574170 +0200 +++ /var/tmp/diff_new_pack.JekRvC/_new 2020-09-08 22:49:18.403574170 +0200 @@ -1,6 +1,6 @@ -diff -rc alpine-2.22/pico/display.c alpine-2.22.insertpat/pico/display.c -*** alpine-2.22/pico/display.c 2020-01-19 01:32:18.428510798 -0700 ---- alpine-2.22.insertpat/pico/display.c 2020-01-19 01:34:56.194449394 -0700 +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 *************** *** 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.22/pico/search.c alpine-2.22.insertpat/pico/search.c -*** alpine-2.22/pico/search.c 2020-01-19 01:32:18.347512428 -0700 ---- alpine-2.22.insertpat/pico/search.c 2020-01-19 01:34:56.195449387 -0700 +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 *************** *** 122,127 **** --- 122,131 ---- ++++++ chappa-maildir.patch ++++++ --- /var/tmp/diff_new_pack.JekRvC/_old 2020-09-08 22:49:18.431574183 +0200 +++ /var/tmp/diff_new_pack.JekRvC/_new 2020-09-08 22:49:18.431574183 +0200 @@ -1,9 +1,9 @@ -diff -rc alpine-2.22/alpine/alpine.c alpine-2.22.maildir/alpine/alpine.c -*** alpine-2.22/alpine/alpine.c 2020-01-19 01:32:20.090477474 -0700 ---- alpine-2.22.maildir/alpine/alpine.c 2020-01-19 01:34:47.848512457 -0700 +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 *************** -*** 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,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.22/alpine/confscroll.c alpine-2.22.maildir/alpine/confscroll.c -*** alpine-2.22/alpine/confscroll.c 2020-01-19 01:32:20.190475483 -0700 ---- alpine-2.22.maildir/alpine/confscroll.c 2020-01-19 01:34:47.850512441 -0700 +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 *************** -*** 5557,5562 **** ---- 5557,5568 ---- +*** 5546,5551 **** +--- 5546,5557 ---- (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.22/imap/src/c-client/mail.c alpine-2.22.maildir/imap/src/c-client/mail.c -*** alpine-2.22/imap/src/c-client/mail.c 2020-01-19 01:32:23.162416684 -0700 ---- alpine-2.22.maildir/imap/src/c-client/mail.c 2020-01-19 01:34:48.243509380 -0700 +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 *************** -*** 1046,1052 **** +*** 1053,1059 **** 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); ---- 1046,1052 ---- +--- 1053,1059 ---- 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); *************** -*** 1070,1075 **** ---- 1070,1077 ---- +*** 1077,1082 **** +--- 1077,1084 ---- return NIL; } @@ -65,8 +65,8 @@ if ((mailbox[0] == '#') && ((mailbox[1] == 'd') || (mailbox[1] == 'D')) && ((mailbox[2] == 'r') || (mailbox[2] == 'R')) && *************** -*** 1100,1105 **** ---- 1102,1114 ---- +*** 1107,1112 **** +--- 1109,1121 ---- (((*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.22/imap/src/c-client/mail.h alpine-2.22.maildir/imap/src/c-client/mail.h -*** alpine-2.22/imap/src/c-client/mail.h 2020-01-19 01:32:23.166416605 -0700 ---- alpine-2.22.maildir/imap/src/c-client/mail.h 2020-01-19 01:34:48.244509372 -0700 +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 *************** -*** 374,379 **** ---- 374,383 ---- +*** 379,384 **** +--- 379,388 ---- #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.22/imap/src/osdep/unix/dummy.c alpine-2.22.maildir/imap/src/osdep/unix/dummy.c -*** alpine-2.22/imap/src/osdep/unix/dummy.c 2020-01-19 01:32:22.660426553 -0700 ---- alpine-2.22.maildir/imap/src/osdep/unix/dummy.c 2020-01-19 01:34:48.245509364 -0700 +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 *************** *** 103,115 **** * Accepts: mailbox name @@ -253,9 +253,9 @@ return T; /* return success */ } -diff -rc alpine-2.22/imap/src/osdep/unix/maildir.c alpine-2.22.maildir/imap/src/osdep/unix/maildir.c -*** alpine-2.22/imap/src/osdep/unix/maildir.c 2020-01-19 01:34:48.437507873 -0700 ---- alpine-2.22.maildir/imap/src/osdep/unix/maildir.c 2020-01-19 01:34:48.249509333 -0700 +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 *************** *** 0 **** --- 1,2671 ---- @@ -2930,9 +2930,9 @@ + LOCAL->uidtempfile = cpystr(tmp); + } + } -diff -rc alpine-2.22/imap/src/osdep/unix/maildir.h alpine-2.22.maildir/imap/src/osdep/unix/maildir.h -*** alpine-2.22/imap/src/osdep/unix/maildir.h 2020-01-19 01:34:48.439507857 -0700 ---- alpine-2.22.maildir/imap/src/osdep/unix/maildir.h 2020-01-19 01:34:48.250509325 -0700 +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 *************** *** 0 **** --- 1,226 ---- @@ -3162,11 +3162,11 @@ + void maildir_assign_uid(MAILSTREAM *stream, unsigned long msgno, unsigned long uid); + void maildir_uid_renew_tempfile(MAILSTREAM *stream); + -diff -rc alpine-2.22/imap/src/osdep/unix/Makefile alpine-2.22.maildir/imap/src/osdep/unix/Makefile -*** alpine-2.22/imap/src/osdep/unix/Makefile 2020-01-19 01:32:22.615427440 -0700 ---- alpine-2.22.maildir/imap/src/osdep/unix/Makefile 2020-01-19 01:34:48.250509325 -0700 +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 *************** -*** 147,153 **** +*** 146,152 **** # However, mh needs to be before any sysinbox formats (such as mmdf or unix) # since otherwise INBOX won't work correctly when mh_allow_inbox is set. # @@ -3174,7 +3174,7 @@ CHUNKSIZE=65536 # Normally no need to change any of these ---- 147,153 ---- +--- 146,152 ---- # However, mh needs to be before any sysinbox formats (such as mmdf or unix) # since otherwise INBOX won't work correctly when mh_allow_inbox is set. # @@ -3183,7 +3183,7 @@ # Normally no need to change any of these *************** -*** 156,162 **** +*** 155,161 **** BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o utf8aux.o siglocal.o \ dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ rfc822.o nntp.o smtp.o imap4r1.o http.o json.o pop3.o \ @@ -3191,7 +3191,7 @@ CFLAGS=-g CAT=cat ---- 156,162 ---- +--- 155,161 ---- BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o utf8aux.o siglocal.o \ dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ rfc822.o nntp.o smtp.o imap4r1.o http.o json.o pop3.o \ @@ -3200,7 +3200,7 @@ CAT=cat *************** -*** 293,299 **** +*** 292,298 **** cyg: # Cygwin - note that most local file drivers don't work!! $(BUILD) `$(CAT) SPECIALS` OS=$@ \ @@ -3208,7 +3208,7 @@ SIGTYPE=psx CHECKPW=cyg LOGINPW=cyg CRXTYPE=std \ SPOOLDIR=/var \ ACTIVEFILE=/usr/local/news/lib/active \ ---- 293,299 ---- +--- 292,298 ---- cyg: # Cygwin - note that most local file drivers don't work!! $(BUILD) `$(CAT) SPECIALS` OS=$@ \ @@ -3217,8 +3217,8 @@ SPOOLDIR=/var \ ACTIVEFILE=/usr/local/news/lib/active \ *************** -*** 922,927 **** ---- 922,928 ---- +*** 921,926 **** +--- 921,927 ---- utf8aux.o: mail.h misc.h osdep.h utf8.h json.o: mail.h misc.h osdep.h utf8.h json.h http.o: mail.h misc.h osdep.h utf8.h http.h json.h @@ -3226,9 +3226,9 @@ # OS-dependent -diff -rc alpine-2.22/imap/src/osdep/unix/os_cyg.h alpine-2.22.maildir/imap/src/osdep/unix/os_cyg.h -*** alpine-2.22/imap/src/osdep/unix/os_cyg.h 2020-01-19 01:32:22.664426475 -0700 ---- alpine-2.22.maildir/imap/src/osdep/unix/os_cyg.h 2020-01-19 01:34:48.251509318 -0700 +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 *************** *** 47,52 **** --- 47,53 ---- @@ -3239,12 +3239,12 @@ #define geteuid Geteuid uid_t Geteuid (void); -diff -rc alpine-2.22/pith/conf.c alpine-2.22.maildir/pith/conf.c -*** alpine-2.22/pith/conf.c 2020-01-19 01:32:18.678505766 -0700 ---- alpine-2.22.maildir/pith/conf.c 2020-01-19 01:34:48.253509302 -0700 +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 *************** -*** 443,448 **** ---- 443,451 ---- +*** 449,454 **** +--- 449,457 ---- 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 *************** -*** 649,654 **** ---- 652,661 ---- +*** 653,658 **** +--- 656,665 ---- 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, *************** -*** 2322,2327 **** ---- 2329,2340 ---- +*** 2338,2343 **** +--- 2345,2356 ---- 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]) *************** -*** 2954,2959 **** ---- 2967,2976 ---- +*** 2976,2981 **** +--- 2989,2998 ---- 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", *************** -*** 7068,7074 **** +*** 7124,7130 **** int just_flip_value, EditWhich ew) { char **vp, *p, **lval, ***alval; @@ -3304,7 +3304,7 @@ char *err; long l; ---- 7085,7091 ---- +--- 7141,7147 ---- int just_flip_value, EditWhich ew) { char **vp, *p, **lval, ***alval; @@ -3313,8 +3313,8 @@ long l; *************** -*** 7121,7126 **** ---- 7138,7150 ---- +*** 7177,7182 **** +--- 7194,7206 ---- break; @@ -3329,8 +3329,8 @@ case F_DATES_TO_LOCAL : clear_index_cache(ps->mail_stream, 0); *************** -*** 7911,7916 **** ---- 7935,7944 ---- +*** 7975,7980 **** +--- 7999,8008 ---- 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.22/pith/conf.h alpine-2.22.maildir/pith/conf.h -*** alpine-2.22/pith/conf.h 2020-01-19 01:32:19.489489496 -0700 ---- alpine-2.22.maildir/pith/conf.h 2020-01-19 01:34:48.277509116 -0700 +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 *************** -*** 256,261 **** ---- 256,265 ---- +*** 260,265 **** +--- 260,269 ---- #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,12 +3357,12 @@ #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.22/pith/conftype.h alpine-2.22.maildir/pith/conftype.h -*** alpine-2.22/pith/conftype.h 2020-01-19 01:32:18.702505283 -0700 ---- alpine-2.22.maildir/pith/conftype.h 2020-01-19 01:34:48.278509108 -0700 +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 *************** -*** 119,124 **** ---- 119,127 ---- +*** 118,123 **** +--- 118,126 ---- , V_NEWSRC_PATH , V_NEWS_ACTIVE_PATH , V_NEWS_SPOOL_DIR @@ -3373,8 +3373,8 @@ , V_UPLOAD_CMD_PREFIX , V_DOWNLOAD_CMD *************** -*** 400,405 **** ---- 403,411 ---- +*** 406,411 **** +--- 409,417 ---- 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.22/pith/init.c alpine-2.22.maildir/pith/init.c -*** alpine-2.22/pith/init.c 2020-01-19 01:32:18.764504035 -0700 ---- alpine-2.22.maildir/pith/init.c 2020-01-19 01:34:48.278509108 -0700 +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 *************** *** 408,413 **** --- 408,416 ---- @@ -3399,9 +3399,9 @@ && strcmp(filename, folder_base)){ #endif #endif -diff -rc alpine-2.22/pith/pattern.c alpine-2.22.maildir/pith/pattern.c -*** alpine-2.22/pith/pattern.c 2020-01-19 01:32:19.260494080 -0700 ---- alpine-2.22.maildir/pith/pattern.c 2020-01-19 01:34:48.281509085 -0700 +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 *************** *** 49,55 **** #include "../pith/icache.h" @@ -3489,12 +3489,12 @@ return(buf[0] != '\0'); } -diff -rc alpine-2.22/pith/pine.hlp alpine-2.22.maildir/pith/pine.hlp -*** alpine-2.22/pith/pine.hlp 2020-01-19 01:32:19.035498584 -0700 ---- alpine-2.22.maildir/pith/pine.hlp 2020-01-19 01:34:48.306508890 -0700 +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 *************** -*** 22897,22902 **** ---- 22897,22998 ---- +*** 23014,23019 **** +--- 23014,23115 ---- <End of help on this topic> </BODY> </HTML> @@ -3598,8 +3598,8 @@ <HTML> <HEAD> *************** -*** 31036,31041 **** ---- 31132,31180 ---- +*** 31245,31250 **** +--- 31341,31389 ---- <P> <End of help on this topic> </BODY> @@ -3649,9 +3649,9 @@ </HTML> ====== h_config_verbose_post ===== <HTML> -diff -rc alpine-2.22/pith/send.c alpine-2.22.maildir/pith/send.c -*** alpine-2.22/pith/send.c 2020-01-19 01:32:18.956500171 -0700 ---- alpine-2.22.maildir/pith/send.c 2020-01-19 01:34:48.420508005 -0700 +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 *************** *** 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.22/README.maildir alpine-2.22.maildir/README.maildir -*** alpine-2.22/README.maildir 2020-01-19 01:34:48.441507842 -0700 ---- alpine-2.22.maildir/README.maildir 2020-01-19 01:34:48.421507997 -0700 +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 *************** *** 0 **** --- 1,149 ---- ++++++ chappa-rules.patch ++++++ ++++ 1104 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/alpine/chappa-rules.patch ++++ and /work/SRC/openSUSE:Factory/.alpine.new.3399/chappa-rules.patch ++++++ pico-fix-spurious-undef-warnings.diff ++++++ --- /var/tmp/diff_new_pack.JekRvC/_old 2020-09-08 22:49:18.515574224 +0200 +++ /var/tmp/diff_new_pack.JekRvC/_new 2020-09-08 22:49:18.515574224 +0200 @@ -5,11 +5,11 @@ pico/osdep/shell.c | 3 +-- 4 files changed, 25 insertions(+), 2 deletions(-) -Index: alpine-2.22/imap/src/c-client/mail.h +Index: alpine-2.23/imap/src/c-client/mail.h =================================================================== ---- alpine-2.22.orig/imap/src/c-client/mail.h -+++ alpine-2.22/imap/src/c-client/mail.h -@@ -1914,6 +1914,14 @@ long INWAIT (long seconds); +--- 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); int PSOUT (char *s); int PSOUTR (SIZEDTEXT *s); int PFLUSH (void); @@ -22,12 +22,12 @@ +#define if(x) if((x)) +#define while(x) while((x)) - /* XOAUTH Client-Side Support */ + /* XOAUTH2 and AUTHBEARER Client-Side Support */ -Index: alpine-2.22/imap/src/osdep/unix/os_slx.h +Index: alpine-2.23/imap/src/osdep/unix/os_slx.h =================================================================== ---- alpine-2.22.orig/imap/src/osdep/unix/os_slx.h -+++ alpine-2.22/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 #include "ftl.h" #include "nl.h" @@ -40,10 +40,10 @@ + */ +#define if(x) if((x)) +#define while(x) while((x)) -Index: alpine-2.22/include/system.h +Index: alpine-2.23/include/system.h =================================================================== ---- alpine-2.22.orig/include/system.h -+++ alpine-2.22/include/system.h +--- alpine-2.23.orig/include/system.h ++++ alpine-2.23/include/system.h @@ -389,4 +389,12 @@ typedef int gid_t; # define LOCAL_PASSWD_CACHE #endif @@ -57,10 +57,10 @@ +#define if(x) if((x)) +#define while(x) while((x)) #endif /* _SYSTEM_INCLUDED */ -Index: alpine-2.22/pico/osdep/shell.c +Index: alpine-2.23/pico/osdep/shell.c =================================================================== ---- alpine-2.22.orig/pico/osdep/shell.c -+++ alpine-2.22/pico/osdep/shell.c +--- alpine-2.23.orig/pico/osdep/shell.c ++++ alpine-2.23/pico/osdep/shell.c @@ -98,7 +98,6 @@ bktoshell(int f, int n) if(gmode&MDSPWN){
