* Release of version 2.22.1

13 files changed, 35 insertions, 32 deletions

diff --git a/Makefile.in b/Makefile.in
index fc7027f9..3413b7ed 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -207,8 +207,8 @@ CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in \
 	$(top_srcdir)/include/config.h.in ABOUT-NLS README compile \
-	config.guess config.rpath config.sub depcomp install-sh \
-	ltmain.sh missing mkinstalldirs
+	config.guess config.rpath config.sub install-sh ltmain.sh \
+	missing mkinstalldirs
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
diff --git a/VERSION b/VERSION
index 4699fb07..d93847fa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.22
+2.22.1
diff --git a/alpine/osdep/alpine-splash.bmp b/alpine/osdep/alpine-splash.bmp
index 18e3f41f..b5e42bc4 100644
--- a/alpine/osdep/alpine-splash.bmp
+++ b/alpine/osdep/alpine-splash.bmp
diff --git a/alpine/osdep/mswin.rc b/alpine/osdep/mswin.rc
index 89d0672e..ab3bf7ec 100644
--- a/alpine/osdep/mswin.rc
+++ b/alpine/osdep/mswin.rc
@@ -244,8 +244,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,22,0,0
- PRODUCTVERSION 2,22,0,0
+ FILEVERSION 2,22,1,0
+ PRODUCTVERSION 2,22,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -267,12 +267,12 @@ BEGIN
 #else
             VALUE "FileDescription", "Alpine\0"
 #endif
-            VALUE "FileVersion", "2.22\0"
+            VALUE "FileVersion", "2.22.1\0"
             VALUE "InternalName", "alpine\0"
             VALUE "LegalCopyright", "Copyright 2013-2020 Eduardo Chappa, Copyright 2006-2009 University of Washington\0"
             VALUE "OriginalFilename", "alpine.exe\0"
             VALUE "ProductName", "alpine\0"
-            VALUE "ProductVersion", "2.22\0"
+            VALUE "ProductVersion", "2.22.1\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/configure b/configure
index 5e8655c9..085ef935 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Rev:29 by chappa@washington.edu.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for alpine 2.22.
+# Generated by GNU Autoconf 2.69 for alpine 2.22.1.
 #
 # Report bugs to <chappa@washington.edu>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='alpine'
 PACKAGE_TARNAME='alpine'
-PACKAGE_VERSION='2.22'
-PACKAGE_STRING='alpine 2.22'
+PACKAGE_VERSION='2.22.1'
+PACKAGE_STRING='alpine 2.22.1'
 PACKAGE_BUGREPORT='chappa@washington.edu'
 PACKAGE_URL=''
 
