pool/alpine
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 863398 from server:mail

Browse Source 
- Update to release 2.24

OBS-URL: https://build.opensuse.org/request/show/863398
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alpine?expand=0&rev=50
This commit is contained in:
Dominique Leuenberger 2021-01-18 10:28:12 +00:00 committed by Git OBS Bridge
commit f94bc2a59c
15 changed files with 6493 additions and 7129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
UPDATING.txt
View File

@ -4,8 +4,9 @@ Some features of Alpine do not exist in the release tarball but are only
provided as patches (but by the same author..). So when there is a new provided as patches (but by the same author..). So when there is a new
release, the OOT patches on the website get updated too. release, the OOT patches on the website get updated too.
version="2.24"
for i in WrtAcc colortext fancy fillpara fromheader insertpat maildir rules; do 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 done
These do not necessarily apply cleanly, so they also need to be These do not necessarily apply cleanly, so they also need to be

3
alpine-2.23.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:927e170473bb060ccb11a37e30d44bb10aaca50c4aafa974d5741ae593a95694
size 5151416

3
alpine-2.24.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:651a9ffa0a29e2b646a0a6e0d5a2c8c50f27a07a26a61640b7c783d06d0abcef
size 7341676

BIN
alpine-2.24.tar.xz.sig Normal file
View File

Binary file not shown.

9
alpine-timestamp.patch
View File

@ -2,11 +2,11 @@
alpine/Makefile.am | 4 ++-- alpine/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 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.24.orig/alpine/Makefile.am
+++ alpine-2.22/alpine/Makefile.am +++ alpine-2.24/alpine/Makefile.am
@@ -50,5 +50,5 @@ AM_LDFLAGS = `cat @top_srcdir@/c-client/ @@ -50,6 +50,6 @@ AM_LDFLAGS = `cat @top_srcdir@/c-client/
CLEANFILES = date.c CLEANFILES = date.c
date.c: date.c:
@ -14,3 +14,4 @@ Index: alpine-2.22/alpine/Makefile.am
- echo "char hoststamp[]="\"$(ALPINE_HOSTSTAMP)\"";" >> date.c - echo "char hoststamp[]="\"$(ALPINE_HOSTSTAMP)\"";" >> date.c
+ echo "char datestamp[]="\"today\"";" > date.c + echo "char datestamp[]="\"today\"";" > date.c
+ echo "char hoststamp[]="\"sand\"";" >> date.c + echo "char hoststamp[]="\"sand\"";" >> date.c
echo "char configoptions[]="\"`../config.status --config`\"";" >> date.c

11
alpine.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jan 15 12:04:04 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
- Update to release 2.24
* A few crash fixes
* Implementation of XOAUTH2 for Yahoo! Mail.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 2 20:43:57 UTC 2020 - Jan Engelhardt <jengelh@inai.de> Fri Oct 2 20:43:57 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
@ -8,6 +15,10 @@ Fri Oct 2 20:43:57 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
to generate a message-id and suppresses all information to generate a message-id and suppresses all information
about Alpine, version, revision, and time of generation about Alpine, version, revision, and time of generation
of the message-id from this header. of the message-id from this header.
* 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.
* When messages are selected, pressing the ';' command to * When messages are selected, pressing the ';' command to
broaden or narrow a search, now offers the possibility to broaden or narrow a search, now offers the possibility to
completely replace the search, and is almost equivalent to completely replace the search, and is almost equivalent to

16
alpine.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package alpine # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -19,7 +19,7 @@
Name: alpine Name: alpine
# For debugging only: # For debugging only:
%define build_vanilla 0 %define build_vanilla 0
Version: 2.23.2 Version: 2.24
Release: 0 Release: 0
Summary: Mail User Agent Summary: Mail User Agent
License: Apache-2.0 License: Apache-2.0
@ -27,10 +27,10 @@ Group: Productivity/Networking/Email/Clients
URL: http://alpine.x10host.com/alpine/ URL: http://alpine.x10host.com/alpine/
#Git-Clone: https://repo.or.cz/alpine.git #Git-Clone: https://repo.or.cz/alpine.git
#Source: http://alpine.x10host.com/alpine/release/src/%name-%version.tar.xz Source: http://alpine.x10host.com/alpine/release/src/alpine-%version.tar.xz
Source: %name-%version.tar.xz Source2: http://alpine.x10host.com/alpine/release/src/sig/alpine-%version.tar.xz.sig
Source1: %name.png Source3: %name.png
Source2: %name.desktop Source4: %name.desktop
Source9: UPDATING.txt Source9: UPDATING.txt
Patch2: make-use-of-strncat-safer.diff Patch2: make-use-of-strncat-safer.diff
Patch3: operation-may-be-undefined-warning.diff Patch3: operation-may-be-undefined-warning.diff
@ -208,8 +208,8 @@ perl -i -pe 's{(define SYSTYPE) "LNX"}{$1 "'"$tag"'"}g' include/config.h
# When called as alpinef, alpine uses function keys instead of Control keys: # When called as alpinef, alpine uses function keys instead of Control keys:
# #
ln %{buildroot}/%{_bindir}/alpine %{buildroot}/%{_bindir}/alpinef ln %{buildroot}/%{_bindir}/alpine %{buildroot}/%{_bindir}/alpinef
install -D -m644 %{SOURCE1} %{buildroot}/%{_datadir}/pixmaps/%name.png install -D -m644 %{SOURCE3} %{buildroot}/%{_datadir}/pixmaps/%name.png
install -D -m644 %{SOURCE2} %{buildroot}/%{_datadir}/applications/%name.desktop install -D -m644 %{SOURCE4} %{buildroot}/%{_datadir}/applications/%name.desktop
%suse_update_desktop_file %name %suse_update_desktop_file %name
: :
ln -sf alpine %{buildroot}/%{_bindir}/pine ln -sf alpine %{buildroot}/%{_bindir}/pine

36
chappa-WrtAcc.patch
View File

