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

Accepting request 961873 from server:mail

Browse Source 
- Update to release 2.25.1

OBS-URL: https://build.opensuse.org/request/show/961873
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alpine?expand=0&rev=55
This commit is contained in:
Dominique Leuenberger 2022-03-15 18:04:55 +00:00 committed by Git OBS Bridge
commit e74823c099
9 changed files with 3734 additions and 4198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_service
View File

@ -12,8 +12,8 @@
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">https://repo.or.cz/alpine.git</param>
<param name="revision">v2.23.2</param>
<param name="versionformat">2.23.2</param>
<param name="revision">v2.25.1</param>
<param name="versionformat">2.25.1</param>
<param name="exclude">*.dll</param>
<param name="exclude">*.exe</param>
<param name="exclude">*.lib</param>

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

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

3
alpine-2.25.tar.xz
View File

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

24
alpine.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Tue Mar 15 10:46:48 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
- Update to release 2.25.1
* In the past, Alpine did not recognize images embedded in an
HTML file, so now it does and a link to open them is given.
* Support for code_verifier and code_challenge when generating
a refresh token and access token in Gmail and Outlook using
the S256 method and plain method.
* Alpine is modified to not to attempt to continue a draft
message if the draft folder is empty. (Some servers do not
allow the Drafts folder to be removed, even when it is
empty.)
* Improvements to the screen that allows a user to select the
client-id when a user attempts to login to a server and more
than one client-id is available for that server.
-------------------------------------------------------------------
Wed Nov 24 10:11:28 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
- Delete chappa-WrtAcc.patch. Under Linux, one can use the Compose
key feature. (And for Windows, the putty client can provide an
equivalent Compose key feature.)
-------------------------------------------------------------------
Sun Sep 19 12:26:48 UTC 2021 - Jan Engelhardt <jengelh@inai.de>

12
alpine.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package alpine
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -19,7 +19,7 @@
Name: alpine
# For debugging only:
%define build_vanilla 0
Version: 2.25
Version: 2.25.1
Release: 0
Summary: Mail User Agent
License: Apache-2.0
@ -27,8 +27,9 @@ Group: Productivity/Networking/Email/Clients
URL: http://alpine.x10host.com/alpine/
#Git-Clone: https://repo.or.cz/alpine.git
Source: http://alpine.x10host.com/alpine/release/src/alpine-%version.tar.xz
#Source2: http://alpine.x10host.com/alpine/release/src/sig/alpine-%version.tar.xz.sig
Source: %name-%version.tar.xz
#Source: http://alpine.x10host.com/alpine/release/src/alpine-%%version.tar.xz
#Source2: http://alpine.x10host.com/alpine/release/src/sig/alpine-%%version.tar.xz.sig
Source3: %name.png
Source4: %name.desktop
Source9: UPDATING.txt
@ -53,8 +54,6 @@ Source603: chappa-insertpat.txt
Patch603: chappa-insertpat.patch
Source604: chappa-maildir.txt
Patch604: chappa-maildir.patch
Source605: chappa-WrtAcc.txt
Patch605: chappa-WrtAcc.patch
Source614: chappa-fillpara.txt
Patch614: chappa-fillpara.patch
Source615: chappa-fromheader.txt
@ -130,7 +129,6 @@ fi
%patch601 -p1
%patch603 -p1
%patch604 -p1
%patch605 -p1
%patch614 -p1
%patch615 -p1
%patch616 -p1

28
chappa-DelText.patch
View File