@@ -1481,7 +1481,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures alpine 2.22 to adapt to many kinds of systems.
+\`configure' configures alpine 2.22.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1551,7 +1551,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of alpine 2.22:";;
+     short | recursive ) echo "Configuration of alpine 2.22.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1865,7 +1865,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-alpine configure 2.22
+alpine configure 2.22.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2471,7 +2471,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by alpine $as_me 2.22, which was
+It was created by alpine $as_me 2.22.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3340,7 +3340,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='alpine'
- VERSION='2.22'
+ VERSION='2.22.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -22256,7 +22256,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by alpine $as_me 2.22, which was
+This file was extended by alpine $as_me 2.22.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22322,7 +22322,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-alpine config.status 2.22
+alpine config.status 2.22.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/doc/man1/alpine.1 b/doc/man1/alpine.1
index 123f391b..d7da830e 100644
--- a/doc/man1/alpine.1
+++ b/doc/man1/alpine.1
@@ -1,4 +1,4 @@
-.TH alpine 1 "Version 2.22"
+.TH alpine 1 "Version 2.22.1"
 .SH NAME
 alpine \- an Alternatively Licensed Program for Internet News and Email
 .SH SYNTAX 
diff --git a/doc/tech-notes/index.html b/doc/tech-notes/index.html
index 96f88e5e..9410ea5e 100644
--- a/doc/tech-notes/index.html
+++ b/doc/tech-notes/index.html
@@ -3,7 +3,7 @@
 <BODY>
 <H1>Alpine Technical Notes</H1>
  
-Version 2.22, January 2020
+Version 2.22.1, June 2020
 
 <H2><A NAME="TOC">Table of Contents</A></H2><P>
 
diff --git a/doc/tech-notes/tech-notes.txt b/doc/tech-notes/tech-notes.txt
index 0ff83a1b..46afd811 100644
--- a/doc/tech-notes/tech-notes.txt
+++ b/doc/tech-notes/tech-notes.txt
@@ -1,7 +1,7 @@
 
                              Alpine Technical Notes
 
-   Version 2.22, January 2020
+   Version 2.22.1, June 2020
 
 Table of Contents
 
diff --git a/include/config.wnt.h b/include/config.wnt.h
index 50d1235e..c9a8da96 100644
--- a/include/config.wnt.h
+++ b/include/config.wnt.h
@@ -463,13 +463,13 @@
 #define PACKAGE_NAME "alpine"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "alpine 2.22"
+#define PACKAGE_STRING "alpine 2.22.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "alpine"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.22"
+#define PACKAGE_VERSION "2.22.1"
 
 /* Program users use to change their password */
 /* #undef PASSWD_PROG */
@@ -600,7 +600,7 @@
 #define UTF8_INTERNAL
 
 /* Version number of package */
-#define VERSION "2.22"
+#define VERSION "2.22.1"
 
 /* Windows is just too different */
 #ifndef _WINDOWS
diff --git a/mapi/pmapi.c b/mapi/pmapi.c
index 9f53a31f..84a2016e 100644
--- a/mapi/pmapi.c
+++ b/mapi/pmapi.c
@@ -1952,7 +1952,7 @@ BOOL APIENTRY DllMain(
 
 	now = time((time_t *)0);
 	tm_now = localtime(&now);
-	fprintf(ms_global->dfd, "pmapi32.dll for Alpine Version 2.22\r\n");
+	fprintf(ms_global->dfd, "pmapi32.dll for Alpine Version 2.22.1\r\n");
 	fprintf(ms_global->dfd, " Build date: %s\r\n", datestamp);
 	fprintf(ms_global->dfd,
 		" please report all bugs to chappa@gmx.com\r\n");
diff --git a/mapi/pmapi.rc b/mapi/pmapi.rc
index 67d3b9cc..417ae3e9 100644
--- a/mapi/pmapi.rc
+++ b/mapi/pmapi.rc
@@ -98,8 +98,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,22,0,0
- PRODUCTVERSION 2,22,0,0
+ FILEVERSION 2,22,1,0
+ PRODUCTVERSION 2,22,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x29L
@@ -117,14 +117,14 @@ BEGIN
             VALUE "Comments", "alpine info: http://repo.or.cz/alpine.git\0"
             VALUE "CompanyName", "Patches for Alpine\0"
             VALUE "FileDescription", "Simple MAPI DLL for Alpine for Windows\0"
-            VALUE "FileVersion", "2.22\0"
+            VALUE "FileVersion", "2.22.1\0"
             VALUE "InternalName", "pmapi32\0"
             VALUE "LegalCopyright", "Copyright ? University of Washington 2006-2009, Eduardo Chappa 2013-2014\0"
             VALUE "LegalTrademarks", "Apache License, Version 2.0\0"
             VALUE "OriginalFilename", "pmapi32.dll\0"
             VALUE "PrivateBuild", " \0"
             VALUE "ProductName", "Simple MAPI for Alpine for Windows\0"
-            VALUE "ProductVersion", "2.22\0"
+            VALUE "ProductVersion", "2.22.1\0"
             VALUE "SpecialBuild", " \0"
         END
     END
diff --git a/packages/alpine.spec b/packages/alpine.spec
index 7b945a6e..847c3a7f 100644
--- a/packages/alpine.spec
+++ b/packages/alpine.spec
@@ -1,6 +1,6 @@
 Summary: Alpine mail user agent
 Name: alpine
-Version: 2.22
+Version: 2.22.1
 Release: 1
 License: Apache License
 Group: Applications/Mail
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 8cb714de..c6ec53a4 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 441 2020-06-10 23:58:48
+Alpine Commit 442 2020-06-11 01:39:17
 ============= h_news =================
 <HTML>
 <HEAD>
@@ -173,10 +173,13 @@ Apache web server.
 
 <H2>New in Alpine <!--#echo var="ALPINE_VERSION"--> (<!--#echo var="ALPINE_REVISION"-->)</H2>
 
-This is a development version of Alpine. These enhancements are
+<!--This is a development version of Alpine. These enhancements are
 released after the release of version 2.22. Please report any
-problems you find with this release.
+problems you find with this release. -->
 
+<P>
+Version <!--#echo var="ALPINE_VERSION"--> addresses bugs found in previous releases and 
+has several additions as well.
 <P> Additions include:
 
 <UL>