@ -1,6 +1,6 @@
diff -rc alpine-2.23/pico/basic.c alpine-2.23.WrtAcc/pico/basic.c diff -rc alpine-2.24/pico/basic.c alpine-2.24.WrtAcc/pico/basic.c
*** alpine-2.23/pico/basic.c 2020-06-18 15:19:23.437319046 -0600 *** alpine-2.24/pico/basic.c 2020-10-10 00:24:28.180553991 -0600
--- alpine-2.23.WrtAcc/pico/basic.c 2020-06-18 16:08:12.541589518 -0600 --- alpine-2.24.WrtAcc/pico/basic.c 2020-10-10 00:26:57.220352202 -0600
*************** ***************
*** 342,347 **** *** 342,347 ****
--- 342,530 ---- --- 342,530 ----
@ -193,9 +193,9 @@ diff -rc alpine-2.23/pico/basic.c alpine-2.23.WrtAcc/pico/basic.c
/* /*
* go forword to the end of the current paragraph * go forword to the end of the current paragraph
diff -rc alpine-2.23/pico/composer.c alpine-2.23.WrtAcc/pico/composer.c diff -rc alpine-2.24/pico/composer.c alpine-2.24.WrtAcc/pico/composer.c
*** alpine-2.23/pico/composer.c 2020-06-18 15:19:23.437319046 -0600 *** alpine-2.24/pico/composer.c 2020-10-10 00:24:28.180553991 -0600
--- alpine-2.23.WrtAcc/pico/composer.c 2020-06-18 16:08:12.545589528 -0600 --- alpine-2.24.WrtAcc/pico/composer.c 2020-10-10 00:26:57.220352202 -0600
*************** ***************
*** 2015,2021 **** *** 2015,2021 ****
tbufp = &strng[ods.p_len]; tbufp = &strng[ods.p_len];
@ -229,9 +229,9 @@ diff -rc alpine-2.23/pico/composer.c alpine-2.23.WrtAcc/pico/composer.c
case (CTRL|KEY_LEFT): /* word skip left */ case (CTRL|KEY_LEFT): /* word skip left */
if(ods.p_ind > 0) /* Scoot one char left if possible */ if(ods.p_ind > 0) /* Scoot one char left if possible */
ods.p_ind--; ods.p_ind--;
diff -rc alpine-2.23/pico/display.c alpine-2.23.WrtAcc/pico/display.c diff -rc alpine-2.24/pico/display.c alpine-2.24.WrtAcc/pico/display.c
*** alpine-2.23/pico/display.c 2020-06-18 15:19:23.437319046 -0600 *** alpine-2.24/pico/display.c 2020-10-10 00:24:28.180553991 -0600
--- alpine-2.23.WrtAcc/pico/display.c 2020-06-18 16:08:12.545589528 -0600 --- alpine-2.24.WrtAcc/pico/display.c 2020-10-10 00:26:57.220352202 -0600
*************** ***************
*** 2196,2201 **** *** 2196,2201 ****
--- 2196,2206 ---- --- 2196,2206 ----
@ -263,9 +263,9 @@ diff -rc alpine-2.23/pico/display.c alpine-2.23.WrtAcc/pico/display.c
/* look for match in extra_v */ /* look for match in extra_v */
for(i = 0; i < 12; i++) for(i = 0; i < 12; i++)
if(c && c == extra_v[i]){ if(c && c == extra_v[i]){
diff -rc alpine-2.23/pico/ebind.h alpine-2.23.WrtAcc/pico/ebind.h diff -rc alpine-2.24/pico/ebind.h alpine-2.24.WrtAcc/pico/ebind.h
*** alpine-2.23/pico/ebind.h 2020-06-18 15:19:23.437319046 -0600 *** alpine-2.24/pico/ebind.h 2020-10-10 00:24:28.184554092 -0600
--- alpine-2.23.WrtAcc/pico/ebind.h 2020-06-18 16:08:12.545589528 -0600 --- alpine-2.24.WrtAcc/pico/ebind.h 2020-10-10 00:26:57.228352405 -0600
*************** ***************
*** 61,67 **** *** 61,67 ****
#ifdef MOUSE #ifdef MOUSE
@ -319,9 +319,9 @@ diff -rc alpine-2.23/pico/ebind.h alpine-2.23.WrtAcc/pico/ebind.h
#endif #endif
#endif #endif
{CTRL|'A', gotobol}, {CTRL|'A', gotobol},
diff -rc alpine-2.23/pico/efunc.h alpine-2.23.WrtAcc/pico/efunc.h diff -rc alpine-2.24/pico/efunc.h alpine-2.24.WrtAcc/pico/efunc.h
*** alpine-2.23/pico/efunc.h 2020-06-18 15:19:23.437319046 -0600 *** alpine-2.24/pico/efunc.h 2020-10-10 00:24:28.180553991 -0600
--- alpine-2.23.WrtAcc/pico/efunc.h 2020-06-18 16:08:12.545589528 -0600 --- alpine-2.24.WrtAcc/pico/efunc.h 2020-10-10 00:26:57.240352712 -0600
*************** ***************
*** 54,59 **** *** 54,59 ****
--- 54,62 ---- --- 54,62 ----
@ -334,9 +334,9 @@ diff -rc alpine-2.23/pico/efunc.h alpine-2.23.WrtAcc/pico/efunc.h
extern int forwpage(int, int); extern int forwpage(int, int);
extern int backpage(int, int); extern int backpage(int, int);
extern int scrollupline(int, int); extern int scrollupline(int, int);
diff -rc alpine-2.23/pico/main.c alpine-2.23.WrtAcc/pico/main.c diff -rc alpine-2.24/pico/main.c alpine-2.24.WrtAcc/pico/main.c
*** alpine-2.23/pico/main.c 2020-06-18 15:19:23.437319046 -0600 *** alpine-2.24/pico/main.c 2020-10-10 00:24:28.180553991 -0600
--- alpine-2.23.WrtAcc/pico/main.c 2020-06-18 16:08:12.545589528 -0600 --- alpine-2.24.WrtAcc/pico/main.c 2020-10-10 00:26:57.280353731 -0600
*************** ***************
*** 458,463 **** *** 458,463 ****
--- 458,469 ---- --- 458,469 ----

116
chappa-colortext.patch
View File

@ -1,9 +1,9 @@
diff -rc alpine-2.23/alpine/confscroll.c alpine-2.23.colortext/alpine/confscroll.c diff -rc alpine-2.24/alpine/confscroll.c alpine-2.24.colortext/alpine/confscroll.c
*** alpine-2.23/alpine/confscroll.c 2020-06-18 15:19:23.465318999 -0600 *** alpine-2.24/alpine/confscroll.c 2020-10-10 00:24:28.216554908 -0600
--- alpine-2.23.colortext/alpine/confscroll.c 2020-06-18 16:08:14.821595407 -0600 --- alpine-2.24.colortext/alpine/confscroll.c 2020-10-10 00:27:00.384432838 -0600
*************** ***************
*** 5227,5232 **** *** 5248,5253 ****
--- 5227,5235 ---- --- 5248,5256 ----
clear_index_cache(ps->mail_stream, 0); clear_index_cache(ps->mail_stream, 0);
} }
@ -13,9 +13,9 @@ diff -rc alpine-2.23/alpine/confscroll.c alpine-2.23.colortext/alpine/confscroll
else if(var == &ps->vars[V_INIT_CMD_LIST]){ else if(var == &ps->vars[V_INIT_CMD_LIST]){
if(!revert) if(!revert)
q_status_message(SM_ASYNC, 0, 3, q_status_message(SM_ASYNC, 0, 3,
diff -rc alpine-2.23/pith/conf.c alpine-2.23.colortext/pith/conf.c diff -rc alpine-2.24/pith/conf.c alpine-2.24.colortext/pith/conf.c
*** alpine-2.23/pith/conf.c 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/conf.c 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.colortext/pith/conf.c 2020-06-18 16:08:14.821595407 -0600 --- alpine-2.24.colortext/pith/conf.c 2020-10-10 00:27:00.388432939 -0600
*************** ***************
*** 233,238 **** *** 233,238 ****
--- 233,240 ---- --- 233,240 ----
@ -28,8 +28,8 @@ diff -rc alpine-2.23/pith/conf.c alpine-2.23.colortext/pith/conf.c
CONF_TXT_T cf_text_quotereplstr[] = "Specifies the string to replace quotes with when viewing a message."; CONF_TXT_T cf_text_quotereplstr[] = "Specifies the string to replace quotes with when viewing a message.";
*************** ***************
*** 583,588 **** *** 587,592 ****
--- 585,592 ---- --- 589,596 ----
#endif /* _WINDOWS */ #endif /* _WINDOWS */
{"composer-wrap-column", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, {"composer-wrap-column", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0,
NULL, cf_text_fillcol}, NULL, cf_text_fillcol},
@ -39,8 +39,8 @@ diff -rc alpine-2.23/pith/conf.c alpine-2.23.colortext/pith/conf.c
NULL, cf_text_replystr}, NULL, cf_text_replystr},
{"reply-leadin", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, {"reply-leadin", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0,
*************** ***************
*** 856,861 **** *** 862,867 ****
--- 860,867 ---- --- 866,873 ----
{"incoming-unseen-background-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, {"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-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}, {"signature-background-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0},
@ -50,8 +50,8 @@ diff -rc alpine-2.23/pith/conf.c alpine-2.23.colortext/pith/conf.c
{"prompt-background-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, {"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}, {"header-general-foreground-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0},
*************** ***************
*** 2057,2062 **** *** 2111,2116 ****
--- 2063,2070 ---- --- 2117,2124 ----
set_current_val(&vars[V_DICTIONARY], TRUE, TRUE); set_current_val(&vars[V_DICTIONARY], TRUE, TRUE);
#endif /* _WINDOWS */ #endif /* _WINDOWS */
set_current_val(&vars[V_IMAGE_VIEWER], TRUE, TRUE); set_current_val(&vars[V_IMAGE_VIEWER], TRUE, TRUE);
@ -61,8 +61,8 @@ diff -rc alpine-2.23/pith/conf.c alpine-2.23.colortext/pith/conf.c
set_current_val(&vars[V_HISTORY], TRUE, TRUE); set_current_val(&vars[V_HISTORY], TRUE, TRUE);
set_current_val(&vars[V_SMTP_SERVER], TRUE, TRUE); set_current_val(&vars[V_SMTP_SERVER], TRUE, TRUE);
*************** ***************
*** 6623,6628 **** *** 6677,6682 ****
--- 6631,6637 ---- --- 6685,6691 ----
set_color_val(&vars[V_IND_OP_FORE_COLOR], 0); set_color_val(&vars[V_IND_OP_FORE_COLOR], 0);
set_color_val(&vars[V_INCUNSEEN_FORE_COLOR], 0); set_color_val(&vars[V_INCUNSEEN_FORE_COLOR], 0);
set_color_val(&vars[V_SIGNATURE_FORE_COLOR], 0); set_color_val(&vars[V_SIGNATURE_FORE_COLOR], 0);
@ -71,8 +71,8 @@ diff -rc alpine-2.23/pith/conf.c alpine-2.23.colortext/pith/conf.c
set_current_val(&ps->vars[V_INDEX_TOKEN_COLORS], TRUE, TRUE); set_current_val(&ps->vars[V_INDEX_TOKEN_COLORS], TRUE, TRUE);
set_current_val(&ps->vars[V_VIEW_HDR_COLORS], TRUE, TRUE); set_current_val(&ps->vars[V_VIEW_HDR_COLORS], TRUE, TRUE);
*************** ***************
*** 7841,7846 **** *** 7926,7931 ****
--- 7850,7857 ---- --- 7935,7942 ----
return(h_config_scroll_margin); return(h_config_scroll_margin);
case V_DEADLETS : case V_DEADLETS :
return(h_config_deadlets); return(h_config_deadlets);
@ -82,8 +82,8 @@ diff -rc alpine-2.23/pith/conf.c alpine-2.23.colortext/pith/conf.c
return(h_config_composer_wrap_column); return(h_config_composer_wrap_column);
case V_TCPOPENTIMEO : case V_TCPOPENTIMEO :
*************** ***************
*** 8020,8025 **** *** 8107,8112 ****
--- 8031,8039 ---- --- 8118,8126 ----
case V_SIGNATURE_FORE_COLOR : case V_SIGNATURE_FORE_COLOR :
case V_SIGNATURE_BACK_COLOR : case V_SIGNATURE_BACK_COLOR :
return(h_config_signature_color); return(h_config_signature_color);
@ -93,12 +93,12 @@ diff -rc alpine-2.23/pith/conf.c alpine-2.23.colortext/pith/conf.c
case V_PROMPT_FORE_COLOR : case V_PROMPT_FORE_COLOR :
case V_PROMPT_BACK_COLOR : case V_PROMPT_BACK_COLOR :
return(h_config_prompt_color); return(h_config_prompt_color);
diff -rc alpine-2.23/pith/conf.h alpine-2.23.colortext/pith/conf.h diff -rc alpine-2.24/pith/conf.h alpine-2.24.colortext/pith/conf.h
*** alpine-2.23/pith/conf.h 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/conf.h 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.colortext/pith/conf.h 2020-06-18 16:08:14.821595407 -0600 --- alpine-2.24.colortext/pith/conf.h 2020-10-10 00:27:00.388432939 -0600
*************** ***************
*** 171,176 **** *** 175,180 ****
--- 171,178 ---- --- 175,182 ----
#define VAR_DICTIONARY vars[V_DICTIONARY].current_val.l #define VAR_DICTIONARY vars[V_DICTIONARY].current_val.l
#define GLO_DICTIONARY vars[V_DICTIONARY].global_val.l #define GLO_DICTIONARY vars[V_DICTIONARY].global_val.l
#endif /* _WINDOWS */ #endif /* _WINDOWS */
@ -108,8 +108,8 @@ diff -rc alpine-2.23/pith/conf.h alpine-2.23.colortext/pith/conf.h
#define GLO_FILLCOL vars[V_FILLCOL].global_val.p #define GLO_FILLCOL vars[V_FILLCOL].global_val.p
#define VAR_DEADLETS vars[V_DEADLETS].current_val.p #define VAR_DEADLETS vars[V_DEADLETS].current_val.p
*************** ***************
*** 472,477 **** *** 474,479 ****
--- 474,481 ---- --- 476,483 ----
#define GLO_SIGNATURE_FORE_COLOR vars[V_SIGNATURE_FORE_COLOR].global_val.p #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 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 #define GLO_SIGNATURE_BACK_COLOR vars[V_SIGNATURE_BACK_COLOR].global_val.p
@ -118,9 +118,9 @@ diff -rc alpine-2.23/pith/conf.h alpine-2.23.colortext/pith/conf.h
#define VAR_PROMPT_FORE_COLOR vars[V_PROMPT_FORE_COLOR].current_val.p #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_PROMPT_BACK_COLOR vars[V_PROMPT_BACK_COLOR].current_val.p
#define VAR_VIEW_HDR_COLORS vars[V_VIEW_HDR_COLORS].current_val.l #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 diff -rc alpine-2.24/pith/conftype.h alpine-2.24.colortext/pith/conftype.h
*** alpine-2.23/pith/conftype.h 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/conftype.h 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.colortext/pith/conftype.h 2020-06-18 16:08:14.821595407 -0600 --- alpine-2.24.colortext/pith/conftype.h 2020-10-10 00:27:00.388432939 -0600
*************** ***************
*** 83,88 **** *** 83,88 ****
--- 83,89 ---- --- 83,89 ----
@ -142,9 +142,9 @@ diff -rc alpine-2.23/pith/conftype.h alpine-2.23.colortext/pith/conftype.h
, V_PROMPT_FORE_COLOR , V_PROMPT_FORE_COLOR
, V_PROMPT_BACK_COLOR , V_PROMPT_BACK_COLOR
, V_HEADER_GENERAL_FORE_COLOR , V_HEADER_GENERAL_FORE_COLOR
diff -rc alpine-2.23/pith/mailview.c alpine-2.23.colortext/pith/mailview.c diff -rc alpine-2.24/pith/mailview.c alpine-2.24.colortext/pith/mailview.c
*** alpine-2.23/pith/mailview.c 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/mailview.c 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.colortext/pith/mailview.c 2020-06-18 16:08:14.821595407 -0600 --- alpine-2.24.colortext/pith/mailview.c 2020-10-10 00:27:00.388432939 -0600
*************** ***************
*** 638,643 **** *** 638,643 ****
--- 638,651 ---- --- 638,651 ----
@ -355,9 +355,9 @@ diff -rc alpine-2.23/pith/mailview.c alpine-2.23.colortext/pith/mailview.c
/* /*
* The argument fieldname is something like "Subject:..." or "Subject". * The argument fieldname is something like "Subject:..." or "Subject".
diff -rc alpine-2.23/pith/mailview.h alpine-2.23.colortext/pith/mailview.h diff -rc alpine-2.24/pith/mailview.h alpine-2.24.colortext/pith/mailview.h
*** alpine-2.23/pith/mailview.h 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/mailview.h 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.colortext/pith/mailview.h 2020-06-18 16:08:14.821595407 -0600 --- alpine-2.24.colortext/pith/mailview.h 2020-10-10 00:27:00.388432939 -0600
*************** ***************
*** 30,35 **** *** 30,35 ****
--- 30,41 ---- --- 30,41 ----
@ -391,12 +391,12 @@ diff -rc alpine-2.23/pith/mailview.h alpine-2.23.colortext/pith/mailview.h
/* /*
* BUG: BELOW IS UNIX/PC ONLY since config'd browser means nothing to webpine * 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 diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.colortext/pith/pine.hlp
*** alpine-2.23/pith/pine.hlp 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/pine.hlp 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.colortext/pith/pine.hlp 2020-06-18 16:08:14.825595417 -0600 --- alpine-2.24.colortext/pith/pine.hlp 2020-10-10 00:27:00.408433449 -0600
*************** ***************
*** 4683,4688 **** *** 4975,4980 ****
--- 4683,4689 ---- --- 4975,4981 ----
<li><a href="h_config_print_cat">OPTION: <!--#echo var="VAR_personal-print-category"--></a> <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_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> <li><a href="h_config_post_char_set">OPTION: <!--#echo var="VAR_posting-character-set"--></a>
@ -405,8 +405,8 @@ diff -rc alpine-2.23/pith/pine.hlp alpine-2.23.colortext/pith/pine.hlp
<li><a href="h_config_print_font_char_set">OPTION: Print-Font-Char-Set</a> <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> <li><a href="h_config_print_font_name">OPTION: Print-Font-Name</a>
*************** ***************
*** 4711,4716 **** *** 5003,5008 ****
--- 4712,4718 ---- --- 5004,5010 ----
<li><a href="h_config_sending_filter">OPTION: <!--#echo var="VAR_sending-filters"--></a> <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_sendmail_path">OPTION: <!--#echo var="VAR_sendmail-path"--></a>
<li><a href="h_config_signature_color">OPTION: Signature Color</a> <li><a href="h_config_signature_color">OPTION: Signature Color</a>
@ -415,8 +415,8 @@ diff -rc alpine-2.23/pith/pine.hlp alpine-2.23.colortext/pith/pine.hlp
<li><a href="h_config_smtp_server">OPTION: <!--#echo var="VAR_smtp-server"--></a> <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> <li><a href="h_config_sort_key">OPTION: <!--#echo var="VAR_sort-key"--></a>
*************** ***************
*** 24379,24384 **** *** 24817,24822 ****
--- 24381,24423 ---- --- 24819,24861 ----
&lt;End of help on this topic&gt; &lt;End of help on this topic&gt;
</BODY> </BODY>
</HTML> </HTML>
@ -461,8 +461,8 @@ diff -rc alpine-2.23/pith/pine.hlp alpine-2.23.colortext/pith/pine.hlp
<HTML> <HTML>
<HEAD> <HEAD>
*************** ***************
*** 33000,33005 **** *** 33438,33443 ****
--- 33039,33068 ---- --- 33477,33506 ----
<P> <P>
<A HREF="h_color_setup">Descriptions of the available commands</A> <A HREF="h_color_setup">Descriptions of the available commands</A>
@ -493,9 +493,9 @@ diff -rc alpine-2.23/pith/pine.hlp alpine-2.23.colortext/pith/pine.hlp
<P> <P>
Look <A HREF="h_edit_nav_cmds">here</A> Look <A HREF="h_edit_nav_cmds">here</A>
to see the available Editing and Navigation commands. to see the available Editing and Navigation commands.
diff -rc alpine-2.23/pith/state.c alpine-2.23.colortext/pith/state.c diff -rc alpine-2.24/pith/state.c alpine-2.24.colortext/pith/state.c
*** alpine-2.23/pith/state.c 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/state.c 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.colortext/pith/state.c 2020-06-18 16:08:14.825595417 -0600 --- alpine-2.24.colortext/pith/state.c 2020-10-10 00:27:00.408433449 -0600
*************** ***************
*** 144,149 **** *** 144,149 ****
--- 144,152 ---- --- 144,152 ----
@ -508,12 +508,12 @@ diff -rc alpine-2.23/pith/state.c alpine-2.23.colortext/pith/state.c
if((*pps)->ui.homedir) if((*pps)->ui.homedir)
fs_give((void **)&(*pps)->ui.homedir); fs_give((void **)&(*pps)->ui.homedir);
diff -rc alpine-2.23/pith/state.h alpine-2.23.colortext/pith/state.h diff -rc alpine-2.24/pith/state.h alpine-2.24.colortext/pith/state.h
*** alpine-2.23/pith/state.h 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/state.h 2020-10-10 00:24:28.208554703 -0600
--- alpine-2.23.colortext/pith/state.h 2020-06-18 16:08:14.825595417 -0600 --- alpine-2.24.colortext/pith/state.h 2020-10-10 00:27:00.420433755 -0600
*************** ***************
*** 347,352 **** *** 348,353 ****
--- 347,354 ---- --- 348,355 ----
char *display_charmap; /* needs to be freed */ char *display_charmap; /* needs to be freed */
char *keyboard_charmap; /* needs to be freed */ char *keyboard_charmap; /* needs to be freed */
void *input_cs; void *input_cs;
@ -522,9 +522,9 @@ diff -rc alpine-2.23/pith/state.h alpine-2.23.colortext/pith/state.h
char *posting_charmap; /* needs to be freed */ char *posting_charmap; /* needs to be freed */
diff -rc alpine-2.23/pith/text.c alpine-2.23.colortext/pith/text.c diff -rc alpine-2.24/pith/text.c alpine-2.24.colortext/pith/text.c
*** alpine-2.23/pith/text.c 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/text.c 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.colortext/pith/text.c 2020-06-18 16:08:14.825595417 -0600 --- alpine-2.24.colortext/pith/text.c 2020-10-10 00:27:00.420433755 -0600
*************** ***************
*** 171,176 **** *** 171,176 ****
--- 171,185 ---- --- 171,185 ----

611
chappa-fancy.patch
View File

File diff suppressed because it is too large Load Diff

226
chappa-fillpara.patch
View File

@ -1,6 +1,6 @@
diff -rc alpine-2.23/alpine/mailview.c alpine-2.23.fillpara/alpine/mailview.c diff -rc alpine-2.24/alpine/mailview.c alpine-2.24.fillpara/alpine/mailview.c
*** alpine-2.23/alpine/mailview.c 2020-06-18 15:19:23.469318992 -0600 *** alpine-2.24/alpine/mailview.c 2020-10-10 00:24:28.216554908 -0600
--- alpine-2.23.fillpara/alpine/mailview.c 2020-06-18 16:08:12.153588516 -0600 --- alpine-2.24.fillpara/alpine/mailview.c 2020-10-10 00:26:56.228326921 -0600
*************** ***************
*** 205,211 **** *** 205,211 ****
--- 205,219 ---- --- 205,219 ----
@ -50,9 +50,9 @@ diff -rc alpine-2.23/alpine/mailview.c alpine-2.23.fillpara/alpine/mailview.c
if(we_cancel) if(we_cancel)
cancel_busy_cue(-1); cancel_busy_cue(-1);
diff -rc alpine-2.23/pico/basic.c alpine-2.23.fillpara/pico/basic.c diff -rc alpine-2.24/pico/basic.c alpine-2.24.fillpara/pico/basic.c
*** alpine-2.23/pico/basic.c 2020-06-18 15:19:23.437319046 -0600 *** alpine-2.24/pico/basic.c 2020-10-10 00:24:28.180553991 -0600
--- alpine-2.23.fillpara/pico/basic.c 2020-06-18 16:08:12.153588516 -0600 --- alpine-2.24.fillpara/pico/basic.c 2020-10-10 00:26:56.228326921 -0600
*************** ***************
*** 26,34 **** *** 26,34 ****
* framing, are hard. * framing, are hard.
@ -323,9 +323,9 @@ diff -rc alpine-2.23/pico/basic.c alpine-2.23.fillpara/pico/basic.c
curwp->w_dotp = lforw(curwp->w_dotp); curwp->w_dotp = lforw(curwp->w_dotp);
curwp->w_doto = llength(curwp->w_dotp); curwp->w_doto = llength(curwp->w_dotp);
diff -rc alpine-2.23/pico/efunc.h alpine-2.23.fillpara/pico/efunc.h diff -rc alpine-2.24/pico/efunc.h alpine-2.24.fillpara/pico/efunc.h
*** alpine-2.23/pico/efunc.h 2020-06-18 15:19:23.437319046 -0600 *** alpine-2.24/pico/efunc.h 2020-10-10 00:24:28.180553991 -0600
--- alpine-2.23.fillpara/pico/efunc.h 2020-06-18 16:08:12.153588516 -0600 --- alpine-2.24.fillpara/pico/efunc.h 2020-10-10 00:26:56.228326921 -0600
*************** ***************
*** 253,262 **** *** 253,262 ****
extern int fillpara(int, int); extern int fillpara(int, int);
@ -355,9 +355,9 @@ diff -rc alpine-2.23/pico/efunc.h alpine-2.23.fillpara/pico/efunc.h
#endif /* EFUNC_H */ #endif /* EFUNC_H */
+ +
diff -rc alpine-2.23/pico/line.c alpine-2.23.fillpara/pico/line.c diff -rc alpine-2.24/pico/line.c alpine-2.24.fillpara/pico/line.c
*** alpine-2.23/pico/line.c 2020-06-18 15:19:23.437319046 -0600 *** alpine-2.24/pico/line.c 2020-10-10 00:24:28.180553991 -0600
--- alpine-2.23.fillpara/pico/line.c 2020-06-18 16:08:12.153588516 -0600 --- alpine-2.24.fillpara/pico/line.c 2020-10-10 00:26:56.280328247 -0600
*************** ***************
*** 612,627 **** *** 612,627 ****
lisblank(LINE *line) lisblank(LINE *line)
@ -389,9 +389,9 @@ diff -rc alpine-2.23/pico/line.c alpine-2.23.fillpara/pico/line.c
return(FALSE); return(FALSE);
return(TRUE); return(TRUE);
diff -rc alpine-2.23/pico/osdep/color.h alpine-2.23.fillpara/pico/osdep/color.h diff -rc alpine-2.24/pico/osdep/color.h alpine-2.24.fillpara/pico/osdep/color.h
*** alpine-2.23/pico/osdep/color.h 2020-06-18 15:19:23.437319046 -0600 *** alpine-2.24/pico/osdep/color.h 2020-10-10 00:24:28.180553991 -0600
--- alpine-2.23.fillpara/pico/osdep/color.h 2020-06-18 16:08:12.153588516 -0600 --- alpine-2.24.fillpara/pico/osdep/color.h 2020-10-10 00:26:56.292328552 -0600
*************** ***************
*** 33,38 **** *** 33,38 ****
--- 33,39 ---- --- 33,39 ----
@ -402,9 +402,9 @@ diff -rc alpine-2.23/pico/osdep/color.h alpine-2.23.fillpara/pico/osdep/color.h
#endif /* PICO_OSDEP_COLOR_INCLUDED */ #endif /* PICO_OSDEP_COLOR_INCLUDED */
diff -rc alpine-2.23/pico/search.c alpine-2.23.fillpara/pico/search.c diff -rc alpine-2.24/pico/search.c alpine-2.24.fillpara/pico/search.c
*** alpine-2.23/pico/search.c 2020-06-18 15:19:23.437319046 -0600 *** alpine-2.24/pico/search.c 2020-10-10 00:24:28.180553991 -0600
--- alpine-2.23.fillpara/pico/search.c 2020-06-18 16:08:12.153588516 -0600 --- alpine-2.24.fillpara/pico/search.c 2020-10-10 00:26:56.304328858 -0600
*************** ***************
*** 36,41 **** *** 36,41 ****
--- 36,42 ---- --- 36,42 ----
@ -483,9 +483,9 @@ diff -rc alpine-2.23/pico/search.c alpine-2.23.fillpara/pico/search.c
+ return(TRUE); + return(TRUE);
+ } + }
+ +
diff -rc alpine-2.23/pico/word.c alpine-2.23.fillpara/pico/word.c diff -rc alpine-2.24/pico/word.c alpine-2.24.fillpara/pico/word.c
*** alpine-2.23/pico/word.c 2020-06-18 15:19:23.437319046 -0600 *** alpine-2.24/pico/word.c 2020-10-10 00:24:28.180553991 -0600
--- alpine-2.23.fillpara/pico/word.c 2020-06-18 16:08:12.153588516 -0600 --- alpine-2.24.fillpara/pico/word.c 2020-10-10 00:26:56.316329164 -0600
*************** ***************
*** 25,34 **** *** 25,34 ****
*/ */
@ -1229,9 +1229,9 @@ diff -rc alpine-2.23/pico/word.c alpine-2.23.fillpara/pico/word.c
+ return get_indent_raw_line(q, GLine, buf, buflen, k, plb); + return get_indent_raw_line(q, GLine, buf, buflen, k, plb);
+ } + }
+ +
diff -rc alpine-2.23/pith/charconv/utf8.c alpine-2.23.fillpara/pith/charconv/utf8.c diff -rc alpine-2.24/pith/charconv/utf8.c alpine-2.24.fillpara/pith/charconv/utf8.c
*** alpine-2.23/pith/charconv/utf8.c 2020-06-18 15:19:23.465318999 -0600 *** alpine-2.24/pith/charconv/utf8.c 2020-10-10 00:24:28.208554703 -0600
--- alpine-2.23.fillpara/pith/charconv/utf8.c 2020-06-18 16:08:12.153588516 -0600 --- alpine-2.24.fillpara/pith/charconv/utf8.c 2020-10-10 00:26:56.320329266 -0600
*************** ***************
*** 1066,1071 **** *** 1066,1071 ****
--- 1066,1121 ---- --- 1066,1121 ----
@ -1291,9 +1291,9 @@ diff -rc alpine-2.23/pith/charconv/utf8.c alpine-2.23.fillpara/pith/charconv/utf
* Copy UTF-8 characters from src into dst. * Copy UTF-8 characters from src into dst.
* This is intended to be used if you want to truncate a string at * This is intended to be used if you want to truncate a string at
* the start instead of the end. For example, you have a long string * the start instead of the end. For example, you have a long string
diff -rc alpine-2.23/pith/charconv/utf8.h alpine-2.23.fillpara/pith/charconv/utf8.h diff -rc alpine-2.24/pith/charconv/utf8.h alpine-2.24.fillpara/pith/charconv/utf8.h
*** alpine-2.23/pith/charconv/utf8.h 2020-06-18 15:19:23.465318999 -0600 *** alpine-2.24/pith/charconv/utf8.h 2020-10-10 00:24:28.208554703 -0600
--- alpine-2.23.fillpara/pith/charconv/utf8.h 2020-06-18 16:08:12.153588516 -0600 --- alpine-2.24.fillpara/pith/charconv/utf8.h 2020-10-10 00:26:56.328329469 -0600
*************** ***************
*** 81,86 **** *** 81,86 ****
--- 81,87 ---- --- 81,87 ----
@ -1304,9 +1304,9 @@ diff -rc alpine-2.23/pith/charconv/utf8.h alpine-2.23.fillpara/pith/charconv/utf
size_t utf8_to_width_rhs(char *, char *, size_t, unsigned); size_t utf8_to_width_rhs(char *, char *, size_t, unsigned);
int utf8_snprintf(char *, size_t, char *, ...); int utf8_snprintf(char *, size_t, char *, ...);
size_t utf8_to_width(char *, char *, size_t, unsigned, unsigned *); size_t utf8_to_width(char *, char *, size_t, unsigned, unsigned *);
diff -rc alpine-2.23/pith/color.c alpine-2.23.fillpara/pith/color.c diff -rc alpine-2.24/pith/color.c alpine-2.24.fillpara/pith/color.c
*** alpine-2.23/pith/color.c 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/color.c 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.fillpara/pith/color.c 2020-06-18 16:08:12.153588516 -0600 --- alpine-2.24.fillpara/pith/color.c 2020-10-10 00:26:56.344329877 -0600
*************** ***************
*** 21,27 **** *** 21,27 ****
#include "../pith/state.h" #include "../pith/state.h"
@ -1517,9 +1517,9 @@ diff -rc alpine-2.23/pith/color.c alpine-2.23.fillpara/pith/color.c
} }
diff -rc alpine-2.23/pith/color.h alpine-2.23.fillpara/pith/color.h diff -rc alpine-2.24/pith/color.h alpine-2.24.fillpara/pith/color.h
*** alpine-2.23/pith/color.h 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/color.h 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.fillpara/pith/color.h 2020-06-18 16:08:12.153588516 -0600 --- alpine-2.24.fillpara/pith/color.h 2020-10-10 00:26:56.364330387 -0600
*************** ***************
*** 22,27 **** *** 22,27 ****
--- 22,45 ---- --- 22,45 ----
@ -1557,9 +1557,9 @@ diff -rc alpine-2.23/pith/color.h alpine-2.23.fillpara/pith/color.h
int color_a_quote(long, char *, LT_INS_S **, void *); int color_a_quote(long, char *, LT_INS_S **, void *);
void free_spec_colors(SPEC_COLOR_S **); void free_spec_colors(SPEC_COLOR_S **);
diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c diff -rc alpine-2.24/pith/filter.c alpine-2.24.fillpara/pith/filter.c
*** alpine-2.23/pith/filter.c 2020-06-18 15:19:23.465318999 -0600 *** alpine-2.24/pith/filter.c 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.fillpara/pith/filter.c 2020-06-18 16:08:12.157588526 -0600 --- alpine-2.24.fillpara/pith/filter.c 2020-10-10 00:26:56.380330795 -0600
*************** ***************
*** 46,51 **** *** 46,51 ****
--- 46,52 ---- --- 46,52 ----
@ -1571,8 +1571,8 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
#include "../pith/pipe.h" #include "../pith/pipe.h"
#include "../pith/status.h" #include "../pith/status.h"
*************** ***************
*** 9453,9458 **** *** 9454,9459 ****
--- 9454,9464 ---- --- 9455,9465 ----
margin_r, margin_r,
indent; indent;
char special[256]; char special[256];
@ -1585,8 +1585,8 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
#define WRAP_MARG_L(F) (((WRAP_S *)(F)->opt)->margin_l) #define WRAP_MARG_L(F) (((WRAP_S *)(F)->opt)->margin_l)
*************** ***************
*** 9494,9499 **** *** 9495,9500 ****
--- 9500,9511 ---- --- 9501,9512 ----
#define WRAP_COLOR(F) (((WRAP_S *)(F)->opt)->color) #define WRAP_COLOR(F) (((WRAP_S *)(F)->opt)->color)
#define WRAP_COLOR_SET(F) ((WRAP_COLOR(F)) && (WRAP_COLOR(F)->fg[0])) #define WRAP_COLOR_SET(F) ((WRAP_COLOR(F)) && (WRAP_COLOR(F)->fg[0]))
#define WRAP_SPACES(F) (((WRAP_S *)(F)->opt)->spaces) #define WRAP_SPACES(F) (((WRAP_S *)(F)->opt)->spaces)
@ -1600,8 +1600,8 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
if((F)->linep == WRAP_LASTC(F)){ \ if((F)->linep == WRAP_LASTC(F)){ \
size_t offset = (F)->linep - (F)->line; \ size_t offset = (F)->linep - (F)->line; \
*************** ***************
*** 9571,9576 **** *** 9572,9577 ****
--- 9583,9590 ---- --- 9584,9591 ----
case CCR : /* CRLF or CR in text ? */ case CCR : /* CRLF or CR in text ? */
state = BOL; /* either way, handle start */ state = BOL; /* either way, handle start */
@ -1611,7 +1611,7 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
/* wrapped line? */ /* wrapped line? */
if(f->f2 == 0 && WRAP_SPC_LEN(f) && WRAP_TRL_SPC(f)){ if(f->f2 == 0 && WRAP_SPC_LEN(f) && WRAP_TRL_SPC(f)){
*************** ***************
*** 9664,9670 **** *** 9665,9671 ****
case BOL : case BOL :
if(WRAP_FLOW(f)){ if(WRAP_FLOW(f)){
@ -1619,7 +1619,7 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
WRAP_FL_QC(f) = 1; /* init it */ WRAP_FL_QC(f) = 1; /* init it */
state = FL_QLEV; /* go collect it */ state = FL_QLEV; /* go collect it */
} }
--- 9678,9688 ---- --- 9679,9689 ----
case BOL : case BOL :
if(WRAP_FLOW(f)){ if(WRAP_FLOW(f)){
@ -1632,7 +1632,7 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
state = FL_QLEV; /* go collect it */ state = FL_QLEV; /* go collect it */
} }
*************** ***************
*** 9678,9684 **** *** 9679,9685 ****
} }
/* quote level change implies new paragraph */ /* quote level change implies new paragraph */
@ -1640,7 +1640,7 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
WRAP_FL_QD(f) = 0; WRAP_FL_QD(f) = 0;
if(WRAP_HARD(f) == 0){ if(WRAP_HARD(f) == 0){
WRAP_HARD(f) = 1; WRAP_HARD(f) = 1;
--- 9696,9711 ---- --- 9697,9712 ----
} }
/* quote level change implies new paragraph */ /* quote level change implies new paragraph */
@ -1658,7 +1658,7 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
if(WRAP_HARD(f) == 0){ if(WRAP_HARD(f) == 0){
WRAP_HARD(f) = 1; WRAP_HARD(f) = 1;
*************** ***************
*** 9730,9737 **** *** 9731,9738 ****
break; break;
case FL_QLEV : case FL_QLEV :
@ -1667,7 +1667,7 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
} }
else { else {
/* if EMBEDed, process it and return here */ /* if EMBEDed, process it and return here */
--- 9757,9768 ---- --- 9758,9769 ----
break; break;
case FL_QLEV : case FL_QLEV :
@ -1681,7 +1681,7 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
else { else {
/* if EMBEDed, process it and return here */ /* if EMBEDed, process it and return here */
*************** ***************
*** 9743,9749 **** *** 9744,9750 ****
} }
/* quote level change signals new paragraph */ /* quote level change signals new paragraph */
@ -1689,7 +1689,7 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
WRAP_FL_QD(f) = WRAP_FL_QC(f); WRAP_FL_QD(f) = WRAP_FL_QC(f);
if(WRAP_HARD(f) == 0){ /* add hard newline */ if(WRAP_HARD(f) == 0){ /* add hard newline */
WRAP_HARD(f) = 1; /* hard newline */ WRAP_HARD(f) = 1; /* hard newline */
--- 9774,9789 ---- --- 9775,9790 ----
} }
/* quote level change signals new paragraph */ /* quote level change signals new paragraph */
@ -1707,8 +1707,8 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
if(WRAP_HARD(f) == 0){ /* add hard newline */ if(WRAP_HARD(f) == 0){ /* add hard newline */
WRAP_HARD(f) = 1; /* hard newline */ WRAP_HARD(f) = 1; /* hard newline */
*************** ***************
*** 9800,9805 **** *** 9801,9806 ****
--- 9840,9852 ---- --- 9841,9853 ----
state = FL_SIG; state = FL_SIG;
break; break;
@ -1723,7 +1723,7 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
state = DFL; state = DFL;
goto case_dfl; /* handle c like DFL */ goto case_dfl; /* handle c like DFL */
*************** ***************
*** 9816,9822 **** *** 9817,9823 ****
&eob); /* note any embedded*/ &eob); /* note any embedded*/
wrap_eol(f, 1, &ip, &eib, wrap_eol(f, 1, &ip, &eib,
&op, &eob); /* plunk down newline */ &op, &eob); /* plunk down newline */
@ -1731,7 +1731,7 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
&op, &eob); /* write any prefix */ &op, &eob); /* write any prefix */
} }
--- 9863,9869 ---- --- 9864,9870 ----
&eob); /* note any embedded*/ &eob); /* note any embedded*/
wrap_eol(f, 1, &ip, &eib, wrap_eol(f, 1, &ip, &eib,
&op, &eob); /* plunk down newline */ &op, &eob); /* plunk down newline */
@ -1740,7 +1740,7 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
} }
*************** ***************
*** 10313,10319 **** *** 10314,10320 ****
wrap_flush_embed(f, &ip, &eib, &op, &eob); wrap_flush_embed(f, &ip, &eib, &op, &eob);
wrap_eol(f, 1, &ip, &eib, &op, wrap_eol(f, 1, &ip, &eib, &op,
&eob); /* plunk down newline */ &eob); /* plunk down newline */
@ -1748,7 +1748,7 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
&eob); /* write any prefix */ &eob); /* write any prefix */
} }
--- 10360,10366 ---- --- 10361,10367 ----
wrap_flush_embed(f, &ip, &eib, &op, &eob); wrap_flush_embed(f, &ip, &eib, &op, &eob);
wrap_eol(f, 1, &ip, &eib, &op, wrap_eol(f, 1, &ip, &eib, &op,
&eob); /* plunk down newline */ &eob); /* plunk down newline */
@ -1757,8 +1757,8 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
} }
*************** ***************
*** 10386,10391 **** *** 10387,10392 ****
--- 10433,10445 ---- --- 10434,10446 ----
if(WRAP_COLOR(f)) if(WRAP_COLOR(f))
free_color_pair(&WRAP_COLOR(f)); free_color_pair(&WRAP_COLOR(f));
@ -1773,7 +1773,7 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
so_give(&WRAP_SPACES(f)); so_give(&WRAP_SPACES(f));
fs_give((void **) &f->opt); /* free wrap widths struct */ fs_give((void **) &f->opt); /* free wrap widths struct */
*************** ***************
*** 10736,10742 **** *** 10737,10743 ****
{ {
int j, i; int j, i;
COLOR_PAIR *col = NULL; COLOR_PAIR *col = NULL;
@ -1781,7 +1781,7 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
if(ps_global->VAR_QUOTE_REPLACE_STRING){ if(ps_global->VAR_QUOTE_REPLACE_STRING){
get_pair(ps_global->VAR_QUOTE_REPLACE_STRING, &prefix, &last_prefix, 0, 0); get_pair(ps_global->VAR_QUOTE_REPLACE_STRING, &prefix, &last_prefix, 0, 0);
--- 10790,10797 ---- --- 10791,10798 ----
{ {
int j, i; int j, i;
COLOR_PAIR *col = NULL; COLOR_PAIR *col = NULL;
@ -1791,7 +1791,7 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
if(ps_global->VAR_QUOTE_REPLACE_STRING){ if(ps_global->VAR_QUOTE_REPLACE_STRING){
get_pair(ps_global->VAR_QUOTE_REPLACE_STRING, &prefix, &last_prefix, 0, 0); get_pair(ps_global->VAR_QUOTE_REPLACE_STRING, &prefix, &last_prefix, 0, 0);
*************** ***************
*** 10745,10754 **** *** 10746,10755 ****
last_prefix = NULL; last_prefix = NULL;
} }
} }
@ -1802,7 +1802,7 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
&& ps_global->VAR_QUOTE1_FORE_COLOR && ps_global->VAR_QUOTE1_FORE_COLOR
&& ps_global->VAR_QUOTE1_BACK_COLOR && ps_global->VAR_QUOTE1_BACK_COLOR
&& (col = new_color_pair(ps_global->VAR_QUOTE1_FORE_COLOR, && (col = new_color_pair(ps_global->VAR_QUOTE1_FORE_COLOR,
--- 10800,10821 ---- --- 10801,10822 ----
last_prefix = NULL; last_prefix = NULL;
} }
} }
@ -1826,7 +1826,7 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
&& ps_global->VAR_QUOTE1_BACK_COLOR && ps_global->VAR_QUOTE1_BACK_COLOR
&& (col = new_color_pair(ps_global->VAR_QUOTE1_FORE_COLOR, && (col = new_color_pair(ps_global->VAR_QUOTE1_FORE_COLOR,
*************** ***************
*** 10756,10762 **** *** 10757,10763 ****
&& pico_is_good_colorpair(col)){ && pico_is_good_colorpair(col)){
GF_COLOR_PUTC(f, col); GF_COLOR_PUTC(f, col);
} }
@ -1834,7 +1834,7 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
&& ps_global->VAR_QUOTE2_FORE_COLOR && ps_global->VAR_QUOTE2_FORE_COLOR
&& ps_global->VAR_QUOTE2_BACK_COLOR && ps_global->VAR_QUOTE2_BACK_COLOR
&& (col = new_color_pair(ps_global->VAR_QUOTE2_FORE_COLOR, && (col = new_color_pair(ps_global->VAR_QUOTE2_FORE_COLOR,
--- 10823,10829 ---- --- 10824,10830 ----
&& pico_is_good_colorpair(col)){ && pico_is_good_colorpair(col)){
GF_COLOR_PUTC(f, col); GF_COLOR_PUTC(f, col);
} }
@ -1843,7 +1843,7 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
&& ps_global->VAR_QUOTE2_BACK_COLOR && ps_global->VAR_QUOTE2_BACK_COLOR
&& (col = new_color_pair(ps_global->VAR_QUOTE2_FORE_COLOR, && (col = new_color_pair(ps_global->VAR_QUOTE2_FORE_COLOR,
*************** ***************
*** 10764,10770 **** *** 10765,10771 ****
&& pico_is_good_colorpair(col)){ && pico_is_good_colorpair(col)){
GF_COLOR_PUTC(f, col); GF_COLOR_PUTC(f, col);
} }
@ -1851,7 +1851,7 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
&& ps_global->VAR_QUOTE3_FORE_COLOR && ps_global->VAR_QUOTE3_FORE_COLOR
&& ps_global->VAR_QUOTE3_BACK_COLOR && ps_global->VAR_QUOTE3_BACK_COLOR
&& (col = new_color_pair(ps_global->VAR_QUOTE3_FORE_COLOR, && (col = new_color_pair(ps_global->VAR_QUOTE3_FORE_COLOR,
--- 10831,10837 ---- --- 10832,10838 ----
&& pico_is_good_colorpair(col)){ && pico_is_good_colorpair(col)){
GF_COLOR_PUTC(f, col); GF_COLOR_PUTC(f, col);
} }
@ -1860,7 +1860,7 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
&& ps_global->VAR_QUOTE3_BACK_COLOR && ps_global->VAR_QUOTE3_BACK_COLOR
&& (col = new_color_pair(ps_global->VAR_QUOTE3_FORE_COLOR, && (col = new_color_pair(ps_global->VAR_QUOTE3_FORE_COLOR,
*************** ***************
*** 10778,10820 **** *** 10779,10821 ****
} }
} }
@ -1904,7 +1904,7 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
return 0; return 0;
} }
--- 10845,10891 ---- --- 10846,10892 ----
} }
} }
@ -1953,8 +1953,8 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
return 0; return 0;
} }
*************** ***************
*** 10846,10851 **** *** 10847,10852 ****
--- 10917,10928 ---- --- 10918,10929 ----
wrap->hdr_color = (GFW_HDRCOLOR & flags) == GFW_HDRCOLOR; wrap->hdr_color = (GFW_HDRCOLOR & flags) == GFW_HDRCOLOR;
wrap->for_compose = (GFW_FORCOMPOSE & flags) == GFW_FORCOMPOSE; wrap->for_compose = (GFW_FORCOMPOSE & flags) == GFW_FORCOMPOSE;
wrap->handle_soft_hyphen = (GFW_SOFTHYPHEN & flags) == GFW_SOFTHYPHEN; wrap->handle_soft_hyphen = (GFW_SOFTHYPHEN & flags) == GFW_SOFTHYPHEN;
@ -1968,8 +1968,8 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
return((void *) wrap); return((void *) wrap);
} }
*************** ***************
*** 11289,11295 **** *** 11290,11296 ****
--- 11366,11580 ---- --- 11367,11581 ----
} \ } \
} }
@ -2185,9 +2185,9 @@ diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c
/* /*
* this simple filter accumulates characters until a newline, offers it * this simple filter accumulates characters until a newline, offers it
diff -rc alpine-2.23/pith/filter.h alpine-2.23.fillpara/pith/filter.h diff -rc alpine-2.24/pith/filter.h alpine-2.24.fillpara/pith/filter.h
*** alpine-2.23/pith/filter.h 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/filter.h 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.fillpara/pith/filter.h 2020-06-18 16:08:12.157588526 -0600 --- alpine-2.24.fillpara/pith/filter.h 2020-10-10 00:26:56.380330795 -0600
*************** ***************
*** 217,222 **** *** 217,222 ****
--- 217,223 ---- --- 217,223 ----
@ -2198,9 +2198,9 @@ diff -rc alpine-2.23/pith/filter.h alpine-2.23.fillpara/pith/filter.h
void *gf_url_hilite_opt(URL_HILITE_S *, HANDLE_S **, int); void *gf_url_hilite_opt(URL_HILITE_S *, HANDLE_S **, int);
void free_filter_module_globals(void); void free_filter_module_globals(void);
diff -rc alpine-2.23/pith/filttype.h alpine-2.23.fillpara/pith/filttype.h diff -rc alpine-2.24/pith/filttype.h alpine-2.24.fillpara/pith/filttype.h
*** alpine-2.23/pith/filttype.h 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/filttype.h 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.fillpara/pith/filttype.h 2020-06-18 16:08:12.157588526 -0600 --- alpine-2.24.fillpara/pith/filttype.h 2020-10-10 00:26:56.384330897 -0600
*************** ***************
*** 36,41 **** *** 36,41 ****
--- 36,43 ---- --- 36,43 ----
@ -2212,9 +2212,9 @@ diff -rc alpine-2.23/pith/filttype.h alpine-2.23.fillpara/pith/filttype.h
void *opt; /* optional per instance data */ void *opt; /* optional per instance data */
void *data; /* misc internal data pointer */ void *data; /* misc internal data pointer */
unsigned char queue[1 + GF_MAXBUF]; unsigned char queue[1 + GF_MAXBUF];
diff -rc alpine-2.23/pith/mailview.c alpine-2.23.fillpara/pith/mailview.c diff -rc alpine-2.24/pith/mailview.c alpine-2.24.fillpara/pith/mailview.c
*** alpine-2.23/pith/mailview.c 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/mailview.c 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.fillpara/pith/mailview.c 2020-06-18 16:08:12.157588526 -0600 --- alpine-2.24.fillpara/pith/mailview.c 2020-10-10 00:26:56.396331203 -0600
*************** ***************
*** 55,61 **** *** 55,61 ****
#include "../pith/escapes.h" #include "../pith/escapes.h"
@ -2472,9 +2472,9 @@ diff -rc alpine-2.23/pith/mailview.c alpine-2.23.fillpara/pith/mailview.c
#define UES_LEN 12 #define UES_LEN 12
#define UES_MAX 32 #define UES_MAX 32
diff -rc alpine-2.23/pith/mailview.h alpine-2.23.fillpara/pith/mailview.h diff -rc alpine-2.24/pith/mailview.h alpine-2.24.fillpara/pith/mailview.h
*** alpine-2.23/pith/mailview.h 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/mailview.h 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.fillpara/pith/mailview.h 2020-06-18 16:08:12.157588526 -0600 --- alpine-2.24.fillpara/pith/mailview.h 2020-10-10 00:26:56.404331406 -0600
*************** ***************
*** 146,151 **** *** 146,151 ****
--- 146,152 ---- --- 146,152 ----
@ -2485,9 +2485,9 @@ diff -rc alpine-2.23/pith/mailview.h alpine-2.23.fillpara/pith/mailview.h
int scroll_handle_start_color(char *, size_t, int *); int scroll_handle_start_color(char *, size_t, int *);
int scroll_handle_end_color(char *, size_t, int *, int); int scroll_handle_end_color(char *, size_t, int *, int);
int width_at_this_position(unsigned char *, unsigned long); int width_at_this_position(unsigned char *, unsigned long);
diff -rc alpine-2.23/pith/osdep/color.c alpine-2.23.fillpara/pith/osdep/color.c diff -rc alpine-2.24/pith/osdep/color.c alpine-2.24.fillpara/pith/osdep/color.c
*** alpine-2.23/pith/osdep/color.c 2020-06-18 15:19:23.465318999 -0600 *** alpine-2.24/pith/osdep/color.c 2020-10-10 00:24:28.208554703 -0600
--- alpine-2.23.fillpara/pith/osdep/color.c 2020-06-18 16:08:12.157588526 -0600 --- alpine-2.24.fillpara/pith/osdep/color.c 2020-10-10 00:26:56.416331712 -0600
*************** ***************
*** 32,38 **** *** 32,38 ****
@ -3792,9 +3792,9 @@ diff -rc alpine-2.23/pith/osdep/color.c alpine-2.23.fillpara/pith/osdep/color.c
+ return allowed_qstr; + return allowed_qstr;
+ } + }
+ +
diff -rc alpine-2.23/pith/osdep/color.h alpine-2.23.fillpara/pith/osdep/color.h diff -rc alpine-2.24/pith/osdep/color.h alpine-2.24.fillpara/pith/osdep/color.h
*** alpine-2.23/pith/osdep/color.h 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/osdep/color.h 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.fillpara/pith/osdep/color.h 2020-06-18 16:08:12.157588526 -0600 --- alpine-2.24.fillpara/pith/osdep/color.h 2020-10-10 00:26:56.436332222 -0600
*************** ***************
*** 17,22 **** *** 17,22 ****
--- 17,40 ---- --- 17,40 ----
@ -3845,12 +3845,12 @@ diff -rc alpine-2.23/pith/osdep/color.h alpine-2.23.fillpara/pith/osdep/color.h
! void record_quote_string (QSTRING_S *); ! void record_quote_string (QSTRING_S *);
#endif /* PITH_OSDEP_COLOR_INCLUDED */ #endif /* PITH_OSDEP_COLOR_INCLUDED */
diff -rc alpine-2.23/pith/pine.hlp alpine-2.23.fillpara/pith/pine.hlp diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.fillpara/pith/pine.hlp
*** alpine-2.23/pith/pine.hlp 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/pine.hlp 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.fillpara/pith/pine.hlp 2020-06-18 16:08:12.161588536 -0600 --- alpine-2.24.fillpara/pith/pine.hlp 2020-10-10 00:26:56.460332833 -0600
*************** ***************
*** 7903,7908 **** *** 8195,8200 ****
--- 7903,7948 ---- --- 8195,8240 ----
&quot;type the character ^&quot;. &quot;type the character ^&quot;.
<P> <P>
@ -3897,12 +3897,12 @@ diff -rc alpine-2.23/pith/pine.hlp alpine-2.23.fillpara/pith/pine.hlp
&lt;End of help on this topic&gt; &lt;End of help on this topic&gt;
</BODY> </BODY>
</HTML> </HTML>
diff -rc alpine-2.23/pith/reply.c alpine-2.23.fillpara/pith/reply.c diff -rc alpine-2.24/pith/reply.c alpine-2.24.fillpara/pith/reply.c
*** alpine-2.23/pith/reply.c 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/reply.c 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.fillpara/pith/reply.c 2020-06-18 16:08:12.161588536 -0600 --- alpine-2.24.fillpara/pith/reply.c 2020-10-10 00:26:56.460332833 -0600
*************** ***************
*** 2839,2844 **** *** 2838,2843 ****
--- 2839,2847 ---- --- 2838,2846 ----
if(flow_res && ps_global->reply.use_flowed) if(flow_res && ps_global->reply.use_flowed)
wrapflags |= GFW_FLOW_RESULT; wrapflags |= GFW_FLOW_RESULT;
@ -3913,7 +3913,7 @@ diff -rc alpine-2.23/pith/reply.c alpine-2.23.fillpara/pith/reply.c
/* /*
* The 80 will cause longer lines than what is likely * The 80 will cause longer lines than what is likely
*************** ***************
*** 2932,2938 **** *** 2931,2937 ****
dq.do_color = 0; dq.do_color = 0;
dq.delete_all = 1; dq.delete_all = 1;
@ -3921,7 +3921,7 @@ diff -rc alpine-2.23/pith/reply.c alpine-2.23.fillpara/pith/reply.c
filters[filtcnt++].data = gf_line_test_opt(delete_quotes, &dq); filters[filtcnt++].data = gf_line_test_opt(delete_quotes, &dq);
} }
--- 2935,2941 ---- --- 2934,2940 ----
dq.do_color = 0; dq.do_color = 0;
dq.delete_all = 1; dq.delete_all = 1;
@ -3929,9 +3929,9 @@ diff -rc alpine-2.23/pith/reply.c alpine-2.23.fillpara/pith/reply.c
filters[filtcnt++].data = gf_line_test_opt(delete_quotes, &dq); filters[filtcnt++].data = gf_line_test_opt(delete_quotes, &dq);
} }
diff -rc alpine-2.23/pith/state.c alpine-2.23.fillpara/pith/state.c diff -rc alpine-2.24/pith/state.c alpine-2.24.fillpara/pith/state.c
*** alpine-2.23/pith/state.c 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/state.c 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.fillpara/pith/state.c 2020-06-18 16:08:12.161588536 -0600 --- alpine-2.24.fillpara/pith/state.c 2020-10-10 00:26:56.464332936 -0600
*************** ***************
*** 235,240 **** *** 235,240 ****
--- 235,242 ---- --- 235,242 ----
@ -3943,12 +3943,12 @@ diff -rc alpine-2.23/pith/state.c alpine-2.23.fillpara/pith/state.c
if((*pps)->atmts){ if((*pps)->atmts){
int i; int i;
diff -rc alpine-2.23/pith/state.h alpine-2.23.fillpara/pith/state.h diff -rc alpine-2.24/pith/state.h alpine-2.24.fillpara/pith/state.h
*** alpine-2.23/pith/state.h 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/state.h 2020-10-10 00:24:28.208554703 -0600
--- alpine-2.23.fillpara/pith/state.h 2020-06-18 16:08:12.161588536 -0600 --- alpine-2.24.fillpara/pith/state.h 2020-10-10 00:26:56.468333038 -0600
*************** ***************
*** 260,265 **** *** 261,266 ****
--- 260,267 ---- --- 261,268 ----
SPEC_COLOR_S *hdr_colors; /* list of configured colors for view */ SPEC_COLOR_S *hdr_colors; /* list of configured colors for view */
SPEC_COLOR_S *index_token_colors; /* list of configured colors for index */ SPEC_COLOR_S *index_token_colors; /* list of configured colors for index */
@ -3957,9 +3957,9 @@ diff -rc alpine-2.23/pith/state.h alpine-2.23.fillpara/pith/state.h
short init_context; short init_context;
struct { struct {
diff -rc alpine-2.23/pith/text.c alpine-2.23.fillpara/pith/text.c diff -rc alpine-2.24/pith/text.c alpine-2.24.fillpara/pith/text.c
*** alpine-2.23/pith/text.c 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/text.c 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.fillpara/pith/text.c 2020-06-18 16:08:12.161588536 -0600 --- alpine-2.24.fillpara/pith/text.c 2020-10-10 00:26:56.468333038 -0600
*************** ***************
*** 92,98 **** *** 92,98 ****
char *err, *charset; char *err, *charset;

56
chappa-fromheader.patch
View File

@ -1,8 +1,8 @@
diff -rc alpine-2.23/alpine/send.c alpine-2.23.fromheader/alpine/send.c diff -rc alpine-2.24/alpine/send.c alpine-2.24.fromheader/alpine/send.c
*** alpine-2.23/alpine/send.c 2020-06-18 15:19:23.465318999 -0600 *** alpine-2.24/alpine/send.c 2020-10-10 00:24:28.212554806 -0600
--- alpine-2.23.fromheader/alpine/send.c 2020-06-18 16:08:13.005590716 -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}, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE},
{"From : ", "From", h_composer_from, 10, 0, NULL, {"From : ", "From", h_composer_from, 10, 0, NULL,
build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL, abook_nickname_complete, build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL, abook_nickname_complete,
@ -10,7 +10,7 @@ diff -rc alpine-2.23/alpine/send.c alpine-2.23.fromheader/alpine/send.c
{"Reply-To: ", "Reply To", h_composer_reply_to, 10, 0, NULL, {"Reply-To: ", "Reply To", h_composer_reply_to, 10, 0, NULL,
build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL, abook_nickname_complete, 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}, 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}, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE},
{"From : ", "From", h_composer_from, 10, 0, NULL, {"From : ", "From", h_composer_from, 10, 0, NULL,
build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL, abook_nickname_complete, build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL, abook_nickname_complete,
@ -19,8 +19,8 @@ diff -rc alpine-2.23/alpine/send.c alpine-2.23.fromheader/alpine/send.c
build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL, abook_nickname_complete, 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}, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, KS_TOADDRBOOK},
*************** ***************
*** 2368,2373 **** *** 2372,2377 ****
--- 2368,2378 ---- --- 2372,2382 ----
he->rich_header = 0; he->rich_header = 0;
} }
} }
@ -33,7 +33,7 @@ diff -rc alpine-2.23/alpine/send.c alpine-2.23.fromheader/alpine/send.c
he_from = he; he_from = he;
break; break;
*************** ***************
*** 3105,3111 **** *** 3109,3115 ****
if(outgoing->return_path) if(outgoing->return_path)
mail_free_address(&outgoing->return_path); mail_free_address(&outgoing->return_path);
@ -41,7 +41,7 @@ diff -rc alpine-2.23/alpine/send.c alpine-2.23.fromheader/alpine/send.c
/* /*
* Don't ever believe the sender that is there. * Don't ever believe the sender that is there.
--- 3110,3118 ---- --- 3114,3122 ----
if(outgoing->return_path) if(outgoing->return_path)
mail_free_address(&outgoing->return_path); mail_free_address(&outgoing->return_path);
@ -51,12 +51,12 @@ diff -rc alpine-2.23/alpine/send.c alpine-2.23.fromheader/alpine/send.c
/* /*
* Don't ever believe the sender that is there. * Don't ever believe the sender that is there.
diff -rc alpine-2.23/pith/conf.c alpine-2.23.fromheader/pith/conf.c diff -rc alpine-2.24/pith/conf.c alpine-2.24.fromheader/pith/conf.c
*** alpine-2.23/pith/conf.c 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/conf.c 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.fromheader/pith/conf.c 2020-06-18 16:08:13.005590716 -0600 --- alpine-2.24.fromheader/pith/conf.c 2020-10-10 00:26:58.004372183 -0600
*************** ***************
*** 2930,2935 **** *** 2984,2989 ****
--- 2930,2937 ---- --- 2984,2991 ----
F_NO_FCC_ATTACH, h_config_no_fcc_attach, PREF_SEND, 0}, F_NO_FCC_ATTACH, h_config_no_fcc_attach, PREF_SEND, 0},
{"fcc-on-bounce", "Include Fcc When Bouncing Messages", {"fcc-on-bounce", "Include Fcc When Bouncing Messages",
F_FCC_ON_BOUNCE, h_config_fcc_on_bounce, PREF_SEND, 0}, F_FCC_ON_BOUNCE, h_config_fcc_on_bounce, PREF_SEND, 0},
@ -65,9 +65,9 @@ diff -rc alpine-2.23/pith/conf.c alpine-2.23.fromheader/pith/conf.c
{"mark-fcc-seen", NULL, {"mark-fcc-seen", NULL,
F_MARK_FCC_SEEN, h_config_mark_fcc_seen, PREF_SEND, 0}, F_MARK_FCC_SEEN, h_config_mark_fcc_seen, PREF_SEND, 0},
{"fcc-only-without-confirm", "Send to Fcc Only Without Confirming", {"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 diff -rc alpine-2.24/pith/conftype.h alpine-2.24.fromheader/pith/conftype.h
*** alpine-2.23/pith/conftype.h 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/conftype.h 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.fromheader/pith/conftype.h 2020-06-18 16:08:13.009590727 -0600 --- alpine-2.24.fromheader/pith/conftype.h 2020-10-10 00:26:58.004372183 -0600
*************** ***************
*** 410,415 **** *** 410,415 ****
--- 410,416 ---- --- 410,416 ----
@ -78,12 +78,12 @@ diff -rc alpine-2.23/pith/conftype.h alpine-2.23.fromheader/pith/conftype.h
F_SEND_WO_CONFIRM, F_SEND_WO_CONFIRM,
F_USE_SENDER_NOT_X, F_USE_SENDER_NOT_X,
F_BLANK_KEYMENU, F_BLANK_KEYMENU,
diff -rc alpine-2.23/pith/pine.hlp alpine-2.23.fromheader/pith/pine.hlp diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.fromheader/pith/pine.hlp
*** alpine-2.23/pith/pine.hlp 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/pine.hlp 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.fromheader/pith/pine.hlp 2020-06-18 16:08:13.017590747 -0600 --- alpine-2.24.fromheader/pith/pine.hlp 2020-10-10 00:26:58.016372489 -0600
*************** ***************
*** 29697,29702 **** *** 30135,30140 ****
--- 29697,29718 ---- --- 30135,30156 ----
&lt;End of help on this topic&gt; &lt;End of help on this topic&gt;
</BODY> </BODY>
</HTML> </HTML>
@ -106,9 +106,9 @@ diff -rc alpine-2.23/pith/pine.hlp alpine-2.23.fromheader/pith/pine.hlp
====== h_config_use_sender_not_x ===== ====== h_config_use_sender_not_x =====
<HTML> <HTML>
<HEAD> <HEAD>
diff -rc alpine-2.23/pith/send.c alpine-2.23.fromheader/pith/send.c diff -rc alpine-2.24/pith/send.c alpine-2.24.fromheader/pith/send.c
*** alpine-2.23/pith/send.c 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/send.c 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.fromheader/pith/send.c 2020-06-18 16:08:13.017590747 -0600 --- alpine-2.24.fromheader/pith/send.c 2020-10-10 00:26:58.016372489 -0600
*************** ***************
*** 53,59 **** *** 53,59 ****
/* name::type::canedit::writehdr::localcopy::rcptto */ /* name::type::canedit::writehdr::localcopy::rcptto */
@ -143,9 +143,9 @@ diff -rc alpine-2.23/pith/send.c alpine-2.23.fromheader/pith/send.c
pf->rcptto = pf_template[i].rcptto; pf->rcptto = pf_template[i].rcptto;
pf->writehdr = pf_template[i].writehdr; pf->writehdr = pf_template[i].writehdr;
pf->localcopy = pf_template[i].localcopy; pf->localcopy = pf_template[i].localcopy;
diff -rc alpine-2.23/pith/send.h alpine-2.23.fromheader/pith/send.h diff -rc alpine-2.24/pith/send.h alpine-2.24.fromheader/pith/send.h
*** alpine-2.23/pith/send.h 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/send.h 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.fromheader/pith/send.h 2020-06-18 16:08:13.017590747 -0600 --- alpine-2.24.fromheader/pith/send.h 2020-10-10 00:26:58.016372489 -0600
*************** ***************
*** 159,164 **** *** 159,164 ****
--- 159,166 ---- --- 159,166 ----

