diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2022-05-30 15:31:53 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2022-05-30 15:31:53 -0600 |
| commit | 6b87c9de3ab319846baa303544084a76254d55f5 (patch) | |
| tree | 248714e2faaa82b2b7b040ec0388be620cf20f93 /pith | |
| parent | 8d79159bae5cd24020ca37de062575c5fd6682f4 (diff) | |
| download | alpine-6b87c9de3ab319846baa303544084a76254d55f5.tar.xz | |
* All unix (non mac) versions of Alpine will have a default password file which
will be created by default when Alpine is compiled with encryption.
The default name will be .alpine.pwd, but it can be overriden with
the --with-passfile option or by a default set by a linux distribution.
Diffstat (limited to 'pith')
| -rw-r--r-- | pith/filter.c | 11 | ||||
| -rw-r--r-- | pith/pine.hlp | 18 |
2 files changed, 28 insertions, 1 deletions
diff --git a/pith/filter.c b/pith/filter.c index 8900b51d..32dfc494 100644 --- a/pith/filter.c +++ b/pith/filter.c @@ -7635,6 +7635,12 @@ html_element_comment(FILTER_S *f, char *s) #ifdef _WINDOWS else if(!strucmp(s, "os_windows")) HD(f)->bitbucket = 0; +#elif OSX_TARGET + else if(!strucmp(s, "os_osx") || !strucmp(s, "os_unix_and_osx")) + HD(f)->bitbucket = 0; +#else + else if(!strucmp(s, "os_unix") || !strucmp(s, "os_unix_and_osx")) + HD(f)->bitbucket = 0; #endif } @@ -7717,6 +7723,11 @@ html_element_comment(FILTER_S *f, char *s) else if(!strcmp(s, "C_CLIENT_VERSION")){ p = CCLIENTVERSION; } +#ifdef PASSFILE + else if(!strcmp(s, "PASSWORD_FILE")){ + p = PASSFILE; + } +#endif else if(!strcmp(s, "ALPINE_COMPILE_DATE")){ p = datestamp; } diff --git a/pith/pine.hlp b/pith/pine.hlp index 5460eca7..f9240e53 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -71,6 +71,12 @@ screen's text: WARNING ABOUT CHTML "if-else-endif" CLAUSES: They don't nest. +1d) Other operating systems added to 1c) above are + + os_unix_and_osx means all unices, incluing mac + os_unix means all unices except mac + os_osx means only mac + 2a) Several "server side include" commented elements are supported: <!--#include file="textfile"--> @@ -97,6 +103,7 @@ Where "variable" is one of either: _BUGS_ADDRESS_ CURRENT_DIR HOME_DIR + PASSWORD_FILE PINE_CONF_PATH PINE_CONF_FIXED_PATH PINE_INFO_PATH @@ -140,7 +147,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 646 2022-05-29 14:01:33 +Alpine Commit 647 2022-05-30 15:31:49 ============= h_news ================= <HTML> <HEAD> @@ -189,6 +196,15 @@ new additions to Alpine, please check it periodically. <P> New features include: <UL> +<!--chtml if pinemode="os_unix"--> +<LI> Unix version of Alpine (not including OSX). Alpine is built with password + file support by default. If Alpine is built with SMIME support and the + password file does not exist, then Alpine will create it by default and + encrypt it. For this version of Alpine, Alpine saves its passwords in the file + "<!--#echo var="PASSWORD_FILE"-->" which is in the same directory that + your .pinerc is located. +<!--chtml endif--> + <LI> In the past Alpine did not recognize images embedded in an HTML file, so now it does and a link to open them is given. Additionally, Alpine did not pass these images to an |