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

Accepting request 197243 from server:mail

Browse Source 
- Update to new upstream release 2.11 (forwarded request 197185 from jengelh)

OBS-URL: https://build.opensuse.org/request/show/197243
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alpine?expand=0&rev=33
This commit is contained in:
Stephan Kulow 2013-09-04 11:16:41 +00:00 committed by Git OBS Bridge
parent 71a80ea808
commit 544ac66853
19 changed files with 7966 additions and 9118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
alpine-2.00-as_needed.patch
View File

@ -1,10 +0,0 @@
--- configure.ac
+++ configure.ac
@@ -1307,6 +1307,7 @@
AC_CHECK_LIB(pam, pam_start,
[
alpine_c_client_target="lnp"
+ LIBS="$LIBS -lpam"
],
[
if test -f /etc/shadow ; then

3
alpine-2.10.clean.tar.lzma
View File

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

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

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

23
alpine-gcc44.diff
View File

@ -1,6 +1,13 @@
--- ./imap/src/osdep/unix/dummy.c 2009/06/02 09:53:30 1.1
+++ ./imap/src/osdep/unix/dummy.c 2009/06/02 10:04:31
@@ -723,6 +723,17 @@
---
imap/src/osdep/unix/dummy.c | 14 ++++++++++++--
pith/send.c | 1 +
2 files changed, 13 insertions(+), 2 deletions(-)
Index: alpine-2.11/imap/src/osdep/unix/dummy.c
===================================================================
--- alpine-2.11.orig/imap/src/osdep/unix/dummy.c
+++ alpine-2.11/imap/src/osdep/unix/dummy.c
@@ -736,6 +736,17 @@ long dummy_copy (MAILSTREAM *stream,char
return NIL;
}
@ -18,7 +25,7 @@
/* Dummy append message string
* Accepts: mail stream
@@ -742,8 +753,7 @@
@@ -755,8 +766,7 @@ long dummy_append (MAILSTREAM *stream,ch
/* append to INBOX? */
if (!compare_cstring (mailbox,"INBOX")) {
/* yes, if no empty proto try creating */
@ -28,9 +35,11 @@
}
else if (dummy_file (tmp,mailbox) && ((fd = open (tmp,O_RDONLY,NIL)) < 0)) {
if ((e = errno) == ENOENT) /* failed, was it no such file? */
--- pith/send.c 2009/06/02 10:04:13 1.11
+++ pith/send.c 2009/06/02 10:04:31
@@ -1569,6 +1569,7 @@
Index: alpine-2.11/pith/send.c
===================================================================
--- alpine-2.11.orig/pith/send.c
+++ alpine-2.11/pith/send.c
@@ -1570,6 +1570,7 @@ set_priority_header(METAENV *header, cha
pf->textbuf = cpystr(value);
}
}

39
alpine-maildir-closedir.patch
View File

@ -1,39 +0,0 @@
--- imap/src/osdep/unix/maildir.c 2011-10-17 10:11:55.000000000 +0200
+++ imap/src/osdep/unix/maildir.c 2011-10-17 10:39:31.000000000 +0200
@@ -2396,7 +2396,6 @@
|| !strncmp(d->d_name, MDUIDTEMP, strlen(MDUIDTEMP)))
break;
}
- closedir(dir);
rv = d ? !strncmp(d->d_name, tmp, strlen(tmp)) : 1;
createtemp = d ? 0 : 1;
if (d && rv == 0){ /* is there a temp file that is not ours? */
@@ -2410,6 +2409,7 @@
unlink(tmp);
}
}
+ closedir(dir);
if(createtemp){
FILE *fp;
sprintf(tmp,"%s/%s.%d.%lu", LOCAL->dir, MDUIDTEMP, getpid(), time(0));
@@ -2442,7 +2442,6 @@
if(!strncmp(d->d_name, MDUIDLAST, strlen(MDUIDLAST)))
break;
}
- closedir(dir);
createuid = d == NULL ? 1 : 0;
if(uid_last == NULL)
deleteuid++;
@@ -2473,9 +2472,10 @@
}
}
if(deleteuid){
- sprintf(tmp,"%s/%s", LOCAL->dir, d->d_name);
+ snprintf(tmp, sizeof(tmp), "%s/%s", LOCAL->dir, d->d_name);
unlink(tmp);
}
+ closedir(dir);
if(createuid)
maildir_write_uid(stream, (uid_last ? *uid_last : stream->uid_last),
uid_validity ? *uid_validity : time(0));
Nur in alpine-2.00/imap/src/osdep/unix: maildir.c~.

16
alpine-month_name-utf8.patch
View File

@ -1,6 +1,12 @@
--- pith/string.c
+++ pith/string.c
@@ -769,6 +769,7 @@
---
pith/string.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
Index: alpine-2.11/pith/string.c
===================================================================
--- alpine-2.11.orig/pith/string.c
+++ alpine-2.11/pith/string.c
@@ -770,6 +770,7 @@ month_abbrev_locale(int month_num)
return("xxx");
else{
static char buf[20];
@ -8,7 +14,7 @@
struct tm tm;
memset(&tm, 0, sizeof(tm));
@@ -810,6 +811,12 @@
@@ -811,6 +812,12 @@ month_abbrev_locale(int month_num)
buf[0] = ' ';
}
@ -21,7 +27,7 @@
return(buf);
}
@@ -841,12 +848,19 @@
@@ -842,12 +849,19 @@ month_name_locale(int month_num)
return("");
else{
static char buf[20];

14
alpine-no-add-needed.patch
View File

@ -3,10 +3,10 @@
configure.ac | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
Index: alpine-2.10/alpine/Makefile.am
Index: alpine-2.11/alpine/Makefile.am
===================================================================
--- alpine-2.10.orig/alpine/Makefile.am
+++ alpine-2.10/alpine/Makefile.am
--- alpine-2.11.orig/alpine/Makefile.am
+++ alpine-2.11/alpine/Makefile.am
@@ -35,7 +35,7 @@ BUILT_SOURCES = date.c
LDADD = ../pico/libpico.a ../pico/osdep/libpicoosd.a \
../pith/libpith.a ../pith/osdep/libpithosd.a \
@ -16,11 +16,11 @@ Index: alpine-2.10/alpine/Makefile.am
AM_CPPFLAGS = -I@top_builddir@/include -I@top_srcdir@/include -DLOCALEDIR=\"$(localedir)\"
Index: alpine-2.10/configure.ac
Index: alpine-2.11/configure.ac
===================================================================
--- alpine-2.10.orig/configure.ac
+++ alpine-2.10/configure.ac
@@ -37,8 +37,9 @@ WEB_BUILD=web/src/alpined.d
--- alpine-2.11.orig/configure.ac
+++ alpine-2.11/configure.ac
@@ -38,8 +38,9 @@ WEB_BUILD=web/src/alpined.d
dnl CHECK PROGRAMS

24
alpine.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Mon Sep 2 14:07:32 UTC 2013 - jengelh@inai.de
- Update to new upstream release 2.11
* Increase encryption of S/MIME encrypted messages.
* Pico: Improvements in justification of paragraphs: lines that
begin with a quote string, followed by a space were considered
individual paragraphs, now they are considered part of a paragraph.
* Unix Alpine: Allow local .pinerc file to be a symbolic link.
* Experimental extended support of recognition of UTF-8 in urls
* Added recognition of ws and wss URIs.
* Add ability to color folder names, directory names, and text in
the FOLDER SCREEN.
* Add the ability to color any token used in the display of the
INDEX SCREEN.
* New option preserve-original-fields that adds the ability to
preserve To: and Cc: fields when replying to a message, as
specified by original sender.
* Added Quota subcommands for printing, forwarding, saving, etc.
- Refresh from homepage (and save as unified): chappa-*.patch
- Refresh for -p1: operation-may-be-undefined-warning.diff,
fix-implicit.patch, alpine-gcc44.diff
- Drop quilt-patches/alpine-2.00-as_needed.patch (merged upstream)
-------------------------------------------------------------------
Wed May 22 20:37:21 UTC 2013 - jengelh@inai.de

59
alpine.spec
View File

@ -17,34 +17,16 @@
Name: alpine
#
# For debugging only:
%define build_vanilla 0
#
Summary: Mail User Agent
License: Apache-2.0
Group: Productivity/Networking/Email/Clients
BuildRequires: imap-devel
BuildRequires: krb5-devel
BuildRequires: libgssapi
BuildRequires: libtool
BuildRequires: ncurses-devel
BuildRequires: openldap2-devel
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: update-desktop-files
BuildRequires: xz
# pgp4pine requires pine:
Provides: pine
#
Obsoletes: pine4
Provides: pine4
#
Version: 2.10
Version: 2.11
Release: 0
Url: http://www.washington.edu/alpine/
Source: http://patches.freeiz.com/alpine/patches/alpine-2.10/alpine-2.10.clean.tar.lzma
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://patches.freeiz.com/alpine/
Source: http://patches.freeiz.com/alpine/release/src/%name-%version.tar.xz
Source1: %name.png
Source2: %name.desktop
Patch1: pine-nonvoid-function.patch
@ -52,7 +34,6 @@ Patch2: make-use-of-strncat-safer.diff
Patch3: operation-may-be-undefined-warning.diff
Patch4: fix-implicit.patch
Patch5: alpine-gcc44.diff
Patch6: alpine-2.00-as_needed.patch
Patch7: alpine-month_name-utf8.patch
Patch10: pico-fix-spurious-undef-warnings.diff
Patch20: pine-expression-warnings.diff
@ -70,6 +51,22 @@ Patch604: chappa-maildir.patch
Patch605: chappa-WrtAcc.patch
Patch606: chappa-unixnullbug.patch
Patch613: alpine-no-add-needed.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf >= 2.69
BuildRequires: imap-devel
BuildRequires: krb5-devel
BuildRequires: libgssapi
BuildRequires: libtool
BuildRequires: ncurses-devel
BuildRequires: openldap2-devel
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: update-desktop-files
BuildRequires: xz
# pgp4pine requires pine:
Provides: pine
Obsoletes: pine4
Provides: pine4
%description
Alpine is a display-oriented email client that is suitable for both
@ -133,11 +130,10 @@ fi
#
%patch1 -p1
%patch2 -p1
%patch3
%patch4 -p0
%patch5 -p0
%patch6 -p0
%patch7
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch7 -p1
%patch10 -p1
%patch20 -p1
%patch40 -p1
@ -188,6 +184,13 @@ autoreconf -fiv
grep -B9 -A20 'failed program was' config.log | grep -A24 checking
exit 5
}
%{?fedora_version: tag=LFD}
%{?mandriva_version: tag=LMD}
%{?redhat_version: tag=LRH}
%{?centos_version: tag=LRH}
%{?suse_version: tag=LSU}
perl -i -pe 's{(define SYSTYPE) "LNX"}{$1 "'"$tag"'"}g' include/config.h
#
# imap does not use CFLAGS from configure, needs EXTRACFLAGS/EXTRALDFLAGS:
#

