diff options
| -rw-r--r-- | .gitignore | 9 | ||||
| -rw-r--r-- | alpine/mailview.c | 5 | ||||
| -rw-r--r-- | autom4te.cache/requests | 158 | ||||
| -rw-r--r-- | pith/pine.hlp | 7 | ||||
| -rw-r--r-- | pith/smime.c | 2 | ||||
| -rw-r--r-- | web/src/alpined.d/local.c | 2 |
6 files changed, 96 insertions, 87 deletions
@@ -1,7 +1,7 @@ *.[ao] *~ *m4 -autom4te* +autom4te.*/* Make* make* alpine @@ -32,4 +32,9 @@ imap/an dmail imap/ip6 include/ -autom4te* +libwpcom* +web/bin +wpcomm* +web/*/*/alpined +web/*/*/alpineldap +.gitignore diff --git a/alpine/mailview.c b/alpine/mailview.c index 35f58339..5193118f 100644 --- a/alpine/mailview.c +++ b/alpine/mailview.c @@ -1432,7 +1432,7 @@ url_launch(HANDLE_S *handle) else #endif /* quote shell specials */ - if(strpbrk(handle->h.url.path, "&*;<>?[]|~$(){}'\"") != NULL){ + if(strpbrk(handle->h.url.path, "&*!;<>?[]|~$(){}'\"") != NULL){ escape_single_quotes++; if((p = strstr(toolp, "_URL_")) != NULL){ /* explicit arg? */ int in_quote = 0; @@ -1510,7 +1510,8 @@ url_launch(HANDLE_S *handle) *cmdp++ = '\''; /* closing quote */ *cmdp++ = '\\'; *cmdp++ = '\''; /* opening quote comes from p below */ - } + } else if (strchr("&*!;<>?[]|~$(){}\"", *p) != NULL) + *cmdp++ = '\\'; *cmdp++ = *p; } diff --git a/autom4te.cache/requests b/autom4te.cache/requests index 3e12765c..e819e61d 100644 --- a/autom4te.cache/requests +++ b/autom4te.cache/requests @@ -86,13 +86,13 @@ 'gt_PRINTF_POSIX' => 1, 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, '_LT_AC_LANG_C_CONFIG' => 1, - 'gl_LOCK_EARLY' => 1, 'AM_PROG_INSTALL_STRIP' => 1, + 'gl_LOCK_EARLY' => 1, '_m4_warn' => 1, 'AC_LIBTOOL_OBJDIR' => 1, 'gl_FUNC_ARGZ' => 1, - 'LTOBSOLETE_VERSION' => 1, 'AM_SANITY_CHECK' => 1, + 'LTOBSOLETE_VERSION' => 1, 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, 'LT_LIB_M' => 1, @@ -104,21 +104,21 @@ '_AM_PROG_TAR' => 1, 'LT_SYS_SYMBOL_USCORE' => 1, 'AC_LIBTOOL_GCJ' => 1, - 'LT_SYS_DLOPEN_DEPLIBS' => 1, 'LT_FUNC_DLSYM_USCORE' => 1, - 'AC_LIB_ARG_WITH' => 1, - 'AC_LIBTOOL_CONFIG' => 1, + 'LT_SYS_DLOPEN_DEPLIBS' => 1, '_LT_AC_LANG_F77' => 1, - 'AC_LTDL_DLLIB' => 1, + 'AC_LIBTOOL_CONFIG' => 1, + 'AC_LIB_ARG_WITH' => 1, '_AM_SUBST_NOTMAKE' => 1, + 'AC_LTDL_DLLIB' => 1, '_AM_AUTOCONF_VERSION' => 1, 'AM_DISABLE_SHARED' => 1, '_LTDL_SETUP' => 1, - 'AM_PROG_LIBTOOL' => 1, '_LT_AC_LANG_CXX' => 1, - 'AM_PROG_LD' => 1, - '_LT_AC_FILE_LTDLL_C' => 1, + 'AM_PROG_LIBTOOL' => 1, 'AC_LIB_LTDL' => 1, + '_LT_AC_FILE_LTDLL_C' => 1, + 'AM_PROG_LD' => 1, 'gt_INTL_MACOSX' => 1, 'AM_ICONV_LINK' => 1, 'AC_LIB_PREPARE_MULTILIB' => 1, @@ -135,60 +135,60 @@ 'LTDL_CONVENIENCE' => 1, '_AM_SET_OPTION' => 1, 'AC_LTDL_PREOPEN' => 1, - 'gl_LOCK_EARLY_BODY' => 1, '_LT_LINKER_BOILERPLATE' => 1, - 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, + 'gl_LOCK_EARLY_BODY' => 1, 'AC_LIBTOOL_PROG_CC_C_O' => 1, + 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, 'gl_PREREQ_ARGZ' => 1, 'AC_LIB_PREFIX' => 1, 'gt_TYPE_LONGDOUBLE' => 1, - 'LT_SUPPORTED_TAG' => 1, 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'LT_PROG_RC' => 1, + 'LT_SUPPORTED_TAG' => 1, 'LT_SYS_MODULE_EXT' => 1, + 'LT_PROG_RC' => 1, 'AC_DEFUN_ONCE' => 1, '_LT_AC_LANG_GCJ' => 1, 'AC_' => 1, 'AC_LTDL_OBJDIR' => 1, - 'gt_INTDIV0' => 1, '_LT_PATH_TOOL_PREFIX' => 1, - 'AM_ICONV' => 1, + 'gt_INTDIV0' => 1, 'AC_LIBTOOL_RC' => 1, - '_LT_AC_PROG_ECHO_BACKSLASH' => 1, - 'AC_DISABLE_FAST_INSTALL' => 1, + 'AM_ICONV' => 1, 'AM_SILENT_RULES' => 1, - 'include' => 1, - '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'AC_DISABLE_FAST_INSTALL' => 1, + '_LT_AC_PROG_ECHO_BACKSLASH' => 1, '_LT_AC_SYS_LIBPATH_AIX' => 1, + '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'include' => 1, 'LT_AC_PROG_SED' => 1, 'AM_ENABLE_SHARED' => 1, - 'AC_LIB_APPENDTOVAR' => 1, 'gl_AC_TYPE_UNSIGNED_LONG_LONG' => 1, - 'AM_GNU_GETTEXT' => 1, + 'AC_LIB_APPENDTOVAR' => 1, 'LTDL_INSTALLABLE' => 1, + 'AM_GNU_GETTEXT' => 1, '_LT_AC_LANG_GCJ_CONFIG' => 1, - 'AM_POSTPROCESS_PO_MAKEFILE' => 1, 'AC_ENABLE_SHARED' => 1, + 'AM_POSTPROCESS_PO_MAKEFILE' => 1, 'AC_LIB_WITH_FINAL_PREFIX' => 1, 'gt_TYPE_WINT_T' => 1, - 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, 'AC_ENABLE_STATIC' => 1, + 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, '_LT_AC_TAGVAR' => 1, 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, 'AM_CONDITIONAL' => 1, 'LT_LIB_DLLOAD' => 1, 'AM_LANGINFO_CODESET' => 1, 'gl_AC_HEADER_INTTYPES_H' => 1, - 'LTVERSION_VERSION' => 1, 'LTDL_INIT' => 1, - 'm4_include' => 1, + 'LTVERSION_VERSION' => 1, 'AM_PROG_INSTALL_SH' => 1, + 'm4_include' => 1, 'AC_PROG_EGREP' => 1, - 'PINEVAR' => 1, - 'AC_PATH_MAGIC' => 1, '_AC_AM_CONFIG_HEADER_HOOK' => 1, - 'gl_PREREQ_LOCK' => 1, + 'AC_PATH_MAGIC' => 1, + 'PINEVAR' => 1, 'AC_LTDL_SYSSEARCHPATH' => 1, + 'gl_PREREQ_LOCK' => 1, 'AM_MAKE_INCLUDE' => 1, 'LT_CMD_MAX_LEN' => 1, '_LT_AC_TAGCONFIG' => 1, @@ -200,96 +200,96 @@ 'AC_LIBTOOL_COMPILER_OPTION' => 1, 'AC_DISABLE_SHARED' => 1, '_LT_COMPILER_BOILERPLATE' => 1, - 'AC_LIBTOOL_WIN32_DLL' => 1, 'AC_LIBTOOL_SETUP' => 1, + 'AC_LIBTOOL_WIN32_DLL' => 1, 'AC_PROG_LD_RELOAD_FLAG' => 1, 'AC_LTDL_DLSYM_USCORE' => 1, - 'AM_MISSING_HAS_RUN' => 1, 'LT_LANG' => 1, - 'AC_TYPE_LONG_LONG_INT' => 1, + 'AM_MISSING_HAS_RUN' => 1, 'LT_SYS_DLSEARCH_PATH' => 1, + 'AC_TYPE_LONG_LONG_INT' => 1, 'LT_CONFIG_LTDL_DIR' => 1, - 'AM_GNU_GETTEXT_VERSION' => 1, - 'AC_LIBTOOL_DLOPEN_SELF' => 1, 'LT_OUTPUT' => 1, + 'AC_LIBTOOL_DLOPEN_SELF' => 1, + 'AM_GNU_GETTEXT_VERSION' => 1, 'AC_LIB_PROG_LD_GNU' => 1, - 'AM_NLS' => 1, 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, - 'AC_WITH_LTDL' => 1, + 'AM_NLS' => 1, 'AC_LIBTOOL_LINKER_OPTION' => 1, + 'AC_WITH_LTDL' => 1, 'gt_INTL_SUBDIR_CORE' => 1, - 'LT_AC_PROG_RC' => 1, 'AC_LIBTOOL_CXX' => 1, + 'LT_AC_PROG_RC' => 1, 'LT_INIT' => 1, - 'LT_AC_PROG_GCJ' => 1, 'LT_SYS_DLOPEN_SELF' => 1, - 'AM_DEP_TRACK' => 1, + 'LT_AC_PROG_GCJ' => 1, 'AM_DISABLE_STATIC' => 1, + 'AM_DEP_TRACK' => 1, '_AC_PROG_LIBTOOL' => 1, '_AM_IF_OPTION' => 1, 'AC_PATH_TOOL_PREFIX' => 1, - 'm4_pattern_allow' => 1, 'AC_LIBTOOL_F77' => 1, + 'm4_pattern_allow' => 1, 'AM_PATH_PROG_WITH_TEST' => 1, 'AM_SET_LEADING_DOT' => 1, 'LT_AC_PROG_EGREP' => 1, '_AM_DEPENDENCIES' => 1, - 'gt_CHECK_DECL' => 1, 'AC_LIBTOOL_LANG_C_CONFIG' => 1, + 'gt_CHECK_DECL' => 1, 'LTOPTIONS_VERSION' => 1, - 'AC_LIB_LINKFLAGS' => 1, '_LT_AC_SYS_COMPILER' => 1, + 'AC_LIB_LINKFLAGS' => 1, 'AM_PROG_NM' => 1, 'AC_LIBLTDL_CONVENIENCE' => 1, - 'AM_GNU_GETTEXT_NEED' => 1, 'AC_DEPLIBS_CHECK_METHOD' => 1, - 'AC_LIBLTDL_INSTALLABLE' => 1, - 'jm_MAINTAINER_MODE' => 1, + 'AM_GNU_GETTEXT_NEED' => 1, 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, - 'gl_XSIZE' => 1, + 'jm_MAINTAINER_MODE' => 1, + 'AC_LIBLTDL_INSTALLABLE' => 1, 'AC_LTDL_ENABLE_INSTALL' => 1, - 'LT_PROG_GCJ' => 1, + 'gl_XSIZE' => 1, 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, + 'LT_PROG_GCJ' => 1, 'gt_GLIBC2' => 1, 'AM_INIT_AUTOMAKE' => 1, 'gl_AC_TYPE_UINTMAX_T' => 1, 'gl_LOCK' => 1, 'AM_INTL_SUBDIR' => 1, - 'gl_VISIBILITY' => 1, 'AC_DISABLE_STATIC' => 1, - 'PINEVAR_UNQUOTED' => 1, + 'gl_VISIBILITY' => 1, 'gt_TYPE_WCHAR_T' => 1, + 'PINEVAR_UNQUOTED' => 1, 'LT_PATH_NM' => 1, 'AM_MAINTAINER_MODE' => 1, 'AC_LTDL_SHLIBEXT' => 1, '_LT_AC_LOCK' => 1, '_LT_AC_LANG_RC_CONFIG' => 1, 'LT_SYS_MODULE_PATH' => 1, - 'LT_WITH_LTDL' => 1, 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, + 'LT_WITH_LTDL' => 1, 'AC_LTDL_SHLIBPATH' => 1, 'AM_AUX_DIR_EXPAND' => 1, - 'AC_LIB_LINKFLAGS_FROM_LIBS' => 1, 'gl_GLIBC21' => 1, - 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, + 'AC_LIB_LINKFLAGS_FROM_LIBS' => 1, '_LT_AC_LANG_F77_CONFIG' => 1, - '_LT_COMPILER_OPTION' => 1, + 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, '_AM_SET_OPTIONS' => 1, - 'AM_RUN_LOG' => 1, + '_LT_COMPILER_OPTION' => 1, '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AC_LIBTOOL_PICMODE' => 1, - 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + 'AM_RUN_LOG' => 1, 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, + 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + 'AC_LIBTOOL_PICMODE' => 1, 'AC_LIB_LINKFLAGS_BODY' => 1, - 'ACX_PTHREAD' => 1, - 'AC_CHECK_LIBM' => 1, 'LT_PATH_LD' => 1, + 'AC_CHECK_LIBM' => 1, + 'ACX_PTHREAD' => 1, 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, - 'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1, - 'gt_LC_MESSAGES' => 1, '_AM_MANGLE_OPTION' => 1, - 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, + 'gt_LC_MESSAGES' => 1, + 'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1, 'AC_LTDL_SYMBOL_USCORE' => 1, + 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, 'AM_SET_DEPDIR' => 1, '_LT_CC_BASENAME' => 1, 'gl_LOCK_BODY' => 1, @@ -309,57 +309,57 @@ 'configure.ac' ], { - 'AM_PROG_F77_C_O' => 1, '_LT_AC_TAGCONFIG' => 1, - 'AC_INIT' => 1, + 'AM_PROG_F77_C_O' => 1, 'm4_pattern_forbid' => 1, - 'AC_CANONICAL_TARGET' => 1, + 'AC_INIT' => 1, '_AM_COND_IF' => 1, - 'AC_CONFIG_LIBOBJ_DIR' => 1, + 'AC_CANONICAL_TARGET' => 1, 'AC_SUBST' => 1, - 'AC_CANONICAL_HOST' => 1, + 'AC_CONFIG_LIBOBJ_DIR' => 1, 'AC_FC_SRCEXT' => 1, + 'AC_CANONICAL_HOST' => 1, 'AC_PROG_LIBTOOL' => 1, 'AM_INIT_AUTOMAKE' => 1, - 'AC_CONFIG_SUBDIRS' => 1, 'AM_PATH_GUILE' => 1, + 'AC_CONFIG_SUBDIRS' => 1, 'AM_AUTOMAKE_VERSION' => 1, 'LT_CONFIG_LTDL_DIR' => 1, - 'AC_CONFIG_LINKS' => 1, 'AC_REQUIRE_AUX_FILE' => 1, - 'LT_SUPPORTED_TAG' => 1, + 'AC_CONFIG_LINKS' => 1, 'm4_sinclude' => 1, + 'LT_SUPPORTED_TAG' => 1, 'AM_MAINTAINER_MODE' => 1, 'AM_NLS' => 1, 'AC_FC_PP_DEFINE' => 1, 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, - '_m4_warn' => 1, 'AM_MAKEFILE_INCLUDE' => 1, + '_m4_warn' => 1, 'AM_PROG_CXX_C_O' => 1, - '_AM_MAKEFILE_INCLUDE' => 1, '_AM_COND_ENDIF' => 1, + '_AM_MAKEFILE_INCLUDE' => 1, 'AM_ENABLE_MULTILIB' => 1, 'AM_SILENT_RULES' => 1, 'AM_PROG_MOC' => 1, 'AC_CONFIG_FILES' => 1, - 'include' => 1, 'LT_INIT' => 1, - 'AM_GNU_GETTEXT' => 1, + 'include' => 1, 'AM_PROG_AR' => 1, + 'AM_GNU_GETTEXT' => 1, 'AC_LIBSOURCE' => 1, - 'AC_CANONICAL_BUILD' => 1, 'AM_PROG_FC_C_O' => 1, + 'AC_CANONICAL_BUILD' => 1, 'AC_FC_FREEFORM' => 1, - 'AC_FC_PP_SRCEXT' => 1, 'AH_OUTPUT' => 1, - 'AC_CONFIG_AUX_DIR' => 1, + 'AC_FC_PP_SRCEXT' => 1, '_AM_SUBST_NOTMAKE' => 1, - 'm4_pattern_allow' => 1, - 'AM_PROG_CC_C_O' => 1, + 'AC_CONFIG_AUX_DIR' => 1, 'sinclude' => 1, - 'AM_CONDITIONAL' => 1, - 'AC_CANONICAL_SYSTEM' => 1, + 'AM_PROG_CC_C_O' => 1, + 'm4_pattern_allow' => 1, 'AM_XGETTEXT_OPTION' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'AM_CONDITIONAL' => 1, 'AC_CONFIG_HEADERS' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1, 'AM_POT_TOOLS' => 1, diff --git a/pith/pine.hlp b/pith/pine.hlp index af1b833a..82872f19 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 8 2013-03-11 01:40:41 +Alpine Commit 9 2013-05-29 16:02:24 ============= h_news ================= <HTML> <HEAD> @@ -179,6 +179,7 @@ Additions include: <P> <UL> + <LI> Increase encryption of S/MIME encrypted messages. <LI> Add ability to <A HREF="h_config_folder_color">color folder names</A>, <A HREF="h_config_directory_color">directory names</A>, and <A HREF="h_config_folder_list_color">text</A> in the FOLDER SCREEN. @@ -197,7 +198,9 @@ message, as specified by original sender. Bugs that have been addressed include: <P> <UL> - <LI> Fix Cygwin separator to "/" + <LI> Proper quote of shell characters in urls. + <LI> Configure script did not test for crypto or pam libraries. + <LI> Fix Cygwin separator to "/". <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. </UL> diff --git a/pith/smime.c b/pith/smime.c index dc332a2a..d212b233 100644 --- a/pith/smime.c +++ b/pith/smime.c @@ -1390,7 +1390,7 @@ encrypt_outgoing_message(METAENV *header, BODY **bodyP) dprint((9, "encrypt_outgoing_message()")); smime_init(); - cipher = EVP_des_cbc(); + cipher = EVP_aes_256_cbc(); encerts = sk_X509_new_null(); diff --git a/web/src/alpined.d/local.c b/web/src/alpined.d/local.c index 990dd286..36eb717f 100644 --- a/web/src/alpined.d/local.c +++ b/web/src/alpined.d/local.c @@ -1,2 +1,2 @@ -char datestamp[]="Thu May 23 08:59:47 MDT 2013"; +char datestamp[]="Tue May 28 01:05:37 MDT 2013"; char hoststamp[]="linux"; |