* New version 2.10.99999

  * Pico: search backwards.
  * do not allow List- headers to be set up by users in accordance with
    RFC 2369.
  * minor fixes for new justification support (add comparison of a line
    with the previous *and* the next).

6 files changed, 26 insertions, 20 deletions

diff --git a/pith/Makefile.in b/pith/Makefile.in
index 87a1ba15..c3c18ed5 100644
--- a/pith/Makefile.in
+++ b/pith/Makefile.in
@@ -184,7 +184,6 @@ C_CLIENT_TARGET = @C_CLIENT_TARGET@
 C_CLIENT_WITH_IPV6 = @C_CLIENT_WITH_IPV6@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -220,7 +219,6 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -267,7 +265,6 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -303,6 +300,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/pith/charconv/Makefile.in b/pith/charconv/Makefile.in
index 9911480c..28e6c4dd 100644
--- a/pith/charconv/Makefile.in
+++ b/pith/charconv/Makefile.in
@@ -116,7 +116,6 @@ C_CLIENT_TARGET = @C_CLIENT_TARGET@
 C_CLIENT_WITH_IPV6 = @C_CLIENT_WITH_IPV6@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -152,7 +151,6 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -199,7 +197,6 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -235,6 +232,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/pith/conf.c b/pith/conf.c
index 990688aa..10c64cfa 100644
--- a/pith/conf.c
+++ b/pith/conf.c
@@ -4,8 +4,8 @@ static char rcsid[] = "$Id: conf.c 1266 2009-07-14 18:39:12Z hubert@u.washington
 
 /*
  * ========================================================================
- * Copyright 2006-2009 University of Washington
  * Copyright 2013 Eduardo Chappa
+ * Copyright 2006-2009 University of Washington
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -5873,7 +5873,8 @@ write_pinerc(struct pine *ps, EditWhich which, int flags)
 
 #ifndef _WINDOWS
 	/* if .pinerc is a symbolic link, override symbolic link */
-	if(our_lstat(filename, &sbuf) == 0){
+	if(our_lstat(filename, &sbuf) == 0 
+		&& ((sbuf.st_mode & S_IFMT) == S_IFLNK)){
 	  if((slink = fs_get((sbuf.st_size+1)*sizeof(char))) != NULL){
 	    int r = -1;			/* assume error */
 	    if(readlink(filename, slink, sbuf.st_size + 1) >= 0){
@@ -8311,3 +8312,4 @@ pcpine_general_help(titlebuf)
 }
 
 #endif	/* _WINDOWS */
+
diff --git a/pith/osdep/Makefile.in b/pith/osdep/Makefile.in
index b2e644f6..8b08c7f9 100644
--- a/pith/osdep/Makefile.in
+++ b/pith/osdep/Makefile.in
@@ -123,7 +123,6 @@ C_CLIENT_TARGET = @C_CLIENT_TARGET@
 C_CLIENT_WITH_IPV6 = @C_CLIENT_WITH_IPV6@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -159,7 +158,6 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -206,7 +204,6 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -242,6 +239,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 2daa9cc0..6afda948 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
 reasonable place to be called from.
 Dummy change to get revision in pine.hlp
 ============= h_revision =================
-Alpine Commit 20 2013-07-21 15:28:03
+Alpine Commit 21 2013-07-23 22:22:31
 ============= h_news =================
 <HTML>
 <HEAD>
@@ -149,7 +149,7 @@ Alpine Commit 20 2013-07-21 15:28:03
 <BODY>                 
 <H1>Alpine Release Notes</H1>
 <DIV ALIGN=CENTER>
-Version <!--#echo var="ALPINE_VERSION"-->(<!--#echo var="ALPINE_REVISION"-->)
+Version <!--#echo var="ALPINE_VERSION"--> (<!--#echo var="ALPINE_REVISION"-->)
 <BR>
 <!--chtml if pinemode="running"-->
 (built <!--#echo var=ALPINE_COMPILE_DATE-->)
@@ -169,9 +169,9 @@ is available as is a world wide web based version designed to run under the
 Apache web server.
 
 
-<H2>New in Alpine <!--#echo var="ALPINE_VERSION"-->(<!--#echo var="ALPINE_REVISION"-->)</H2>
+<H2>New in Alpine <!--#echo var="ALPINE_VERSION"--> (<!--#echo var="ALPINE_REVISION"-->)</H2>
 
-Version <!--#echo var="ALPINE_VERSION"-->(<!--#echo var="ALPINE_REVISION"-->)
+Version <!--#echo var="ALPINE_VERSION"--> (<!--#echo var="ALPINE_REVISION"-->)
 addresses bugs found in previous releases and has a few additions as well.
 
 <P>
@@ -180,10 +180,13 @@ Additions include:
 
 <UL>
    <LI> Increase encryption of S/MIME encrypted messages.
-   <LI> Improvements in justification of paragraphs: lines that begin
+   <LI> 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. Based on earlier joint work
 with Jeff Franklin.
+   <LI> Pico: The search command in Pico allows backwards search. In order
+to search backwards, start a search with the CTRL-W command, and press
+CTRL-P to change the direction of the search.
    <LI> Unix Alpine: Allow local .pinerc file to be a symbolic link.
    <LI> Experimental extended support of recognition of UTF-8 in urls based on 
 information from <A HREF="http://url.spec.whatwg.org">http://url.spec.whatwg.org</A>.
@@ -206,13 +209,14 @@ message, as specified by original sender.
 Bugs that have been addressed include:
 <P>
 <UL>
+  <LI> Crash when a non-compliant SMTP server closes a connection without a QUIT command.
+  <LI> Crash when resizing the screen in a configuration screen.
   <LI> Do not bail out during a tcp timeout, instead close connection and avoid crash.
   <LI> Do not use a shell to open a browser.
   <LI> Configure script did not test for crypto or pam libraries.
   <LI> Configure script still built web component, even if header file tcl.h was not present.
-  <LI> Fix Cygwin directory separator from &quot;\&quot; to &quot;/&quot;.
-  <LI> Crash when a non-compliant SMTP server closes a connection without a QUIT command.
-  <LI> Crash when resizing the screen in a configuration screen.
+  <LI> Change Cygwin directory separator to &quot;/&quot;.
+  <LI> Alpine could set List- headers, contrary to RFC 2369.
 </UL>
 
 <P>
diff --git a/pith/send.c b/pith/send.c
index a0c60439..273f59aa 100644
--- a/pith/send.c
+++ b/pith/send.c
@@ -4,8 +4,8 @@ static char rcsid[] = "$Id: send.c 1204 2009-02-02 19:54:23Z hubert@u.washington
 
 /*
  * ========================================================================
- * Copyright 2006-2008 University of Washington
  * Copyright 2013 Eduardo Chappa
+ * Copyright 2006-2008 University of Washington
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -4800,6 +4800,12 @@ pine_header_forbidden(char *name)
 	"content-type",
 	"x-priority",
 	"user-agent",
+	"list-help",		/* rfc 2369, section 3 */
+	"list-unsubscribe",
+	"list-subscribe",
+	"list-post",
+	"list-owner",
+	"list-archive",
 	NULL
     };