alpine: 2.21.9999.r51.74c603f-2 -> 2.21.9999.r55.78b20aa-1

3 files changed, 19 insertions, 115 deletions

diff --git a/alpine/PKGBUILD b/alpine/PKGBUILD
index 8795b9485..94911aab1 100644
--- a/alpine/PKGBUILD
+++ b/alpine/PKGBUILD
@@ -2,9 +2,9 @@
 # Contributor: Adrian C. <anrxc..sysphere.org>
 
 pkgname=alpine
-pkgver=2.21.9999.r51.74c603f
+pkgver=2.21.9999.r55.78b20aa
 _commit=${pkgver##*.}
-pkgrel=2
+pkgrel=1
 arch=("i686" "pentium4" "x86_64")
 pkgdesc="Apache licensed PINE mail user agent"
 url="http://alpine.freeiz.com"
@@ -21,16 +21,13 @@ options=("!makeflags")
 source=(
   "alpine::git://repo.or.cz/alpine.git#commit=${_commit}"
   'topal-patch.patch'
-  'backwards-search.patch' # thanks, Astyanax Foo - http://mailman13.u.washington.edu/pipermail/alpine-info/2009-February/001753.html
 )
 sha512sums=('SKIP'
-            'bc7a3143cb2f7d79438c49b89bfdc52db7473521a7870ad621ecba96fff2f1688f4f3d58def9b8d57f8beba4e1e9c8b193f9281571e0564538ca7c7db16f0027'
-            'c4ebb6ace5c2520e74ed28eea730d34d4dea68b7ae3ac67966e5cc4db0a5731de748f8f11137115cc2a5d4b7278e10fa450d0b4b04956e53402f1d92fae2d7d6')
+            'bdaf9f0ed2bb9d10eaf4b456e24684cd09eb9e97ae2cf6eb4a2bc2bb5e231e8254d79efa63da9918022302fd970180f2dcd90a69d8c8d817c729c6a18fd6d506')
 
 prepare() {
   cd "${srcdir}/${pkgname}"
   patch -p1 -i "${srcdir}/topal-patch.patch"
-  patch -p1 -i "${srcdir}/backwards-search.patch"
 }
 
 pkgver() {
diff --git a/alpine/backwards-search.patch b/alpine/backwards-search.patch
deleted file mode 100644
index 892660976..000000000
--- a/alpine/backwards-search.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/alpine/mailindx.c b/alpine/mailindx.c
-index 18583c3..f1dd874 100644
---- a/alpine/mailindx.c
-+++ b/alpine/mailindx.c
-@@ -2954,19 +2954,21 @@ away.
- void
- index_search(struct pine *state, MAILSTREAM *stream, int command_line, MSGNO_S *msgmap)
- {
--    int         rc, select_all = 0, flags, prefetch, we_turned_on = 0;
-+    int         rc, select_all = 0, flags, prefetch, searchbound, otherbound, offset = 0, we_turned_on = 0;
-     long        i, sorted_msg, selected = 0L;
-     char        prompt[MAX_SEARCH+50], new_string[MAX_SEARCH+1];
-     char        buf[MAX_SCREEN_COLS+1], *p;
-     HelpType	help;
-     char        search_string[MAX_SEARCH+1];
-     ICE_S      *ice, *ic;
-+    static int direction = 1;
-     static HISTORY_S *history = NULL;
-     static ESCKEY_S header_search_key[] = { {0, 0, NULL, NULL },
- 					    {ctrl('Y'), 10, "^Y", N_("First Msg")},
- 					    {ctrl('V'), 11, "^V", N_("Last Msg")},
- 					    {KEY_UP,    30, "", ""},
- 					    {KEY_DOWN,  31, "", ""},
-+					    {ctrl('W'), 32, "^W", N_("Direction")},
- 					    {-1, 0, NULL, NULL} };
- #define KU_IS (3)	/* index of KEY_UP */
- #define PREFETCH_THIS_MANY_LINES (50)
-@@ -2995,7 +2997,8 @@ index_search(struct pine *state, MAILSTREAM *stream, int command_line, MSGNO_S *
-     new_string[0] = '\0';
- 
-     while(1) {
--	snprintf(prompt, sizeof(prompt), _("Word to search for [%s] : "), search_string);
-+	snprintf(prompt, sizeof(prompt), _("Word to search %sfor [%s] : "),
-+		direction == -1 ? _("(backwards) ") : "", search_string);
- 
- 	if(F_ON(F_ENABLE_AGG_OPS, ps_global)){
- 	    header_search_key[0].ch    = ctrl('X');
-@@ -3092,6 +3095,10 @@ index_search(struct pine *state, MAILSTREAM *stream, int command_line, MSGNO_S *
- 
- 	    continue;
- 	}
-+	else if(rc == 32){
-+	    direction *= -1;
-+	    continue;
-+	}
- 
-         if(rc != 4){			/* 4 is redraw */
- 	    save_hist(history, new_string, 0, NULL);
-@@ -3115,9 +3122,18 @@ index_search(struct pine *state, MAILSTREAM *stream, int command_line, MSGNO_S *
-     we_turned_on = intr_handling_on();
- 
-     prefetch = 0;
--    for(i = sorted_msg + ((select_all)?0:1);
--	i <= mn_get_total(msgmap) && !ps_global->intr_pending;
--	i++){
-+    if (direction == -1) {
-+	searchbound = -1;
-+	otherbound = mn_get_total(msgmap);
-+	offset = 2;
-+    } else {
-+	searchbound = mn_get_total(msgmap);
-+	otherbound = 1;
-+    }
-+
-+    for(i = sorted_msg + ((select_all)?0:1) - offset;
-+	i * direction <= searchbound && !ps_global->intr_pending;
-+	i += direction){
-       if(msgline_hidden(stream, msgmap, i, 0))
- 	continue;
- 
-@@ -3139,8 +3155,11 @@ index_search(struct pine *state, MAILSTREAM *stream, int command_line, MSGNO_S *
-     }
- 
-     prefetch = 0;
--    if(i > mn_get_total(msgmap)){
--      for(i = 1; i < sorted_msg && !ps_global->intr_pending; i++){
-+    if(i * direction > searchbound){
-+      for(i = otherbound;
-+	i * direction < sorted_msg * direction && !ps_global->intr_pending;
-+	i += direction ){
-+
-         if(msgline_hidden(stream, msgmap, i, 0))
- 	  continue;
- 
-@@ -3194,7 +3213,7 @@ index_search(struct pine *state, MAILSTREAM *stream, int command_line, MSGNO_S *
-     }
-     else if(selected){
- 	q_status_message1(SM_ORDER, 0, 3, _("Word found%s"),
--			  (i < sorted_msg) ? _(". Search wrapped to beginning") :
-+			  (i * direction < sorted_msg * direction) ? _(". Search wrapped to beginning") :
- 			   (i == sorted_msg) ? _(". Current line contains only match") : "");
- 	mn_set_cur(msgmap, i);
-     }
diff --git a/alpine/topal-patch.patch b/alpine/topal-patch.patch
index 00eaa9992..4090ac9b4 100644
--- a/alpine/topal-patch.patch
+++ b/alpine/topal-patch.patch
@@ -83,10 +83,10 @@ index 6eb3313..ba55d1c 100644
  			    }
  
 diff --git a/imap/src/c-client/mail.c b/imap/src/c-client/mail.c
-index 8f0373e..8b0dc80 100644
+index 49444eb..4b2c67e 100644
 --- a/imap/src/c-client/mail.c
 +++ b/imap/src/c-client/mail.c
-@@ -2807,6 +2807,8 @@ BODY *mail_body_section (BODY *b, unsigned char *section)
+@@ -2815,6 +2815,8 @@ BODY *mail_body_section (BODY *b, unsigned char *section)
  BODY *mail_body (MAILSTREAM *stream,unsigned long msgno,unsigned char *section)
  {
    BODY *b = NIL;
@@ -96,10 +96,10 @@ index 8f0373e..8b0dc80 100644
    if (section && *section && mail_fetchstructure (stream,msgno,&b) && b)
      return mail_body_section(b, section);
 diff --git a/imap/src/c-client/mail.h b/imap/src/c-client/mail.h
-index 58d2979..70deb46 100644
+index b5cd65d..dbf607f 100644
 --- a/imap/src/c-client/mail.h
 +++ b/imap/src/c-client/mail.h
-@@ -828,6 +828,7 @@ BODY {
+@@ -831,6 +831,7 @@ BODY {
      unsigned long bytes;	/* size of text in octets */
    } size;
    char *md5;			/* MD5 checksum */
@@ -108,7 +108,7 @@ index 58d2979..70deb46 100644
  };
  
 diff --git a/pith/conf.c b/pith/conf.c
-index c7c24db..bb9daa7 100644
+index 3742e9a..bf31096 100644
 --- a/pith/conf.c
 +++ b/pith/conf.c
 @@ -2910,6 +2910,8 @@ feature_list(int index)
@@ -133,7 +133,7 @@ index bfb337c..21b630d 100644
  	F_COMPOSE_ALWAYS_DOWNGRADE,
  	F_SORT_DEFAULT_FCC_ALPHA,
 diff --git a/pith/mailcap.c b/pith/mailcap.c
-index 06a0b63..87a82e7 100644
+index 06f521f..04d1b7d 100644
 --- a/pith/mailcap.c
 +++ b/pith/mailcap.c
 @@ -583,8 +583,17 @@ mc_get_command(int type, char *subtype, BODY *body,
@@ -157,10 +157,10 @@ index 06a0b63..87a82e7 100644
  		strncpy(ext = tmp_ext, e2b.from.ext - 1, sizeof(tmp_ext)); /* remember it */
  		tmp_ext[sizeof(tmp_ext)-1] = '\0';
 diff --git a/pith/pine.hlp b/pith/pine.hlp
-index 9967019..d2e657d 100644
+index 8a1fff7..e334631 100644
 --- a/pith/pine.hlp
 +++ b/pith/pine.hlp
-@@ -4216,7 +4216,8 @@ There are also additional details on
+@@ -4368,7 +4368,8 @@ There are also additional details on
  <li><a href="h_config_always_spell_check">FEATURE: <!--#echo var="FEAT_spell-check-before-sending"--></a>
  <li><a href="h_config_winpos_in_config">FEATURE: <!--#echo var="FEAT_store-window-position-in-config"--></a>
  <li><a href="h_config_strip_sigdashes">FEATURE: <!--#echo var="FEAT_strip-from-sigdashes-on-reply"--></a>
@@ -170,7 +170,7 @@ index 9967019..d2e657d 100644
  <li><a href="h_config_quells_asterisks">FEATURE: <!--#echo var="FEAT_suppress-asterisks-in-password-prompt"--></a>
  <li><a href="h_config_quell_attach_ext_warn">FEATURE: <!--#echo var="FEAT_quell-attachment-extension-warn"--></a>
  <li><a href="h_config_quell_attach_extra_prompt">FEATURE: <!--#echo var="FEAT_quell-attachment-extra-prompt"--></a>
-@@ -29862,6 +29863,21 @@ is enabled. However, notice that the default is to include text if you edit the
+@@ -30014,6 +30015,21 @@ is enabled. However, notice that the default is to include text if you edit the
  reply indent string or if you explicitly set through this menu that you
  want headers included in the reply message.
  
@@ -193,7 +193,7 @@ index 9967019..d2e657d 100644
  &lt;End of help on this topic&gt;
  </BODY>
 diff --git a/pith/send.c b/pith/send.c
-index b724385..05c5982 100644
+index 32722a3..7c20b80 100644
 --- a/pith/send.c
 +++ b/pith/send.c
 @@ -108,7 +108,7 @@ long       post_rfc822_output(char *, ENVELOPE *, BODY *, soutr_t, TCPSTREAM *,
@@ -304,7 +304,7 @@ index b724385..05c5982 100644
  	part = body->nested.part;	/* first body part */
  					/* find cookie */
  	for (param = body->parameter; param && !cookie; param = param->next)
-@@ -4401,10 +4419,14 @@ pine_rfc822_output_body(struct mail_bodystruct *body, soutr_t f, void *s)
+@@ -4402,10 +4420,14 @@ pine_rfc822_output_body(struct mail_bodystruct *body, soutr_t f, void *s)
  	 * BEFORE applying any encoding (rfc1341: appendix G)...
  	 * NOTE: almost all filters expect CRLF newlines 
  	 */
@@ -322,7 +322,7 @@ index b724385..05c5982 100644
  	}
  
  	switch (body->encoding) {	/* all else needs filtering */
-@@ -4517,7 +4539,7 @@ pine_write_body_header(struct mail_bodystruct *body, soutr_t f, void *s)
+@@ -4518,7 +4540,7 @@ pine_write_body_header(struct mail_bodystruct *body, soutr_t f, void *s)
  	  return(pwbh_finish(0, so));
  	    
  	if(body->parameter){
@@ -331,7 +331,7 @@ index b724385..05c5982 100644
  	      return(pwbh_finish(0, so));
  	}
  	else if ((body->type != TYPEMESSAGE
-@@ -4599,7 +4621,7 @@ pine_write_body_header(struct mail_bodystruct *body, soutr_t f, void *s)
+@@ -4600,7 +4622,7 @@ pine_write_body_header(struct mail_bodystruct *body, soutr_t f, void *s)
  		 && so_puts(so, body->disposition.type)))
  	      return(pwbh_finish(0, so));
  
@@ -340,7 +340,7 @@ index b724385..05c5982 100644
  	      return(pwbh_finish(0, so));	      
  
  	    if(!so_puts(so, "\015\012"))
-@@ -4661,7 +4683,7 @@ pine_write_header_line(char *hdr, char *val, STORE_S *so)
+@@ -4662,7 +4684,7 @@ pine_write_header_line(char *hdr, char *val, STORE_S *so)
   * pine_write_param - convert, encode and write MIME header-field parameters
   */
  int
@@ -349,7 +349,7 @@ index b724385..05c5982 100644
  {	      
      for(; param; param = param->next){
  	int   rv;
-@@ -4670,9 +4692,17 @@ pine_write_params(PARAMETER *param, STORE_S *so)
+@@ -4671,9 +4693,17 @@ pine_write_params(PARAMETER *param, STORE_S *so)
  
  	cs = posting_characterset(param->value, NULL, HdrText);
  	cv = utf8_to_charset(param->value, cs, 0);
@@ -370,7 +370,7 @@ index b724385..05c5982 100644
  	if(cv && cv != param->value)
  	  fs_give((void **) &cv);
  
-@@ -4779,7 +4809,9 @@ send_body_size(struct mail_bodystruct *body)
+@@ -4780,7 +4810,9 @@ send_body_size(struct mail_bodystruct *body)
      long  l = 0L;
      PART *part;