@ -4,11 +4,11 @@
pico/search.c | 8 ++++++--
3 files changed, 57 insertions(+), 2 deletions(-)
Index: alpine-2.25/pico/basic.c
Index: alpine-2.25.1/pico/basic.c
===================================================================
--- alpine-2.25.orig/pico/basic.c
+++ alpine-2.25/pico/basic.c
@@ -959,7 +959,57 @@ scrolldownline(int f, int n)
--- alpine-2.25.1.orig/pico/basic.c
+++ alpine-2.25.1/pico/basic.c
@@ -772,7 +772,57 @@ scrolldownline(int f, int n)
return (scrollforw (1, FALSE));
}
@ -66,23 +66,23 @@ Index: alpine-2.25/pico/basic.c
/*
* Scroll to a position.
Index: alpine-2.25/pico/efunc.h
Index: alpine-2.25.1/pico/efunc.h
===================================================================
--- alpine-2.25.orig/pico/efunc.h
+++ alpine-2.25/pico/efunc.h
@@ -59,6 +59,7 @@ extern unsigned char accent(UCS, UCS);
extern unsigned char GetAccent(void);
--- alpine-2.25.1.orig/pico/efunc.h
+++ alpine-2.25.1/pico/efunc.h
@@ -56,6 +56,7 @@ extern int gotobop(int, int);
extern int gotoeop(int, int);
extern int forwpage(int, int);
extern int backpage(int, int);
+extern int deltext (int, int);
extern int scrollupline(int, int);
extern int scrolldownline(int, int);
extern int scrollto(int, int);
Index: alpine-2.25/pico/search.c
Index: alpine-2.25.1/pico/search.c
===================================================================
--- alpine-2.25.orig/pico/search.c
+++ alpine-2.25/pico/search.c
@@ -73,7 +73,7 @@ EXTRAKEYS menu_srchpat[] = {
--- alpine-2.25.1.orig/pico/search.c
+++ alpine-2.25.1/pico/search.c
@@ -69,7 +69,7 @@ EXTRAKEYS menu_srchpat[] = {
{"^O", N_("End of Para"), (CTRL|'O')},
{"^U", N_("FullJustify"), (CTRL|'U')},
{"^P", N_("Delete Para"), (CTRL|'P')},
@ -91,7 +91,7 @@ Index: alpine-2.25/pico/search.c
};
#define EXACTSR_KEY 1 /* toggle an exact or approximate search */
@@ -286,7 +286,11 @@ forwsearch(int f, int n)
@@ -282,7 +282,11 @@ forwsearch(int f, int n)
break;
case (CTRL|'X'):

354
chappa-WrtAcc.patch
View File

