diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2021-09-23 10:40:11 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2021-09-23 10:40:11 -0600 |
| commit | fb2217ac67706e4cbef69bea41041e2fb8b910e9 (patch) | |
| tree | 74a6fea89a47592f5a7858930ffe2485ba04af64 /pith | |
| parent | 465e23b898e5a3393b9ae52fc7620002541b2e75 (diff) | |
| download | alpine-fb2217ac67706e4cbef69bea41041e2fb8b910e9.tar.xz | |
* Alpine fails to build when given the --without-ssl configure
option due to an undefined value for DF_ENCRYPTION_RANGE.
Reported by David Morris.
Diffstat (limited to 'pith')
| -rw-r--r-- | pith/conf.c | 8 | ||||
| -rw-r--r-- | pith/conftype.h | 2 | ||||
| -rw-r--r-- | pith/pine.hlp | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/pith/conf.c b/pith/conf.c index 452c6db2..704c6911 100644 --- a/pith/conf.c +++ b/pith/conf.c @@ -768,8 +768,10 @@ static struct variable variables[] = { NULL, cf_text_disable_drivers}, {"disable-these-authenticators", 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, NULL, cf_text_disable_auths}, +#ifdef DF_ENCRYPTION_RANGE {"encryption-protocol-range", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, NULL, cf_text_encryption_range}, +#endif /* DF_ENCRYPTION_RANGE */ {"remote-abook-metafile", 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, NULL, cf_text_remote_abook_metafile}, {"remote-abook-history", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, @@ -1631,7 +1633,9 @@ init_vars(struct pine *ps, void (*cmds_f) (struct pine *, char **)) GLO_PRINTER = cpystr(DF_DEFAULT_PRINTER); GLO_ELM_STYLE_SAVE = cpystr(DF_ELM_STYLE_SAVE); +#ifdef DF_ENCRYPTION_RANGE GLO_ENCRYPTION_RANGE = cpystr(DF_ENCRYPTION_RANGE); +#endif /* DF_ENCRYPTION_RANGE */ GLO_SAVE_BY_SENDER = cpystr(DF_SAVE_BY_SENDER); GLO_HEADER_IN_REPLY = cpystr(DF_HEADER_IN_REPLY); GLO_INBOX_PATH = cpystr("inbox"); @@ -2411,7 +2415,9 @@ init_vars(struct pine *ps, void (*cmds_f) (struct pine *, char **)) set_current_val(&vars[V_FORCED_ABOOK_ENTRY], TRUE, TRUE); set_current_val(&vars[V_DISABLE_DRIVERS], TRUE, TRUE); set_current_val(&vars[V_DISABLE_AUTHS], TRUE, TRUE); +#ifdef DF_ENCRYPTION_RANGE set_current_val(&vars[V_ENCRYPTION_RANGE], TRUE, TRUE); +#endif /* DF_ENCRYPTION_RANGE */ set_current_val(&vars[V_VIEW_HEADERS], TRUE, TRUE); /* strip spaces and colons */ @@ -7985,8 +7991,10 @@ config_help(int var, int feature) return(h_config_disable_drivers); case V_DISABLE_AUTHS : return(h_config_disable_auths); +#ifdef DF_ENCRYPTION_RANGE case V_ENCRYPTION_RANGE : return(h_config_encryption_range); +#endif /* DF_ENCRYPTION_RANGE */ case V_REMOTE_ABOOK_METADATA : return(h_config_abook_metafile); case V_REPLY_STRING : diff --git a/pith/conftype.h b/pith/conftype.h index 5f2dd505..94dffcbc 100644 --- a/pith/conftype.h +++ b/pith/conftype.h @@ -177,7 +177,9 @@ typedef enum { V_PERSONAL_NAME = 0 , V_NEW_VER_QUELL , V_DISABLE_DRIVERS , V_DISABLE_AUTHS +#ifdef DF_ENCRYPTION_RANGE , V_ENCRYPTION_RANGE +#endif /* DF_ENCRYPTION_RANGE */ , V_REMOTE_ABOOK_METADATA , V_REMOTE_ABOOK_HISTORY , V_REMOTE_ABOOK_VALIDITY diff --git a/pith/pine.hlp b/pith/pine.hlp index 0c142065..fab964e1 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 592 2021-09-18 09:01:17 +Alpine Commit 593 2021-09-23 10:40:08 ============= h_news ================= <HTML> <HEAD> |