221
chappa-WrtAcc.patch
View File

@ -1,14 +1,23 @@
diff -rc alpine-2.10/pico/basic.c alpine-2.10.WrtAcc/pico/basic.c
*** alpine-2.10/pico/basic.c 2013-01-11 11:25:28.000000000 -0700
--- alpine-2.10.WrtAcc/pico/basic.c 2013-01-11 20:43:11.000000000 -0700
***************
*** 344,349 ****
--- 344,532 ----
---
pico/basic.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
pico/composer.c | 9 ++
pico/display.c | 7 +-
pico/ebind.h | 8 +-
pico/efunc.h | 3
pico/main.c | 6 +
pico/search.c | 6 -
7 files changed, 214 insertions(+), 8 deletions(-)
Index: alpine-2.11/pico/basic.c
===================================================================
--- alpine-2.11.orig/pico/basic.c
+++ alpine-2.11/pico/basic.c
@@ -344,6 +344,189 @@ gotobop(int f, int n)
return(TRUE);
}
+ unsigned char GetAccent()
+ {
+unsigned char GetAccent()
+{
+ UCS c,d;
+ c = GetKey();
+ if ((c == '?') || (c == '!')) {
@ -26,20 +35,20 @@ diff -rc alpine-2.10/pico/basic.c alpine-2.10.WrtAcc/pico/basic.c
+ else
+ d = GetKey();
+ return accent(c,d);
+ }
+}
+
+ int pineaccent(f,n)
+int pineaccent(f,n)
+ int f,n;
+ { unsigned char e;
+{ unsigned char e;
+
+ if (e = GetAccent())
+ execute(e, 0, 1);
+ return 1;
+ }
+}
+
+ unsigned char accent(f,n)
+ UCS f,n;
+ { UCS c,d;
+unsigned char accent(f,n)
+UCS f,n;
+{ UCS c,d;
+
+ c = f;
+ d = n;
@ -189,33 +198,24 @@ diff -rc alpine-2.10/pico/basic.c alpine-2.10.WrtAcc/pico/basic.c
+ break;
+ }
+ return '\0';
+ }
+}
/*
* go forword to the end of the current paragraph
diff -rc alpine-2.10/pico/composer.c alpine-2.10.WrtAcc/pico/composer.c
*** alpine-2.10/pico/composer.c 2013-01-11 19:45:41.000000000 -0700
--- alpine-2.10.WrtAcc/pico/composer.c 2013-01-11 20:43:11.000000000 -0700
***************
*** 2015,2021 ****
Index: alpine-2.11/pico/composer.c
===================================================================
--- alpine-2.11.orig/pico/composer.c
+++ alpine-2.11/pico/composer.c
@@ -2015,7 +2015,7 @@ LineEdit(int allowedit, UCS *lastch)
tbufp = &strng[ods.p_len];
if(VALID_KEY(ch)){ /* char input */
! /*
- /*
+insert_char:/*
* if we are allowing editing, insert the new char
* end up leaving tbufp pointing to newly
* inserted character in string, and offset to the
--- 2015,2021 ----
tbufp = &strng[ods.p_len];
if(VALID_KEY(ch)){ /* char input */
! insert_char:/*
* if we are allowing editing, insert the new char
* end up leaving tbufp pointing to newly
* inserted character in string, and offset to the
***************
*** 2095,2100 ****
--- 2095,2107 ----
@@ -2095,6 +2095,13 @@ LineEdit(int allowedit, UCS *lastch)
}
else { /* interpret ch as a command */
switch (ch = normalize_cmd(ch, ckm, 2)) {
@ -229,12 +229,11 @@ diff -rc alpine-2.10/pico/composer.c alpine-2.10.WrtAcc/pico/composer.c
case (CTRL|KEY_LEFT): /* word skip left */
if(ods.p_ind > 0) /* Scoot one char left if possible */
ods.p_ind--;
diff -rc alpine-2.10/pico/display.c alpine-2.10.WrtAcc/pico/display.c
*** alpine-2.10/pico/display.c 2013-01-11 11:25:29.000000000 -0700
--- alpine-2.10.WrtAcc/pico/display.c 2013-01-11 20:43:11.000000000 -0700
***************
*** 1751,1756 ****
--- 1751,1761 ----
Index: alpine-2.11/pico/display.c
===================================================================
--- alpine-2.11.orig/pico/display.c
+++ alpine-2.11/pico/display.c
@@ -1751,6 +1751,11 @@ mlreplyd(UCS *prompt, UCS *buf, int nbuf
b = &buf[ucs4_strlen(buf)];
continue;
@ -246,100 +245,67 @@ diff -rc alpine-2.10/pico/display.c alpine-2.10.WrtAcc/pico/display.c
case (CTRL|'F') : /* CTRL-F forward a char*/
case KEY_RIGHT :
if(*b == '\0')
***************
*** 1869,1875 ****
@@ -1881,7 +1886,7 @@ mlreplyd(UCS *prompt, UCS *buf, int nbuf
#endif
default :
!
-
+text:
/* look for match in extra_v */
for(i = 0; i < 12; i++)
if(c && c == extra_v[i]){
--- 1874,1880 ----
#endif
default :
! text:
/* look for match in extra_v */
for(i = 0; i < 12; i++)
if(c && c == extra_v[i]){
diff -rc alpine-2.10/pico/ebind.h alpine-2.10.WrtAcc/pico/ebind.h
*** alpine-2.10/pico/ebind.h 2013-01-11 11:25:29.000000000 -0700
--- alpine-2.10.WrtAcc/pico/ebind.h 2013-01-11 20:43:11.000000000 -0700
***************
*** 61,67 ****
Index: alpine-2.11/pico/ebind.h
===================================================================
--- alpine-2.11.orig/pico/ebind.h
+++ alpine-2.11/pico/ebind.h
@@ -61,7 +61,7 @@ KEYTAB keytab[NBINDS] = {
#ifdef MOUSE
{KEY_MOUSE, mousepress},
#ifndef _WINDOWS
! {CTRL|'\\', toggle_xterm_mouse},
- {CTRL|'\\', toggle_xterm_mouse},
+ {CTRL|'|', toggle_xterm_mouse},
#endif
#endif
{CTRL|'A', gotobol},
--- 61,67 ----
#ifdef MOUSE
{KEY_MOUSE, mousepress},
#ifndef _WINDOWS
! {CTRL|'|', toggle_xterm_mouse},
#endif
#endif
{CTRL|'A', gotobol},
***************
*** 100,106 ****
@@ -100,7 +100,9 @@ KEYTAB keytab[NBINDS] = {
{CTRL|KEY_HOME, gotobob},
{CTRL|KEY_END, gotoeob},
{0x7F, backdel},
! {0, NULL}
- {0, NULL}
+ {CTRL|'\\', pineaccent},
+ {0,
+NULL}
};
--- 100,108 ----
{CTRL|KEY_HOME, gotobob},
{CTRL|KEY_END, gotoeob},
{0x7F, backdel},
! {CTRL|'\\', pineaccent},
! {0,
! NULL}
};
***************
*** 123,129 ****
@@ -123,7 +125,7 @@ KEYTAB pkeytab[NBINDS] = {
#ifdef MOUSE
{KEY_MOUSE, mousepress},
#ifndef _WINDOWS
! {CTRL|'\\', toggle_xterm_mouse},
- {CTRL|'\\', toggle_xterm_mouse},
+ {CTRL|'|', toggle_xterm_mouse},
#endif
#endif
{CTRL|'A', gotobol},
--- 125,131 ----
#ifdef MOUSE
{KEY_MOUSE, mousepress},
#ifndef _WINDOWS
! {CTRL|'|', toggle_xterm_mouse},
#endif
#endif
{CTRL|'A', gotobol},
diff -rc alpine-2.10/pico/efunc.h alpine-2.10.WrtAcc/pico/efunc.h
*** alpine-2.10/pico/efunc.h 2013-01-11 11:25:29.000000000 -0700
--- alpine-2.10.WrtAcc/pico/efunc.h 2013-01-11 20:43:11.000000000 -0700
***************
*** 54,59 ****
--- 54,62 ----
Index: alpine-2.11/pico/efunc.h
===================================================================
--- alpine-2.11.orig/pico/efunc.h
+++ alpine-2.11/pico/efunc.h
@@ -54,6 +54,9 @@ extern int forwline(int, int);
extern int backline(int, int);
extern int gotobop(int, int);
extern int gotoeop(int, int);
+ extern int pineaccent(int, int);
+ extern unsigned char accent(UCS, UCS);
+ extern unsigned char GetAccent(void);
+extern int pineaccent(int, int);
+extern unsigned char accent(UCS, UCS);
+extern unsigned char GetAccent(void);
extern int forwpage(int, int);
extern int backpage(int, int);
extern int scrollupline(int, int);
diff -rc alpine-2.10/pico/main.c alpine-2.10.WrtAcc/pico/main.c
*** alpine-2.10/pico/main.c 2013-01-11 11:25:29.000000000 -0700
--- alpine-2.10.WrtAcc/pico/main.c 2013-01-11 20:43:11.000000000 -0700
***************
*** 416,421 ****
--- 416,427 ----
Index: alpine-2.11/pico/main.c
===================================================================
--- alpine-2.11.orig/pico/main.c
+++ alpine-2.11/pico/main.c
@@ -416,6 +416,12 @@ main(int argc, char *argv[])
emlwrite(_("You may possibly have new mail."), NULL);
}
@ -352,57 +318,34 @@ diff -rc alpine-2.10/pico/main.c alpine-2.10.WrtAcc/pico/main.c
if(km_popped)
switch(c){
case NODATA:
diff -rc alpine-2.10/pico/search.c alpine-2.10.WrtAcc/pico/search.c
*** alpine-2.10/pico/search.c 2013-01-11 11:25:29.000000000 -0700
--- alpine-2.10.WrtAcc/pico/search.c 2013-01-11 20:43:11.000000000 -0700
***************
*** 274,280 ****
Index: alpine-2.11/pico/search.c
===================================================================
--- alpine-2.11.orig/pico/search.c
+++ alpine-2.11/pico/search.c
@@ -278,7 +278,7 @@ forwsearch(int f, int n)
}
if(status + curwp->w_doto >= llength(curwp->w_dotp) ||
! !eq(defpat[status],lgetc(curwp->w_dotp, curwp->w_doto + status).c))
- !eq(defpat[status],lgetc(curwp->w_dotp, curwp->w_doto + status).c))
+ !eq((unsigned char)defpat[status],lgetc(curwp->w_dotp, curwp->w_doto + status).c))
break; /* do nothing! */
status++;
}
--- 274,280 ----
}
if(status + curwp->w_doto >= llength(curwp->w_dotp) ||
! !eq((unsigned char)defpat[status],lgetc(curwp->w_dotp, curwp->w_doto + status).c))
break; /* do nothing! */
status++;
}
***************
*** 927,933 ****
@@ -931,7 +931,7 @@ forscan(int *wrapt, /* boolean indicatin
c = lgetc(curline, curoff++).c; /* get the char */
/* test it against first char in pattern */
! if (eq(c, patrn[0]) != FALSE) { /* if we find it..*/
- if (eq(c, patrn[0]) != FALSE) { /* if we find it..*/
+ if (eq(c, (unsigned char)patrn[0]) != FALSE) { /* if we find it..*/
/* setup match pointers */
matchline = curline;
matchoff = curoff;
--- 927,933 ----
c = lgetc(curline, curoff++).c; /* get the char */
/* test it against first char in pattern */
! if (eq(c, (unsigned char)patrn[0]) != FALSE) { /* if we find it..*/
/* setup match pointers */
matchline = curline;
matchoff = curoff;
***************
*** 948,954 ****
@@ -952,7 +952,7 @@ forscan(int *wrapt, /* boolean indicatin
return(FALSE);
/* and test it against the pattern */
! if (eq(*patptr, c) == FALSE)
goto fail;
}
--- 948,954 ----
return(FALSE);
/* and test it against the pattern */
! if (eq((unsigned char) *patptr, c) == FALSE)
- if (eq(*patptr, c) == FALSE)
+ if (eq((unsigned char) *patptr, c) == FALSE)
goto fail;
}

391
chappa-colortext.patch
View File

@ -1,9 +1,21 @@
diff -rc alpine-2.10/alpine/confscroll.c alpine-2.10.colortext/alpine/confscroll.c
*** alpine-2.10/alpine/confscroll.c 2013-01-11 15:21:34.000000000 -0700
--- alpine-2.10.colortext/alpine/confscroll.c 2013-01-11 20:43:16.000000000 -0700
***************
*** 5180,5185 ****
--- 5180,5188 ----
---
alpine/confscroll.c | 3
pith/conf.c | 14 +++
pith/conf.h | 4 +
pith/conftype.h | 3
pith/mailview.c | 192 ++++++++++++++++++++++++++++++++++++++++++++++++++++
pith/mailview.h | 15 ++++
pith/pine.hlp | 63 +++++++++++++++++
pith/state.c | 3
pith/state.h | 2
pith/text.c | 9 ++
10 files changed, 308 insertions(+)
Index: alpine-2.11/alpine/confscroll.c
===================================================================
--- alpine-2.11.orig/alpine/confscroll.c
+++ alpine-2.11/alpine/confscroll.c
@@ -5183,6 +5183,9 @@ fix_side_effects(struct pine *ps, struct
clear_index_cache(ps->mail_stream, 0);
}
@ -13,45 +25,38 @@ diff -rc alpine-2.10/alpine/confscroll.c alpine-2.10.colortext/alpine/confscroll
else if(var == &ps->vars[V_INIT_CMD_LIST]){
if(!revert)
q_status_message(SM_ASYNC, 0, 3,
diff -rc alpine-2.10/pith/conf.c alpine-2.10.colortext/pith/conf.c
*** alpine-2.10/pith/conf.c 2013-01-11 19:45:41.000000000 -0700
--- alpine-2.10.colortext/pith/conf.c 2013-01-11 20:43:16.000000000 -0700
***************
*** 226,231 ****
--- 226,233 ----
Index: alpine-2.11/pith/conf.c
===================================================================
--- alpine-2.11.orig/pith/conf.c
+++ alpine-2.11/pith/conf.c
@@ -228,6 +228,8 @@ CONF_TXT_T cf_text_deadlets[] = "Specif
CONF_TXT_T cf_text_fillcol[] = "Specifies the column of the screen where the composer should wrap.";
+ CONF_TXT_T cf_special_text_color[] = "Specifies a comma separated list of text and regular expresions that Pine\n# will highlight";
+CONF_TXT_T cf_special_text_color[] = "Specifies a comma separated list of text and regular expresions that Pine\n# will highlight";
+
CONF_TXT_T cf_text_replystr[] = "Specifies the string to insert when replying to a message.";
CONF_TXT_T cf_text_quotereplstr[] = "Specifies the string to replace quotes with when viewing a message.";
***************
*** 558,563 ****
--- 560,567 ----
@@ -560,6 +562,8 @@ static struct variable variables[] = {
NULL, cf_text_speller},
{"composer-wrap-column", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0,
NULL, cf_text_fillcol},
+ {"special-text-color", 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0,
+{"special-text-color", 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0,
+ NULL, cf_special_text_color},
{"reply-indent-string", 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0,
NULL, cf_text_replystr},
{"reply-leadin", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0,
***************
*** 809,814 ****
--- 813,820 ----
@@ -817,6 +821,8 @@ static struct variable variables[] = {
{"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},
+ {"special-text-foreground-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0},
+ {"special-text-background-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0},
+{"special-text-foreground-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0},
+{"special-text-background-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0},
{"prompt-foreground-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},
***************
*** 1972,1977 ****
--- 1978,1985 ----
@@ -1985,6 +1991,8 @@ init_vars(struct pine *ps, void (*cmds_f
set_current_val(&vars[V_FORM_FOLDER], TRUE, TRUE);
set_current_val(&vars[V_EDITOR], TRUE, TRUE);
set_current_val(&vars[V_SPELLER], TRUE, TRUE);
@ -60,19 +65,15 @@ diff -rc alpine-2.10/pith/conf.c alpine-2.10.colortext/pith/conf.c
set_current_val(&vars[V_IMAGE_VIEWER], TRUE, TRUE);
set_current_val(&vars[V_BROWSER], TRUE, TRUE);
set_current_val(&vars[V_SMTP_SERVER], TRUE, TRUE);
***************
*** 6424,6429 ****
--- 6432,6438 ----
@@ -6483,6 +6491,7 @@ set_current_color_vals(struct pine *ps)
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);
+ set_color_val(&vars[V_SPECIAL_TEXT_FORE_COLOR], 0);
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_KW_COLORS], TRUE, TRUE);
***************
*** 7599,7604 ****
--- 7608,7615 ----
@@ -7664,6 +7673,8 @@ config_help(int var, int feature)
return(h_config_scroll_margin);
case V_DEADLETS :
return(h_config_deadlets);
@ -81,9 +82,7 @@ diff -rc alpine-2.10/pith/conf.c alpine-2.10.colortext/pith/conf.c
case V_FILLCOL :
return(h_config_composer_wrap_column);
case V_TCPOPENTIMEO :
***************
*** 7758,7763 ****
--- 7769,7777 ----
@@ -7829,6 +7840,9 @@ config_help(int var, int feature)
case V_SIGNATURE_FORE_COLOR :
case V_SIGNATURE_BACK_COLOR :
return(h_config_signature_color);
@ -93,37 +92,33 @@ diff -rc alpine-2.10/pith/conf.c alpine-2.10.colortext/pith/conf.c
case V_PROMPT_FORE_COLOR :
case V_PROMPT_BACK_COLOR :
return(h_config_prompt_color);
diff -rc alpine-2.10/pith/conf.h alpine-2.10.colortext/pith/conf.h
*** alpine-2.10/pith/conf.h 2013-01-11 11:26:44.000000000 -0700
--- alpine-2.10.colortext/pith/conf.h 2013-01-11 20:43:16.000000000 -0700
***************
*** 161,166 ****
--- 161,168 ----
Index: alpine-2.11/pith/conf.h
===================================================================
--- alpine-2.11.orig/pith/conf.h
+++ alpine-2.11/pith/conf.h
@@ -161,6 +161,8 @@
#define GLO_EDITOR vars[V_EDITOR].global_val.l
#define VAR_SPELLER vars[V_SPELLER].current_val.p
#define GLO_SPELLER vars[V_SPELLER].global_val.p
+ #define VAR_SPECIAL_TEXT vars[V_SPECIAL_TEXT].current_val.l
+ #define GLO_SPECIAL_TEXT vars[V_SPECIAL_TEXT].global_val.l
+#define VAR_SPECIAL_TEXT vars[V_SPECIAL_TEXT].current_val.l
+#define GLO_SPECIAL_TEXT vars[V_SPECIAL_TEXT].global_val.l
#define VAR_FILLCOL vars[V_FILLCOL].current_val.p
#define GLO_FILLCOL vars[V_FILLCOL].global_val.p
#define VAR_DEADLETS vars[V_DEADLETS].current_val.p
***************
*** 444,449 ****
--- 446,453 ----
@@ -456,6 +458,8 @@
#define GLO_SIGNATURE_FORE_COLOR vars[V_SIGNATURE_FORE_COLOR].global_val.p
#define VAR_SIGNATURE_BACK_COLOR vars[V_SIGNATURE_BACK_COLOR].current_val.p
#define GLO_SIGNATURE_BACK_COLOR vars[V_SIGNATURE_BACK_COLOR].global_val.p
+ #define VAR_SPECIAL_TEXT_FORE_COLOR vars[V_SPECIAL_TEXT_FORE_COLOR].current_val.p
+ #define VAR_SPECIAL_TEXT_BACK_COLOR vars[V_SPECIAL_TEXT_BACK_COLOR].current_val.p
+#define VAR_SPECIAL_TEXT_FORE_COLOR vars[V_SPECIAL_TEXT_FORE_COLOR].current_val.p
+#define VAR_SPECIAL_TEXT_BACK_COLOR vars[V_SPECIAL_TEXT_BACK_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_VIEW_HDR_COLORS vars[V_VIEW_HDR_COLORS].current_val.l
diff -rc alpine-2.10/pith/conftype.h alpine-2.10.colortext/pith/conftype.h
*** alpine-2.10/pith/conftype.h 2013-01-11 19:45:41.000000000 -0700
--- alpine-2.10.colortext/pith/conftype.h 2013-01-11 20:43:16.000000000 -0700
***************
*** 80,85 ****
--- 80,86 ----
Index: alpine-2.11/pith/conftype.h
===================================================================
--- alpine-2.11.orig/pith/conftype.h
+++ alpine-2.11/pith/conftype.h
@@ -80,6 +80,7 @@ typedef enum { V_PERSONAL_NAME = 0
, V_EDITOR
, V_SPELLER
, V_FILLCOL
@ -131,9 +126,7 @@ diff -rc alpine-2.10/pith/conftype.h alpine-2.10.colortext/pith/conftype.h
, V_REPLY_STRING
, V_REPLY_INTRO
, V_QUOTE_REPLACE_STRING
***************
*** 224,229 ****
--- 225,232 ----
@@ -230,6 +231,8 @@ typedef enum { V_PERSONAL_NAME = 0
, V_INCUNSEEN_BACK_COLOR
, V_SIGNATURE_FORE_COLOR
, V_SIGNATURE_BACK_COLOR
@ -142,12 +135,11 @@ diff -rc alpine-2.10/pith/conftype.h alpine-2.10.colortext/pith/conftype.h
, V_PROMPT_FORE_COLOR
, V_PROMPT_BACK_COLOR
, V_HEADER_GENERAL_FORE_COLOR
diff -rc alpine-2.10/pith/mailview.c alpine-2.10.colortext/pith/mailview.c
*** alpine-2.10/pith/mailview.c 2013-01-11 17:43:09.000000000 -0700
--- alpine-2.10.colortext/pith/mailview.c 2013-01-11 20:43:16.000000000 -0700
***************
*** 282,287 ****
--- 282,295 ----
Index: alpine-2.11/pith/mailview.c
===================================================================
--- alpine-2.11.orig/pith/mailview.c
+++ alpine-2.11/pith/mailview.c
@@ -282,6 +282,14 @@ format_body(long int msgno, BODY *body,
if((flgs & FM_DISPLAY)
&& !(flgs & FM_NOCOLOR)
&& pico_usingcolor()
@ -162,15 +154,13 @@ diff -rc alpine-2.10/pith/mailview.c alpine-2.10.colortext/pith/mailview.c
&& ps_global->VAR_SIGNATURE_FORE_COLOR
&& ps_global->VAR_SIGNATURE_BACK_COLOR){
gf_link_filter(gf_line_test, gf_line_test_opt(color_signature, &is_in_sig));
***************
*** 2503,2508 ****
--- 2511,2700 ----
@@ -2503,6 +2511,190 @@ hdr_color(char *fieldname, char *value,
return(color_pair);
}
+ void
+ interval_free(IVAL_S **ival)
+ {
+void
+interval_free(IVAL_S **ival)
+{
+ if (!(*ival))
+ return;
+
@ -178,11 +168,11 @@ diff -rc alpine-2.10/pith/mailview.c alpine-2.10.colortext/pith/mailview.c
+ interval_free(&((*ival)->next));
+
+ fs_give((void **)(ival));
+ }
+}
+
+ IVAL_S *
+ compute_interval (char *string, int endm)
+ {
+IVAL_S *
+compute_interval (char *string, int endm)
+{
+ IVAL_S *ival = NULL;
+ regmatch_t pmatch;
+
@ -194,11 +184,11 @@ diff -rc alpine-2.10/pith/mailview.c alpine-2.10.colortext/pith/mailview.c
+ ival->next = compute_interval(string, ival->end);
+ }
+ return ival;
+ }
+}
+
+ void
+ regex_pattern(char **plist)
+ {
+void
+regex_pattern(char **plist)
+{
+ int i = 0, j = 0, len = 0;
+ char *pattern = NULL;
+ regex_t preg;
@ -222,12 +212,12 @@ diff -rc alpine-2.10/pith/mailview.c alpine-2.10.colortext/pith/mailview.c
+ }
+ if(pattern)
+ fs_give((void **)&pattern);
+ }
+}
+
+ LT_INS_S **
+ insert_color_special_text(LT_INS_S **ins, char **p, IVAL_S *ival, int last_end,
+LT_INS_S **
+insert_color_special_text(LT_INS_S **ins, char **p, IVAL_S *ival, int last_end,
+ COLOR_PAIR *col)
+ {
+{
+ struct variable *vars = ps_global->vars;
+
+ if (ival){
@ -240,11 +230,11 @@ diff -rc alpine-2.10/pith/mailview.c alpine-2.10.colortext/pith/mailview.c
+ ins = insert_color_special_text(ins, p, ival->next, ival->end, col);
+ }
+ return ins;
+ }
+}
+
+ int
+ length_color(char *p, int begin_color)
+ {
+int
+length_color(char *p, int begin_color)
+{
+ int len = 0, done = begin_color ? 0 : -1;
+ char *orig = p;
+
@ -268,22 +258,22 @@ diff -rc alpine-2.10/pith/mailview.c alpine-2.10.colortext/pith/mailview.c
+ }
+ len = p - orig;
+ return len;
+ }
+}
+
+ int
+ any_color_in_string(char *p)
+ {
+int
+any_color_in_string(char *p)
+{
+ int rv = 0;
+ char *orig = p;
+ while (*p && !rv)
+ if (*p++ == TAG_EMBED)
+ rv = p - orig;
+ return rv;
+ }
+}
+
+ void
+ remove_spaces_ival(IVAL_S **ivalp, char *p)
+ {
+void
+remove_spaces_ival(IVAL_S **ivalp, char *p)
+{
+ IVAL_S *ival;
+ int i;
+ if (!ivalp || !*ivalp)
@ -298,18 +288,18 @@ diff -rc alpine-2.10/pith/mailview.c alpine-2.10.colortext/pith/mailview.c
+ ival->end -= i;
+ if (ival->next)
+ remove_spaces_ival(&(ival->next), p);
+ }
+}
+
+ int
+ color_this_text(long linenum, char *line, LT_INS_S **ins, void *local)
+ {
+int
+color_this_text(long linenum, char *line, LT_INS_S **ins, void *local)
+{
+ struct variable *vars = ps_global->vars;
+ COLOR_PAIR *col = NULL;
+ char *p;
+ int i = 0;
+ static char *pattern = NULL;
+
+ /* select_quote(linenum, line, ins, (void *) &i);
+/* select_quote(linenum, line, ins, (void *) &i);
+ for (i = 0; tmp_20k_buf[i] != '\0'; i++); */
+ p = line + i;
+
@ -351,154 +341,143 @@ diff -rc alpine-2.10/pith/mailview.c alpine-2.10.colortext/pith/mailview.c
+ }
+
+ return 0;
+ }
+}
/*
* The argument fieldname is something like "Subject:..." or "Subject".
diff -rc alpine-2.10/pith/mailview.h alpine-2.10.colortext/pith/mailview.h
*** alpine-2.10/pith/mailview.h 2013-01-11 11:26:44.000000000 -0700
--- alpine-2.10.colortext/pith/mailview.h 2013-01-11 20:43:16.000000000 -0700
***************
*** 30,35 ****
--- 30,41 ----
Index: alpine-2.11/pith/mailview.h
===================================================================
--- alpine-2.11.orig/pith/mailview.h
+++ alpine-2.11/pith/mailview.h
@@ -30,6 +30,12 @@
#include "../pith/color.h"
+ typedef struct IVAL {
+typedef struct IVAL {
+ int start;
+ int end;
+ struct IVAL *next;
+ } IVAL_S;
+} IVAL_S;
+
/* format_message flags */
#define FM_DISPLAY 0x0001 /* result is headed for display */
#define FM_NEW_MESS 0x0002 /* a new message so zero out attachment descrip */
***************
*** 126,131 ****
--- 132,146 ----
@@ -126,6 +132,15 @@ char *format_body(long int, BODY *, HAND
int url_hilite(long, char *, LT_INS_S **, void *);
int handle_start_color(char *, size_t, int *, int);
int handle_end_color(char *, size_t, int *);
+ IVAL_S *compute_interval(char *, int);
+ void remove_spaces_ival(IVAL_S **, char *);
+ void interval_free(IVAL_S **);
+ void regex_pattern(char **);
+ LT_INS_S **insert_color_special_text(LT_INS_S **, char **, IVAL_S *,
+IVAL_S *compute_interval(char *, int);
+void remove_spaces_ival(IVAL_S **, char *);
+void interval_free(IVAL_S **);
+void regex_pattern(char **);
+LT_INS_S **insert_color_special_text(LT_INS_S **, char **, IVAL_S *,
+ int, COLOR_PAIR *);
+ int any_color_in_string(char *);
+ int length_color(char *, int);
+ int color_this_text(long, char *, LT_INS_S **, void *);
+int any_color_in_string(char *);
+int length_color(char *, int);
+int color_this_text(long, char *, LT_INS_S **, void *);
/*
* BUG: BELOW IS UNIX/PC ONLY since config'd browser means nothing to webpine
diff -rc alpine-2.10/pith/pine.hlp alpine-2.10.colortext/pith/pine.hlp
*** alpine-2.10/pith/pine.hlp 2013-01-11 20:33:27.000000000 -0700
--- alpine-2.10.colortext/pith/pine.hlp 2013-01-11 20:43:16.000000000 -0700
***************
*** 3517,3522 ****
--- 3517,3523 ----
Index: alpine-2.11/pith/pine.hlp
===================================================================
--- alpine-2.11.orig/pith/pine.hlp
+++ alpine-2.11/pith/pine.hlp
@@ -3563,6 +3563,7 @@ There are also additional details on
<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>
+ <li><a href="h_config_special_text_to_color">OPTION: <!--#echo var="VAR_h_config_special_text_to_color"--></a>
+<li><a href="h_config_special_text_to_color">OPTION: <!--#echo var="VAR_h_config_special_text_to_color"--></a>
<li><a href="h_config_postponed_folder">OPTION: <!--#echo var="VAR_postponed-folder"--></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>
***************
*** 3545,3550 ****
--- 3546,3552 ----
@@ -3591,6 +3592,7 @@ There are also additional details on
<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>
+ <li><a href="h_config_special_text_color">OPTION: Special Text Color</a>
+<li><a href="h_config_special_text_color">OPTION: Special Text Color</a>
<li><a href="h_config_signature_file">OPTION: <!--#echo var="VAR_signature-file"--></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>
***************
*** 22792,22797 ****
--- 22794,22836 ----
@@ -22838,6 +22840,43 @@ That won't work because spell works in a
&lt;End of help on this topic&gt;
</BODY>
</HTML>
+ ====== h_config_special_text_to_color =====
+ <HTML>
+ <HEAD>
+ <TITLE>OPTION: <!--#echo var="VAR_special-text-color"--></TITLE>
+ </HEAD>
+ <BODY>
+ <H1>OPTION: <!--#echo var="VAR_special-text-color"--></H1>
+====== h_config_special_text_to_color =====
+<HTML>
+<HEAD>
+<TITLE>OPTION: <!--#echo var="VAR_special-text-color"--></TITLE>
+</HEAD>
+<BODY>
+<H1>OPTION: <!--#echo var="VAR_special-text-color"--></H1>
+
+ Use this option to enter patterns (text or regular expressions) that
+ Alpine will highlight in the body of the text that is not part of a handle
+ (an internal or external link that Alpine paints in a different color).
+Use this option to enter patterns (text or regular expressions) that
+Alpine will highlight in the body of the text that is not part of a handle
+(an internal or external link that Alpine paints in a different color).
+
+ <P>
+ Enter each pattern in a different line. Pine will internally merge these
+ patterns (by adding a "|" character), or you can add them all in one line
+ by separating them by a "|" character. There is only a <A
+ HREF="h_regex_text">set</A> of regular expressions that are matched.
+<P>
+Enter each pattern in a different line. Pine will internally merge these
+patterns (by adding a "|" character), or you can add them all in one line
+by separating them by a "|" character. There is only a <A
+HREF="h_regex_text">set</A> of regular expressions that are matched.
+
+ <P>
+ Pine will use the colors defined in the
+ <A HREF="h_config_special_text_color">Special Text Color</A> variable.
+ to paint any match.
+<P>
+Pine will use the colors defined in the
+<A HREF="h_config_special_text_color">Special Text Color</A> variable.
+to paint any match.
+
+ <P>
+ If the Special Text Color is not set, setting this variable will not
+ cause that special text to be indicated in any special way. It will look
+ like any normal text. You must set those colors in order to make Pine
+ paint the screen differently when it finds the patterns specified in this
+ variable.
+<P>
+If the Special Text Color is not set, setting this variable will not
+cause that special text to be indicated in any special way. It will look
+like any normal text. You must set those colors in order to make Pine
+paint the screen differently when it finds the patterns specified in this
+variable.
+
+ <P>
+ <UL>
+ <LI><A HREF="h_finding_help">Finding more information and requesting help</A>
+ </UL><P>
+ &lt;End of help on this topic&gt;
+ </BODY>
+ </HTML>
+<P>
+<UL>
+<LI><A HREF="h_finding_help">Finding more information and requesting help</A>
+</UL><P>
+&lt;End of help on this topic&gt;
+</BODY>
+</HTML>
====== h_config_display_filters =====
<HTML>
<HEAD>
***************
*** 31396,31401 ****
--- 31435,31464 ----
@@ -31455,6 +31494,30 @@ the Quote3 Color is black characters on
<P>
<A HREF="h_color_setup">Descriptions of the available commands</A>
<P>
+ Look <A HREF="h_edit_nav_cmds">here</A>
+ to see the available Editing and Navigation commands.
+ <P>
+ &lt;End of help on this topic&gt;
+ </BODY>
+ </HTML>
+ ====== h_config_special_text_color =====
+ <HTML>
+ <HEAD>
+ <TITLE>OPTION: Special Text Color</TITLE>
+ </HEAD>
+ <BODY>
+ <H1>OPTION: Special Text Color</H1>
+Look <A HREF="h_edit_nav_cmds">here</A>
+to see the available Editing and Navigation commands.
+<P>
+&lt;End of help on this topic&gt;
+</BODY>
+</HTML>
+====== h_config_special_text_color =====
+<HTML>
+<HEAD>
+<TITLE>OPTION: Special Text Color</TITLE>
+</HEAD>
+<BODY>
+<H1>OPTION: Special Text Color</H1>
+
+ Sets the color Pine uses for coloring any text in the body of the message
+ that is not part of a handle (and internal or external link that Pine
+ paints in a different color). By default, this variable is not defined,
+ which means that text that matches the pattern is not painted in any
+ particular way. This variable must be set in a special form if you
+ want text to be painted.
+Sets the color Pine uses for coloring any text in the body of the message
+that is not part of a handle (and internal or external link that Pine
+paints in a different color). By default, this variable is not defined,
+which means that text that matches the pattern is not painted in any
+particular way. This variable must be set in a special form if you
+want text to be painted.
+
+ <P>
+ <A HREF="h_color_setup">Descriptions of the available commands</A>
+ <P>
+<P>
+<A HREF="h_color_setup">Descriptions of the available commands</A>
+<P>
Look <A HREF="h_edit_nav_cmds">here</A>
to see the available Editing and Navigation commands.
<P>
diff -rc alpine-2.10/pith/state.c alpine-2.10.colortext/pith/state.c
*** alpine-2.10/pith/state.c 2013-01-11 11:26:44.000000000 -0700
--- alpine-2.10.colortext/pith/state.c 2013-01-11 20:43:16.000000000 -0700
***************
*** 131,136 ****
--- 131,139 ----
Index: alpine-2.11/pith/state.c
===================================================================
--- alpine-2.11.orig/pith/state.c
+++ alpine-2.11/pith/state.c
@@ -131,6 +131,9 @@ free_pine_struct(struct pine **pps)
if((*pps)->folders_dir != NULL)
fs_give((void **)&(*pps)->folders_dir);
@ -508,12 +487,11 @@ diff -rc alpine-2.10/pith/state.c alpine-2.10.colortext/pith/state.c
if((*pps)->ui.homedir)
fs_give((void **)&(*pps)->ui.homedir);
diff -rc alpine-2.10/pith/state.h alpine-2.10.colortext/pith/state.h
*** alpine-2.10/pith/state.h 2013-01-11 19:45:41.000000000 -0700
--- alpine-2.10.colortext/pith/state.h 2013-01-11 20:43:16.000000000 -0700
***************
*** 320,325 ****
--- 320,327 ----
Index: alpine-2.11/pith/state.h
===================================================================
--- alpine-2.11.orig/pith/state.h
+++ alpine-2.11/pith/state.h
@@ -326,6 +326,8 @@ struct pine {
char *display_charmap; /* needs to be freed */
char *keyboard_charmap; /* needs to be freed */
void *input_cs;
@ -522,12 +500,11 @@ diff -rc alpine-2.10/pith/state.h alpine-2.10.colortext/pith/state.h
char *posting_charmap; /* needs to be freed */
diff -rc alpine-2.10/pith/text.c alpine-2.10.colortext/pith/text.c
*** alpine-2.10/pith/text.c 2013-01-11 11:26:44.000000000 -0700
--- alpine-2.10.colortext/pith/text.c 2013-01-11 20:43:16.000000000 -0700
***************
*** 171,176 ****
--- 171,185 ----
Index: alpine-2.11/pith/text.c
===================================================================
--- alpine-2.11.orig/pith/text.c
+++ alpine-2.11/pith/text.c
@@ -171,6 +171,15 @@ decode_text(ATTACH_S *att,
gf_url_hilite_opt(&uh,handlesp,0));
}

2818
chappa-fancy.patch
View File

File diff suppressed because it is too large Load Diff

131
chappa-ignoresize.patch
View File

@ -1,9 +1,16 @@
diff -rc alpine-2.10/alpine/mailcmd.c alpine-2.10.ignoresize/alpine/mailcmd.c
*** alpine-2.10/alpine/mailcmd.c 2013-01-11 15:21:34.000000000 -0700
--- alpine-2.10.ignoresize/alpine/mailcmd.c 2013-01-11 20:43:20.000000000 -0700
***************
*** 3349,3354 ****
--- 3349,3357 ----
---
alpine/mailcmd.c | 3 +++
pith/conf.c | 2 ++
pith/conftype.h | 1 +
pith/pine.hlp | 35 +++++++++++++++++++++++++++++++++++
pith/save.c | 1 +
5 files changed, 42 insertions(+)
Index: alpine-2.11/alpine/mailcmd.c
===================================================================
--- alpine-2.11.orig/alpine/mailcmd.c
+++ alpine-2.11/alpine/mailcmd.c
@@ -3368,6 +3368,9 @@ save_size_changed_prompt(long msgno, int
{-1, 0, NULL, NULL}
};
@ -13,12 +20,11 @@ diff -rc alpine-2.10/alpine/mailcmd.c alpine-2.10.ignoresize/alpine/mailcmd.c
if(flags & SSCP_INIT || flags & SSCP_END){
if(flags & SSCP_END && possible_corruption)
q_status_message(SM_ORDER, 3, 3, "There is possible data corruption, check the results");
diff -rc alpine-2.10/pith/conf.c alpine-2.10.ignoresize/pith/conf.c
*** alpine-2.10/pith/conf.c 2013-01-11 19:45:41.000000000 -0700
--- alpine-2.10.ignoresize/pith/conf.c 2013-01-11 20:43:20.000000000 -0700
***************
*** 3082,3087 ****
--- 3082,3089 ----
Index: alpine-2.11/pith/conf.c
===================================================================
--- alpine-2.11.orig/pith/conf.c
+++ alpine-2.11/pith/conf.c
@@ -3123,6 +3123,8 @@ feature_list(int index)
F_FULL_AUTO_EXPUNGE, h_config_full_auto_expunge, PREF_MISC, 0},
{"force-arrow-cursor", NULL,
F_FORCE_ARROW, h_config_force_arrow, PREF_MISC, 0},
@ -27,12 +33,11 @@ diff -rc alpine-2.10/pith/conf.c alpine-2.10.ignoresize/pith/conf.c
{"maildrops-preserve-state", NULL,
F_MAILDROPS_PRESERVE_STATE, h_config_maildrops_preserve_state,
PREF_MISC, 0},
diff -rc alpine-2.10/pith/conftype.h alpine-2.10.ignoresize/pith/conftype.h
*** alpine-2.10/pith/conftype.h 2013-01-11 19:45:41.000000000 -0700
--- alpine-2.10.ignoresize/pith/conftype.h 2013-01-11 20:43:20.000000000 -0700
***************
*** 335,340 ****
--- 335,341 ----
Index: alpine-2.11/pith/conftype.h
===================================================================
--- alpine-2.11.orig/pith/conftype.h
+++ alpine-2.11/pith/conftype.h
@@ -346,6 +346,7 @@ typedef enum {
F_FORCE_ARROW,
F_PRUNE_USES_ISO,
F_ALT_ED_NOW,
@ -40,68 +45,64 @@ diff -rc alpine-2.10/pith/conftype.h alpine-2.10.ignoresize/pith/conftype.h
F_SHOW_DELAY_CUE,
F_CANCEL_CONFIRM,
F_AUTO_OPEN_NEXT_UNREAD,
diff -rc alpine-2.10/pith/pine.hlp alpine-2.10.ignoresize/pith/pine.hlp
*** alpine-2.10/pith/pine.hlp 2013-01-11 20:33:27.000000000 -0700
--- alpine-2.10.ignoresize/pith/pine.hlp 2013-01-11 20:43:20.000000000 -0700
***************
*** 3251,3256 ****
--- 3251,3257 ----
Index: alpine-2.11/pith/pine.hlp
===================================================================
--- alpine-2.11.orig/pith/pine.hlp
+++ alpine-2.11/pith/pine.hlp
@@ -3296,6 +3296,7 @@ There are also additional details on
<li><a href="h_config_full_auto_expunge">FEATURE: <!--#echo var="FEAT_expunge-without-confirm-everywhere"--></a>
<li><a href="h_config_no_fcc_attach">FEATURE: <!--#echo var="FEAT_fcc-without-attachments"--></a>
<li><a href="h_config_force_arrow">FEATURE: <!--#echo var="FEAT_force-arrow-cursor"--></a>
+ <li><a href="h_config_ignore_size">FEATURE: <!--#echo var="FEAT_ignore-size-changes"--></a>
+<li><a href="h_config_ignore_size">FEATURE: <!--#echo var="FEAT_ignore-size-changes"--></a>
<li><a href="h_config_forward_as_attachment">FEATURE: <!--#echo var="FEAT_forward-as-attachment"--></a>
<li><a href="h_config_preserve_field">FEATURE: <!--#echo var="FEAT_preserve-original-fields"--></a>
<li><a href="h_config_quell_empty_dirs">FEATURE: <!--#echo var="FEAT_quell-empty-directories"--></a>
<li><a href="h_config_hide_nntp_path">FEATURE: <!--#echo var="FEAT_hide-nntp-path"--></a>
***************
*** 30437,30442 ****
--- 30438,30477 ----
@@ -30787,6 +30788,40 @@ but that is not implemented.
<P>
&lt;End of help on this topic&gt;
+ </BODY>
+ </HTML>
+ ====== h_config_ignore_size =====
+ <HTML>
+ <HEAD>
+ <TITLE>FEATURE: <!--#echo var="FEAT_ignore-size-changes"--></TITLE>
+ </HEAD>
+ <BODY>
+ <H1>FEATURE: <!--#echo var="FEAT_ignore-size-changes"--></H1>
+</BODY>
+</HTML>
+====== h_config_ignore_size =====
+<HTML>
+<HEAD>
+<TITLE>FEATURE: <!--#echo var="FEAT_ignore-size-changes"--></TITLE>
+</HEAD>
+<BODY>
+<H1>FEATURE: <!--#echo var="FEAT_ignore-size-changes"--></H1>
+
+ When you have an account residing in an IMAP server, Alpine gets the size of
+ each message from the server. However, when Alpine saves a message residing
+ in an IMAP server, Alpine computes the size of the message independently. If
+ these two numbers do not match for a message, Alpine asks you if you still
+ want to take the risk of saving the message, since data corruption or loss
+ of data could result of this save.
+When you have an account residing in an IMAP server, Alpine gets the size of
+each message from the server. However, when Alpine saves a message residing
+in an IMAP server, Alpine computes the size of the message independently. If
+these two numbers do not match for a message, Alpine asks you if you still
+want to take the risk of saving the message, since data corruption or loss
+of data could result of this save.
+
+ <P>
+ Sometimes the root of this problem is that the server is defective, and
+ there will not be loss of information when saving such message. Enabling
+ this feature will make Aline ignore such error and continue saving the
+ message. If you can determine that this is the case, enable this feature
+ so that the saving operation will succeed. An example of a defective server
+ is the Gmail IMAP server. Another example is some versions of the Exchange
+ server.
+<P>
+Sometimes the root of this problem is that the server is defective, and
+there will not be loss of information when saving such message. Enabling
+this feature will make Aline ignore such error and continue saving the
+message. If you can determine that this is the case, enable this feature
+so that the saving operation will succeed. An example of a defective server
+is the Gmail IMAP server. Another example is some versions of the Exchange
+server.
+
+ <P>
+ It is recommended that this feature be disabled most of the time and only
+ enabled when you find a server which you can determine that has the above
+ mentioned defect, but be disabled again after making this operation
+ succeed.
+<P>
+It is recommended that this feature be disabled most of the time and only
+enabled when you find a server which you can determine that has the above
+mentioned defect, but be disabled again after making this operation
+succeed.
+
+ <P>
+ &lt;End of help on this topic&gt;
+<P>
+&lt;End of help on this topic&gt;
</BODY>
</HTML>
====== h_config_force_low_speed =====
diff -rc alpine-2.10/pith/save.c alpine-2.10.ignoresize/pith/save.c
*** alpine-2.10/pith/save.c 2013-01-11 11:26:44.000000000 -0700
--- alpine-2.10.ignoresize/pith/save.c 2013-01-11 20:43:20.000000000 -0700
***************
*** 1157,1162 ****
--- 1157,1163 ----
Index: alpine-2.11/pith/save.c
===================================================================
--- alpine-2.11.orig/pith/save.c
+++ alpine-2.11/pith/save.c
@@ -1157,6 +1157,7 @@ long save_fetch_append_cb(MAILSTREAM *st
snprintf(buf, sizeof(buf),
"Message to save shrank: source msg # %ld may be saved incorrectly",
mn_raw2m(pkg->msgmap, raw));

35
chappa-insertpat.patch
View File

@ -1,9 +1,13 @@
diff -rc alpine-2.10/pico/display.c alpine-2.10.insertpat/pico/display.c
*** alpine-2.10/pico/display.c 2013-01-11 11:25:29.000000000 -0700
--- alpine-2.10.insertpat/pico/display.c 2013-01-11 20:43:15.000000000 -0700
***************
*** 1760,1765 ****
--- 1760,1777 ----
---
pico/display.c | 12 ++++++++++++
pico/search.c | 4 ++++
2 files changed, 16 insertions(+)
Index: alpine-2.11/pico/display.c
===================================================================
--- alpine-2.11.orig/pico/display.c
+++ alpine-2.11/pico/display.c
@@ -1760,6 +1760,18 @@ mlreplyd(UCS *prompt, UCS *buf, int nbuf
continue;
@ -22,19 +26,18 @@ diff -rc alpine-2.10/pico/display.c alpine-2.10.insertpat/pico/display.c
case (CTRL|'G') : /* CTRL-G help */
if(term.t_mrow == 0 && km_popped == 0){
movecursor(term.t_nrow-2, 0);
diff -rc alpine-2.10/pico/search.c alpine-2.10.insertpat/pico/search.c
*** alpine-2.10/pico/search.c 2013-01-11 11:25:29.000000000 -0700
--- alpine-2.10.insertpat/pico/search.c 2013-01-11 20:43:15.000000000 -0700
***************
*** 76,81 ****
--- 76,85 ----
Index: alpine-2.11/pico/search.c
===================================================================
--- alpine-2.11.orig/pico/search.c
+++ alpine-2.11/pico/search.c
@@ -76,6 +76,10 @@ N_(" brackets. This string is th
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."),
" ",
+ N_("~ Hitting ~^~N will reinsert the last string you searched for"),
+ N_(" so that you can edit it (in case you made a mistake entering the"),
+ N_(" search pattern the first time)."),
+ " ",
+N_("~ Hitting ~^~N will reinsert the last string you searched for"),
+N_(" so that you can edit it (in case you made a mistake entering the"),
+N_(" search pattern the first time)."),
+" ",
N_(" The text search is not case sensitive, and will examine the"),
N_(" entire message."),
" ",

2051
chappa-maildir.patch
View File

File diff suppressed because it is too large Load Diff

38
chappa-unixnullbug.patch
View File

@ -1,38 +1,28 @@
diff -rc alpine-2.10/imap/src/c-client/mail.c alpine-2.10.unixnullbug/imap/src/c-client/mail.c
*** alpine-2.10/imap/src/c-client/mail.c 2013-01-11 15:21:34.000000000 -0700
--- alpine-2.10.unixnullbug/imap/src/c-client/mail.c 2013-01-11 20:45:05.000000000 -0700
***************
*** 3352,3364 ****
---
imap/src/c-client/mail.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
Index: alpine-2.11/imap/src/c-client/mail.c
===================================================================
--- alpine-2.11.orig/imap/src/c-client/mail.c
+++ alpine-2.11/imap/src/c-client/mail.c
@@ -3361,13 +3361,13 @@ unsigned long mail_filter (char *text,un
long flags)
{
STRINGLIST *hdrs;
! int notfound;
- int notfound;
+ int notfound, fix = text[len - 1] == '\0';
unsigned long i;
char c,*s,*e,*t,tmp[MAILTMPLEN];
char *src = text;
char *dst = src;
char *end = text + len;
! text[len] = '\012'; /* guard against running off buffer */
- text[len] = '\012'; /* guard against running off buffer */
+ text[fix ? len - 1 : len] = '\012'; /* guard against running off buffer */
while (src < end) { /* process header */
/* slurp header line name */
for (s = src,e = s + MAILTMPLEN - 1,e = (e < end ? e : end),t = tmp;
--- 3352,3364 ----
long flags)
{
STRINGLIST *hdrs;
! int notfound, fix = text[len - 1] == '\0';
unsigned long i;
char c,*s,*e,*t,tmp[MAILTMPLEN];
char *src = text;
char *dst = src;
char *end = text + len;
! text[fix ? len - 1 : len] = '\012'; /* guard against running off buffer */
while (src < end) { /* process header */
/* slurp header line name */
for (s = src,e = s + MAILTMPLEN - 1,e = (e < end ? e : end),t = tmp;
***************
*** 3397,3402 ****
--- 3397,3406 ----
@@ -3406,6 +3406,10 @@ unsigned long mail_filter (char *text,un
}
}
*dst = '\0'; /* tie off destination */

111
chappa-unverified.patch
View File

@ -1,111 +0,0 @@
diff -rc alpine-2.10/alpine/reply.c alpine-2.10.unverified/alpine/reply.c
*** alpine-2.10/alpine/reply.c 2013-01-11 11:19:33.000000000 -0700
--- alpine-2.10.unverified/alpine/reply.c 2013-01-11 16:20:11.000000000 -0700
***************
*** 1165,1173 ****
}
else if(!outgoing->newsgroups)
outgoing->newsgroups = cpystr(env->newsgroups);
- if(!IS_NEWS(ps_global->mail_stream))
- q_status_message(SM_ORDER, 2, 3,
- _("Replying to message that MAY or MAY NOT have been posted to newsgroup"));
}
return(ret);
--- 1165,1170 ----
diff -rc alpine-2.10/imap/src/c-client/imap4r1.c alpine-2.10.unverified/imap/src/c-client/imap4r1.c
*** alpine-2.10/imap/src/c-client/imap4r1.c 2011-01-09 21:00:20.000000000 -0700
--- alpine-2.10.unverified/imap/src/c-client/imap4r1.c 2013-01-11 16:20:11.000000000 -0700
***************
*** 4527,4532 ****
--- 4527,4533 ----
if (*env) { /* need to merge this header into envelope? */
if (!(*env)->newsgroups) { /* need Newsgroups? */
(*env)->newsgroups = nenv->newsgroups;
+ (*env)->ngpathexists = nenv->ngpathexists;
nenv->newsgroups = NIL;
}
if (!(*env)->followup_to) { /* need Followup-To? */
***************
*** 4581,4586 ****
--- 4582,4588 ----
if (oenv) { /* need to merge old envelope? */
(*env)->newsgroups = oenv->newsgroups;
oenv->newsgroups = NIL;
+ (*env)->ngpathexists = oenv->ngpathexists;
(*env)->followup_to = oenv->followup_to;
oenv->followup_to = NIL;
(*env)->references = oenv->references;
diff -rc alpine-2.10/imap/src/c-client/mail.h alpine-2.10.unverified/imap/src/c-client/mail.h
*** alpine-2.10/imap/src/c-client/mail.h 2013-01-11 15:21:34.000000000 -0700
--- alpine-2.10.unverified/imap/src/c-client/mail.h 2013-01-11 16:20:11.000000000 -0700
***************
*** 685,690 ****
--- 685,691 ----
/* Message envelope */
typedef struct mail_envelope {
+ unsigned int ngpathexists : 1; /* newsgroups may be bogus */
unsigned int incomplete : 1; /* envelope may be incomplete */
unsigned int imapenvonly : 1; /* envelope only has IMAP envelope */
char *remail; /* remail header if any */
diff -rc alpine-2.10/imap/src/c-client/rfc822.c alpine-2.10.unverified/imap/src/c-client/rfc822.c
*** alpine-2.10/imap/src/c-client/rfc822.c 2011-01-09 21:00:20.000000000 -0700
--- alpine-2.10.unverified/imap/src/c-client/rfc822.c 2013-01-11 16:20:11.000000000 -0700
***************
*** 128,133 ****
--- 128,134 ----
ENVELOPE *env = (*en = mail_newenvelope ());
BODY *body = bdy ? (*bdy = mail_newbody ()) : NIL;
long MIMEp = -1; /* flag that MIME semantics are in effect */
+ long PathP = NIL; /* flag that a Path: was seen */
parseline_t pl = (parseline_t) mail_parameters (NIL,GET_PARSELINE,NIL);
if (!host) host = BADHOST; /* make sure that host is non-null */
while (i && *s != '\n') { /* until end of header */
***************
*** 230,235 ****
--- 231,239 ----
*t++ = '\0';
}
break;
+ case 'P': /* possible Path: */
+ if (!strcmp (tmp+1,"ATH")) env->ngpathexists = T;
+ break;
case 'R': /* possible Reply-To: */
if (!strcmp (tmp+1,"EPLY-TO"))
rfc822_parse_adrlist (&env->reply_to,d,host);
diff -rc alpine-2.10/pith/mailview.c alpine-2.10.unverified/pith/mailview.c
*** alpine-2.10/pith/mailview.c 2013-01-11 11:26:43.000000000 -0700
--- alpine-2.10.unverified/pith/mailview.c 2013-01-11 16:20:11.000000000 -0700
***************
*** 2379,2386 ****
format_addr_string(s, n, sect, "Return-Path: ", e->return_path,
flags, oacs, pc);
! if((which & FE_NEWSGROUPS) && e->newsgroups)
format_newsgroup_string("Newsgroups: ", e->newsgroups, flags, pc);
if((which & FE_FOLLOWUPTO) && e->followup_to)
format_newsgroup_string("Followup-To: ", e->followup_to, flags, pc);
--- 2379,2399 ----
format_addr_string(s, n, sect, "Return-Path: ", e->return_path,
flags, oacs, pc);
! if((which & FE_NEWSGROUPS) && e->newsgroups){
! int bogus = NIL;
format_newsgroup_string("Newsgroups: ", e->newsgroups, flags, pc);
+ if (!e->ngpathexists && e->message_id &&
+ strncmp (e->message_id,"<alpine.",8) &&
+ strncmp (e->message_id,"<Pine.",6) &&
+ strncmp (e->message_id,"<MS-C.",6) &&
+ strncmp (e->message_id,"<MailManager.",13) &&
+ strncmp (e->message_id,"<EasyMail.",11) &&
+ strncmp (e->message_id,"<ML-",4)) bogus = T;
+
+ if(bogus)
+ q_status_message(SM_ORDER, 0, 3,
+ "Unverified Newsgroup header -- Message MAY or MAY NOT have been posted");
+ }
if((which & FE_FOLLOWUPTO) && e->followup_to)
format_newsgroup_string("Followup-To: ", e->followup_to, flags, pc);

10
fix-implicit.patch
View File

@ -1,5 +1,11 @@
--- imap/src/mlock/mlock.c
+++ imap/src/mlock/mlock.c
---
imap/src/mlock/mlock.c | 1 +
1 file changed, 1 insertion(+)
Index: alpine-2.11/imap/src/mlock/mlock.c
===================================================================
--- alpine-2.11.orig/imap/src/mlock/mlock.c
+++ alpine-2.11/imap/src/mlock/mlock.c
@@ -28,6 +28,7 @@
#include <errno.h>

21
operation-may-be-undefined-warning.diff
View File

@ -1,6 +1,13 @@
--- alpine/folder.c
+++ alpine/folder.c
@@ -6013,7 +6013,7 @@
---
alpine/folder.c | 2 +-
imap/src/c-client/mail.c | 10 ++++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
Index: alpine-2.11/alpine/folder.c
===================================================================
--- alpine-2.11.orig/alpine/folder.c
+++ alpine-2.11/alpine/folder.c
@@ -6132,7 +6132,7 @@ folder_select_count(long int *count, int
continue;
case 14 : /* toggle comparison */
@ -9,9 +16,11 @@
continue;
case -1 : /* cancel */
--- imap/src/c-client/mail.c
+++ imap/src/c-client/mail.c
@@ -2931,8 +2931,14 @@
Index: alpine-2.11/imap/src/c-client/mail.c
===================================================================
--- alpine-2.11.orig/imap/src/c-client/mail.c
+++ alpine-2.11/imap/src/c-client/mail.c
@@ -2940,8 +2940,14 @@ long mail_parse_date (MESSAGECACHE *elt,
/* parse time */
d = strtoul (s+1,(char **) &s,10);
if (*s != ':') return NIL;