Hello community, here is the log from the commit of package alpine for openSUSE:Factory checked in at 2020-05-12 22:34:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alpine (Old) and /work/SRC/openSUSE:Factory/.alpine.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alpine" Tue May 12 22:34:54 2020 rev:46 rq:802949 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/alpine/alpine.changes 2019-09-05 12:42:55.423472189 +0200 +++ /work/SRC/openSUSE:Factory/.alpine.new.2738/alpine.changes 2020-05-12 22:36:30.136391535 +0200 @@ -1,0 +2,28 @@ +Thu May 7 20:32:03 UTC 2020 - Jan Engelhardt <[email protected]> + +- Update to release 2.22 + * Support for XOAUTH2 authentication method in Gmail. + * NTLM authentication support with the ntlm library. + * Added the "/tls1_3" flag for servers that support it. + * Add the "g" option to the select command that works in IMAP + servers that implement the X-GM-EXT-1 capability (such as the + one offered by Gmail). + * Added "/auth=XYZ" to the way to define a server. This allows + users to select the method to authenticate to an IMAP, SMTP + or POP3 server. Examples are /auth=plain, or /auth=gssapi, + etc. + * When a message is of type multipart/mixed, and its first part + is multipart/signed, Alpine will include the text of the + original message in a reply message, instead of including a + multipart attachment. + * Added backward search in the index screen. + * pico: Add -dict option to Pico, which allows users to choose a + dictionary when spelling. +- Drop /usr/bin/mailutil, it is not built by default anymore. +- Remove alpine-pinepw.patch (merged upstream) +- Add description files for patches 600-616. These live in a + separate file because (a) upstream does not offer the description + as part of the patch file, (b) redownloading the patches would + nuke any added description due to <a>. + +------------------------------------------------------------------- Old: ---- alpine-2.21.tar.xz alpine-pinepw.patch New: ---- UPDATING.txt alpine-2.22.tar.xz chappa-WrtAcc.txt chappa-colortext.txt chappa-fancy.txt chappa-fillpara.txt chappa-fromheader.txt chappa-insertpat.txt chappa-maildir.txt chappa-rules.txt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alpine.spec ++++++ --- /var/tmp/diff_new_pack.LuIn60/_old 2020-05-12 22:36:55.908445319 +0200 +++ /var/tmp/diff_new_pack.LuIn60/_new 2020-05-12 22:36:55.912445327 +0200 @@ -1,7 +1,7 @@ # # spec file for package alpine # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # 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.21 +Version: 2.22 Release: 0 URL: http://alpine.x10host.com/alpine/ @@ -31,12 +31,12 @@ Source: %name-%version.tar.xz Source1: %name.png Source2: %name.desktop +Source9: UPDATING.txt Patch2: make-use-of-strncat-safer.diff Patch3: operation-may-be-undefined-warning.diff Patch4: fix-implicit.patch Patch5: alpine-gcc44.diff Patch6: alpine-timestamp.patch -Patch7: alpine-pinepw.patch Patch10: pico-fix-spurious-undef-warnings.diff Patch20: pine-expression-warnings.diff Patch60: signal-and-panic-improvements.diff @@ -45,13 +45,21 @@ # Eduardo Chappa's patches. # http://patches.freeiz.com/alpine/ # +Source600: chappa-colortext.txt Patch600: chappa-colortext.patch +Source601: chappa-fancy.txt Patch601: chappa-fancy.patch +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 Patch615: chappa-fromheader.patch +Source616: chappa-rules.txt Patch616: chappa-rules.patch BuildRequires: autoconf >= 2.69 BuildRequires: krb5-devel @@ -132,7 +140,6 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 %patch10 -p1 %patch20 -p1 %patch60 -p1 @@ -196,13 +203,11 @@ make %{?_smp_mflags} EXTRACFLAGS="$CFLAGS" EXTRALDFLAGS="$EXTRALDFLAGS" %install -make install DESTDIR=%buildroot +%make_install # # When called as alpinef, alpine uses function keys instead of Control keys: # ln %{buildroot}/%{_bindir}/alpine %{buildroot}/%{_bindir}/alpinef -install -m755 imap/mailutil/mailutil %{buildroot}/%{_bindir} -install -m644 imap/src/mailutil/mailutil.1 %{buildroot}/%{_mandir}/man1/ install -D -m644 %{SOURCE1} %{buildroot}/%{_datadir}/pixmaps/%name.png install -D -m644 %{SOURCE2} %{buildroot}/%{_datadir}/applications/%name.desktop %suse_update_desktop_file %name @@ -213,8 +218,8 @@ install -m644 doc/man1/{pico.1,pilot.1} %{buildroot}/%{_mandir}/man1/ %check -#since where are no logs in the package at the moment, there are no checks, -#but the warning logs can be recreated for regresstion tracking in warnings: +#since there are no logs in the package at the moment, there are no checks, +#but the warning logs can be recreated for regression tracking in warnings: if [ -s %{_sourcedir}/compile-warnings-%{suse_version}-%{_arch}.log ]; then grep -e '^[a-z0-9_]*.[cho]:' -e 'Entering directory' make.log | sed "s/^make\[.\]: //;/Entering directory/s/[\`']//g;" \ @@ -269,13 +274,11 @@ %doc %{_mandir}/man1/alpine.* %doc %{_mandir}/man1/rpdump.* %doc %{_mandir}/man1/rpload.* -%doc %{_mandir}/man1/mailutil.* %doc README NOTICE LICENSE %doc doc/mailcap.unx doc/mime.types doc/tech-notes/tech-notes.txt doc/tech-notes/*.html %{_bindir}/*pine %{_bindir}/alpinef %{_bindir}/rp* -%{_bindir}/mailutil %{_datadir}/applications/%name.desktop %{_datadir}/pixmaps/%name.png ++++++ UPDATING.txt ++++++ Update procedure: Some features of Alpine do not exist in the release tarball but are only provided as patches (but by the same author..). So when there is a new release, the OOT patches on the website get updated too. for i in WrtAcc colortext fancy fillpara fromheader insertpat maildir rules; do wget -O- http://alpine.x10host.com/alpine/patches/alpine-2.22/$i.patch.gz | gzip -cd >chappa-$i.patch; done These do not necessarily apply cleanly, so they also need to be quilt-refreshed as needed. ++++++ alpine-2.21.tar.xz -> alpine-2.22.tar.xz ++++++ /work/SRC/openSUSE:Factory/alpine/alpine-2.21.tar.xz /work/SRC/openSUSE:Factory/.alpine.new.2738/alpine-2.22.tar.xz differ: char 26, line 1 ++++++ alpine-timestamp.patch ++++++ --- /var/tmp/diff_new_pack.LuIn60/_old 2020-05-12 22:36:56.012445536 +0200 +++ /var/tmp/diff_new_pack.LuIn60/_new 2020-05-12 22:36:56.016445544 +0200 @@ -1,27 +1,16 @@ -Index: alpine-2.20/alpine/Makefile.am +--- + alpine/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: alpine-2.22/alpine/Makefile.am =================================================================== ---- alpine-2.20.orig/alpine/Makefile.am -+++ alpine-2.20/alpine/Makefile.am -@@ -48,5 +48,5 @@ AM_LDFLAGS = `cat @top_srcdir@/c-client/ +--- alpine-2.22.orig/alpine/Makefile.am ++++ alpine-2.22/alpine/Makefile.am +@@ -50,5 +50,5 @@ AM_LDFLAGS = `cat @top_srcdir@/c-client/ CLEANFILES = date.c 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 -Index: alpine-2.20/alpine/Makefile.in -=================================================================== ---- alpine-2.20.orig/alpine/Makefile.in -+++ alpine-2.20/alpine/Makefile.in -@@ -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. +- echo "char datestamp[]="\"$(ALPINE_DATESTAMP)\"";" > date.c +- echo "char hoststamp[]="\"$(ALPINE_HOSTSTAMP)\"";" >> date.c ++ echo "char datestamp[]="\"today\"";" > date.c ++ echo "char hoststamp[]="\"sand\"";" >> date.c ++++++ chappa-WrtAcc.patch ++++++ --- /var/tmp/diff_new_pack.LuIn60/_old 2020-05-12 22:36:56.048445610 +0200 +++ /var/tmp/diff_new_pack.LuIn60/_new 2020-05-12 22:36:56.048445610 +0200 @@ -1,6 +1,6 @@ -diff -rc alpine-2.21/pico/basic.c alpine-2.21.WrtAcc/pico/basic.c -*** alpine-2.21/pico/basic.c Sun Feb 5 16:02:36 2017 ---- alpine-2.21.WrtAcc/pico/basic.c Sun Feb 5 16:15:24 2017 +diff -rc alpine-2.22/pico/basic.c alpine-2.22.WrtAcc/pico/basic.c +*** alpine-2.22/pico/basic.c 2020-01-19 01:32:18.272513938 -0700 +--- alpine-2.22.WrtAcc/pico/basic.c 2020-01-19 01:34:53.223471368 -0700 *************** *** 342,347 **** --- 342,530 ---- @@ -193,9 +193,9 @@ /* * go forword to the end of the current paragraph -diff -rc alpine-2.21/pico/composer.c alpine-2.21.WrtAcc/pico/composer.c -*** alpine-2.21/pico/composer.c Sun Feb 5 16:02:36 2017 ---- alpine-2.21.WrtAcc/pico/composer.c Sun Feb 5 16:15:24 2017 +diff -rc alpine-2.22/pico/composer.c alpine-2.22.WrtAcc/pico/composer.c +*** alpine-2.22/pico/composer.c 2020-01-19 01:32:18.262514139 -0700 +--- alpine-2.22.WrtAcc/pico/composer.c 2020-01-19 01:34:53.224471360 -0700 *************** *** 2015,2021 **** tbufp = &strng[ods.p_len]; @@ -229,9 +229,9 @@ 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.21/pico/display.c alpine-2.21.WrtAcc/pico/display.c -*** alpine-2.21/pico/display.c Sun Feb 5 16:02:36 2017 ---- alpine-2.21.WrtAcc/pico/display.c Sun Feb 5 16:15:24 2017 +diff -rc alpine-2.22/pico/display.c alpine-2.22.WrtAcc/pico/display.c +*** alpine-2.22/pico/display.c 2020-01-19 01:32:18.428510798 -0700 +--- alpine-2.22.WrtAcc/pico/display.c 2020-01-19 01:34:53.225471353 -0700 *************** *** 2196,2201 **** --- 2196,2206 ---- @@ -263,9 +263,9 @@ /* look for match in extra_v */ for(i = 0; i < 12; i++) if(c && c == extra_v[i]){ -diff -rc alpine-2.21/pico/ebind.h alpine-2.21.WrtAcc/pico/ebind.h -*** alpine-2.21/pico/ebind.h Sun Feb 5 16:02:36 2017 ---- alpine-2.21.WrtAcc/pico/ebind.h Sun Feb 5 16:15:24 2017 +diff -rc alpine-2.22/pico/ebind.h alpine-2.22.WrtAcc/pico/ebind.h +*** alpine-2.22/pico/ebind.h 2020-01-19 01:32:18.369511986 -0700 +--- alpine-2.22.WrtAcc/pico/ebind.h 2020-01-19 01:34:53.226471345 -0700 *************** *** 61,67 **** #ifdef MOUSE @@ -319,9 +319,9 @@ #endif #endif {CTRL|'A', gotobol}, -diff -rc alpine-2.21/pico/efunc.h alpine-2.21.WrtAcc/pico/efunc.h -*** alpine-2.21/pico/efunc.h Sun Feb 5 16:02:36 2017 ---- alpine-2.21.WrtAcc/pico/efunc.h Sun Feb 5 16:15:24 2017 +diff -rc alpine-2.22/pico/efunc.h alpine-2.22.WrtAcc/pico/efunc.h +*** alpine-2.22/pico/efunc.h 2020-01-19 01:32:18.308513213 -0700 +--- alpine-2.22.WrtAcc/pico/efunc.h 2020-01-19 01:34:53.226471345 -0700 *************** *** 54,59 **** --- 54,62 ---- @@ -334,12 +334,12 @@ extern int forwpage(int, int); extern int backpage(int, int); extern int scrollupline(int, int); -diff -rc alpine-2.21/pico/main.c alpine-2.21.WrtAcc/pico/main.c -*** alpine-2.21/pico/main.c Sun Feb 5 16:02:36 2017 ---- alpine-2.21.WrtAcc/pico/main.c Sun Feb 5 16:15:24 2017 +diff -rc alpine-2.22/pico/main.c alpine-2.22.WrtAcc/pico/main.c +*** alpine-2.22/pico/main.c 2020-01-19 01:32:18.322512932 -0700 +--- alpine-2.22.WrtAcc/pico/main.c 2020-01-19 01:34:53.226471345 -0700 *************** -*** 451,456 **** ---- 451,462 ---- +*** 458,463 **** +--- 458,469 ---- emlwrite(_("You may possibly have new mail."), NULL); } ++++++ chappa-WrtAcc.txt ++++++ 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. ++++++ chappa-colortext.patch ++++++ --- /var/tmp/diff_new_pack.LuIn60/_old 2020-05-12 22:36:56.072445660 +0200 +++ /var/tmp/diff_new_pack.LuIn60/_new 2020-05-12 22:36:56.072445660 +0200 @@ -1,9 +1,9 @@ -diff -rc alpine-2.21/alpine/confscroll.c alpine-2.21.colortext/alpine/confscroll.c -*** alpine-2.21/alpine/confscroll.c Sun Feb 5 16:02:36 2017 ---- alpine-2.21.colortext/alpine/confscroll.c Sun Feb 5 16:15:26 2017 +diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.colortext/alpine/confscroll.c +*** alpine-2.22/alpine/confscroll.c 2020-01-19 01:32:20.190475483 -0700 +--- alpine-2.22.colortext/alpine/confscroll.c 2020-01-19 01:34:56.906444203 -0700 *************** -*** 5222,5227 **** ---- 5222,5230 ---- +*** 5228,5233 **** +--- 5228,5236 ---- clear_index_cache(ps->mail_stream, 0); } @@ -13,12 +13,12 @@ else if(var == &ps->vars[V_INIT_CMD_LIST]){ if(!revert) q_status_message(SM_ASYNC, 0, 3, -diff -rc alpine-2.21/pith/conf.c alpine-2.21.colortext/pith/conf.c -*** alpine-2.21/pith/conf.c Sun Feb 5 16:02:36 2017 ---- alpine-2.21.colortext/pith/conf.c Sun Feb 5 16:15:26 2017 +diff -rc alpine-2.22/pith/conf.c alpine-2.22.colortext/pith/conf.c +*** alpine-2.22/pith/conf.c 2020-01-19 01:32:18.678505766 -0700 +--- alpine-2.22.colortext/pith/conf.c 2020-01-19 01:34:56.908444189 -0700 *************** -*** 232,237 **** ---- 232,239 ---- +*** 231,236 **** +--- 231,238 ---- CONF_TXT_T cf_text_fillcol[] = "Specifies the column of the screen where the composer should wrap."; @@ -28,8 +28,8 @@ CONF_TXT_T cf_text_quotereplstr[] = "Specifies the string to replace quotes with when viewing a message."; *************** -*** 572,577 **** ---- 574,581 ---- +*** 577,582 **** +--- 579,586 ---- #endif /* _WINDOWS */ {"composer-wrap-column", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, NULL, cf_text_fillcol}, @@ -39,8 +39,8 @@ NULL, cf_text_replystr}, {"reply-leadin", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, *************** -*** 833,838 **** ---- 837,844 ---- +*** 844,849 **** +--- 848,855 ---- {"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}, @@ -50,8 +50,8 @@ {"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}, *************** -*** 2021,2026 **** ---- 2027,2034 ---- +*** 2035,2040 **** +--- 2041,2048 ---- set_current_val(&vars[V_DICTIONARY], TRUE, TRUE); #endif /* _WINDOWS */ set_current_val(&vars[V_IMAGE_VIEWER], TRUE, TRUE); @@ -61,8 +61,8 @@ set_current_val(&vars[V_HISTORY], TRUE, TRUE); set_current_val(&vars[V_SMTP_SERVER], TRUE, TRUE); *************** -*** 6567,6572 **** ---- 6575,6581 ---- +*** 6599,6604 **** +--- 6607,6613 ---- 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); @@ -71,8 +71,8 @@ set_current_val(&ps->vars[V_INDEX_TOKEN_COLORS], TRUE, TRUE); set_current_val(&ps->vars[V_VIEW_HDR_COLORS], TRUE, TRUE); *************** -*** 7755,7760 **** ---- 7764,7771 ---- +*** 7787,7792 **** +--- 7796,7803 ---- return(h_config_scroll_margin); case V_DEADLETS : return(h_config_deadlets); @@ -82,8 +82,8 @@ return(h_config_composer_wrap_column); case V_TCPOPENTIMEO : *************** -*** 7922,7927 **** ---- 7933,7941 ---- +*** 7956,7961 **** +--- 7967,7975 ---- case V_SIGNATURE_FORE_COLOR : case V_SIGNATURE_BACK_COLOR : return(h_config_signature_color); @@ -93,9 +93,9 @@ case V_PROMPT_FORE_COLOR : case V_PROMPT_BACK_COLOR : return(h_config_prompt_color); -diff -rc alpine-2.21/pith/conf.h alpine-2.21.colortext/pith/conf.h -*** alpine-2.21/pith/conf.h Sun Feb 5 16:02:36 2017 ---- alpine-2.21.colortext/pith/conf.h Sun Feb 5 16:15:26 2017 +diff -rc alpine-2.22/pith/conf.h alpine-2.22.colortext/pith/conf.h +*** alpine-2.22/pith/conf.h 2020-01-19 01:32:19.489489496 -0700 +--- alpine-2.22.colortext/pith/conf.h 2020-01-19 01:34:56.909444181 -0700 *************** *** 165,170 **** --- 165,172 ---- @@ -108,8 +108,8 @@ #define GLO_FILLCOL vars[V_FILLCOL].global_val.p #define VAR_DEADLETS vars[V_DEADLETS].current_val.p *************** -*** 463,468 **** ---- 465,472 ---- +*** 466,471 **** +--- 468,475 ---- #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 @@ -118,9 +118,9 @@ #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.21/pith/conftype.h alpine-2.21.colortext/pith/conftype.h -*** alpine-2.21/pith/conftype.h Sun Feb 5 16:02:36 2017 ---- alpine-2.21.colortext/pith/conftype.h Sun Feb 5 16:15:26 2017 +diff -rc alpine-2.22/pith/conftype.h alpine-2.22.colortext/pith/conftype.h +*** alpine-2.22/pith/conftype.h 2020-01-19 01:32:18.702505283 -0700 +--- alpine-2.22.colortext/pith/conftype.h 2020-01-19 01:34:56.910444174 -0700 *************** *** 83,88 **** --- 83,89 ---- @@ -132,8 +132,8 @@ , V_REPLY_INTRO , V_QUOTE_REPLACE_STRING *************** -*** 235,240 **** ---- 236,243 ---- +*** 238,243 **** +--- 239,246 ---- , V_INCUNSEEN_BACK_COLOR , V_SIGNATURE_FORE_COLOR , V_SIGNATURE_BACK_COLOR @@ -142,12 +142,12 @@ , V_PROMPT_FORE_COLOR , V_PROMPT_BACK_COLOR , V_HEADER_GENERAL_FORE_COLOR -diff -rc alpine-2.21/pith/mailview.c alpine-2.21.colortext/pith/mailview.c -*** alpine-2.21/pith/mailview.c Sun Feb 5 16:02:36 2017 ---- alpine-2.21.colortext/pith/mailview.c Sun Feb 5 16:15:26 2017 +diff -rc alpine-2.22/pith/mailview.c alpine-2.22.colortext/pith/mailview.c +*** alpine-2.22/pith/mailview.c 2020-01-19 01:32:18.803503250 -0700 +--- alpine-2.22.colortext/pith/mailview.c 2020-01-19 01:34:56.911444167 -0700 *************** -*** 282,287 **** ---- 282,295 ---- +*** 638,643 **** +--- 638,651 ---- if((flgs & FM_DISPLAY) && !(flgs & FM_NOCOLOR) && pico_usingcolor() @@ -163,8 +163,8 @@ && 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 ---- +*** 2870,2875 **** +--- 2878,3067 ---- return(color_pair); } @@ -355,9 +355,9 @@ /* * The argument fieldname is something like "Subject:..." or "Subject". -diff -rc alpine-2.21/pith/mailview.h alpine-2.21.colortext/pith/mailview.h -*** alpine-2.21/pith/mailview.h Sun Feb 5 16:02:36 2017 ---- alpine-2.21.colortext/pith/mailview.h Sun Feb 5 16:15:26 2017 +diff -rc alpine-2.22/pith/mailview.h alpine-2.22.colortext/pith/mailview.h +*** alpine-2.22/pith/mailview.h 2020-01-19 01:32:19.614486993 -0700 +--- alpine-2.22.colortext/pith/mailview.h 2020-01-19 01:34:56.911444167 -0700 *************** *** 30,35 **** --- 30,41 ---- @@ -374,8 +374,8 @@ #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 ---- +*** 130,135 **** +--- 136,150 ---- 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 *); @@ -391,12 +391,12 @@ /* * BUG: BELOW IS UNIX/PC ONLY since config'd browser means nothing to webpine -diff -rc alpine-2.21/pith/pine.hlp alpine-2.21.colortext/pith/pine.hlp -*** alpine-2.21/pith/pine.hlp Sun Feb 5 16:02:36 2017 ---- alpine-2.21.colortext/pith/pine.hlp Sun Feb 5 16:15:26 2017 +diff -rc alpine-2.22/pith/pine.hlp alpine-2.22.colortext/pith/pine.hlp +*** alpine-2.22/pith/pine.hlp 2020-01-19 01:32:19.035498584 -0700 +--- alpine-2.22.colortext/pith/pine.hlp 2020-01-19 01:34:56.924444072 -0700 *************** -*** 4227,4232 **** ---- 4227,4233 ---- +*** 4601,4606 **** +--- 4601,4607 ---- <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> @@ -405,8 +405,8 @@ <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> *************** -*** 4255,4260 **** ---- 4256,4262 ---- +*** 4629,4634 **** +--- 4630,4636 ---- <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> @@ -415,8 +415,8 @@ <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> *************** -*** 23729,23734 **** ---- 23731,23773 ---- +*** 24262,24267 **** +--- 24264,24306 ---- <End of help on this topic> </BODY> </HTML> @@ -461,11 +461,12 @@ <HTML> <HEAD> *************** -*** 32340,32345 **** ---- 32379,32408 ---- +*** 32864,32869 **** +--- 32903,32932 ---- + <P> <A HREF="h_color_setup">Descriptions of the available commands</A> - <P> ++ <P> + Look <A HREF="h_edit_nav_cmds">here</A> + to see the available Editing and Navigation commands. + <P> @@ -489,16 +490,15 @@ + + <P> + <A HREF="h_color_setup">Descriptions of the available commands</A> -+ <P> + <P> Look <A HREF="h_edit_nav_cmds">here</A> to see the available Editing and Navigation commands. - <P> -diff -rc alpine-2.21/pith/state.c alpine-2.21.colortext/pith/state.c -*** alpine-2.21/pith/state.c Sun Feb 5 16:02:36 2017 ---- alpine-2.21.colortext/pith/state.c Sun Feb 5 16:15:26 2017 +diff -rc alpine-2.22/pith/state.c alpine-2.22.colortext/pith/state.c +*** alpine-2.22/pith/state.c 2020-01-19 01:32:18.700505323 -0700 +--- alpine-2.22.colortext/pith/state.c 2020-01-19 01:34:56.926444057 -0700 *************** -*** 134,139 **** ---- 134,142 ---- +*** 138,143 **** +--- 138,146 ---- if((*pps)->folders_dir != NULL) fs_give((void **)&(*pps)->folders_dir); @@ -508,12 +508,12 @@ if((*pps)->ui.homedir) fs_give((void **)&(*pps)->ui.homedir); -diff -rc alpine-2.21/pith/state.h alpine-2.21.colortext/pith/state.h -*** alpine-2.21/pith/state.h Sun Feb 5 16:02:36 2017 ---- alpine-2.21.colortext/pith/state.h Sun Feb 5 16:15:26 2017 +diff -rc alpine-2.22/pith/state.h alpine-2.22.colortext/pith/state.h +*** alpine-2.22/pith/state.h 2020-01-19 01:32:18.561508121 -0700 +--- alpine-2.22.colortext/pith/state.h 2020-01-19 01:34:56.926444057 -0700 *************** -*** 338,343 **** ---- 338,345 ---- +*** 340,345 **** +--- 340,347 ---- char *display_charmap; /* needs to be freed */ char *keyboard_charmap; /* needs to be freed */ void *input_cs; @@ -522,9 +522,9 @@ char *posting_charmap; /* needs to be freed */ -diff -rc alpine-2.21/pith/text.c alpine-2.21.colortext/pith/text.c -*** alpine-2.21/pith/text.c Sun Feb 5 16:02:36 2017 ---- alpine-2.21.colortext/pith/text.c Sun Feb 5 16:15:26 2017 +diff -rc alpine-2.22/pith/text.c alpine-2.22.colortext/pith/text.c +*** alpine-2.22/pith/text.c 2020-01-19 01:32:19.317492939 -0700 +--- alpine-2.22.colortext/pith/text.c 2020-01-19 01:34:56.927444050 -0700 *************** *** 171,176 **** --- 171,185 ---- ++++++ chappa-colortext.txt ++++++ From: http://alpine.x10host.com/alpine/info/WrtAcc.html Upstream: constitutes upstream source, delivered in non-tarball form This patch allows you to define special custom text that will be seen in a different color than normal text. This can be used in different ways, one can use it to emphasize important keywords in a message, or to erase offensive language. ++++++ chappa-fancy.patch ++++++ ++++ 1200 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/alpine/chappa-fancy.patch ++++ and /work/SRC/openSUSE:Factory/.alpine.new.2738/chappa-fancy.patch ++++++ chappa-fancy.txt ++++++ From: http://alpine.x10host.com/alpine/info/fancy.html Upstream: constitutes upstream source, delivered in non-tarball form You can use this patch to add functionality to the thread interface offered by Alpine. It adds commands and options that control several aspects of the way threads are presented. * You can delete a thread, by pressing ^R (to remove), you can undelete it by pressing ^U (without this patch, you would have to collapse the thread before you can delete it). * You can select and unselect a thread, by pressing ^T. This is useful if you want to make aggregate operations on a thread, like saving it. * You can collapse or expand a particular thread by pressing [ or ] respectively. If you want to collapse or expand ALL threads, use the commands { and } respectively. These last two commands work only if you have selected any of the options (*) regular-index-with-expanded/collapsed-threads. * You can move to the next or previous thread by pressing ) or ( respectively. * You can sort threads by arrival, in order to do this press k a. There are other sorts for threads by Date and by Score. If you want to have threads permanently sorted by arrival, say, then set the variable thread-sort-key to be arrival. You can also start Alpine with the option -threadsort arrival to accomplish the same. * Similarly, you can sort threads by their length. In order to do this press k z. Small threads appear at the beginning of the listing, while long threads appear at the bottom. Threads of the same length are sorted according to the date of their first message. In particular, single message threads are sorted by date. * A new configuration option was added: [X] enhanced-fancy-thread-support if you enable this configuration option, then all of the above commands will act on loose threads, which are threads without parents. * The SIZETHREAD index token was added, which tells you the size of a thread, instead of the size of the individual messages in the thread. ++++++ chappa-fillpara.patch ++++++ ++++ 856 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/alpine/chappa-fillpara.patch ++++ and /work/SRC/openSUSE:Factory/.alpine.new.2738/chappa-fillpara.patch ++++++ chappa-fillpara.txt ++++++ From: http://alpine.x10host.com/alpine/info/fillpara.html Upstream: constitutes upstream source, delivered in non-tarball form When you reply to a message, which has been quoted by several people and you justify a paragraph, Alpine may not notice any other quote strings and justify the paragraph as if there was no other quote strings in it. This patch will help Alpine recognize extra levels of quoting, so that justifying will still make the text readable. This is important because the purpose of justification is to make the text more readable, and an incorrect justification may make the text impossible to read. ++++++ chappa-fromheader.patch ++++++ --- /var/tmp/diff_new_pack.LuIn60/_old 2020-05-12 22:36:56.144445811 +0200 +++ /var/tmp/diff_new_pack.LuIn60/_new 2020-05-12 22:36:56.144445811 +0200 @@ -1,8 +1,8 @@ -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 +diff -rc alpine-2.22/alpine/send.c alpine-2.22.fromheader/alpine/send.c +*** alpine-2.22/alpine/send.c 2020-01-19 01:32:20.126476758 -0700 +--- alpine-2.22.fromheader/alpine/send.c 2020-01-19 01:34:53.915466200 -0700 *************** -*** 913,919 **** +*** 909,915 **** 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, @@ -10,7 +10,7 @@ {"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 ---- +--- 909,915 ---- 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, @@ -19,8 +19,8 @@ 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 ---- +*** 2364,2369 **** +--- 2364,2374 ---- he->rich_header = 0; } } @@ -33,7 +33,7 @@ he_from = he; break; *************** -*** 3104,3110 **** +*** 3101,3107 **** if(outgoing->return_path) mail_free_address(&outgoing->return_path); @@ -41,7 +41,7 @@ /* * Don't ever believe the sender that is there. ---- 3109,3117 ---- +--- 3106,3114 ---- if(outgoing->return_path) mail_free_address(&outgoing->return_path); @@ -51,12 +51,12 @@ /* * 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 +diff -rc alpine-2.22/pith/conf.c alpine-2.22.fromheader/pith/conf.c +*** alpine-2.22/pith/conf.c 2020-01-19 01:32:18.678505766 -0700 +--- alpine-2.22.fromheader/pith/conf.c 2020-01-19 01:34:53.918466178 -0700 *************** -*** 2884,2889 **** ---- 2884,2891 ---- +*** 2908,2913 **** +--- 2908,2915 ---- 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}, @@ -65,12 +65,12 @@ {"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 +diff -rc alpine-2.22/pith/conftype.h alpine-2.22.fromheader/pith/conftype.h +*** alpine-2.22/pith/conftype.h 2020-01-19 01:32:18.702505283 -0700 +--- alpine-2.22.fromheader/pith/conftype.h 2020-01-19 01:34:53.919466170 -0700 *************** -*** 399,404 **** ---- 399,405 ---- +*** 404,409 **** +--- 404,410 ---- F_AUTO_REPLY_TO, F_VERBOSE_POST, F_FCC_ON_BOUNCE, @@ -78,12 +78,12 @@ 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 +diff -rc alpine-2.22/pith/pine.hlp alpine-2.22.fromheader/pith/pine.hlp +*** alpine-2.22/pith/pine.hlp 2020-01-19 01:32:19.035498584 -0700 +--- alpine-2.22.fromheader/pith/pine.hlp 2020-01-19 01:34:53.931466081 -0700 *************** -*** 28940,28945 **** ---- 28940,28961 ---- +*** 29530,29535 **** +--- 29530,29551 ---- <End of help on this topic> </BODY> </HTML> @@ -106,9 +106,9 @@ ====== 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 +diff -rc alpine-2.22/pith/send.c alpine-2.22.fromheader/pith/send.c +*** alpine-2.22/pith/send.c 2020-01-19 01:32:18.956500171 -0700 +--- alpine-2.22.fromheader/pith/send.c 2020-01-19 01:34:53.934466058 -0700 *************** *** 53,59 **** /* name::type::canedit::writehdr::localcopy::rcptto */ @@ -127,25 +127,25 @@ {TONAME, Address, 1, 1, 1, 1}, {CCNAME, Address, 1, 1, 1, 1}, *************** -*** 1232,1238 **** - *p = *(p+4); +*** 1227,1233 **** + } 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); +--- 1227,1233 ---- + } 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 +diff -rc alpine-2.22/pith/send.h alpine-2.22.fromheader/pith/send.h +*** alpine-2.22/pith/send.h 2020-01-19 01:32:19.354492198 -0700 +--- alpine-2.22.fromheader/pith/send.h 2020-01-19 01:34:53.934466058 -0700 *************** *** 159,164 **** --- 159,166 ---- ++++++ chappa-fromheader.txt ++++++ From: http://alpine.x10host.com/alpine/info/fromheader.html Upstream: constitutes upstream source, delivered in non-tarball form This patch allows you to change the From header without you having to configure anything. The From header will always be available to you. ++++++ chappa-insertpat.patch ++++++ --- /var/tmp/diff_new_pack.LuIn60/_old 2020-05-12 22:36:56.168445861 +0200 +++ /var/tmp/diff_new_pack.LuIn60/_new 2020-05-12 22:36:56.168445861 +0200 @@ -1,6 +1,6 @@ -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 +diff -rc alpine-2.22/pico/display.c alpine-2.22.insertpat/pico/display.c +*** alpine-2.22/pico/display.c 2020-01-19 01:32:18.428510798 -0700 +--- alpine-2.22.insertpat/pico/display.c 2020-01-19 01:34:56.194449394 -0700 *************** *** 2205,2210 **** --- 2205,2222 ---- @@ -22,9 +22,9 @@ 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 +diff -rc alpine-2.22/pico/search.c alpine-2.22.insertpat/pico/search.c +*** alpine-2.22/pico/search.c 2020-01-19 01:32:18.347512428 -0700 +--- alpine-2.22.insertpat/pico/search.c 2020-01-19 01:34:56.195449387 -0700 *************** *** 122,127 **** --- 122,131 ---- ++++++ chappa-insertpat.txt ++++++ From: http://alpine.x10host.com/alpine/info/insertpat.html Upstream: constitutes upstream source, delivered in non-tarball form This patch allows you to insert the pattern that you searched last to be edited. Say for example you wanted to look for "foo_bar", but wrote mistakenly "foo-bar" instead, then pressing ^W to search and then ^N you will make appear in your input "foo-bar" from where you can now easily switch "-" to "_". ++++++ chappa-maildir.patch ++++++ ++++ 816 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/alpine/chappa-maildir.patch ++++ and /work/SRC/openSUSE:Factory/.alpine.new.2738/chappa-maildir.patch ++++++ chappa-maildir.txt ++++++ From: http://alpine.x10host.com/alpine/info/maildir.html Upstream: constitutes upstream source, delivered in non-tarball form I have added support for the Courier/Cyrus/Dovecot file system, read the configuration instructions. This patch assumes that your INBOX is located at "$HOME/Maildir". This is a directory which should have three subdirectories "cur", "tmp" and "new". If you read maildir from another directory in your $HOME directory (e.g. .maildir), then set the variable maildir-location to reflect this fact (e.g. maildir-location=.maildir). This is the best way to change the path of the inbox. Set Inbox Path = #md/INBOX. ++++++ chappa-rules.patch ++++++ ++++ 12079 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/alpine/chappa-rules.patch ++++ and /work/SRC/openSUSE:Factory/.alpine.new.2738/chappa-rules.patch ++++++ chappa-rules.txt ++++++ From: http://alpine.x10host.com/alpine/info/rules.html Upstream: constitutes upstream source, delivered in non-tarball form This patch allows you to create specific hooks, so that operations that would normally be global in nature can be customized on a per message/folder/person basis. [...] [For example:] * Compose Rules This option can be used to generate signatures in cases when setting up a role does not work. Examples are _TO_ >> {Peter Flinstones} => _SIGNATURE_{~/.petersignature} _COLLECTION_ >> {Mail} => _SIGNATURE_{~/ll} ++++++ pico-fix-spurious-undef-warnings.diff ++++++ --- /var/tmp/diff_new_pack.LuIn60/_old 2020-05-12 22:36:56.260446053 +0200 +++ /var/tmp/diff_new_pack.LuIn60/_new 2020-05-12 22:36:56.260446053 +0200 @@ -1,44 +1,37 @@ ---- alpine-0.999/pico/osdep/shell.c 2007/08/02 12:09:33 1.1 -+++ alpine-0.999/pico/osdep/shell.c 2007/08/02 12:10:03 -@@ -90,7 +90,6 @@ bktoshell(void) /* suspend MicroEMACS a - - if(gmode&MDSPWN){ - char *shell; -- int dummy; - - vttidy(); - movecursor(0, 0); -@@ -98,7 +97,7 @@ bktoshell(void) /* suspend MicroEMACS a - printf("\n\n\nUse \"exit\" to return to Pi%s\n", - (gmode & MDBRONLY) ? "lot" : "co"); - system((shell = (char *)getenv("SHELL")) ? shell : "/bin/csh"); -- rtfrmshell(dummy); /* fixup tty */ -+ rtfrmshell(0); /* fixup tty */ - } - else { - movecursor(term.t_nrow-1, 0); -// Those may be obsolete now: ---- alpine-0.999/include/system.h 2007/08/03 13:16:15 1.1 -+++ alpine-0.999/include/system.h 2007/08/03 13:19:03 -@@ -381,4 +381,12 @@ - # define LOCAL_PASSWD_CACHE - #endif - +--- + imap/src/c-client/mail.h | 8 ++++++++ + imap/src/osdep/unix/os_slx.h | 8 ++++++++ + include/system.h | 8 ++++++++ + pico/osdep/shell.c | 3 +-- + 4 files changed, 25 insertions(+), 2 deletions(-) + +Index: alpine-2.22/imap/src/c-client/mail.h +=================================================================== +--- alpine-2.22.orig/imap/src/c-client/mail.h ++++ alpine-2.22/imap/src/c-client/mail.h +@@ -1914,6 +1914,14 @@ long INWAIT (long seconds); + int PSOUT (char *s); + int PSOUTR (SIZEDTEXT *s); + int PFLUSH (void); +/* + * Shuts up spurious + * "warning: suggest parentheses around assignment used as truth value" -+ * which occurs ing gcc4.2.1 and older when an assigment is used in a -+ * if, which works just fine and is not iterpreted as always true: ++ * which occurs in gcc4.2.1 and older when an assigment is used in a ++ * if, which works just fine and is not interpreted as always true: + */ +#define if(x) if((x)) +#define while(x) while((x)) - #endif /* _SYSTEM_INCLUDED */ ---- alpine-0.999/imap/src/c-client/mail.h 2007/08/03 13:42:06 1.1 -+++ alpine-0.999/imap/src/c-client/mail.h 2007/08/03 13:42:57 -@@ -1829,3 +1829,11 @@ - int PSOUT (char *s); - int PSOUTR (SIZEDTEXT *s); - int PFLUSH (void); + + /* XOAUTH Client-Side Support */ + +Index: alpine-2.22/imap/src/osdep/unix/os_slx.h +=================================================================== +--- alpine-2.22.orig/imap/src/osdep/unix/os_slx.h ++++ alpine-2.22/imap/src/osdep/unix/os_slx.h +@@ -69,3 +69,11 @@ int portable_utime (char *file,time_t ti + #include "ftl.h" + #include "nl.h" + #include "tcp.h" +/* + * Shuts up spurious + * "warning: suggest parentheses around assignment used as truth value" @@ -47,12 +40,14 @@ + */ +#define if(x) if((x)) +#define while(x) while((x)) ---- alpine-0.999/imap/src/osdep/unix/os_slx.h 2007/08/03 13:54:41 1.1 -+++ alpine-0.999/imap/src/osdep/unix/os_slx.h 2007/08/03 13:55:38 -@@ -65,3 +65,11 @@ - #include "ftl.h" - #include "nl.h" - #include "tcp.h" +Index: alpine-2.22/include/system.h +=================================================================== +--- alpine-2.22.orig/include/system.h ++++ alpine-2.22/include/system.h +@@ -389,4 +389,12 @@ typedef int gid_t; + # define LOCAL_PASSWD_CACHE + #endif + +/* + * Shuts up spurious + * "warning: suggest parentheses around assignment used as truth value" @@ -61,3 +56,25 @@ + */ +#define if(x) if((x)) +#define while(x) while((x)) + #endif /* _SYSTEM_INCLUDED */ +Index: alpine-2.22/pico/osdep/shell.c +=================================================================== +--- alpine-2.22.orig/pico/osdep/shell.c ++++ alpine-2.22/pico/osdep/shell.c +@@ -98,7 +98,6 @@ bktoshell(int f, int n) + + if(gmode&MDSPWN){ + char *shell; +- int dummy; + + vttidy(); + movecursor(0, 0); +@@ -106,7 +105,7 @@ bktoshell(int f, int n) + printf("\n\n\nUse \"exit\" to return to Pi%s\n", + (gmode & MDBRONLY) ? "lot" : "co"); + system((shell = (char *)getenv("SHELL")) ? shell : "/bin/csh"); +- rtfrmshell(dummy); /* fixup tty */ ++ rtfrmshell(0); /* fixup tty */ + } + else { + movecursor(term.t_nrow-1, 0);