12
chappa-insertpat.patch
View File

@ -1,6 +1,6 @@
diff -rc alpine-2.23/pico/display.c alpine-2.23.insertpat/pico/display.c diff -rc alpine-2.24/pico/display.c alpine-2.24.insertpat/pico/display.c
*** alpine-2.23/pico/display.c 2020-06-18 15:19:23.437319046 -0600 *** alpine-2.24/pico/display.c 2020-10-10 00:24:28.180553991 -0600
--- alpine-2.23.insertpat/pico/display.c 2020-06-18 16:08:14.569594756 -0600 --- alpine-2.24.insertpat/pico/display.c 2020-10-10 00:26:59.856419380 -0600
*************** ***************
*** 2205,2210 **** *** 2205,2210 ****
--- 2205,2222 ---- --- 2205,2222 ----
@ -22,9 +22,9 @@ diff -rc alpine-2.23/pico/display.c alpine-2.23.insertpat/pico/display.c
case (CTRL|'G') : /* CTRL-G help */ case (CTRL|'G') : /* CTRL-G help */
if(term.t_mrow == 0 && km_popped == 0){ if(term.t_mrow == 0 && km_popped == 0){
movecursor(term.t_nrow-2, 0); movecursor(term.t_nrow-2, 0);
diff -rc alpine-2.23/pico/search.c alpine-2.23.insertpat/pico/search.c diff -rc alpine-2.24/pico/search.c alpine-2.24.insertpat/pico/search.c
*** alpine-2.23/pico/search.c 2020-06-18 15:19:23.437319046 -0600 *** alpine-2.24/pico/search.c 2020-10-10 00:24:28.180553991 -0600
--- alpine-2.23.insertpat/pico/search.c 2020-06-18 16:08:14.569594756 -0600 --- alpine-2.24.insertpat/pico/search.c 2020-10-10 00:26:59.856419380 -0600
*************** ***************
*** 122,127 **** *** 122,127 ****
--- 122,131 ---- --- 122,131 ----

190
chappa-maildir.patch
View File

@ -1,9 +1,9 @@
diff -rc alpine-2.23/alpine/alpine.c alpine-2.23.maildir/alpine/alpine.c diff -rc alpine-2.24/alpine/alpine.c alpine-2.24.maildir/alpine/alpine.c
*** alpine-2.23/alpine/alpine.c 2020-06-18 15:19:23.469318992 -0600 *** alpine-2.24/alpine/alpine.c 2020-10-10 00:24:28.216554908 -0600
--- alpine-2.23.maildir/alpine/alpine.c 2020-06-18 16:08:07.725577079 -0600 --- alpine-2.24.maildir/alpine/alpine.c 2020-10-10 00:26:49.964167282 -0600
*************** ***************
*** 597,602 **** *** 591,596 ****
--- 597,607 ---- --- 591,601 ----
if(F_ON(F_MAILDROPS_PRESERVE_STATE, ps_global)) if(F_ON(F_MAILDROPS_PRESERVE_STATE, ps_global))
mail_parameters(NULL, SET_SNARFPRESERVE, (void *) TRUE); mail_parameters(NULL, SET_SNARFPRESERVE, (void *) TRUE);
@ -15,12 +15,12 @@ diff -rc alpine-2.23/alpine/alpine.c alpine-2.23.maildir/alpine/alpine.c
rvl = 0L; rvl = 0L;
if(pine_state->VAR_NNTPRANGE){ if(pine_state->VAR_NNTPRANGE){
if(!SVAR_NNTPRANGE(pine_state, rvl, tmp_20k_buf, SIZEOF_20KBUF)) 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 diff -rc alpine-2.24/alpine/confscroll.c alpine-2.24.maildir/alpine/confscroll.c
*** alpine-2.23/alpine/confscroll.c 2020-06-18 15:19:23.465318999 -0600 *** alpine-2.24/alpine/confscroll.c 2020-10-10 00:24:28.216554908 -0600
--- alpine-2.23.maildir/alpine/confscroll.c 2020-06-18 16:08:07.729577089 -0600 --- alpine-2.24.maildir/alpine/confscroll.c 2020-10-10 00:26:49.968167384 -0600
*************** ***************
*** 5546,5551 **** *** 5567,5572 ****
--- 5546,5557 ---- --- 5567,5578 ----
(void *)var->current_val.p); (void *)var->current_val.p);
} }
#endif #endif
@ -33,11 +33,11 @@ diff -rc alpine-2.23/alpine/confscroll.c alpine-2.23.maildir/alpine/confscroll.c
else if(revert && standard_radio_var(ps, var)){ else if(revert && standard_radio_var(ps, var)){
cur_rule_value(var, TRUE, FALSE); 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 diff -rc alpine-2.24/imap/src/c-client/mail.c alpine-2.24.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.24/imap/src/c-client/mail.c 2020-10-10 00:24:28.200554500 -0600
--- alpine-2.23.maildir/imap/src/c-client/mail.c 2020-06-18 16:08:07.729577089 -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; MAILSTREAM *ts;
char *s,*t,tmp[MAILTMPLEN]; char *s,*t,tmp[MAILTMPLEN];
size_t i; size_t i;
@ -45,7 +45,7 @@ diff -rc alpine-2.23/imap/src/c-client/mail.c alpine-2.23.maildir/imap/src/c-cli
/* never allow names with newlines */ /* never allow names with newlines */
if ((s = strpbrk (mailbox,"\015\012")) != NULL) { if ((s = strpbrk (mailbox,"\015\012")) != NULL) {
MM_LOG ("Can't create mailbox with such a name",ERROR); MM_LOG ("Can't create mailbox with such a name",ERROR);
--- 1053,1059 ---- --- 1063,1069 ----
MAILSTREAM *ts; MAILSTREAM *ts;
char *s,*t,tmp[MAILTMPLEN]; char *s,*t,tmp[MAILTMPLEN];
size_t i; size_t i;
@ -54,8 +54,8 @@ diff -rc alpine-2.23/imap/src/c-client/mail.c alpine-2.23.maildir/imap/src/c-cli
if ((s = strpbrk (mailbox,"\015\012")) != NULL) { if ((s = strpbrk (mailbox,"\015\012")) != NULL) {
MM_LOG ("Can't create mailbox with such a name",ERROR); MM_LOG ("Can't create mailbox with such a name",ERROR);
*************** ***************
*** 1077,1082 **** *** 1087,1092 ****
--- 1077,1084 ---- --- 1087,1094 ----
return NIL; return NIL;
} }
@ -65,8 +65,8 @@ diff -rc alpine-2.23/imap/src/c-client/mail.c alpine-2.23.maildir/imap/src/c-cli
if ((mailbox[0] == '#') && ((mailbox[1] == 'd') || (mailbox[1] == 'D')) && if ((mailbox[0] == '#') && ((mailbox[1] == 'd') || (mailbox[1] == 'D')) &&
((mailbox[2] == 'r') || (mailbox[2] == 'R')) && ((mailbox[2] == 'r') || (mailbox[2] == 'R')) &&
*************** ***************
*** 1107,1112 **** *** 1117,1122 ****
--- 1109,1121 ---- --- 1119,1131 ----
(((*mailbox == '{') || (*mailbox == '#')) && (((*mailbox == '{') || (*mailbox == '#')) &&
(stream = mail_open (NIL,mailbox,OP_PROTOTYPE | OP_SILENT)))) (stream = mail_open (NIL,mailbox,OP_PROTOTYPE | OP_SILENT))))
d = stream->dtb; d = stream->dtb;
@ -80,12 +80,12 @@ diff -rc alpine-2.23/imap/src/c-client/mail.c alpine-2.23.maildir/imap/src/c-cli
else if ((*mailbox != '{') && (ts = default_proto (NIL))) d = ts->dtb; else if ((*mailbox != '{') && (ts = default_proto (NIL))) d = ts->dtb;
else { /* failed utterly */ else { /* failed utterly */
sprintf (tmp,"Can't create mailbox %.80s: indeterminate format",mailbox); 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 diff -rc alpine-2.24/imap/src/c-client/mail.h alpine-2.24.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.24/imap/src/c-client/mail.h 2020-10-10 00:24:28.200554500 -0600
--- alpine-2.23.maildir/imap/src/c-client/mail.h 2020-06-18 16:08:07.729577089 -0600 --- alpine-2.24.maildir/imap/src/c-client/mail.h 2020-10-10 00:26:49.968167384 -0600
*************** ***************
*** 379,384 **** *** 383,388 ****
--- 379,388 ---- --- 383,392 ----
#define SET_SCANCONTENTS (long) 573 #define SET_SCANCONTENTS (long) 573
#define GET_MHALLOWINBOX (long) 574 #define GET_MHALLOWINBOX (long) 574
#define SET_MHALLOWINBOX (long) 575 #define SET_MHALLOWINBOX (long) 575
@ -96,11 +96,11 @@ diff -rc alpine-2.23/imap/src/c-client/mail.h alpine-2.23.maildir/imap/src/c-cli
/* Driver flags */ /* Driver flags */
diff -rc alpine-2.23/imap/src/osdep/unix/dummy.c alpine-2.23.maildir/imap/src/osdep/unix/dummy.c diff -rc alpine-2.24/imap/src/osdep/unix/dummy.c alpine-2.24.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.24/imap/src/osdep/unix/dummy.c 2020-10-10 00:24:28.192554297 -0600
--- alpine-2.23.maildir/imap/src/osdep/unix/dummy.c 2020-06-18 16:08:07.729577089 -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 * Accepts: mailbox name
* Returns: our driver if name is valid, NIL otherwise * Returns: our driver if name is valid, NIL otherwise
*/ */
@ -114,7 +114,7 @@ diff -rc alpine-2.23/imap/src/osdep/unix/dummy.c alpine-2.23.maildir/imap/src/os
/* indeterminate clearbox INBOX */ /* indeterminate clearbox INBOX */
if (!*s) return &dummydriver; if (!*s) return &dummydriver;
else if (!stat (s,&sbuf)) switch (sbuf.st_mode & S_IFMT) { else if (!stat (s,&sbuf)) switch (sbuf.st_mode & S_IFMT) {
--- 103,121 ---- --- 104,122 ----
* Accepts: mailbox name * Accepts: mailbox name
* Returns: our driver if name is valid, NIL otherwise * Returns: our driver if name is valid, NIL otherwise
*/ */
@ -135,7 +135,7 @@ diff -rc alpine-2.23/imap/src/osdep/unix/dummy.c alpine-2.23.maildir/imap/src/os
if (!*s) return &dummydriver; if (!*s) return &dummydriver;
else if (!stat (s,&sbuf)) switch (sbuf.st_mode & S_IFMT) { else if (!stat (s,&sbuf)) switch (sbuf.st_mode & S_IFMT) {
*************** ***************
*** 118,125 **** *** 119,126 ****
return &dummydriver; return &dummydriver;
} }
/* blackbox INBOX does not exist yet */ /* blackbox INBOX does not exist yet */
@ -144,7 +144,7 @@ diff -rc alpine-2.23/imap/src/osdep/unix/dummy.c alpine-2.23.maildir/imap/src/os
return NIL; return NIL;
} }
--- 124,132 ---- --- 125,133 ----
return &dummydriver; return &dummydriver;
} }
/* blackbox INBOX does not exist yet */ /* blackbox INBOX does not exist yet */
@ -155,8 +155,8 @@ diff -rc alpine-2.23/imap/src/osdep/unix/dummy.c alpine-2.23.maildir/imap/src/os
} }
*************** ***************
*** 452,457 **** *** 453,458 ****
--- 459,466 ---- --- 460,467 ----
{ {
char *s,tmp[MAILTMPLEN]; char *s,tmp[MAILTMPLEN];
long ret = NIL; long ret = NIL;
@ -166,8 +166,8 @@ diff -rc alpine-2.23/imap/src/osdep/unix/dummy.c alpine-2.23.maildir/imap/src/os
if (!(compare_cstring (mailbox,"INBOX") && (s = dummy_file (tmp,mailbox)))) { if (!(compare_cstring (mailbox,"INBOX") && (s = dummy_file (tmp,mailbox)))) {
sprintf (tmp,"Can't create %.80s: invalid name",mailbox); sprintf (tmp,"Can't create %.80s: invalid name",mailbox);
*************** ***************
*** 517,522 **** *** 518,523 ****
--- 526,539 ---- --- 527,540 ----
{ {
struct stat sbuf; struct stat sbuf;
char *s,tmp[MAILTMPLEN]; char *s,tmp[MAILTMPLEN];
@ -183,7 +183,7 @@ diff -rc alpine-2.23/imap/src/osdep/unix/dummy.c alpine-2.23.maildir/imap/src/os
sprintf (tmp,"Can't delete - invalid name: %.80s",s); sprintf (tmp,"Can't delete - invalid name: %.80s",s);
MM_LOG (tmp,ERROR); MM_LOG (tmp,ERROR);
*************** ***************
*** 542,553 **** *** 543,554 ****
long dummy_rename (MAILSTREAM *stream,char *old,char *newname) long dummy_rename (MAILSTREAM *stream,char *old,char *newname)
{ {
struct stat sbuf; struct stat sbuf;
@ -196,7 +196,7 @@ diff -rc alpine-2.23/imap/src/osdep/unix/dummy.c alpine-2.23.maildir/imap/src/os
MM_LOG (mbx,ERROR); MM_LOG (mbx,ERROR);
return NIL; return NIL;
} }
--- 559,581 ---- --- 560,582 ----
long dummy_rename (MAILSTREAM *stream,char *old,char *newname) long dummy_rename (MAILSTREAM *stream,char *old,char *newname)
{ {
struct stat sbuf; struct stat sbuf;
@ -221,7 +221,7 @@ diff -rc alpine-2.23/imap/src/osdep/unix/dummy.c alpine-2.23.maildir/imap/src/os
return NIL; return NIL;
} }
*************** ***************
*** 563,576 **** *** 564,577 ****
} }
} }
/* rename of non-ex INBOX creates dest */ /* rename of non-ex INBOX creates dest */
@ -236,7 +236,7 @@ diff -rc alpine-2.23/imap/src/osdep/unix/dummy.c alpine-2.23.maildir/imap/src/os
return T; /* return success */ return T; /* return success */
} }
--- 591,606 ---- --- 592,607 ----
} }
} }
/* rename of non-ex INBOX creates dest */ /* rename of non-ex INBOX creates dest */
@ -253,9 +253,9 @@ diff -rc alpine-2.23/imap/src/osdep/unix/dummy.c alpine-2.23.maildir/imap/src/os
return T; /* return success */ 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 diff -rc alpine-2.24/imap/src/osdep/unix/maildir.c alpine-2.24.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.24/imap/src/osdep/unix/maildir.c 2020-10-10 00:26:50.012168504 -0600
--- alpine-2.23.maildir/imap/src/osdep/unix/maildir.c 2020-06-18 16:08:07.733577099 -0600 --- alpine-2.24.maildir/imap/src/osdep/unix/maildir.c 2020-10-10 00:26:49.972167485 -0600
*************** ***************
*** 0 **** *** 0 ****
--- 1,2671 ---- --- 1,2671 ----
@ -2930,9 +2930,9 @@ diff -rc alpine-2.23/imap/src/osdep/unix/maildir.c alpine-2.23.maildir/imap/src/
+ LOCAL->uidtempfile = cpystr(tmp); + 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 diff -rc alpine-2.24/imap/src/osdep/unix/maildir.h alpine-2.24.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.24/imap/src/osdep/unix/maildir.h 2020-10-10 00:26:50.012168504 -0600
--- alpine-2.23.maildir/imap/src/osdep/unix/maildir.h 2020-06-18 16:08:07.733577099 -0600 --- alpine-2.24.maildir/imap/src/osdep/unix/maildir.h 2020-10-10 00:26:49.972167485 -0600
*************** ***************
*** 0 **** *** 0 ****
--- 1,226 ---- --- 1,226 ----
@ -3162,9 +3162,9 @@ diff -rc alpine-2.23/imap/src/osdep/unix/maildir.h alpine-2.23.maildir/imap/src/
+ void maildir_assign_uid(MAILSTREAM *stream, unsigned long msgno, unsigned long uid); + void maildir_assign_uid(MAILSTREAM *stream, unsigned long msgno, unsigned long uid);
+ void maildir_uid_renew_tempfile(MAILSTREAM *stream); + 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 diff -rc alpine-2.24/imap/src/osdep/unix/Makefile alpine-2.24.maildir/imap/src/osdep/unix/Makefile
*** alpine-2.23/imap/src/osdep/unix/Makefile 2020-06-18 15:19:23.453319019 -0600 *** alpine-2.24/imap/src/osdep/unix/Makefile 2020-10-10 00:24:28.196554399 -0600
--- alpine-2.23.maildir/imap/src/osdep/unix/Makefile 2020-06-18 16:08:07.733577099 -0600 --- alpine-2.24.maildir/imap/src/osdep/unix/Makefile 2020-10-10 00:26:49.976167588 -0600
*************** ***************
*** 146,152 **** *** 146,152 ****
# However, mh needs to be before any sysinbox formats (such as mmdf or unix) # However, mh needs to be before any sysinbox formats (such as mmdf or unix)
@ -3226,9 +3226,9 @@ diff -rc alpine-2.23/imap/src/osdep/unix/Makefile alpine-2.23.maildir/imap/src/o
# OS-dependent # 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 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.23/imap/src/osdep/unix/os_cyg.h 2020-06-18 15:19:23.449319026 -0600 *** alpine-2.24/imap/src/osdep/unix/os_cyg.h 2020-10-10 00:24:28.192554297 -0600
--- alpine-2.23.maildir/imap/src/osdep/unix/os_cyg.h 2020-06-18 16:08:07.733577099 -0600 --- alpine-2.24.maildir/imap/src/osdep/unix/os_cyg.h 2020-10-10 00:26:49.976167588 -0600
*************** ***************
*** 47,52 **** *** 47,52 ****
--- 47,53 ---- --- 47,53 ----
@ -3239,12 +3239,12 @@ diff -rc alpine-2.23/imap/src/osdep/unix/os_cyg.h alpine-2.23.maildir/imap/src/o
#define geteuid Geteuid #define geteuid Geteuid
uid_t Geteuid (void); uid_t Geteuid (void);
diff -rc alpine-2.23/pith/conf.c alpine-2.23.maildir/pith/conf.c diff -rc alpine-2.24/pith/conf.c alpine-2.24.maildir/pith/conf.c
*** alpine-2.23/pith/conf.c 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/conf.c 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.maildir/pith/conf.c 2020-06-18 16:08:07.737577110 -0600 --- alpine-2.24.maildir/pith/conf.c 2020-10-10 00:26:49.976167588 -0600
*************** ***************
*** 449,454 **** *** 453,458 ****
--- 449,457 ---- --- 453,461 ----
CONF_TXT_T cf_text_newsrc_path[] = "Full path and name of NEWSRC file"; CONF_TXT_T cf_text_newsrc_path[] = "Full path and name of NEWSRC file";
@ -3255,8 +3255,8 @@ diff -rc alpine-2.23/pith/conf.c alpine-2.23.maildir/pith/conf.c
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
These are the variables that control a number of pine functions. They These are the variables that control a number of pine functions. They
*************** ***************
*** 653,658 **** *** 657,662 ****
--- 656,665 ---- --- 660,669 ----
NULL, cf_text_news_active}, NULL, cf_text_news_active},
{"news-spool-directory", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, {"news-spool-directory", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0,
NULL, cf_text_news_spooldir}, NULL, cf_text_news_spooldir},
@ -3268,8 +3268,8 @@ diff -rc alpine-2.23/pith/conf.c alpine-2.23.maildir/pith/conf.c
NULL, cf_text_upload_cmd}, NULL, cf_text_upload_cmd},
{"upload-command-prefix", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, {"upload-command-prefix", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0,
*************** ***************
*** 2338,2343 **** *** 2392,2397 ****
--- 2345,2356 ---- --- 2399,2410 ----
mail_parameters(NULL, SET_NEWSSPOOL, mail_parameters(NULL, SET_NEWSSPOOL,
(void *)VAR_NEWS_SPOOL_DIR); (void *)VAR_NEWS_SPOOL_DIR);
@ -3283,8 +3283,8 @@ diff -rc alpine-2.23/pith/conf.c alpine-2.23.maildir/pith/conf.c
set_current_val(&vars[V_DEFAULT_SAVE_FOLDER], TRUE, TRUE); set_current_val(&vars[V_DEFAULT_SAVE_FOLDER], TRUE, TRUE);
if(!VAR_DEFAULT_SAVE_FOLDER || !VAR_DEFAULT_SAVE_FOLDER[0]) if(!VAR_DEFAULT_SAVE_FOLDER || !VAR_DEFAULT_SAVE_FOLDER[0])
*************** ***************
*** 2976,2981 **** *** 3030,3035 ****
--- 2989,2998 ---- --- 3043,3052 ----
F_SORT_DEFAULT_SAVE_ALPHA, h_config_sort_save_alpha, PREF_FLDR, 0}, F_SORT_DEFAULT_SAVE_ALPHA, h_config_sort_save_alpha, PREF_FLDR, 0},
{"vertical-folder-list", "Use Vertical Folder List", {"vertical-folder-list", "Use Vertical Folder List",
F_VERTICAL_FOLDER_LIST, h_config_vertical_list, PREF_FLDR, 0}, F_VERTICAL_FOLDER_LIST, h_config_vertical_list, PREF_FLDR, 0},
@ -3296,7 +3296,7 @@ diff -rc alpine-2.23/pith/conf.c alpine-2.23.maildir/pith/conf.c
/* Addr book */ /* Addr book */
{"combined-addrbook-display", "Combined Address Book Display", {"combined-addrbook-display", "Combined Address Book Display",
*************** ***************
*** 7124,7130 **** *** 7209,7215 ****
int just_flip_value, EditWhich ew) int just_flip_value, EditWhich ew)
{ {
char **vp, *p, **lval, ***alval; char **vp, *p, **lval, ***alval;
@ -3304,7 +3304,7 @@ diff -rc alpine-2.23/pith/conf.c alpine-2.23.maildir/pith/conf.c
char *err; char *err;
long l; long l;
--- 7141,7147 ---- --- 7226,7232 ----
int just_flip_value, EditWhich ew) int just_flip_value, EditWhich ew)
{ {
char **vp, *p, **lval, ***alval; char **vp, *p, **lval, ***alval;
@ -3313,8 +3313,8 @@ diff -rc alpine-2.23/pith/conf.c alpine-2.23.maildir/pith/conf.c
long l; long l;
*************** ***************
*** 7177,7182 **** *** 7262,7267 ****
--- 7194,7206 ---- --- 7279,7291 ----
break; break;
@ -3329,8 +3329,8 @@ diff -rc alpine-2.23/pith/conf.c alpine-2.23.maildir/pith/conf.c
case F_DATES_TO_LOCAL : case F_DATES_TO_LOCAL :
clear_index_cache(ps->mail_stream, 0); clear_index_cache(ps->mail_stream, 0);
*************** ***************
*** 7975,7980 **** *** 8062,8067 ****
--- 7999,8008 ---- --- 8086,8095 ----
return(h_config_newmailwidth); return(h_config_newmailwidth);
case V_NEWSRC_PATH : case V_NEWSRC_PATH :
return(h_config_newsrc_path); return(h_config_newsrc_path);
@ -3341,12 +3341,12 @@ diff -rc alpine-2.23/pith/conf.c alpine-2.23.maildir/pith/conf.c
case V_BROWSER : case V_BROWSER :
return(h_config_browser); return(h_config_browser);
case V_HISTORY : case V_HISTORY :
diff -rc alpine-2.23/pith/conf.h alpine-2.23.maildir/pith/conf.h diff -rc alpine-2.24/pith/conf.h alpine-2.24.maildir/pith/conf.h
*** alpine-2.23/pith/conf.h 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/conf.h 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.maildir/pith/conf.h 2020-06-18 16:08:07.737577110 -0600 --- alpine-2.24.maildir/pith/conf.h 2020-10-10 00:26:49.976167588 -0600
*************** ***************
*** 260,265 **** *** 264,269 ****
--- 260,269 ---- --- 264,273 ----
#define GLO_NEWS_ACTIVE_PATH vars[V_NEWS_ACTIVE_PATH].global_val.p #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 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 #define GLO_NEWS_SPOOL_DIR vars[V_NEWS_SPOOL_DIR].global_val.p
@ -3357,9 +3357,9 @@ diff -rc alpine-2.23/pith/conf.h alpine-2.23.maildir/pith/conf.h
#define VAR_DISABLE_DRIVERS vars[V_DISABLE_DRIVERS].current_val.l #define VAR_DISABLE_DRIVERS vars[V_DISABLE_DRIVERS].current_val.l
#define VAR_DISABLE_AUTHS vars[V_DISABLE_AUTHS].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 #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 diff -rc alpine-2.24/pith/conftype.h alpine-2.24.maildir/pith/conftype.h
*** alpine-2.23/pith/conftype.h 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/conftype.h 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.maildir/pith/conftype.h 2020-06-18 16:08:07.737577110 -0600 --- alpine-2.24.maildir/pith/conftype.h 2020-10-10 00:26:49.980167690 -0600
*************** ***************
*** 118,123 **** *** 118,123 ****
--- 118,126 ---- --- 118,126 ----
@ -3384,9 +3384,9 @@ diff -rc alpine-2.23/pith/conftype.h alpine-2.23.maildir/pith/conftype.h
F_TAB_CHK_RECENT, F_TAB_CHK_RECENT,
F_AUTO_REPLY_TO, F_AUTO_REPLY_TO,
F_VERBOSE_POST, F_VERBOSE_POST,
diff -rc alpine-2.23/pith/init.c alpine-2.23.maildir/pith/init.c diff -rc alpine-2.24/pith/init.c alpine-2.24.maildir/pith/init.c
*** alpine-2.23/pith/init.c 2020-06-18 15:19:23.465318999 -0600 *** alpine-2.24/pith/init.c 2020-10-10 00:24:28.208554703 -0600
--- alpine-2.23.maildir/pith/init.c 2020-06-18 16:08:07.737577110 -0600 --- alpine-2.24.maildir/pith/init.c 2020-10-10 00:26:49.980167690 -0600
*************** ***************
*** 408,413 **** *** 408,413 ****
--- 408,416 ---- --- 408,416 ----
@ -3399,9 +3399,9 @@ diff -rc alpine-2.23/pith/init.c alpine-2.23.maildir/pith/init.c
&& strcmp(filename, folder_base)){ && strcmp(filename, folder_base)){
#endif #endif
#endif #endif
diff -rc alpine-2.23/pith/pattern.c alpine-2.23.maildir/pith/pattern.c diff -rc alpine-2.24/pith/pattern.c alpine-2.24.maildir/pith/pattern.c
*** alpine-2.23/pith/pattern.c 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/pattern.c 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.maildir/pith/pattern.c 2020-06-18 16:08:07.741577120 -0600 --- alpine-2.24.maildir/pith/pattern.c 2020-10-10 00:26:49.984167792 -0600
*************** ***************
*** 49,55 **** *** 49,55 ****
#include "../pith/icache.h" #include "../pith/icache.h"
@ -3489,12 +3489,12 @@ diff -rc alpine-2.23/pith/pattern.c alpine-2.23.maildir/pith/pattern.c
return(buf[0] != '\0'); return(buf[0] != '\0');
} }
diff -rc alpine-2.23/pith/pine.hlp alpine-2.23.maildir/pith/pine.hlp diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.maildir/pith/pine.hlp
*** alpine-2.23/pith/pine.hlp 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/pine.hlp 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.maildir/pith/pine.hlp 2020-06-18 16:08:07.749577141 -0600 --- alpine-2.24.maildir/pith/pine.hlp 2020-10-10 00:26:49.996168098 -0600
*************** ***************
*** 23014,23019 **** *** 23452,23457 ****
--- 23014,23115 ---- --- 23452,23553 ----
&lt;End of help on this topic&gt; &lt;End of help on this topic&gt;
</BODY> </BODY>
</HTML> </HTML>
@ -3598,8 +3598,8 @@ diff -rc alpine-2.23/pith/pine.hlp alpine-2.23.maildir/pith/pine.hlp
<HTML> <HTML>
<HEAD> <HEAD>
*************** ***************
*** 31245,31250 **** *** 31683,31688 ****
--- 31341,31389 ---- --- 31779,31827 ----
<P> <P>
&lt;End of help on this topic&gt; &lt;End of help on this topic&gt;
</BODY> </BODY>
@ -3649,9 +3649,9 @@ diff -rc alpine-2.23/pith/pine.hlp alpine-2.23.maildir/pith/pine.hlp
</HTML> </HTML>
====== h_config_verbose_post ===== ====== h_config_verbose_post =====
<HTML> <HTML>
diff -rc alpine-2.23/pith/send.c alpine-2.23.maildir/pith/send.c diff -rc alpine-2.24/pith/send.c alpine-2.24.maildir/pith/send.c
*** alpine-2.23/pith/send.c 2020-06-18 15:19:23.461319005 -0600 *** alpine-2.24/pith/send.c 2020-10-10 00:24:28.204554602 -0600
--- alpine-2.23.maildir/pith/send.c 2020-06-18 16:08:07.761577172 -0600 --- alpine-2.24.maildir/pith/send.c 2020-10-10 00:26:49.996168098 -0600
*************** ***************
*** 47,52 **** *** 47,52 ****
--- 47,55 ---- --- 47,55 ----
@ -3680,9 +3680,9 @@ diff -rc alpine-2.23/pith/send.c alpine-2.23.maildir/pith/send.c
if(!(IS_REMOTE(tmp) || is_absolute_path(tmp))){ if(!(IS_REMOTE(tmp) || is_absolute_path(tmp))){
/* /*
* The mbox is relative to the home directory. * The mbox is relative to the home directory.
diff -rc alpine-2.23/README.maildir alpine-2.23.maildir/README.maildir diff -rc alpine-2.24/README.maildir alpine-2.24.maildir/README.maildir
*** alpine-2.23/README.maildir 2020-06-18 16:08:07.777577213 -0600 *** alpine-2.24/README.maildir 2020-10-10 00:26:50.012168504 -0600
--- alpine-2.23.maildir/README.maildir 2020-06-18 16:08:07.761577172 -0600 --- alpine-2.24.maildir/README.maildir 2020-10-10 00:26:49.996168098 -0600
*************** ***************
*** 0 **** *** 0 ****
--- 1,149 ---- --- 1,149 ----

12054
chappa-rules.patch
View File

File diff suppressed because it is too large Load Diff