summaryrefslogtreecommitdiff
path: root/alpine/osdep
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2015-01-25 18:52:13 -0700
committerEduardo Chappa <chappa@washington.edu>2015-01-25 18:52:13 -0700
commit4db5ba9a511564e4a3cb3d2b67bce4bb171eae4f (patch)
tree8ff91f6581acb023e7a3d989414cc925927b49b3 /alpine/osdep
parent2ea73d14866f5eb39bc6a9aab36312abd6fa525c (diff)
downloadalpine-4db5ba9a511564e4a3cb3d2b67bce4bb171eae4f.tar.xz
* new version 2.20.1
* Ignore message from smtp server after a successful authentication challenge. * Alpine would not set include and lib paths for OpenSSL if this was installed in /usr/local/ssl. * If the .pinerc file is a symbolic link, Alpine might not write its contents when saving its configuration. * The _INIT_ token does not skip over non-alpha numeric characters in the name. Reported by Andreas Fehr. * If SSLDIR is defined somehow, do not disable S/MIME if the SSLCERTSDIR is not found. * Mismatch in size of UCS and CELL caused a corruption in the content of a pointer, which made the speller in PC-Alpine get the content of a word incorrectly. * Update splash screen to version 2.20 in main repository. * Skip testing openssl compatibility version when cross-compilation is detected. Fix contributed by Antti Seppälä.
Diffstat (limited to 'alpine/osdep')
-rw-r--r--alpine/osdep/alpine-splash.bmpbin532014 -> 712866 bytes
-rw-r--r--alpine/osdep/execview.c4
-rw-r--r--alpine/osdep/mswin.rc8
-rw-r--r--alpine/osdep/mswinver.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/alpine/osdep/alpine-splash.bmp b/alpine/osdep/alpine-splash.bmp
index 0bd797be..3289bc2b 100644
--- a/alpine/osdep/alpine-splash.bmp
+++ b/alpine/osdep/alpine-splash.bmp
Binary files differ
diff --git a/alpine/osdep/execview.c b/alpine/osdep/execview.c
index d79c85db..9ef2855e 100644
--- a/alpine/osdep/execview.c
+++ b/alpine/osdep/execview.c
@@ -269,11 +269,11 @@ exec_mailcap_cmd(MCAP_CMD_S *mc_cmd, char *image_file, int needsterminal)
q = cpystr("");
#endif /* PSEFCMD */
- l = 32 + strlen(cmd) + 2*strlen(image_file) + strlen(q);
+ l = 45 + strlen(cmd) + 2*strlen(image_file) + strlen(q);
p = command = (char *)fs_get((l+1) * sizeof(char));
if(!needsterminal) /* put in background if it doesn't need terminal */
*p++ = '(';
- snprintf(p, l+1-(p-command), "%s ; %s rm -f %s", cmd, q, image_file);
+ snprintf(p, l+1-(p-command), "%s ; %s sleep 5 ; rm -f %s", cmd, q, image_file);
fs_give((void **)&q);
command[l] = '\0';
p += strlen(p);
diff --git a/alpine/osdep/mswin.rc b/alpine/osdep/mswin.rc
index 5d3d1352..2769c8c3 100644
--- a/alpine/osdep/mswin.rc
+++ b/alpine/osdep/mswin.rc
@@ -244,8 +244,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,19,9999,0
- PRODUCTVERSION 2,19,9999,0
+ FILEVERSION 2,20,1,0
+ PRODUCTVERSION 2,20,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -267,12 +267,12 @@ BEGIN
#else
VALUE "FileDescription", "Alpine\0"
#endif
- VALUE "FileVersion", "2.19.9999\0"
+ VALUE "FileVersion", "2.20.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.19.9999\0"
+ VALUE "ProductVersion", "2.20.1\0"
END
END
BLOCK "VarFileInfo"
diff --git a/alpine/osdep/mswinver.c b/alpine/osdep/mswinver.c
index 28f1a0ac..3c932123 100644
--- a/alpine/osdep/mswinver.c
+++ b/alpine/osdep/mswinver.c
@@ -13,7 +13,7 @@
*/
#define VER_MAJOR 2
-#define VER_MINOR 19
+#define VER_MINOR 20
extern char datestamp[];