Hello community, here is the log from the commit of package alpine for openSUSE:Factory checked in at 2015-03-30 19:33:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alpine (Old) and /work/SRC/openSUSE:Factory/.alpine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "alpine" Changes: -------- --- /work/SRC/openSUSE:Factory/alpine/alpine.changes 2014-03-12 14:45:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.alpine.new/alpine.changes 2015-03-30 19:33:59.000000000 +0200 @@ -1,0 +2,48 @@ +Wed Mar 25 16:59:29 UTC 2015 - jengelh@inai.de + +- Update to new upstream release 2.20 +* Upgrade UW-IMAP to Panda IMAP from github.com/jonabbey/panda-imap +* S/MIME: Add screen to manage certificates. +* S/MIME: Signatures are validated using the user's certificates + instead of the ones included in the message. Behavior can be + disabled by disabling the option "Validate Using Certificate + Store Only" which is enabled by default. +* S/MIME: add the sender certificate to the list of certificates + in encrypted messages to make it possible for the sender to + decrypt the message they sent. +* S/MIME: Forwarding a message will include the signed part as part + of the text and not as a multipart message, just as the reply + command does. +* Add support to selective expunge through a subcommand of the + select-apply commands. +* Pico: New subcommand of the search command, allows to reverse the + direction of search. +* Add /tls1, /tls1_1, /tls1_2 and /dtls1 to the definition of a + server to use different ways to connect using ssl, for example + {server.com/tls1} will attempt to connect to server.com at the + ssl imap port (port 993) and establish a connection using TLSv1. + These flags can be used in conjunction with the /ssl flag, the + ssl flag is redundant. Conversely, however, the /ssl flag does + not imply any of these flags; the /ssl flag means SSLv3 or, if + not available, SSLv2 in the SSL port. +* Alpine does not attempt to automatically reopen a collection that + was not opened due to cancellation by the user. Instead, the user + must try to open it explicitly. +* Experimental: Write the content-type of a message in lowercase, + as some non-compliant servers do not understand uppercase + content-type. +* Opening a folder updates recent count in maildrops (this + already works for other types of folders) +* Pico: Justification works without need of a predefined quote + string. This allows justification of blocks of text that are + indented with spaces. +* Decode the name of attachment names, so they can be written as + part of the description of the part. +* Replace tabs by spaces in From and Subject fields to control for + size in screen of these fields. Change only in index screen + display. +- Drop alpine-month_name-utf8.patch (solved differently upstream), + drop alpine-mime-type-workaround.patch (merged upstream) +- Add lint.diff to workaround new source code problems + +------------------------------------------------------------------- Old: ---- alpine-2.11.tar.xz alpine-mime-type-workaround.patch alpine-month_name-utf8.patch New: ---- alpine-2.20.tar.xz lint.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alpine.spec ++++++ --- /var/tmp/diff_new_pack.uOcWEr/_old 2015-03-30 19:34:00.000000000 +0200 +++ /var/tmp/diff_new_pack.uOcWEr/_new 2015-03-30 19:34:00.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package alpine # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,11 +22,13 @@ Summary: Mail User Agent License: Apache-2.0 Group: Productivity/Networking/Email/Clients -Version: 2.11 +Version: 2.20 Release: 0 Url: http://patches.freeiz.com/alpine/ -Source: http://patches.freeiz.com/alpine/release/src/%name-%version.tar.xz +# direct download does not work for openSUSE:Factory +# Source: http://patches.freeiz.com/alpine/release/src/%name-%version.tar.xz +Source: %name-%version.tar.xz Source1: %name.png Source2: %name.desktop Patch1: pine-nonvoid-function.patch @@ -34,12 +36,11 @@ Patch3: operation-may-be-undefined-warning.diff Patch4: fix-implicit.patch Patch5: alpine-gcc44.diff -Patch7: alpine-month_name-utf8.patch Patch10: pico-fix-spurious-undef-warnings.diff Patch20: pine-expression-warnings.diff Patch40: pico-stripwhitespace.diff Patch60: signal-and-panic-improvements.diff -Patch61: alpine-mime-type-workaround.patch +Patch61: lint.diff # # Eduardo Chappa's patches. # http://patches.freeiz.com/alpine/ @@ -64,8 +65,8 @@ BuildRequires: pam-devel BuildRequires: update-desktop-files BuildRequires: xz -# pgp4pine requires pine: -Provides: pine +# pgp4pine requires pine: (6.20 is what alpine writes to ~/.pinerc) +Provides: pine = 6.20 Obsoletes: pine4 Provides: pine4 @@ -134,7 +135,6 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch7 -p1 %patch10 -p1 %patch20 -p1 %patch40 -p1 @@ -275,7 +275,7 @@ %doc %{_mandir}/man1/rpload.* %doc %{_mandir}/man1/mailutil.* %doc README NOTICE LICENSE -%doc doc/mailcap.unx doc/mime.types doc/tech-notes.txt doc/tech-notes/*.html +%doc doc/mailcap.unx doc/mime.types doc/tech-notes/tech-notes.txt doc/tech-notes/*.html %{_bindir}/*pine %{_bindir}/alpinef %{_bindir}/rp* ++++++ alpine-2.11.tar.xz -> alpine-2.20.tar.xz ++++++ ++++ 161922 lines of diff (skipped) ++++++ alpine-gcc44.diff ++++++ --- /var/tmp/diff_new_pack.uOcWEr/_old 2015-03-30 19:34:03.000000000 +0200 +++ /var/tmp/diff_new_pack.uOcWEr/_new 2015-03-30 19:34:03.000000000 +0200 @@ -3,11 +3,11 @@ pith/send.c | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) -Index: alpine-2.11/imap/src/osdep/unix/dummy.c +Index: alpine-2.20/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 +--- alpine-2.20.orig/imap/src/osdep/unix/dummy.c ++++ alpine-2.20/imap/src/osdep/unix/dummy.c +@@ -734,6 +734,17 @@ long dummy_copy (MAILSTREAM *stream,char return NIL; } @@ -25,7 +25,7 @@ /* Dummy append message string * Accepts: mail stream -@@ -755,8 +766,7 @@ long dummy_append (MAILSTREAM *stream,ch +@@ -753,8 +764,7 @@ long dummy_append (MAILSTREAM *stream,ch /* append to INBOX? */ if (!compare_cstring (mailbox,"INBOX")) { /* yes, if no empty proto try creating */ @@ -35,12 +35,12 @@ } else if (dummy_file (tmp,mailbox) && ((fd = open (tmp,O_RDONLY,NIL)) < 0)) { if ((e = errno) == ENOENT) /* failed, was it no such file? */ -Index: alpine-2.11/pith/send.c +Index: alpine-2.20/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); +--- alpine-2.20.orig/pith/send.c ++++ alpine-2.20/pith/send.c +@@ -4159,6 +4159,7 @@ set_parameter(PARAMETER **param, char *p + pm->value = cpystr(new_value); } } + return 0; ++++++ chappa-WrtAcc.patch ++++++ --- /var/tmp/diff_new_pack.uOcWEr/_old 2015-03-30 19:34:03.000000000 +0200 +++ /var/tmp/diff_new_pack.uOcWEr/_new 2015-03-30 19:34:03.000000000 +0200 @@ -8,11 +8,11 @@ pico/search.c | 6 - 7 files changed, 214 insertions(+), 8 deletions(-) -Index: alpine-2.11/pico/basic.c +Index: alpine-2.20/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) +--- alpine-2.20.orig/pico/basic.c ++++ alpine-2.20/pico/basic.c +@@ -342,6 +342,189 @@ gotobop(int f, int n) return(TRUE); } @@ -202,10 +202,10 @@ /* * go forword to the end of the current paragraph -Index: alpine-2.11/pico/composer.c +Index: alpine-2.20/pico/composer.c =================================================================== ---- alpine-2.11.orig/pico/composer.c -+++ alpine-2.11/pico/composer.c +--- alpine-2.20.orig/pico/composer.c ++++ alpine-2.20/pico/composer.c @@ -2015,7 +2015,7 @@ LineEdit(int allowedit, UCS *lastch) tbufp = &strng[ods.p_len]; @@ -229,10 +229,10 @@ case (CTRL|KEY_LEFT): /* word skip left */ if(ods.p_ind > 0) /* Scoot one char left if possible */ ods.p_ind--; -Index: alpine-2.11/pico/display.c +Index: alpine-2.20/pico/display.c =================================================================== ---- alpine-2.11.orig/pico/display.c -+++ alpine-2.11/pico/display.c +--- alpine-2.20.orig/pico/display.c ++++ alpine-2.20/pico/display.c @@ -1751,6 +1751,11 @@ mlreplyd(UCS *prompt, UCS *buf, int nbuf b = &buf[ucs4_strlen(buf)]; continue; @@ -254,10 +254,10 @@ /* look for match in extra_v */ for(i = 0; i < 12; i++) if(c && c == extra_v[i]){ -Index: alpine-2.11/pico/ebind.h +Index: alpine-2.20/pico/ebind.h =================================================================== ---- alpine-2.11.orig/pico/ebind.h -+++ alpine-2.11/pico/ebind.h +--- alpine-2.20.orig/pico/ebind.h ++++ alpine-2.20/pico/ebind.h @@ -61,7 +61,7 @@ KEYTAB keytab[NBINDS] = { #ifdef MOUSE {KEY_MOUSE, mousepress}, @@ -287,10 +287,10 @@ #endif #endif {CTRL|'A', gotobol}, -Index: alpine-2.11/pico/efunc.h +Index: alpine-2.20/pico/efunc.h =================================================================== ---- alpine-2.11.orig/pico/efunc.h -+++ alpine-2.11/pico/efunc.h +--- alpine-2.20.orig/pico/efunc.h ++++ alpine-2.20/pico/efunc.h @@ -54,6 +54,9 @@ extern int forwline(int, int); extern int backline(int, int); extern int gotobop(int, int); @@ -301,10 +301,10 @@ extern int forwpage(int, int); extern int backpage(int, int); extern int scrollupline(int, int); -Index: alpine-2.11/pico/main.c +Index: alpine-2.20/pico/main.c =================================================================== ---- alpine-2.11.orig/pico/main.c -+++ alpine-2.11/pico/main.c +--- alpine-2.20.orig/pico/main.c ++++ alpine-2.20/pico/main.c @@ -416,6 +416,12 @@ main(int argc, char *argv[]) emlwrite(_("You may possibly have new mail."), NULL); } @@ -318,21 +318,21 @@ if(km_popped) switch(c){ case NODATA: -Index: alpine-2.11/pico/search.c +Index: alpine-2.20/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) +--- alpine-2.20.orig/pico/search.c ++++ alpine-2.20/pico/search.c +@@ -291,7 +291,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((unsigned char)defpat[status],lgetc(curwp->w_dotp, curwp->w_doto + status).c)) - break; /* do nothing! */ ++ !eq((unsigned char) defpat[status],lgetc(curwp->w_dotp, curwp->w_doto + status).c)) + break; status++; } -@@ -931,7 +931,7 @@ forscan(int *wrapt, /* boolean indicatin - c = lgetc(curline, curoff++).c; /* get the char */ +@@ -1096,7 +1096,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..*/ @@ -340,7 +340,7 @@ /* setup match pointers */ matchline = curline; matchoff = curoff; -@@ -952,7 +952,7 @@ forscan(int *wrapt, /* boolean indicatin +@@ -1117,7 +1117,7 @@ forscan(int *wrapt, /* boolean indicatin return(FALSE); /* and test it against the pattern */ ++++++ chappa-colortext.patch ++++++ --- /var/tmp/diff_new_pack.uOcWEr/_old 2015-03-30 19:34:03.000000000 +0200 +++ /var/tmp/diff_new_pack.uOcWEr/_new 2015-03-30 19:34:03.000000000 +0200 @@ -11,11 +11,11 @@ pith/text.c | 9 ++ 10 files changed, 308 insertions(+) -Index: alpine-2.11/alpine/confscroll.c +Index: alpine-2.20/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 +--- alpine-2.20.orig/alpine/confscroll.c ++++ alpine-2.20/alpine/confscroll.c +@@ -5196,6 +5196,9 @@ fix_side_effects(struct pine *ps, struct clear_index_cache(ps->mail_stream, 0); } @@ -25,10 +25,10 @@ else if(var == &ps->vars[V_INIT_CMD_LIST]){ if(!revert) q_status_message(SM_ASYNC, 0, 3, -Index: alpine-2.11/pith/conf.c +Index: alpine-2.20/pith/conf.c =================================================================== ---- alpine-2.11.orig/pith/conf.c -+++ alpine-2.11/pith/conf.c +--- alpine-2.20.orig/pith/conf.c ++++ alpine-2.20/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."; @@ -38,7 +38,7 @@ 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."; -@@ -560,6 +562,8 @@ static struct variable variables[] = { +@@ -562,6 +564,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}, @@ -47,7 +47,7 @@ {"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, -@@ -817,6 +821,8 @@ static struct variable variables[] = { +@@ -821,6 +825,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}, @@ -56,7 +56,7 @@ {"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}, -@@ -1985,6 +1991,8 @@ init_vars(struct pine *ps, void (*cmds_f +@@ -1990,6 +1996,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); @@ -65,7 +65,7 @@ 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); -@@ -6483,6 +6491,7 @@ set_current_color_vals(struct pine *ps) +@@ -6549,6 +6557,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); @@ -73,7 +73,7 @@ set_current_val(&ps->vars[V_INDEX_TOKEN_COLORS], TRUE, TRUE); set_current_val(&ps->vars[V_VIEW_HDR_COLORS], TRUE, TRUE); -@@ -7664,6 +7673,8 @@ config_help(int var, int feature) +@@ -7732,6 +7741,8 @@ config_help(int var, int feature) return(h_config_scroll_margin); case V_DEADLETS : return(h_config_deadlets); @@ -82,7 +82,7 @@ case V_FILLCOL : return(h_config_composer_wrap_column); case V_TCPOPENTIMEO : -@@ -7829,6 +7840,9 @@ config_help(int var, int feature) +@@ -7897,6 +7908,9 @@ config_help(int var, int feature) case V_SIGNATURE_FORE_COLOR : case V_SIGNATURE_BACK_COLOR : return(h_config_signature_color); @@ -92,10 +92,10 @@ case V_PROMPT_FORE_COLOR : case V_PROMPT_BACK_COLOR : return(h_config_prompt_color); -Index: alpine-2.11/pith/conf.h +Index: alpine-2.20/pith/conf.h =================================================================== ---- alpine-2.11.orig/pith/conf.h -+++ alpine-2.11/pith/conf.h +--- alpine-2.20.orig/pith/conf.h ++++ alpine-2.20/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 @@ -105,7 +105,7 @@ #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 -@@ -456,6 +458,8 @@ +@@ -458,6 +460,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 @@ -114,10 +114,10 @@ #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 -Index: alpine-2.11/pith/conftype.h +Index: alpine-2.20/pith/conftype.h =================================================================== ---- alpine-2.11.orig/pith/conftype.h -+++ alpine-2.11/pith/conftype.h +--- alpine-2.20.orig/pith/conftype.h ++++ alpine-2.20/pith/conftype.h @@ -80,6 +80,7 @@ typedef enum { V_PERSONAL_NAME = 0 , V_EDITOR , V_SPELLER @@ -126,7 +126,7 @@ , V_REPLY_STRING , V_REPLY_INTRO , V_QUOTE_REPLACE_STRING -@@ -230,6 +231,8 @@ typedef enum { V_PERSONAL_NAME = 0 +@@ -231,6 +232,8 @@ typedef enum { V_PERSONAL_NAME = 0 , V_INCUNSEEN_BACK_COLOR , V_SIGNATURE_FORE_COLOR , V_SIGNATURE_BACK_COLOR @@ -135,10 +135,10 @@ , V_PROMPT_FORE_COLOR , V_PROMPT_BACK_COLOR , V_HEADER_GENERAL_FORE_COLOR -Index: alpine-2.11/pith/mailview.c +Index: alpine-2.20/pith/mailview.c =================================================================== ---- alpine-2.11.orig/pith/mailview.c -+++ alpine-2.11/pith/mailview.c +--- alpine-2.20.orig/pith/mailview.c ++++ alpine-2.20/pith/mailview.c @@ -282,6 +282,14 @@ format_body(long int msgno, BODY *body, if((flgs & FM_DISPLAY) && !(flgs & FM_NOCOLOR) @@ -345,10 +345,10 @@ /* * The argument fieldname is something like "Subject:..." or "Subject". -Index: alpine-2.11/pith/mailview.h +Index: alpine-2.20/pith/mailview.h =================================================================== ---- alpine-2.11.orig/pith/mailview.h -+++ alpine-2.11/pith/mailview.h +--- alpine-2.20.orig/pith/mailview.h ++++ alpine-2.20/pith/mailview.h @@ -30,6 +30,12 @@ #include "../pith/color.h" @@ -378,11 +378,11 @@ /* * BUG: BELOW IS UNIX/PC ONLY since config'd browser means nothing to webpine -Index: alpine-2.11/pith/pine.hlp +Index: alpine-2.20/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 +--- alpine-2.20.orig/pith/pine.hlp ++++ alpine-2.20/pith/pine.hlp +@@ -3833,6 +3833,7 @@ There are also additional details on
  • OPTION:
  • OPTION:
  • OPTION: @@ -390,7 +390,7 @@
  • OPTION:
  • OPTION: Print-Font-Char-Set
  • OPTION: Print-Font-Name -@@ -3591,6 +3592,7 @@ There are also additional details on +@@ -3861,6 +3862,7 @@ There are also additional details on
  • OPTION:
  • OPTION:
  • OPTION: Signature Color @@ -398,7 +398,7 @@
  • OPTION:
  • OPTION:
  • OPTION: -@@ -22838,6 +22840,43 @@ That won't work because spell works in a +@@ -23234,6 +23236,43 @@ That won't work because spell works in a <End of help on this topic> @@ -442,7 +442,7 @@ ====== h_config_display_filters ===== -@@ -31455,6 +31494,30 @@ the Quote3 Color is black characters on +@@ -31851,6 +31890,30 @@ the Quote3 Color is black characters on

    Descriptions of the available commands

    @@ -473,10 +473,10 @@ Look here to see the available Editing and Navigation commands.

    -Index: alpine-2.11/pith/state.c +Index: alpine-2.20/pith/state.c =================================================================== ---- alpine-2.11.orig/pith/state.c -+++ alpine-2.11/pith/state.c +--- alpine-2.20.orig/pith/state.c ++++ alpine-2.20/pith/state.c @@ -131,6 +131,9 @@ free_pine_struct(struct pine **pps) if((*pps)->folders_dir != NULL) fs_give((void **)&(*pps)->folders_dir); @@ -487,11 +487,11 @@ if((*pps)->ui.homedir) fs_give((void **)&(*pps)->ui.homedir); -Index: alpine-2.11/pith/state.h +Index: alpine-2.20/pith/state.h =================================================================== ---- alpine-2.11.orig/pith/state.h -+++ alpine-2.11/pith/state.h -@@ -326,6 +326,8 @@ struct pine { +--- alpine-2.20.orig/pith/state.h ++++ alpine-2.20/pith/state.h +@@ -331,6 +331,8 @@ struct pine { char *display_charmap; /* needs to be freed */ char *keyboard_charmap; /* needs to be freed */ void *input_cs; @@ -500,10 +500,10 @@ char *posting_charmap; /* needs to be freed */ -Index: alpine-2.11/pith/text.c +Index: alpine-2.20/pith/text.c =================================================================== ---- alpine-2.11.orig/pith/text.c -+++ alpine-2.11/pith/text.c +--- alpine-2.20.orig/pith/text.c ++++ alpine-2.20/pith/text.c @@ -171,6 +171,15 @@ decode_text(ATTACH_S *att, gf_url_hilite_opt(&uh,handlesp,0)); } ++++++ chappa-fancy.patch ++++++ ++++ 810 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/alpine/chappa-fancy.patch ++++ and /work/SRC/openSUSE:Factory/.alpine.new/chappa-fancy.patch ++++++ chappa-ignoresize.patch ++++++ --- /var/tmp/diff_new_pack.uOcWEr/_old 2015-03-30 19:34:03.000000000 +0200 +++ /var/tmp/diff_new_pack.uOcWEr/_new 2015-03-30 19:34:03.000000000 +0200 @@ -6,11 +6,11 @@ pith/save.c | 1 + 5 files changed, 42 insertions(+) -Index: alpine-2.11/alpine/mailcmd.c +Index: alpine-2.20/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 +--- alpine-2.20.orig/alpine/mailcmd.c ++++ alpine-2.20/alpine/mailcmd.c +@@ -3491,6 +3491,9 @@ save_size_changed_prompt(long msgno, int {-1, 0, NULL, NULL} }; @@ -20,11 +20,11 @@ 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"); -Index: alpine-2.11/pith/conf.c +Index: alpine-2.20/pith/conf.c =================================================================== ---- alpine-2.11.orig/pith/conf.c -+++ alpine-2.11/pith/conf.c -@@ -3123,6 +3123,8 @@ feature_list(int index) +--- alpine-2.20.orig/pith/conf.c ++++ alpine-2.20/pith/conf.c +@@ -3140,6 +3140,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}, @@ -33,11 +33,11 @@ {"maildrops-preserve-state", NULL, F_MAILDROPS_PRESERVE_STATE, h_config_maildrops_preserve_state, PREF_MISC, 0}, -Index: alpine-2.11/pith/conftype.h +Index: alpine-2.20/pith/conftype.h =================================================================== ---- alpine-2.11.orig/pith/conftype.h -+++ alpine-2.11/pith/conftype.h -@@ -346,6 +346,7 @@ typedef enum { +--- alpine-2.20.orig/pith/conftype.h ++++ alpine-2.20/pith/conftype.h +@@ -347,6 +347,7 @@ typedef enum { F_FORCE_ARROW, F_PRUNE_USES_ISO, F_ALT_ED_NOW, @@ -45,11 +45,11 @@ F_SHOW_DELAY_CUE, F_CANCEL_CONFIRM, F_AUTO_OPEN_NEXT_UNREAD, -Index: alpine-2.11/pith/pine.hlp +Index: alpine-2.20/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 +--- alpine-2.20.orig/pith/pine.hlp ++++ alpine-2.20/pith/pine.hlp +@@ -3565,6 +3565,7 @@ There are also additional details on

  • FEATURE:
  • FEATURE:
  • FEATURE: @@ -57,7 +57,7 @@
  • FEATURE:
  • FEATURE:
  • FEATURE: -@@ -30787,6 +30788,40 @@ but that is not implemented. +@@ -31183,6 +31184,40 @@ but that is not implemented.

    <End of help on this topic> @@ -98,10 +98,10 @@ ====== h_config_force_low_speed ===== -Index: alpine-2.11/pith/save.c +Index: alpine-2.20/pith/save.c =================================================================== ---- alpine-2.11.orig/pith/save.c -+++ alpine-2.11/pith/save.c +--- alpine-2.20.orig/pith/save.c ++++ alpine-2.20/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", ++++++ chappa-insertpat.patch ++++++ --- /var/tmp/diff_new_pack.uOcWEr/_old 2015-03-30 19:34:03.000000000 +0200 +++ /var/tmp/diff_new_pack.uOcWEr/_new 2015-03-30 19:34:03.000000000 +0200 @@ -3,10 +3,10 @@ pico/search.c | 4 ++++ 2 files changed, 16 insertions(+) -Index: alpine-2.11/pico/display.c +Index: alpine-2.20/pico/display.c =================================================================== ---- alpine-2.11.orig/pico/display.c -+++ alpine-2.11/pico/display.c +--- alpine-2.20.orig/pico/display.c ++++ alpine-2.20/pico/display.c @@ -1760,6 +1760,18 @@ mlreplyd(UCS *prompt, UCS *buf, int nbuf continue; @@ -26,11 +26,11 @@ case (CTRL|'G') : /* CTRL-G help */ if(term.t_mrow == 0 && km_popped == 0){ movecursor(term.t_nrow-2, 0); -Index: alpine-2.11/pico/search.c +Index: alpine-2.20/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 +--- alpine-2.20.orig/pico/search.c ++++ alpine-2.20/pico/search.c +@@ -81,6 +81,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."), " ", ++++++ chappa-maildir.patch ++++++ ++++ 669 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/alpine/chappa-maildir.patch ++++ and /work/SRC/openSUSE:Factory/.alpine.new/chappa-maildir.patch ++++++ chappa-unixnullbug.patch ++++++ --- /var/tmp/diff_new_pack.uOcWEr/_old 2015-03-30 19:34:03.000000000 +0200 +++ /var/tmp/diff_new_pack.uOcWEr/_new 2015-03-30 19:34:03.000000000 +0200 @@ -2,11 +2,11 @@ imap/src/c-client/mail.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -Index: alpine-2.11/imap/src/c-client/mail.c +Index: alpine-2.20/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 +--- alpine-2.20.orig/imap/src/c-client/mail.c ++++ alpine-2.20/imap/src/c-client/mail.c +@@ -3400,13 +3400,13 @@ unsigned long mail_filter (char *text,un long flags) { STRINGLIST *hdrs; @@ -22,7 +22,7 @@ while (src < end) { /* process header */ /* slurp header line name */ for (s = src,e = s + MAILTMPLEN - 1,e = (e < end ? e : end),t = tmp; -@@ -3406,6 +3406,10 @@ unsigned long mail_filter (char *text,un +@@ -3447,6 +3447,10 @@ unsigned long mail_filter (char *text,un } } *dst = '\0'; /* tie off destination */ ++++++ lint.diff ++++++ From: Jan Engelhardt Date: 2015-03-25 18:25:22.663262139 +0100 rpmlint: W: alpine implicit-pointer-decl dmail.c:160 W: alpine implicit-pointer-decl mlock.c:114 W: alpine implicit-pointer-decl tmail.c:168 E: alpine no-return-in-nonvoid-function imap.c:2790 gcc: dmail.c:160:5: warning: implicit declaration of function 'isdigit' [-Wimplicit-function-declaration] mlock.c:114:5: warning: implicit declaration of function 'time' [-Wimplicit-function-declaration] tmail.c:168:7: warning: implicit declaration of function 'isdigit' [-Wimplicit-function-declaration] imap.c:2790:1: warning: control reaches end of non-void function [-Wreturn-type] --- alpine/imap.c | 1 + imap/src/dmail/dmail.c | 1 + imap/src/mlock/mlock.c | 1 + imap/src/tmail/tmail.c | 1 + 4 files changed, 4 insertions(+) Index: alpine-2.20/alpine/imap.c =================================================================== --- alpine-2.20.orig/alpine/imap.c +++ alpine-2.20/alpine/imap.c @@ -2786,6 +2786,7 @@ if(F_OFF(F_DISABLE_PASSWORD_FILE_SAVING, return(want_to(_("Preserve password on DISK for next login"), 'y', 'x', NO_HELP, WT_NORM) == 'y'); +return 0; #endif /* PASSFILE */ } Index: alpine-2.20/imap/src/dmail/dmail.c =================================================================== --- alpine-2.20.orig/imap/src/dmail/dmail.c +++ alpine-2.20/imap/src/dmail/dmail.c @@ -24,6 +24,7 @@ * */ +#include #include #include #include Index: alpine-2.20/imap/src/mlock/mlock.c =================================================================== --- alpine-2.20.orig/imap/src/mlock/mlock.c +++ alpine-2.20/imap/src/mlock/mlock.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include Index: alpine-2.20/imap/src/tmail/tmail.c =================================================================== --- alpine-2.20.orig/imap/src/tmail/tmail.c +++ alpine-2.20/imap/src/tmail/tmail.c @@ -23,6 +23,7 @@ * */ +#include #include #include #include ++++++ operation-may-be-undefined-warning.diff ++++++ --- /var/tmp/diff_new_pack.uOcWEr/_old 2015-03-30 19:34:03.000000000 +0200 +++ /var/tmp/diff_new_pack.uOcWEr/_new 2015-03-30 19:34:03.000000000 +0200 @@ -1,26 +1,12 @@ --- - alpine/folder.c | 2 +- imap/src/c-client/mail.c | 10 ++++++++-- - 2 files changed, 9 insertions(+), 3 deletions(-) + 1 file changed, 8 insertions(+), 2 deletions(-) -Index: alpine-2.11/alpine/folder.c +Index: alpine-2.20/imap/src/c-client/mail.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 */ -- *cmp = ++(*cmp) % 3; -+ *cmp = ((*cmp) + 1) % 3; - continue; - - case -1 : /* cancel */ -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, +--- alpine-2.20.orig/imap/src/c-client/mail.c ++++ alpine-2.20/imap/src/c-client/mail.c +@@ -2979,8 +2979,14 @@ long mail_parse_date (MESSAGECACHE *elt, /* parse time */ d = strtoul (s+1,(char **) &s,10); if (*s != ':') return NIL;