@ -1,354 +0,0 @@
diff -rc alpine-2.25/pico/basic.c alpine-2.25.WrtAcc/pico/basic.c
*** alpine-2.25/pico/basic.c 2021-09-18 09:02:36.386783561 -0600
--- alpine-2.25.WrtAcc/pico/basic.c 2021-09-18 09:03:15.983056911 -0600
***************
*** 342,347 ****
--- 342,530 ----
return(TRUE);
}
+ unsigned char GetAccent()
+ {
+ UCS c,d;
+ c = GetKey();
+ if ((c == '?') || (c == '!')) {
+ d = c;
+ c = '\\';
+ }
+ else
+ if ((c == 's') || (c == 'S')){
+ c = d = 's';
+ }
+ else
+ if ((c == 'l') || (c == 'L')){
+ c = d = 'l';
+ }
+ else
+ d = GetKey();
+ return accent(c,d);
+ }
+
+ int pineaccent(f,n)
+ int f,n;
+ { unsigned char e;
+
+ if (e = GetAccent())
+ execute(e, 0, 1);
+ return 1;
+ }
+
+ unsigned char accent(f,n)
+ UCS f,n;
+ { UCS c,d;
+
+ c = f;
+ d = n;
+ switch(c){
+ case '~' :
+ switch(d){
+ case 'a' : return '\343';
+ case 'n' : return '\361';
+ case 'o' : return '\365';
+ case 'A' : return '\303';
+ case 'N' : return '\321';
+ case 'O' : return '\325';
+ }
+ break;
+ case '\047' :
+ switch(d){
+ case 'a' : return '\341';
+ case 'e' : return '\351';
+ case 'i' : return '\355';
+ case 'o' : return '\363';
+ case 'u' : return '\372';
+ case 'y' : return '\375';
+ case 'A' : return '\301';
+ case 'E' : return '\311';
+ case 'I' : return '\315';
+ case 'O' : return '\323';
+ case 'U' : return '\332';
+ case 'Y' : return '\335';
+ }
+ break;
+ case '"' :
+ switch(d){
+ case 'a' : return '\344';
+ case 'e' : return '\353';
+ case 'i' : return '\357';
+ case 'o' : return '\366';
+ case 'u' : return '\374';
+ case 'y' : return '\377';
+ case 'A' : return '\304';
+ case 'E' : return '\313';
+ case 'I' : return '\317';
+ case 'O' : return '\326';
+ case 'U' : return '\334';
+ }
+ break;
+ case '^' :
+ switch(d){
+ case 'a' : return '\342';
+ case 'e' : return '\352';
+ case 'i' : return '\356';
+ case 'o' : return '\364';
+ case 'u' : return '\373';
+ case 'A' : return '\302';
+ case 'E' : return '\312';
+ case 'I' : return '\316';
+ case 'O' : return '\324';
+ case 'U' : return '\333';
+ case '0' : return '\260';
+ case '1' : return '\271';
+ case '2' : return '\262';
+ case '3' : return '\263';
+ }
+ break;
+ case '`' :
+ switch(d){
+ case 'a' : return '\340';
+ case 'e' : return '\350';
+ case 'i' : return '\354';
+ case 'o' : return '\362';
+ case 'u' : return '\371';
+ case 'A' : return '\300';
+ case 'E' : return '\310';
+ case 'I' : return '\314';
+ case 'O' : return '\322';
+ case 'U' : return '\331';
+ }
+ break;
+ case 'o' :
+ switch(d){
+ case 'a' : return '\345';
+ case 'A' : return '\305';
+ case '/' : return '\370';
+ case 'r' : return '\256';
+ case 'R' : return '\256';
+ case 'c' : return '\251';
+ case 'C' : return '\251';
+ }
+ break;
+ case '-' :
+ switch(d){
+ case 'o' : return '\272';
+ case 'O' : return '\272';
+ case '0' : return '\272';
+ case 'a' : return '\252';
+ case 'A' : return '\252';
+ case 'l' : return '\243';
+ case 'L' : return '\243';
+ }
+ break;
+ case 'O' :
+ switch(d){
+ case '/' : return '\330';
+ case 'r' : return '\256';
+ case 'R' : return '\256';
+ case 'c' : return '\251';
+ case 'C' : return '\251';
+ }
+ case '/' :
+ switch(d){
+ case 'o' : return '\370';
+ case 'O' : return '\330';
+ }
+ break;
+ case 'a' :
+ switch(d){
+ case 'e' : return '\346';
+ case 'E' : return '\346';
+ }
+ break;
+ case 'A' :
+ switch(d){
+ case 'E' : return '\306';
+ case 'e' : return '\306';
+ }
+ break;
+ case ',' :
+ switch(d){
+ case 'c' : return '\347';
+ case 'C' : return '\307';
+ }
+ break;
+ case '\\' :
+ switch(d){
+ case '?' : return '\277';
+ case '!' : return '\241';
+ }
+ break;
+ case 's' :
+ switch(d){
+ case 's' : return '\337';
+ }
+ break;
+ case 'l' :
+ switch(d){
+ case 'l' : return '\243';
+ }
+ break;
+ }
+ return '\0';
+ }
/*
* go forword to the end of the current paragraph
diff -rc alpine-2.25/pico/composer.c alpine-2.25.WrtAcc/pico/composer.c
*** alpine-2.25/pico/composer.c 2021-09-18 09:02:36.386783561 -0600
--- alpine-2.25.WrtAcc/pico/composer.c 2021-09-18 09:03:15.983056911 -0600
***************
*** 2015,2021 ****
tbufp = &strng[ods.p_len];
if(VALID_KEY(ch)){ /* char input */
! /*
* 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 ----
}
else { /* interpret ch as a command */
switch (ch = normalize_cmd(ch, ckm, 2)) {
+ case (CTRL|'\\') :
+ if (ch = GetAccent())
+ goto insert_char;
+ else
+ clearcursor();
+ break;
+
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.25/pico/display.c alpine-2.25.WrtAcc/pico/display.c
*** alpine-2.25/pico/display.c 2021-09-18 09:02:36.386783561 -0600
--- alpine-2.25.WrtAcc/pico/display.c 2021-09-18 09:03:16.279058955 -0600
***************
*** 2191,2196 ****
--- 2191,2201 ----
b = &buf[ucs4_strlen(buf)];
continue;
+ case (CTRL|'\\'):
+ if (c = GetAccent())
+ goto text;
+ continue;
+
case (CTRL|'F') : /* CTRL-F forward a char*/
case KEY_RIGHT :
if(*b == '\0')
***************
*** 2309,2315 ****
#endif
default :
!
/* look for match in extra_v */
for(i = 0; i < 12; i++)
if(c && c == extra_v[i]){
--- 2314,2320 ----
#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.25/pico/ebind.h alpine-2.25.WrtAcc/pico/ebind.h
*** alpine-2.25/pico/ebind.h 2021-09-18 09:02:36.386783561 -0600
--- alpine-2.25.WrtAcc/pico/ebind.h 2021-09-18 09:03:16.339059369 -0600
***************
*** 61,67 ****
#ifdef MOUSE
{KEY_MOUSE, mousepress},
#ifndef _WINDOWS
! {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 ****
{CTRL|KEY_HOME, gotobob},
{CTRL|KEY_END, gotoeob},
{0x7F, backdel},
! {0, NULL}
};
--- 100,108 ----
{CTRL|KEY_HOME, gotobob},
{CTRL|KEY_END, gotoeob},
{0x7F, backdel},
! {CTRL|'\\', pineaccent},
! {0,
! NULL}
};
***************
*** 123,129 ****
#ifdef MOUSE
{KEY_MOUSE, mousepress},
#ifndef _WINDOWS
! {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.25/pico/efunc.h alpine-2.25.WrtAcc/pico/efunc.h
*** alpine-2.25/pico/efunc.h 2021-09-18 09:02:36.386783561 -0600
--- alpine-2.25.WrtAcc/pico/efunc.h 2021-09-18 09:03:16.383059672 -0600
***************
*** 54,59 ****
--- 54,62 ----
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 forwpage(int, int);
extern int backpage(int, int);
extern int scrollupline(int, int);
diff -rc alpine-2.25/pico/main.c alpine-2.25.WrtAcc/pico/main.c
*** alpine-2.25/pico/main.c 2021-09-18 09:02:36.386783561 -0600
--- alpine-2.25.WrtAcc/pico/main.c 2021-09-18 09:03:16.423059949 -0600
***************
*** 458,463 ****
--- 458,469 ----
emlwrite(_("You may possibly have new mail."), NULL);
}
+ if (c == (CTRL|'\\')){
+ c = GetAccent();
+ if (!c)
+ c = NODATA;
+ }
+
if(km_popped)
switch(c){
case NODATA:

9
chappa-WrtAcc.txt
View File

@ -1,9 +0,0 @@
From: http://alpine.x10host.com/alpine/info/WrtAcc.html
Upstream: constitutes upstream source, delivered in non-tarball form
This patch allows you to write many kind of accents in Alpine and pico. You can
write characters like á. Each character is introduced using a consistent
combination of keystrokes. The first keystroke is always "^\". Then you write
the kind of accent you want to write and finally the letter over which you want
the accent to be written, so á would be written ^\'a. Other special characters
such as ß, ø and £ can be input too using special combinations described below.

7359
chappa-maildir.patch
View File

File diff suppressed because it is too large Load Diff