* New version 2.21.1

11 files changed, 35 insertions, 29 deletions

diff --git a/VERSION b/VERSION
index 2ef40bd8..3fe7dd19 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.21
+2.21.1
diff --git a/alpine/osdep/mswin.rc b/alpine/osdep/mswin.rc
index 96c333b9..62c74a2d 100644
--- a/alpine/osdep/mswin.rc
+++ b/alpine/osdep/mswin.rc
@@ -244,8 +244,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,21,21,0
- PRODUCTVERSION 2,21,21,0
+ FILEVERSION 2,21,1,0
+ PRODUCTVERSION 2,21,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -267,12 +267,12 @@ BEGIN
 #else
             VALUE "FileDescription", "Alpine\0"
 #endif
-            VALUE "FileVersion", "2.21\0"
+            VALUE "FileVersion", "2.21.1\0"
             VALUE "InternalName", "alpine\0"
             VALUE "LegalCopyright", "Copyright 2006-2009 University of Washington, Copyright 2013-2014\0"
             VALUE "OriginalFilename", "alpine.exe\0"
             VALUE "ProductName", "alpine\0"
-            VALUE "ProductVersion", "2.21\0"
+            VALUE "ProductVersion", "2.21.1\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/config.guess b/config.guess
index eab94e23..b9da8803 100755
--- a/config.guess
+++ b/config.guess
@@ -1013,7 +1013,7 @@ EOF
 	echo powerpcle-${VENDOR}-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
 	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
diff --git a/config.sub b/config.sub
index 7ffe3737..a93c4879 100755
--- a/config.sub
+++ b/config.sub
@@ -1058,12 +1058,18 @@ case $basic_machine in
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
-	s390 | s390-*)
+	s390)
 		basic_machine=s390-ibm
 		;;
-	s390x | s390x-*)
+	s390-*)
+		basic_machine=s390-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	s390x)
 		basic_machine=s390x-ibm
 		;;
+	s390x-*)
+		basic_machine=s390x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
diff --git a/configure b/configure
index 1d2d71cb..eba79165 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Rev:21 by chappa@washington.edu.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for alpine 2.21.
+# Generated by GNU Autoconf 2.69 for alpine 2.21.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.21'
-PACKAGE_STRING='alpine 2.21'
+PACKAGE_VERSION='2.21.1'
+PACKAGE_STRING='alpine 2.21.1'
 PACKAGE_BUGREPORT='chappa@washington.edu'
 PACKAGE_URL=''
 
@@ -1469,7 +1469,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.21 to adapt to many kinds of systems.
+\`configure' configures alpine 2.21.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1539,7 +1539,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of alpine 2.21:";;
+     short | recursive ) echo "Configuration of alpine 2.21.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1838,7 +1838,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-alpine configure 2.21
+alpine configure 2.21.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2444,7 +2444,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.21, which was
+It was created by alpine $as_me 2.21.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3313,7 +3313,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='alpine'
- VERSION='2.21'
+ VERSION='2.21.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -22209,7 +22209,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.21, which was
+This file was extended by alpine $as_me 2.21.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22275,7 +22275,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.21
+alpine config.status 2.21.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 0d3c2307..0efa0469 100644
--- a/doc/man1/alpine.1
+++ b/doc/man1/alpine.1
@@ -1,4 +1,4 @@
-.TH alpine 1 "Version 2.21"
+.TH alpine 1 "Version 2.21.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 7a6ac59c..c118fca1 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.21, February 2017
+Version 2.21.1, March 2017
 
 <H2><A NAME="TOC">Table of Contents</A></H2><P>
 
diff --git a/include/config.wnt.h b/include/config.wnt.h
index cee006ce..e110d027 100644
--- a/include/config.wnt.h
+++ b/include/config.wnt.h
@@ -454,13 +454,13 @@
 #define PACKAGE_NAME "alpine"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "alpine 2.21"
+#define PACKAGE_STRING "alpine 2.21.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.21"
+#define PACKAGE_VERSION "2.21.1"
 
 /* Program users use to change their password */
 /* #undef PASSWD_PROG */
@@ -552,7 +552,7 @@
 #define UTF8_INTERNAL
 
 /* Version number of package */
-#define VERSION "2.21"
+#define VERSION "2.21.1"
 
 /* Windows is just too different */
 #ifndef _WINDOWS
diff --git a/mapi/pmapi.c b/mapi/pmapi.c
index 0cb17df6..ef841ec1 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.21\r\n");
+	fprintf(ms_global->dfd, "pmapi32.dll for Alpine Version 2.21.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 2fae7940..39d398f1 100644
--- a/mapi/pmapi.rc
+++ b/mapi/pmapi.rc
@@ -98,8 +98,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,21,21,0
- PRODUCTVERSION 2,21,21,0
+ FILEVERSION 2,21,1,0
+ PRODUCTVERSION 2,21,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x29L
@@ -117,14 +117,14 @@ BEGIN
             VALUE "Comments", "alpine info: http://patches.freeiz.com/alpine\0"
             VALUE "CompanyName", "Patches for Alpine\0"
             VALUE "FileDescription", "Simple MAPI DLL for Alpine for Windows\0"
-            VALUE "FileVersion", "2.21\0"
+            VALUE "FileVersion", "2.21.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.21\0"
+            VALUE "ProductVersion", "2.21.1\0"
             VALUE "SpecialBuild", " \0"
         END
     END
diff --git a/packages/alpine.spec b/packages/alpine.spec
index a461f876..043804ba 100644
--- a/packages/alpine.spec
+++ b/packages/alpine.spec
@@ -1,6 +1,6 @@
 Summary: Alpine mail user agent
 Name: alpine
-Version: 2.21
+Version: 2.21.1
 Release: 1
 License: Apache License
 Group: Applications/Mail