Hello community, here is the log from the commit of package alpine for openSUSE:Factory checked in at 2017-04-12 17:37:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alpine (Old) and /work/SRC/openSUSE:Factory/.alpine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alpine" Wed Apr 12 17:37:46 2017 rev:41 rq:487419 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/alpine/alpine.changes 2016-04-08 09:39:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.alpine.new/alpine.changes 2017-04-12 17:59:41.618133082 +0200 @@ -1,0 +2,30 @@ +Tue Mar 21 21:21:06 UTC 2017 - [email protected] + +- add chappa patch to add own rules (chappa-rules.patch) +- add chappa patch to change from header (chappa-fromheader.patch) +- add chappa patch to better justify paragraphs (chappa-fillpara.patch) +- drop empty lint.diff + +------------------------------------------------------------------- +Tue Mar 21 15:31:10 UTC 2017 - [email protected] + +- New version 2.21: + * New SHORTSUBJECT, SHORTSUBJKEY and SHORTSUBJKEYINIT token for + index format + * New SMARTTIME24 token for index screen. + * Added support for RFC 2971 - IMAP ID extension. + * SMIME: Upgrade the default signature digest from SHA-1 to + SHA-256. + * SMIME: Turn off automatic signing and encrypting of a message + when bouncing. + * The complete change list can be viewed by pressing "R" + in the Alpine main menu. +- Updated "Chappa" patches to the latest version. +- Obsolete patches: + * alpine-no-add-needed.patch + * chappa-ignoresize.patch + * chappa-unixnullbug.patch + * pico-stripwhitespace.diff + * pine-nonvoid-function.patch + +------------------------------------------------------------------- Old: ---- alpine-2.20.tar.xz alpine-no-add-needed.patch chappa-ignoresize.patch chappa-unixnullbug.patch lint.diff pico-stripwhitespace.diff pine-nonvoid-function.patch New: ---- alpine-2.21.tar.xz chappa-fillpara.patch chappa-fromheader.patch chappa-rules.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alpine.spec ++++++ --- /var/tmp/diff_new_pack.nZCMwc/_old 2017-04-12 17:59:42.661985458 +0200 +++ /var/tmp/diff_new_pack.nZCMwc/_new 2017-04-12 17:59:42.665984892 +0200 @@ -1,7 +1,7 @@ # # spec file for package alpine # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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,7 +22,7 @@ Summary: Mail User Agent License: Apache-2.0 Group: Productivity/Networking/Email/Clients -Version: 2.20 +Version: 2.21 Release: 0 Url: http://patches.freeiz.com/alpine/ @@ -31,7 +31,6 @@ Source: %name-%version.tar.xz Source1: %name.png Source2: %name.desktop -Patch1: pine-nonvoid-function.patch Patch2: make-use-of-strncat-safer.diff Patch3: operation-may-be-undefined-warning.diff Patch4: fix-implicit.patch @@ -39,21 +38,19 @@ Patch6: alpine-timestamp.patch Patch10: pico-fix-spurious-undef-warnings.diff Patch20: pine-expression-warnings.diff -Patch40: pico-stripwhitespace.diff Patch60: signal-and-panic-improvements.diff -Patch61: lint.diff # # Eduardo Chappa's patches. # http://patches.freeiz.com/alpine/ # Patch600: chappa-colortext.patch Patch601: chappa-fancy.patch -Patch602: chappa-ignoresize.patch Patch603: chappa-insertpat.patch Patch604: chappa-maildir.patch Patch605: chappa-WrtAcc.patch -Patch606: chappa-unixnullbug.patch -Patch613: alpine-no-add-needed.patch +Patch614: chappa-fillpara.patch +Patch615: chappa-fromheader.patch +Patch616: chappa-rules.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.69 BuildRequires: imap-devel @@ -121,16 +118,15 @@ # %patch600 -p1 %patch601 -p1 -%patch602 -p1 %patch603 -p1 %patch604 -p1 %patch605 -p1 -%patch606 -p1 -%patch613 -p1 +%patch614 -p1 +%patch615 -p1 +%patch616 -p1 # # SuSE patches - warning fixes, etc: # -%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 @@ -138,9 +134,7 @@ %patch6 -p1 %patch10 -p1 %patch20 -p1 -%patch40 -p1 %patch60 -p1 -%patch61 -p1 %endif # End of "if !{build_vanilla}" %build @@ -214,7 +208,7 @@ ln -sf alpine $RPM_BUILD_ROOT%{_bindir}/pine : install -m755 pico/{pico,pilot} $RPM_BUILD_ROOT%{_bindir} -install -m644 doc/{pico.1,pilot.1} $RPM_BUILD_ROOT%{_mandir}/man1/ +install -m644 doc/man1/{pico.1,pilot.1} $RPM_BUILD_ROOT%{_mandir}/man1/ %check #since where are no logs in the package at the moment, there are no checks, ++++++ alpine-2.20.tar.xz -> alpine-2.21.tar.xz ++++++ ++++ 66819 lines of diff (skipped) ++++++ alpine-timestamp.patch ++++++ --- /var/tmp/diff_new_pack.nZCMwc/_old 2017-04-12 17:59:44.769687382 +0200 +++ /var/tmp/diff_new_pack.nZCMwc/_new 2017-04-12 17:59:44.773686816 +0200 @@ -1,24 +1,3 @@ ---- - alpine/Makefile | 4 ++-- - alpine/Makefile.am | 4 ++-- - alpine/Makefile.in | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -Index: alpine-2.20/alpine/Makefile -=================================================================== ---- alpine-2.20.orig/alpine/Makefile -+++ alpine-2.20/alpine/Makefile -@@ -888,8 +888,8 @@ uninstall-am: uninstall-binPROGRAMS - - - date.c: -- echo "char datestamp[]="\"`date`\"";" > date.c -- echo "char hoststamp[]="\"`hostname`\"";" >> date.c -+ echo 'char datestamp[]="today";' > date.c -+ echo 'char hoststamp[]="sand";' >> date.c - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. Index: alpine-2.20/alpine/Makefile.am =================================================================== --- alpine-2.20.orig/alpine/Makefile.am ++++++ chappa-WrtAcc.patch ++++++ ++++ 705 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/alpine/chappa-WrtAcc.patch ++++ and /work/SRC/openSUSE:Factory/.alpine.new/chappa-WrtAcc.patch ++++++ chappa-colortext.patch ++++++ ++++ 1066 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/alpine/chappa-colortext.patch ++++ and /work/SRC/openSUSE:Factory/.alpine.new/chappa-colortext.patch ++++++ chappa-fancy.patch ++++++ ++++ 7220 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/alpine/chappa-fancy.patch ++++ and /work/SRC/openSUSE:Factory/.alpine.new/chappa-fancy.patch ++++++ chappa-fillpara.patch ++++++ ++++ 4114 lines (skipped) ++++++ chappa-fromheader.patch ++++++ diff -rc alpine-2.21/alpine/send.c alpine-2.21.fromheader/alpine/send.c *** alpine-2.21/alpine/send.c Sun Feb 5 16:02:36 2017 --- alpine-2.21.fromheader/alpine/send.c Sun Feb 5 16:15:24 2017 *************** *** 913,919 **** 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE}, {"From : ", "From", h_composer_from, 10, 0, NULL, build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL, abook_nickname_complete, ! 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, KS_TOADDRBOOK}, {"Reply-To: ", "Reply To", h_composer_reply_to, 10, 0, NULL, build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL, abook_nickname_complete, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, KS_TOADDRBOOK}, --- 913,919 ---- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE}, {"From : ", "From", h_composer_from, 10, 0, NULL, build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL, abook_nickname_complete, ! 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_TOADDRBOOK}, {"Reply-To: ", "Reply To", h_composer_reply_to, 10, 0, NULL, build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL, abook_nickname_complete, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, KS_TOADDRBOOK}, *************** *** 2367,2372 **** --- 2367,2377 ---- he->rich_header = 0; } } + if (F_ON(F_ALLOW_CHANGING_FROM, ps_global) && + !ps_global->never_allow_changing_from){ + he->display_it = 1; /* show it */ + he->rich_header = 0; + } he_from = he; break; *************** *** 3104,3110 **** if(outgoing->return_path) mail_free_address(&outgoing->return_path); ! outgoing->return_path = rfc822_cpy_adr(outgoing->from); /* * Don't ever believe the sender that is there. --- 3109,3117 ---- if(outgoing->return_path) mail_free_address(&outgoing->return_path); ! outgoing->return_path = F_ON(F_USE_DOMAIN_NAME,ps_global) ! ? rfc822_cpy_adr(generate_from()) ! : rfc822_cpy_adr(outgoing->from); /* * Don't ever believe the sender that is there. diff -rc alpine-2.21/pith/conf.c alpine-2.21.fromheader/pith/conf.c *** alpine-2.21/pith/conf.c Sun Feb 5 16:02:36 2017 --- alpine-2.21.fromheader/pith/conf.c Sun Feb 5 16:15:24 2017 *************** *** 2884,2889 **** --- 2884,2891 ---- F_NO_FCC_ATTACH, h_config_no_fcc_attach, PREF_SEND, 0}, {"fcc-on-bounce", "Include Fcc When Bouncing Messages", F_FCC_ON_BOUNCE, h_config_fcc_on_bounce, PREF_SEND, 0}, + {"return-path-uses-domain-name", NULL, + F_USE_DOMAIN_NAME, h_config_use_domain, PREF_SEND, 0}, {"mark-fcc-seen", NULL, F_MARK_FCC_SEEN, h_config_mark_fcc_seen, PREF_SEND, 0}, {"fcc-only-without-confirm", "Send to Fcc Only Without Confirming", diff -rc alpine-2.21/pith/conftype.h alpine-2.21.fromheader/pith/conftype.h *** alpine-2.21/pith/conftype.h Sun Feb 5 16:02:36 2017 --- alpine-2.21.fromheader/pith/conftype.h Sun Feb 5 16:15:24 2017 *************** *** 399,404 **** --- 399,405 ---- F_AUTO_REPLY_TO, F_VERBOSE_POST, F_FCC_ON_BOUNCE, + F_USE_DOMAIN_NAME, F_SEND_WO_CONFIRM, F_USE_SENDER_NOT_X, F_BLANK_KEYMENU, diff -rc alpine-2.21/pith/pine.hlp alpine-2.21.fromheader/pith/pine.hlp *** alpine-2.21/pith/pine.hlp Sun Feb 5 16:02:36 2017 --- alpine-2.21.fromheader/pith/pine.hlp Sun Feb 5 16:15:24 2017 *************** *** 28940,28945 **** --- 28940,28961 ---- <End of help on this topic> </BODY> </HTML> + ====== h_config_use_domain ===== + <HTML> + <HEAD> + <TITLE>FEATURE: <!--#echo var="FEAT_return-path-uses-domain-name"--> </TITLE> + </HEAD> + <BODY> + <H1>FEATURE: <!--#echo var="FEAT_return-path-uses-domain-name"--></H1> + + If you enable this configuration option Pine will use your domain name and your + username in that domain name to construct your Return-Path header, if not Pine + will use the address that you have set in the From: field to construct it. + + <P> + <End of help on this topic> + </BODY> + </HTML> ====== h_config_use_sender_not_x ===== <HTML> <HEAD> diff -rc alpine-2.21/pith/send.c alpine-2.21.fromheader/pith/send.c *** alpine-2.21/pith/send.c Sun Feb 5 16:02:36 2017 --- alpine-2.21.fromheader/pith/send.c Sun Feb 5 16:15:24 2017 *************** *** 53,59 **** /* name::type::canedit::writehdr::localcopy::rcptto */ PINEFIELD pf_template[] = { {"X-Auth-Received", FreeText, 0, 1, 1, 0}, /* N_AUTHRCVD */ ! {"From", Address, 0, 1, 1, 0}, {"Reply-To", Address, 0, 1, 1, 0}, {TONAME, Address, 1, 1, 1, 1}, {CCNAME, Address, 1, 1, 1, 1}, --- 53,59 ---- /* name::type::canedit::writehdr::localcopy::rcptto */ PINEFIELD pf_template[] = { {"X-Auth-Received", FreeText, 0, 1, 1, 0}, /* N_AUTHRCVD */ ! {"From", Address, 1, 1, 1, 0}, {"Reply-To", Address, 0, 1, 1, 0}, {TONAME, Address, 1, 1, 1, 1}, {CCNAME, Address, 1, 1, 1, 1}, *************** *** 1232,1238 **** *p = *(p+4); pf->type = pf_template[i].type; ! pf->canedit = pf_template[i].canedit; pf->rcptto = pf_template[i].rcptto; pf->writehdr = pf_template[i].writehdr; pf->localcopy = pf_template[i].localcopy; --- 1232,1238 ---- *p = *(p+4); pf->type = pf_template[i].type; ! pf->canedit = (i == N_FROM) ? CAN_EDIT(ps_global) : pf_template[i].canedit; pf->rcptto = pf_template[i].rcptto; pf->writehdr = pf_template[i].writehdr; pf->localcopy = pf_template[i].localcopy; diff -rc alpine-2.21/pith/send.h alpine-2.21.fromheader/pith/send.h *** alpine-2.21/pith/send.h Sun Feb 5 16:02:36 2017 --- alpine-2.21.fromheader/pith/send.h Sun Feb 5 16:15:24 2017 *************** *** 159,164 **** --- 159,166 ---- unsigned text_written:1; }; + #define CAN_EDIT(x) (!((x)->never_allow_changing_from) && \ + F_ON(F_ALLOW_CHANGING_FROM, (x))) #define TONAME "To" #define CCNAME "cc" ++++++ chappa-insertpat.patch ++++++ --- /var/tmp/diff_new_pack.nZCMwc/_old 2017-04-12 17:59:44.873672676 +0200 +++ /var/tmp/diff_new_pack.nZCMwc/_new 2017-04-12 17:59:44.873672676 +0200 @@ -1,43 +1,40 @@ ---- - pico/display.c | 12 ++++++++++++ - pico/search.c | 4 ++++ - 2 files changed, 16 insertions(+) - -Index: alpine-2.20/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; - -+ case (CTRL|'N'): /* Insert pattern */ -+ if (pat[0] != '\0'){ -+ ucs4_strncpy(buf+ucs4_strlen(buf), pat, NPAT); -+ pputs(pat,1); -+ b = &buf[ucs4_strlen(buf)]; -+ dline.vused += ucs4_strlen(pat); -+ changed = TRUE; -+ } -+ else -+ (*term.t_beep)(); -+ continue; -+ - case (CTRL|'G') : /* CTRL-G help */ - if(term.t_mrow == 0 && km_popped == 0){ - movecursor(term.t_nrow-2, 0); -Index: alpine-2.20/pico/search.c -=================================================================== ---- 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."), - " ", -+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."), - " ", +diff -rc alpine-2.21/pico/display.c alpine-2.21.insertpat/pico/display.c +*** alpine-2.21/pico/display.c Sun Feb 5 16:02:36 2017 +--- alpine-2.21.insertpat/pico/display.c Sun Feb 5 16:15:26 2017 +*************** +*** 2205,2210 **** +--- 2205,2222 ---- + + continue; + ++ case (CTRL|'N'): /* Insert pattern */ ++ if (pat[0] != '\0'){ ++ ucs4_strncpy(buf+ucs4_strlen(buf), pat, NPAT); ++ pputs(pat,1); ++ b = &buf[ucs4_strlen(buf)]; ++ dline.vused += ucs4_strlen(pat); ++ changed = TRUE; ++ } ++ else ++ (*term.t_beep)(); ++ continue; ++ + case (CTRL|'G') : /* CTRL-G help */ + if(term.t_mrow == 0 && km_popped == 0){ + movecursor(term.t_nrow-2, 0); +diff -rc alpine-2.21/pico/search.c alpine-2.21.insertpat/pico/search.c +*** alpine-2.21/pico/search.c Sun Feb 5 16:02:36 2017 +--- alpine-2.21.insertpat/pico/search.c Sun Feb 5 16:15:26 2017 +*************** +*** 122,127 **** +--- 122,131 ---- + 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_(" The text search is not case sensitive, and will examine the"), + N_(" entire message."), + " ", ++++++ chappa-maildir.patch ++++++ ++++ 7525 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/alpine/chappa-maildir.patch ++++ and /work/SRC/openSUSE:Factory/.alpine.new/chappa-maildir.patch ++++++ chappa-rules.patch ++++++ ++++ 6242 lines (skipped)
