commit alpine for openSUSE:Factory
Hello community,
here is the log from the commit of package alpine for openSUSE:Factory checked in at 2013-09-04 13:16:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2013-05-27 09:31:31.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.alpine.new/alpine.changes 2013-09-04 13:16:42.000000000 +0200
@@ -1,0 +2,24 @@
+Mon Sep 2 14:07:32 UTC 2013 - jengelh@inai.de
+
+- Update to new upstream release 2.11
+* Increase encryption of S/MIME encrypted messages.
+* Pico: Improvements in justification of paragraphs: lines that
+ begin with a quote string, followed by a space were considered
+ individual paragraphs, now they are considered part of a paragraph.
+* Unix Alpine: Allow local .pinerc file to be a symbolic link.
+* Experimental extended support of recognition of UTF-8 in urls
+* Added recognition of ws and wss URIs.
+* Add ability to color folder names, directory names, and text in
+ the FOLDER SCREEN.
+* Add the ability to color any token used in the display of the
+ INDEX SCREEN.
+* New option preserve-original-fields that adds the ability to
+ preserve To: and Cc: fields when replying to a message, as
+ specified by original sender.
+* Added Quota subcommands for printing, forwarding, saving, etc.
+- Refresh from homepage (and save as unified): chappa-*.patch
+- Refresh for -p1: operation-may-be-undefined-warning.diff,
+ fix-implicit.patch, alpine-gcc44.diff
+- Drop quilt-patches/alpine-2.00-as_needed.patch (merged upstream)
+
+-------------------------------------------------------------------
Old:
----
alpine-2.00-as_needed.patch
alpine-2.10.clean.tar.lzma
alpine-maildir-closedir.patch
chappa-unverified.patch
New:
----
alpine-2.11.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alpine.spec ++++++
--- /var/tmp/diff_new_pack.jS4DJt/_old 2013-09-04 13:16:44.000000000 +0200
+++ /var/tmp/diff_new_pack.jS4DJt/_new 2013-09-04 13:16:44.000000000 +0200
@@ -17,34 +17,16 @@
Name: alpine
-#
# For debugging only:
%define build_vanilla 0
-#
Summary: Mail User Agent
License: Apache-2.0
Group: Productivity/Networking/Email/Clients
-BuildRequires: imap-devel
-BuildRequires: krb5-devel
-BuildRequires: libgssapi
-BuildRequires: libtool
-BuildRequires: ncurses-devel
-BuildRequires: openldap2-devel
-BuildRequires: openssl-devel
-BuildRequires: pam-devel
-BuildRequires: update-desktop-files
-BuildRequires: xz
-# pgp4pine requires pine:
-Provides: pine
-#
-Obsoletes: pine4
-Provides: pine4
-#
-Version: 2.10
+Version: 2.11
Release: 0
-Url: http://www.washington.edu/alpine/
-Source: http://patches.freeiz.com/alpine/patches/alpine-2.10/alpine-2.10.clean.tar.l...
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Url: http://patches.freeiz.com/alpine/
+
+Source: http://patches.freeiz.com/alpine/release/src/%name-%version.tar.xz
Source1: %name.png
Source2: %name.desktop
Patch1: pine-nonvoid-function.patch
@@ -52,7 +34,6 @@
Patch3: operation-may-be-undefined-warning.diff
Patch4: fix-implicit.patch
Patch5: alpine-gcc44.diff
-Patch6: alpine-2.00-as_needed.patch
Patch7: alpine-month_name-utf8.patch
Patch10: pico-fix-spurious-undef-warnings.diff
Patch20: pine-expression-warnings.diff
@@ -70,6 +51,22 @@
Patch605: chappa-WrtAcc.patch
Patch606: chappa-unixnullbug.patch
Patch613: alpine-no-add-needed.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: autoconf >= 2.69
+BuildRequires: imap-devel
+BuildRequires: krb5-devel
+BuildRequires: libgssapi
+BuildRequires: libtool
+BuildRequires: ncurses-devel
+BuildRequires: openldap2-devel
+BuildRequires: openssl-devel
+BuildRequires: pam-devel
+BuildRequires: update-desktop-files
+BuildRequires: xz
+# pgp4pine requires pine:
+Provides: pine
+Obsoletes: pine4
+Provides: pine4
%description
Alpine is a display-oriented email client that is suitable for both
@@ -133,11 +130,10 @@
#
%patch1 -p1
%patch2 -p1
-%patch3
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch7
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch7 -p1
%patch10 -p1
%patch20 -p1
%patch40 -p1
@@ -188,6 +184,13 @@
grep -B9 -A20 'failed program was' config.log | grep -A24 checking
exit 5
}
+%{?fedora_version: tag=LFD}
+%{?mandriva_version: tag=LMD}
+%{?redhat_version: tag=LRH}
+%{?centos_version: tag=LRH}
+%{?suse_version: tag=LSU}
+perl -i -pe 's{(define SYSTYPE) "LNX"}{$1 "'"$tag"'"}g' include/config.h
+
#
# imap does not use CFLAGS from configure, needs EXTRACFLAGS/EXTRALDFLAGS:
#
++++++ alpine-gcc44.diff ++++++
--- /var/tmp/diff_new_pack.jS4DJt/_old 2013-09-04 13:16:44.000000000 +0200
+++ /var/tmp/diff_new_pack.jS4DJt/_new 2013-09-04 13:16:44.000000000 +0200
@@ -1,6 +1,13 @@
---- ./imap/src/osdep/unix/dummy.c 2009/06/02 09:53:30 1.1
-+++ ./imap/src/osdep/unix/dummy.c 2009/06/02 10:04:31
-@@ -723,6 +723,17 @@
+---
+ imap/src/osdep/unix/dummy.c | 14 ++++++++++++--
+ pith/send.c | 1 +
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+Index: alpine-2.11/imap/src/osdep/unix/dummy.c
+===================================================================
+--- alpine-2.11.orig/imap/src/osdep/unix/dummy.c
++++ alpine-2.11/imap/src/osdep/unix/dummy.c
+@@ -736,6 +736,17 @@ long dummy_copy (MAILSTREAM *stream,char
return NIL;
}
@@ -18,7 +25,7 @@
/* Dummy append message string
* Accepts: mail stream
-@@ -742,8 +753,7 @@
+@@ -755,8 +766,7 @@ long dummy_append (MAILSTREAM *stream,ch
/* append to INBOX? */
if (!compare_cstring (mailbox,"INBOX")) {
/* yes, if no empty proto try creating */
@@ -28,9 +35,11 @@
}
else if (dummy_file (tmp,mailbox) && ((fd = open (tmp,O_RDONLY,NIL)) < 0)) {
if ((e = errno) == ENOENT) /* failed, was it no such file? */
---- pith/send.c 2009/06/02 10:04:13 1.11
-+++ pith/send.c 2009/06/02 10:04:31
-@@ -1569,6 +1569,7 @@
+Index: alpine-2.11/pith/send.c
+===================================================================
+--- alpine-2.11.orig/pith/send.c
++++ alpine-2.11/pith/send.c
+@@ -1570,6 +1570,7 @@ set_priority_header(METAENV *header, cha
pf->textbuf = cpystr(value);
}
}
++++++ alpine-month_name-utf8.patch ++++++
--- /var/tmp/diff_new_pack.jS4DJt/_old 2013-09-04 13:16:44.000000000 +0200
+++ /var/tmp/diff_new_pack.jS4DJt/_new 2013-09-04 13:16:44.000000000 +0200
@@ -1,6 +1,12 @@
---- pith/string.c
-+++ pith/string.c
-@@ -769,6 +769,7 @@
+---
+ pith/string.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+Index: alpine-2.11/pith/string.c
+===================================================================
+--- alpine-2.11.orig/pith/string.c
++++ alpine-2.11/pith/string.c
+@@ -770,6 +770,7 @@ month_abbrev_locale(int month_num)
return("xxx");
else{
static char buf[20];
@@ -8,7 +14,7 @@
struct tm tm;
memset(&tm, 0, sizeof(tm));
-@@ -810,6 +811,12 @@
+@@ -811,6 +812,12 @@ month_abbrev_locale(int month_num)
buf[0] = ' ';
}
@@ -21,7 +27,7 @@
return(buf);
}
-@@ -841,12 +848,19 @@
+@@ -842,12 +849,19 @@ month_name_locale(int month_num)
return("");
else{
static char buf[20];
++++++ alpine-no-add-needed.patch ++++++
--- /var/tmp/diff_new_pack.jS4DJt/_old 2013-09-04 13:16:44.000000000 +0200
+++ /var/tmp/diff_new_pack.jS4DJt/_new 2013-09-04 13:16:44.000000000 +0200
@@ -3,10 +3,10 @@
configure.ac | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
-Index: alpine-2.10/alpine/Makefile.am
+Index: alpine-2.11/alpine/Makefile.am
===================================================================
---- alpine-2.10.orig/alpine/Makefile.am
-+++ alpine-2.10/alpine/Makefile.am
+--- alpine-2.11.orig/alpine/Makefile.am
++++ alpine-2.11/alpine/Makefile.am
@@ -35,7 +35,7 @@ BUILT_SOURCES = date.c
LDADD = ../pico/libpico.a ../pico/osdep/libpicoosd.a \
../pith/libpith.a ../pith/osdep/libpithosd.a \
@@ -16,11 +16,11 @@
AM_CPPFLAGS = -I@top_builddir@/include -I@top_srcdir@/include -DLOCALEDIR=\"$(localedir)\"
-Index: alpine-2.10/configure.ac
+Index: alpine-2.11/configure.ac
===================================================================
---- alpine-2.10.orig/configure.ac
-+++ alpine-2.10/configure.ac
-@@ -37,8 +37,9 @@ WEB_BUILD=web/src/alpined.d
+--- alpine-2.11.orig/configure.ac
++++ alpine-2.11/configure.ac
+@@ -38,8 +38,9 @@ WEB_BUILD=web/src/alpined.d
dnl CHECK PROGRAMS
++++++ chappa-WrtAcc.patch ++++++
++++ 759 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-ignoresize.patch ++++++
--- /var/tmp/diff_new_pack.jS4DJt/_old 2013-09-04 13:16:44.000000000 +0200
+++ /var/tmp/diff_new_pack.jS4DJt/_new 2013-09-04 13:16:44.000000000 +0200
@@ -1,111 +1,112 @@
-diff -rc alpine-2.10/alpine/mailcmd.c alpine-2.10.ignoresize/alpine/mailcmd.c
-*** alpine-2.10/alpine/mailcmd.c 2013-01-11 15:21:34.000000000 -0700
---- alpine-2.10.ignoresize/alpine/mailcmd.c 2013-01-11 20:43:20.000000000 -0700
-***************
-*** 3349,3354 ****
---- 3349,3357 ----
- {-1, 0, NULL, NULL}
- };
-
-+ if(F_ON(F_IGNORE_SIZE, ps_global))
-+ return 'y';
-+
- if(flags & SSCP_INIT || flags & SSCP_END){
- if(flags & SSCP_END && possible_corruption)
- q_status_message(SM_ORDER, 3, 3, "There is possible data corruption, check the results");
-diff -rc alpine-2.10/pith/conf.c alpine-2.10.ignoresize/pith/conf.c
-*** alpine-2.10/pith/conf.c 2013-01-11 19:45:41.000000000 -0700
---- alpine-2.10.ignoresize/pith/conf.c 2013-01-11 20:43:20.000000000 -0700
-***************
-*** 3082,3087 ****
---- 3082,3089 ----
- 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},
-+ {"ignore-size-changes", NULL,
-+ F_IGNORE_SIZE, h_config_ignore_size, PREF_MISC, 0},
- {"maildrops-preserve-state", NULL,
- F_MAILDROPS_PRESERVE_STATE, h_config_maildrops_preserve_state,
- PREF_MISC, 0},
-diff -rc alpine-2.10/pith/conftype.h alpine-2.10.ignoresize/pith/conftype.h
-*** alpine-2.10/pith/conftype.h 2013-01-11 19:45:41.000000000 -0700
---- alpine-2.10.ignoresize/pith/conftype.h 2013-01-11 20:43:20.000000000 -0700
-***************
-*** 335,340 ****
---- 335,341 ----
- F_FORCE_ARROW,
- F_PRUNE_USES_ISO,
- F_ALT_ED_NOW,
-+ F_IGNORE_SIZE,
- F_SHOW_DELAY_CUE,
- F_CANCEL_CONFIRM,
- F_AUTO_OPEN_NEXT_UNREAD,
-diff -rc alpine-2.10/pith/pine.hlp alpine-2.10.ignoresize/pith/pine.hlp
-*** alpine-2.10/pith/pine.hlp 2013-01-11 20:33:27.000000000 -0700
---- alpine-2.10.ignoresize/pith/pine.hlp 2013-01-11 20:43:20.000000000 -0700
-***************
-*** 3251,3256 ****
---- 3251,3257 ----
- <li><a href="h_config_full_auto_expunge">FEATURE: <!--#echo var="FEAT_expunge-without-confirm-everywhere"--></a>
- <li><a href="h_config_no_fcc_attach">FEATURE: <!--#echo var="FEAT_fcc-without-attachments"--></a>
- <li><a href="h_config_force_arrow">FEATURE: <!--#echo var="FEAT_force-arrow-cursor"--></a>
-+ <li><a href="h_config_ignore_size">FEATURE: <!--#echo var="FEAT_ignore-size-changes"--></a>
- <li><a href="h_config_forward_as_attachment">FEATURE: <!--#echo var="FEAT_forward-as-attachment"--></a>
- <li><a href="h_config_quell_empty_dirs">FEATURE: <!--#echo var="FEAT_quell-empty-directories"--></a>
- <li><a href="h_config_hide_nntp_path">FEATURE: <!--#echo var="FEAT_hide-nntp-path"--></a>
-***************
-*** 30437,30442 ****
---- 30438,30477 ----
-
- <P>
- <End of help on this topic>
-+ </BODY>
-+ </HTML>
-+ ====== h_config_ignore_size =====
-+ <HTML>
-+ <HEAD>
-+ <TITLE>FEATURE: <!--#echo var="FEAT_ignore-size-changes"--></TITLE>
-+ </HEAD>
-+ <BODY>
-+ <H1>FEATURE: <!--#echo var="FEAT_ignore-size-changes"--></H1>
-+
-+ When you have an account residing in an IMAP server, Alpine gets the size of
-+ each message from the server. However, when Alpine saves a message residing
-+ in an IMAP server, Alpine computes the size of the message independently. If
-+ these two numbers do not match for a message, Alpine asks you if you still
-+ want to take the risk of saving the message, since data corruption or loss
-+ of data could result of this save.
-+
-+ <P>
-+ Sometimes the root of this problem is that the server is defective, and
-+ there will not be loss of information when saving such message. Enabling
-+ this feature will make Aline ignore such error and continue saving the
-+ message. If you can determine that this is the case, enable this feature
-+ so that the saving operation will succeed. An example of a defective server
-+ is the Gmail IMAP server. Another example is some versions of the Exchange
-+ server.
-+
-+ <P>
-+ It is recommended that this feature be disabled most of the time and only
-+ enabled when you find a server which you can determine that has the above
-+ mentioned defect, but be disabled again after making this operation
-+ succeed.
-+
-+ <P>
-+ <End of help on this topic>
- </BODY>
- </HTML>
- ====== h_config_force_low_speed =====
-diff -rc alpine-2.10/pith/save.c alpine-2.10.ignoresize/pith/save.c
-*** alpine-2.10/pith/save.c 2013-01-11 11:26:44.000000000 -0700
---- alpine-2.10.ignoresize/pith/save.c 2013-01-11 20:43:20.000000000 -0700
-***************
-*** 1157,1162 ****
---- 1157,1163 ----
- snprintf(buf, sizeof(buf),
- "Message to save shrank: source msg # %ld may be saved incorrectly",
- mn_raw2m(pkg->msgmap, raw));
-+ if(F_OFF(F_IGNORE_SIZE, ps_global))
- q_status_message(SM_ORDER, 0, 3, buf);
- }
- else{
+---
+ alpine/mailcmd.c | 3 +++
+ pith/conf.c | 2 ++
+ pith/conftype.h | 1 +
+ pith/pine.hlp | 35 +++++++++++++++++++++++++++++++++++
+ pith/save.c | 1 +
+ 5 files changed, 42 insertions(+)
+
+Index: alpine-2.11/alpine/mailcmd.c
+===================================================================
+--- alpine-2.11.orig/alpine/mailcmd.c
++++ alpine-2.11/alpine/mailcmd.c
+@@ -3368,6 +3368,9 @@ save_size_changed_prompt(long msgno, int
+ {-1, 0, NULL, NULL}
+ };
+
++ if(F_ON(F_IGNORE_SIZE, ps_global))
++ return 'y';
++
+ 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
+===================================================================
+--- alpine-2.11.orig/pith/conf.c
++++ alpine-2.11/pith/conf.c
+@@ -3123,6 +3123,8 @@ feature_list(int index)
+ F_FULL_AUTO_EXPUNGE, h_config_full_auto_expunge, PREF_MISC, 0},
+ {"force-arrow-cursor", NULL,
+ F_FORCE_ARROW, h_config_force_arrow, PREF_MISC, 0},
++ {"ignore-size-changes", NULL,
++ F_IGNORE_SIZE, h_config_ignore_size, PREF_MISC, 0},
+ {"maildrops-preserve-state", NULL,
+ F_MAILDROPS_PRESERVE_STATE, h_config_maildrops_preserve_state,
+ PREF_MISC, 0},
+Index: alpine-2.11/pith/conftype.h
+===================================================================
+--- alpine-2.11.orig/pith/conftype.h
++++ alpine-2.11/pith/conftype.h
+@@ -346,6 +346,7 @@ typedef enum {
+ F_FORCE_ARROW,
+ F_PRUNE_USES_ISO,
+ F_ALT_ED_NOW,
++ F_IGNORE_SIZE,
+ F_SHOW_DELAY_CUE,
+ F_CANCEL_CONFIRM,
+ F_AUTO_OPEN_NEXT_UNREAD,
+Index: alpine-2.11/pith/pine.hlp
+===================================================================
+--- alpine-2.11.orig/pith/pine.hlp
++++ alpine-2.11/pith/pine.hlp
+@@ -3296,6 +3296,7 @@ There are also additional details on
+ <li><a href="h_config_full_auto_expunge">FEATURE: <!--#echo var="FEAT_expunge-without-confirm-everywhere"--></a>
+ <li><a href="h_config_no_fcc_attach">FEATURE: <!--#echo var="FEAT_fcc-without-attachments"--></a>
+ <li><a href="h_config_force_arrow">FEATURE: <!--#echo var="FEAT_force-arrow-cursor"--></a>
++<li><a href="h_config_ignore_size">FEATURE: <!--#echo var="FEAT_ignore-size-changes"--></a>
+ <li><a href="h_config_forward_as_attachment">FEATURE: <!--#echo var="FEAT_forward-as-attachment"--></a>
+ <li><a href="h_config_preserve_field">FEATURE: <!--#echo var="FEAT_preserve-original-fields"--></a>
+ <li><a href="h_config_quell_empty_dirs">FEATURE: <!--#echo var="FEAT_quell-empty-directories"--></a>
+@@ -30787,6 +30788,40 @@ but that is not implemented.
+
+ <P>
+ <End of help on this topic>
++</BODY>
++</HTML>
++====== h_config_ignore_size =====
++<HTML>
++<HEAD>
++<TITLE>FEATURE: <!--#echo var="FEAT_ignore-size-changes"--></TITLE>
++</HEAD>
++<BODY>
++<H1>FEATURE: <!--#echo var="FEAT_ignore-size-changes"--></H1>
++
++When you have an account residing in an IMAP server, Alpine gets the size of
++each message from the server. However, when Alpine saves a message residing
++in an IMAP server, Alpine computes the size of the message independently. If
++these two numbers do not match for a message, Alpine asks you if you still
++want to take the risk of saving the message, since data corruption or loss
++of data could result of this save.
++
++<P>
++Sometimes the root of this problem is that the server is defective, and
++there will not be loss of information when saving such message. Enabling
++this feature will make Aline ignore such error and continue saving the
++message. If you can determine that this is the case, enable this feature
++so that the saving operation will succeed. An example of a defective server
++is the Gmail IMAP server. Another example is some versions of the Exchange
++server.
++
++<P>
++It is recommended that this feature be disabled most of the time and only
++enabled when you find a server which you can determine that has the above
++mentioned defect, but be disabled again after making this operation
++succeed.
++
++<P>
++<End of help on this topic>
+ </BODY>
+ </HTML>
+ ====== h_config_force_low_speed =====
+Index: alpine-2.11/pith/save.c
+===================================================================
+--- alpine-2.11.orig/pith/save.c
++++ alpine-2.11/pith/save.c
+@@ -1157,6 +1157,7 @@ long save_fetch_append_cb(MAILSTREAM *st
+ snprintf(buf, sizeof(buf),
+ "Message to save shrank: source msg # %ld may be saved incorrectly",
+ mn_raw2m(pkg->msgmap, raw));
++ if(F_OFF(F_IGNORE_SIZE, ps_global))
+ q_status_message(SM_ORDER, 0, 3, buf);
+ }
+ else{
++++++ chappa-insertpat.patch ++++++
--- /var/tmp/diff_new_pack.jS4DJt/_old 2013-09-04 13:16:44.000000000 +0200
+++ /var/tmp/diff_new_pack.jS4DJt/_new 2013-09-04 13:16:44.000000000 +0200
@@ -1,40 +1,43 @@
-diff -rc alpine-2.10/pico/display.c alpine-2.10.insertpat/pico/display.c
-*** alpine-2.10/pico/display.c 2013-01-11 11:25:29.000000000 -0700
---- alpine-2.10.insertpat/pico/display.c 2013-01-11 20:43:15.000000000 -0700
-***************
-*** 1760,1765 ****
---- 1760,1777 ----
-
- 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.10/pico/search.c alpine-2.10.insertpat/pico/search.c
-*** alpine-2.10/pico/search.c 2013-01-11 11:25:29.000000000 -0700
---- alpine-2.10.insertpat/pico/search.c 2013-01-11 20:43:15.000000000 -0700
-***************
-*** 76,81 ****
---- 76,85 ----
- 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."),
- " ",
+---
+ pico/display.c | 12 ++++++++++++
+ pico/search.c | 4 ++++
+ 2 files changed, 16 insertions(+)
+
+Index: alpine-2.11/pico/display.c
+===================================================================
+--- alpine-2.11.orig/pico/display.c
++++ alpine-2.11/pico/display.c
+@@ -1760,6 +1760,18 @@ mlreplyd(UCS *prompt, UCS *buf, int nbuf
+
+ continue;
+
++ 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.11/pico/search.c
+===================================================================
+--- alpine-2.11.orig/pico/search.c
++++ alpine-2.11/pico/search.c
+@@ -76,6 +76,10 @@ N_(" brackets. This string is th
+ N_("~ Hitting only ~R~e~t~u~r~n or at the prompt will cause the"),
+ N_(" search to be made with the default value."),
+ " ",
++N_("~ Hitting ~^~N will reinsert the last string you searched for"),
++N_(" so that you can edit it (in case you made a mistake entering the"),
++N_(" search pattern the first time)."),
++" ",
+ N_(" The text search is not case sensitive, and will examine the"),
+ N_(" entire message."),
+ " ",
++++++ chappa-maildir.patch ++++++
++++ 7376 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.jS4DJt/_old 2013-09-04 13:16:44.000000000 +0200
+++ /var/tmp/diff_new_pack.jS4DJt/_new 2013-09-04 13:16:44.000000000 +0200
@@ -1,45 +1,35 @@
-diff -rc alpine-2.10/imap/src/c-client/mail.c alpine-2.10.unixnullbug/imap/src/c-client/mail.c
-*** alpine-2.10/imap/src/c-client/mail.c 2013-01-11 15:21:34.000000000 -0700
---- alpine-2.10.unixnullbug/imap/src/c-client/mail.c 2013-01-11 20:45:05.000000000 -0700
-***************
-*** 3352,3364 ****
- long flags)
- {
- STRINGLIST *hdrs;
-! int notfound;
- unsigned long i;
- char c,*s,*e,*t,tmp[MAILTMPLEN];
- char *src = text;
- char *dst = src;
- char *end = text + len;
-! text[len] = '\012'; /* guard against running off buffer */
- while (src < end) { /* process header */
- /* slurp header line name */
- for (s = src,e = s + MAILTMPLEN - 1,e = (e < end ? e : end),t = tmp;
---- 3352,3364 ----
- long flags)
- {
- STRINGLIST *hdrs;
-! int notfound, fix = text[len - 1] == '\0';
- unsigned long i;
- char c,*s,*e,*t,tmp[MAILTMPLEN];
- char *src = text;
- char *dst = src;
- char *end = text + len;
-! text[fix ? len - 1 : len] = '\012'; /* guard against running off buffer */
- while (src < end) { /* process header */
- /* slurp header line name */
- for (s = src,e = s + MAILTMPLEN - 1,e = (e < end ? e : end),t = tmp;
-***************
-*** 3397,3402 ****
---- 3397,3406 ----
- }
- }
- *dst = '\0'; /* tie off destination */
-+ if(fix){
-+ text[len] = '\012';
-+ text[len-1] = '\0';
-+ }
- return dst - text;
- }
-
+---
+ imap/src/c-client/mail.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+Index: alpine-2.11/imap/src/c-client/mail.c
+===================================================================
+--- alpine-2.11.orig/imap/src/c-client/mail.c
++++ alpine-2.11/imap/src/c-client/mail.c
+@@ -3361,13 +3361,13 @@ unsigned long mail_filter (char *text,un
+ long flags)
+ {
+ STRINGLIST *hdrs;
+- int notfound;
++ int notfound, fix = text[len - 1] == '\0';
+ unsigned long i;
+ char c,*s,*e,*t,tmp[MAILTMPLEN];
+ char *src = text;
+ char *dst = src;
+ char *end = text + len;
+- text[len] = '\012'; /* guard against running off buffer */
++ text[fix ? len - 1 : len] = '\012'; /* guard against running off buffer */
+ while (src < end) { /* process header */
+ /* slurp header line name */
+ for (s = src,e = s + MAILTMPLEN - 1,e = (e < end ? e : end),t = tmp;
+@@ -3406,6 +3406,10 @@ unsigned long mail_filter (char *text,un
+ }
+ }
+ *dst = '\0'; /* tie off destination */
++ if(fix){
++ text[len] = '\012';
++ text[len-1] = '\0';
++ }
+ return dst - text;
+ }
+
++++++ fix-implicit.patch ++++++
--- /var/tmp/diff_new_pack.jS4DJt/_old 2013-09-04 13:16:44.000000000 +0200
+++ /var/tmp/diff_new_pack.jS4DJt/_new 2013-09-04 13:16:44.000000000 +0200
@@ -1,5 +1,11 @@
---- imap/src/mlock/mlock.c
-+++ imap/src/mlock/mlock.c
+---
+ imap/src/mlock/mlock.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: alpine-2.11/imap/src/mlock/mlock.c
+===================================================================
+--- alpine-2.11.orig/imap/src/mlock/mlock.c
++++ alpine-2.11/imap/src/mlock/mlock.c
@@ -28,6 +28,7 @@
#include
participants (1)
-
root@hilbert.suse.de