Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package alpine for openSUSE:Factory checked in at 2022-06-30 13:18:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/alpine (Old)
and /work/SRC/openSUSE:Factory/.alpine.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alpine"
Thu Jun 30 13:18:11 2022 rev:56 rq:986005 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/alpine/alpine.changes 2022-03-15 19:05:44.488981536 +0100
+++ /work/SRC/openSUSE:Factory/.alpine.new.1548/alpine.changes 2022-06-30 13:18:14.837528207 +0200
@@ -1,0 +2,23 @@
+Fri Jun 10 15:51:07 UTC 2022 - Jan Engelhardt
+
+- Update to release 2.26
+ * Alpine is built with password file support by default. If
+ Alpine is built with SMIME support and the password file does
+ not exist, then Alpine will create it by default and encrypt
+ it.
+ * In the past, Alpine did not recognize images embedded in an
+ HTML file, so now it does and a link to open them is given.
+ Additionally, Alpine did not pass these images to an external
+ browser for display using the external command; it does so now.
+ * Support for code_verifier and code_challenge when generating
+ a refresh token and access token in Gmail and Outlook using
+ the S256 method and plain method.
+ * Changed the redirect_uri scheme for Gmail, as Google is
+ deprecating the use of oob. Changed to http://localhost.
+ Users are supposed to enter the URL they see in their browser
+ in place of the code.
+ * Added support to the LDAP attribute "userCertificate";
+ * If new mail has arrived when a user is closing a mailbox,
+ Alpine will also announce how many new messages have arrived.
+
+-------------------------------------------------------------------
Old:
----
alpine-2.25.1.tar.xz
New:
----
alpine-2.26.tar.xz
alpine-2.26.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alpine.spec ++++++
--- /var/tmp/diff_new_pack.mNQIzl/_old 2022-06-30 13:18:16.017529092 +0200
+++ /var/tmp/diff_new_pack.mNQIzl/_new 2022-06-30 13:18:16.021529095 +0200
@@ -16,20 +16,22 @@
#
+# grep '\*version' for new pico version number
+# grep 'PILOT_VERSION' for new pilot version number
Name: alpine
# For debugging only:
%define build_vanilla 0
-Version: 2.25.1
+Version: 2.26
Release: 0
Summary: Mail User Agent
License: Apache-2.0
Group: Productivity/Networking/Email/Clients
-URL: http://alpine.x10host.com/alpine/
+URL: https://alpineapp.email/
#Git-Clone: https://repo.or.cz/alpine.git
-Source: %name-%version.tar.xz
-#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
+#Source: %name-%version.tar.xz
+Source: https://alpineapp.email/alpine/release/src/alpine-%version.tar.xz
+Source2: https://alpineapp.email/alpine/release/src/sig/alpine-%version.tar.xz.sig
Source3: %name.png
Source4: %name.desktop
Source9: UPDATING.txt
@@ -88,7 +90,7 @@
%package -n pico
Summary: A small, easy to use editor
Group: Productivity/Editors/Other
-Version: 5.07
+Version: 5.09
Release: 0
%description -n pico
++++++ UPDATING.txt ++++++
--- /var/tmp/diff_new_pack.mNQIzl/_old 2022-06-30 13:18:16.073529134 +0200
+++ /var/tmp/diff_new_pack.mNQIzl/_new 2022-06-30 13:18:16.077529137 +0200
@@ -4,8 +4,8 @@
provided as patches (but by the same author..). So when there is a new
release, the out-of-tree patches on the website get updated too.
- version="2.25"
- for i in WrtAcc colortext fancy fillpara fromheader insertpat maildir rules DelText; do
+ version="2.26"
+ for i in 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.25.1.tar.xz -> alpine-2.26.tar.xz ++++++
/work/SRC/openSUSE:Factory/alpine/alpine-2.25.1.tar.xz /work/SRC/openSUSE:Factory/.alpine.new.1548/alpine-2.26.tar.xz differ: char 13, line 1
++++++ chappa-DelText.patch ++++++
--- /var/tmp/diff_new_pack.mNQIzl/_old 2022-06-30 13:18:16.141529185 +0200
+++ /var/tmp/diff_new_pack.mNQIzl/_new 2022-06-30 13:18:16.141529185 +0200
@@ -1,13 +1,13 @@
---
pico/basic.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
pico/efunc.h | 1 +
- pico/search.c | 8 ++++++--
- 3 files changed, 57 insertions(+), 2 deletions(-)
+ pico/search.c | 7 ++++++-
+ 3 files changed, 57 insertions(+), 1 deletion(-)
-Index: alpine-2.25.1/pico/basic.c
+Index: alpine-2.26/pico/basic.c
===================================================================
---- alpine-2.25.1.orig/pico/basic.c
-+++ alpine-2.25.1/pico/basic.c
+--- alpine-2.26.orig/pico/basic.c
++++ alpine-2.26/pico/basic.c
@@ -772,7 +772,57 @@ scrolldownline(int f, int n)
return (scrollforw (1, FALSE));
}
@@ -66,10 +66,10 @@
/*
* Scroll to a position.
-Index: alpine-2.25.1/pico/efunc.h
+Index: alpine-2.26/pico/efunc.h
===================================================================
---- alpine-2.25.1.orig/pico/efunc.h
-+++ alpine-2.25.1/pico/efunc.h
+--- alpine-2.26.orig/pico/efunc.h
++++ alpine-2.26/pico/efunc.h
@@ -56,6 +56,7 @@ extern int gotobop(int, int);
extern int gotoeop(int, int);
extern int forwpage(int, int);
@@ -78,20 +78,19 @@
extern int scrollupline(int, int);
extern int scrolldownline(int, int);
extern int scrollto(int, int);
-Index: alpine-2.25.1/pico/search.c
+Index: alpine-2.26/pico/search.c
===================================================================
---- alpine-2.25.1.orig/pico/search.c
-+++ alpine-2.25.1/pico/search.c
-@@ -69,7 +69,7 @@ EXTRAKEYS menu_srchpat[] = {
+--- alpine-2.26.orig/pico/search.c
++++ alpine-2.26/pico/search.c
+@@ -69,6 +69,7 @@ EXTRAKEYS menu_srchpat[] = {
{"^O", N_("End of Para"), (CTRL|'O')},
{"^U", N_("FullJustify"), (CTRL|'U')},
{"^P", N_("Delete Para"), (CTRL|'P')},
-- {NULL, NULL, 0}
+ {"^X", N_("Del End"), (CTRL|'X')},
+ {NULL, NULL, 0}
};
- #define EXACTSR_KEY 1 /* toggle an exact or approximate search */
-@@ -282,7 +282,11 @@ forwsearch(int f, int n)
+@@ -282,7 +283,11 @@ forwsearch(int f, int n)
break;
case (CTRL|'X'):
++++++ chappa-colortext.patch ++++++
--- /var/tmp/diff_new_pack.mNQIzl/_old 2022-06-30 13:18:16.157529197 +0200
+++ /var/tmp/diff_new_pack.mNQIzl/_new 2022-06-30 13:18:16.157529197 +0200
@@ -1,9 +1,9 @@
-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
+diff -rc alpine-2.26/alpine/confscroll.c alpine-2.26.colortext/alpine/confscroll.c
+*** alpine-2.26/alpine/confscroll.c 2022-06-02 18:14:00.463274817 -0600
+--- alpine-2.26.colortext/alpine/confscroll.c 2022-06-02 18:15:04.147118665 -0600
***************
-*** 5248,5253 ****
---- 5248,5256 ----
+*** 5246,5251 ****
+--- 5246,5254 ----
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.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
+diff -rc alpine-2.26/pith/conf.c alpine-2.26.colortext/pith/conf.c
+*** alpine-2.26/pith/conf.c 2022-06-02 18:14:00.491274749 -0600
+--- alpine-2.26.colortext/pith/conf.c 2022-06-02 18:15:04.151118655 -0600
***************
-*** 233,238 ****
---- 233,240 ----
+*** 229,234 ****
+--- 229,236 ----
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.";
***************
-*** 589,594 ****
---- 591,598 ----
+*** 585,590 ****
+--- 587,594 ----
#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,
***************
-*** 866,871 ****
---- 870,877 ----
+*** 864,869 ****
+--- 868,875 ----
{"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},
@@ -61,8 +61,8 @@
set_current_val(&vars[V_HISTORY], TRUE, TRUE);
set_current_val(&vars[V_SMTP_SERVER], TRUE, TRUE);
***************
-*** 6684,6689 ****
---- 6692,6698 ----
+*** 6685,6690 ****
+--- 6693,6699 ----
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);
***************
-*** 7933,7938 ****
---- 7942,7949 ----
+*** 7934,7939 ****
+--- 7943,7950 ----
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 :
***************
-*** 8116,8121 ****
---- 8127,8135 ----
+*** 8119,8124 ****
+--- 8130,8138 ----
case V_SIGNATURE_FORE_COLOR :
case V_SIGNATURE_BACK_COLOR :
return(h_config_signature_color);
@@ -93,9 +93,9 @@
case V_PROMPT_FORE_COLOR :
case V_PROMPT_BACK_COLOR :
return(h_config_prompt_color);
-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
+diff -rc alpine-2.26/pith/conf.h alpine-2.26.colortext/pith/conf.h
+*** alpine-2.26/pith/conf.h 2022-06-02 18:14:00.491274749 -0600
+--- alpine-2.26.colortext/pith/conf.h 2022-06-02 18:15:04.187118567 -0600
***************
*** 176,181 ****
--- 176,183 ----
@@ -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.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
+diff -rc alpine-2.26/pith/conftype.h alpine-2.26.colortext/pith/conftype.h
+*** alpine-2.26/pith/conftype.h 2022-06-02 18:14:00.491274749 -0600
+--- alpine-2.26.colortext/pith/conftype.h 2022-06-02 18:15:04.235118450 -0600
***************
*** 83,88 ****
--- 83,89 ----
@@ -132,8 +132,8 @@
, V_REPLY_INTRO
, V_QUOTE_REPLACE_STRING
***************
-*** 244,249 ****
---- 245,252 ----
+*** 246,251 ****
+--- 247,254 ----
, 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.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
+diff -rc alpine-2.26/pith/mailview.c alpine-2.26.colortext/pith/mailview.c
+*** alpine-2.26/pith/mailview.c 2022-06-02 18:14:00.491274749 -0600
+--- alpine-2.26.colortext/pith/mailview.c 2022-06-02 18:15:04.251118410 -0600
***************
-*** 636,641 ****
---- 636,649 ----
+*** 632,637 ****
+--- 632,645 ----
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));
***************
-*** 2868,2873 ****
---- 2876,3065 ----
+*** 2864,2869 ****
+--- 2872,3061 ----
return(color_pair);
}
@@ -295,7 +295,7 @@
+ else
+ return;
+ for (i = 0; isspace((unsigned char) p[ival->end - i - 1]); i++);
-+ ival->end -= i;
++ ival->end -= i;
+ if (ival->next)
+ remove_spaces_ival(&(ival->next), p);
+ }
@@ -325,7 +325,7 @@
+ int done = 0, begin_color = 0;
+
+ while (!done){
-+ if (i = any_color_in_string(p)){
++ if ((i = any_color_in_string(p))){
+ begin_color = (begin_color + 1) % 2;
+ if (begin_color){
+ p[i - 1] = '\0';
@@ -355,9 +355,9 @@
/*
* The argument fieldname is something like "Subject:..." or "Subject".
-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
+diff -rc alpine-2.26/pith/mailview.h alpine-2.26.colortext/pith/mailview.h
+*** alpine-2.26/pith/mailview.h 2022-06-02 18:14:00.491274749 -0600
+--- alpine-2.26.colortext/pith/mailview.h 2022-06-02 18:15:04.263118380 -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.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
+diff -rc alpine-2.26/pith/pine.hlp alpine-2.26.colortext/pith/pine.hlp
+*** alpine-2.26/pith/pine.hlp 2022-06-02 18:14:00.491274749 -0600
+--- alpine-2.26.colortext/pith/pine.hlp 2022-06-02 18:15:04.299118293 -0600
***************
-*** 5134,5139 ****
---- 5134,5140 ----
+*** 5290,5295 ****
+--- 5290,5296 ----
<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>
***************
-*** 5162,5167 ****
---- 5163,5169 ----
+*** 5318,5323 ****
+--- 5319,5325 ----
<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>
***************
-*** 25004,25009 ****
---- 25006,25048 ----
+*** 25158,25163 ****
+--- 25160,25202 ----
<End of help on this topic>
</BODY>
</HTML>
@@ -461,8 +461,8 @@
<HTML>
<HEAD>
***************
-*** 33616,33621 ****
---- 33655,33684 ----
+*** 33778,33783 ****
+--- 33817,33846 ----
<P>
<A HREF="h_color_setup">Descriptions of the available commands</A>
@@ -493,12 +493,12 @@
<P>
Look <A HREF="h_edit_nav_cmds">here</A>
to see the available Editing and Navigation commands.
-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
+diff -rc alpine-2.26/pith/state.c alpine-2.26.colortext/pith/state.c
+*** alpine-2.26/pith/state.c 2022-06-02 18:14:00.491274749 -0600
+--- alpine-2.26.colortext/pith/state.c 2022-06-02 18:15:04.299118293 -0600
***************
-*** 144,149 ****
---- 144,152 ----
+*** 140,145 ****
+--- 140,148 ----
if((*pps)->html_dir_list != NULL)
free_html_log(&(*pps)->html_dir_list);
@@ -508,12 +508,12 @@
if((*pps)->ui.homedir)
fs_give((void **)&(*pps)->ui.homedir);
-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
+diff -rc alpine-2.26/pith/state.h alpine-2.26.colortext/pith/state.h
+*** alpine-2.26/pith/state.h 2022-06-02 18:14:00.491274749 -0600
+--- alpine-2.26.colortext/pith/state.h 2022-06-02 18:15:04.303118282 -0600
***************
-*** 349,354 ****
---- 349,356 ----
+*** 351,356 ****
+--- 351,358 ----
char *display_charmap; /* needs to be freed */
char *keyboard_charmap; /* needs to be freed */
void *input_cs;
@@ -522,12 +522,12 @@
char *posting_charmap; /* needs to be freed */
-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
+diff -rc alpine-2.26/pith/text.c alpine-2.26.colortext/pith/text.c
+*** alpine-2.26/pith/text.c 2022-06-02 18:14:00.491274749 -0600
+--- alpine-2.26.colortext/pith/text.c 2022-06-02 18:15:04.315118253 -0600
***************
-*** 171,176 ****
---- 171,185 ----
+*** 167,172 ****
+--- 167,181 ----
gf_url_hilite_opt(&uh,handlesp,0));
}
++++++ chappa-fancy.patch ++++++
++++ 2187 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/alpine/chappa-fancy.patch
++++ and /work/SRC/openSUSE:Factory/.alpine.new.1548/chappa-fancy.patch
++++++ chappa-fillpara.patch ++++++
++++ 1583 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/alpine/chappa-fillpara.patch
++++ and /work/SRC/openSUSE:Factory/.alpine.new.1548/chappa-fillpara.patch
++++++ chappa-fromheader.patch ++++++
--- /var/tmp/diff_new_pack.mNQIzl/_old 2022-06-30 13:18:16.213529239 +0200
+++ /var/tmp/diff_new_pack.mNQIzl/_new 2022-06-30 13:18:16.217529242 +0200
@@ -1,8 +1,8 @@
-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
+diff -rc alpine-2.26/alpine/send.c alpine-2.26.fromheader/alpine/send.c
+*** alpine-2.26/alpine/send.c 2022-06-02 18:14:00.463274817 -0600
+--- alpine-2.26.fromheader/alpine/send.c 2022-06-02 18:14:58.723131963 -0600
***************
-*** 908,914 ****
+*** 907,913 ****
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},
---- 908,914 ----
+--- 907,913 ----
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},
***************
-*** 2372,2377 ****
---- 2372,2382 ----
+*** 2371,2376 ****
+--- 2371,2381 ----
he->rich_header = 0;
}
}
@@ -33,7 +33,7 @@
he_from = he;
break;
***************
-*** 3109,3115 ****
+*** 3108,3114 ****
if(outgoing->return_path)
mail_free_address(&outgoing->return_path);
@@ -41,7 +41,7 @@
/*
* Don't ever believe the sender that is there.
---- 3114,3122 ----
+--- 3113,3121 ----
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.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
+diff -rc alpine-2.26/pith/conf.c alpine-2.26.fromheader/pith/conf.c
+*** alpine-2.26/pith/conf.c 2022-06-02 18:14:00.491274749 -0600
+--- alpine-2.26.fromheader/pith/conf.c 2022-06-02 18:14:58.727131952 -0600
***************
-*** 2989,2994 ****
---- 2989,2996 ----
+*** 2991,2996 ****
+--- 2991,2998 ----
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.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
+diff -rc alpine-2.26/pith/conftype.h alpine-2.26.fromheader/pith/conftype.h
+*** alpine-2.26/pith/conftype.h 2022-06-02 18:14:00.491274749 -0600
+--- alpine-2.26.fromheader/pith/conftype.h 2022-06-02 18:15:00.011128806 -0600
***************
-*** 412,417 ****
---- 412,418 ----
+*** 414,419 ****
+--- 414,420 ----
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.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
+diff -rc alpine-2.26/pith/pine.hlp alpine-2.26.fromheader/pith/pine.hlp
+*** alpine-2.26/pith/pine.hlp 2022-06-02 18:14:00.491274749 -0600
+--- alpine-2.26.fromheader/pith/pine.hlp 2022-06-02 18:15:00.063128678 -0600
***************
-*** 30313,30318 ****
---- 30313,30334 ----
+*** 30451,30456 ****
+--- 30451,30472 ----
<End of help on this topic>
</BODY>
</HTML>
@@ -106,11 +106,11 @@
====== h_config_use_sender_not_x =====
<HTML>
<HEAD>
-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
+diff -rc alpine-2.26/pith/send.c alpine-2.26.fromheader/pith/send.c
+*** alpine-2.26/pith/send.c 2022-06-02 18:14:00.491274749 -0600
+--- alpine-2.26.fromheader/pith/send.c 2022-06-02 18:15:00.063128678 -0600
***************
-*** 53,59 ****
+*** 49,55 ****
/* name::type::canedit::writehdr::localcopy::rcptto */
PINEFIELD pf_template[] = {
{"X-Auth-Received", FreeText, 0, 1, 1, 0}, /* N_AUTHRCVD */
@@ -118,7 +118,7 @@
{"Reply-To", Address, 0, 1, 1, 0},
{TONAME, Address, 1, 1, 1, 1},
{CCNAME, Address, 1, 1, 1, 1},
---- 53,59 ----
+--- 49,55 ----
/* name::type::canedit::writehdr::localcopy::rcptto */
PINEFIELD pf_template[] = {
{"X-Auth-Received", FreeText, 0, 1, 1, 0}, /* N_AUTHRCVD */
@@ -127,7 +127,7 @@
{TONAME, Address, 1, 1, 1, 1},
{CCNAME, Address, 1, 1, 1, 1},
***************
-*** 1227,1233 ****
+*** 1223,1229 ****
}
pf->type = pf_template[i].type;
@@ -135,7 +135,7 @@
pf->rcptto = pf_template[i].rcptto;
pf->writehdr = pf_template[i].writehdr;
pf->localcopy = pf_template[i].localcopy;
---- 1227,1233 ----
+--- 1223,1229 ----
}
pf->type = pf_template[i].type;
@@ -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.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
+diff -rc alpine-2.26/pith/send.h alpine-2.26.fromheader/pith/send.h
+*** alpine-2.26/pith/send.h 2022-06-02 18:14:00.491274749 -0600
+--- alpine-2.26.fromheader/pith/send.h 2022-06-02 18:15:00.071128658 -0600
***************
*** 159,164 ****
--- 159,166 ----
++++++ chappa-insertpat.patch ++++++
--- /var/tmp/diff_new_pack.mNQIzl/_old 2022-06-30 13:18:16.233529254 +0200
+++ /var/tmp/diff_new_pack.mNQIzl/_new 2022-06-30 13:18:16.237529257 +0200
@@ -1,9 +1,9 @@
-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
+diff -rc alpine-2.26/pico/display.c alpine-2.26.insertpat/pico/display.c
+*** alpine-2.26/pico/display.c 2022-06-02 18:14:00.487274758 -0600
+--- alpine-2.26.insertpat/pico/display.c 2022-06-02 18:15:03.495120264 -0600
***************
-*** 2200,2205 ****
---- 2200,2217 ----
+*** 2196,2201 ****
+--- 2196,2213 ----
continue;
@@ -22,12 +22,12 @@
case (CTRL|'G') : /* CTRL-G help */
if(term.t_mrow == 0 && km_popped == 0){
movecursor(term.t_nrow-2, 0);
-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
+diff -rc alpine-2.26/pico/search.c alpine-2.26.insertpat/pico/search.c
+*** alpine-2.26/pico/search.c 2022-06-02 18:14:00.487274758 -0600
+--- alpine-2.26.insertpat/pico/search.c 2022-06-02 18:15:03.499120253 -0600
***************
-*** 122,127 ****
---- 122,131 ----
+*** 118,123 ****
+--- 118,127 ----
N_("~ Hitting only ~R~e~t~u~r~n or at the prompt will cause the"),
N_(" search to be made with the default value."),
" ",
++++++ chappa-maildir.patch ++++++
++++ 7621 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/alpine/chappa-maildir.patch
++++ and /work/SRC/openSUSE:Factory/.alpine.new.1548/chappa-maildir.patch
++++++ chappa-rules.patch ++++++
++++ 1540 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/alpine/chappa-rules.patch
++++ and /work/SRC/openSUSE:Factory/.alpine.new.1548/chappa-rules.patch