summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--alpine/mailview.c10
-rw-r--r--alpine/newuser.c26
-rw-r--r--alpine/osdep/mswin.rc2
-rw-r--r--alpine/send.c70
-rw-r--r--alpine/send.h1
-rw-r--r--pico/osdep/mswin.rc2
-rw-r--r--pith/filter.c2
-rw-r--r--pith/pine.hlp7
-rw-r--r--pith/send.c49
-rw-r--r--pith/send.h2
-rw-r--r--pith/state.h1
11 files changed, 11 insertions, 161 deletions
diff --git a/alpine/mailview.c b/alpine/mailview.c
index d8cf663d..60d5941a 100644
--- a/alpine/mailview.c
+++ b/alpine/mailview.c
@@ -175,7 +175,6 @@ int url_launch_too_long(int);
char *url_external_handler(HANDLE_S *, int);
void url_mailto_addr(ADDRESS **, char *);
int ical_send_reply(char *);
-int url_local_phone_home(char *);
int url_local_imap(char *);
int url_local_nntp(char *);
int url_local_news(char *);
@@ -1618,7 +1617,6 @@ url_local_handler(char *s)
#endif
{"news:", 5, url_local_news},
{"x-alpine-ical:", 14, ical_send_reply},
- {"x-alpine-phone-home:", 20, url_local_phone_home},
{"x-alpine-gripe:", 15, gripe_gripe_to},
{"x-alpine-help:", 14, url_local_helper},
{"x-pine-help:", 12, url_local_helper},
@@ -2184,14 +2182,6 @@ ical_send_reply(char *url)
}
-int
-url_local_phone_home(char *URL)
-{
- phone_home(URL + strlen("x-alpine-phone-home:"));
- return(2);
-}
-
-
/*
* Format editorial comment referencing screen offering
* List-* header supplied commands
diff --git a/alpine/newuser.c b/alpine/newuser.c
index 804bedb0..f61ffae2 100644
--- a/alpine/newuser.c
+++ b/alpine/newuser.c
@@ -69,20 +69,6 @@ new_user_or_version(struct pine *ps)
shown_text = text;
/*
- * Set this if the major revision number
- * (the first after the dot) has changed.
- */
- ps->phone_home = (first_time_alpine_user
- || (ps->pine_pre_vers
- && isdigit((unsigned char) ps->pine_pre_vers[0])
- && ps->pine_pre_vers[1] == '.'
- && isdigit((unsigned char) ps->pine_pre_vers[2])
- && isdigit((unsigned char) vers[0])
- && vers[1] == '.'
- && isdigit((unsigned char) vers[2])
- && strncmp(ps->pine_pre_vers, vers, 3) < 0));
-
- /*
* At this point, shown_text is a charstarstar with html
* Turn it into a charstar with digested html
*/
@@ -140,15 +126,9 @@ new_user_or_version(struct pine *ps)
(nuov_keymenu.how_many * 12) * sizeof(struct key));
setbitmap(sargs.keys.bitmap);
- if(ps->phone_home){
- km.keys[NUOV_EXIT].label = "Exit this greeting";
- km.keys[NUOV_EXIT].bind.nch = 1;
- }
- else{
- km.keys[NUOV_EXIT].label = "[Exit this greeting]";
- km.keys[NUOV_EXIT].bind.nch = 3;
- clrbitn(NUOV_VIEW, sargs.keys.bitmap);
- }
+ km.keys[NUOV_EXIT].label = "[Exit this greeting]";
+ km.keys[NUOV_EXIT].bind.nch = 3;
+ clrbitn(NUOV_VIEW, sargs.keys.bitmap);
if(ps->first_time_user)
clrbitn(NUOV_RELNOTES, sargs.keys.bitmap);
diff --git a/alpine/osdep/mswin.rc b/alpine/osdep/mswin.rc
index 8df4aa9e..91b74a76 100644
--- a/alpine/osdep/mswin.rc
+++ b/alpine/osdep/mswin.rc
@@ -269,7 +269,7 @@ BEGIN
#endif
VALUE "FileVersion", "2.21.99999\0"
VALUE "InternalName", "alpine\0"
- VALUE "LegalCopyright", "Copyright 2013-2020 Eduardo Chappa, Copyright 2006-2009 University of Washington, Copyright 2013-2014\0"
+ VALUE "LegalCopyright", "Copyright 2013-2020 Eduardo Chappa, Copyright 2006-2009 University of Washington\0"
VALUE "OriginalFilename", "alpine.exe\0"
VALUE "ProductName", "alpine\0"
VALUE "ProductVersion", "2.21.99999\0"
diff --git a/alpine/send.c b/alpine/send.c
index 332b3dc3..e611fa79 100644
--- a/alpine/send.c
+++ b/alpine/send.c
@@ -71,10 +71,6 @@ typedef struct body_particulars {
PARAMETER *parameter;
} BODY_PARTICULARS_S;
-#define PHONE_HOME_VERSION ".count"
-
-#define PHONE_HOME_HOST "vfemail.net"
-
/*
* macro to bind pico's headerentry pointer to PINEFIELD "extdata" hook
*/
@@ -5544,72 +5540,6 @@ pine_send_newsgroup_name(char *mailbox, char *group_name, size_t len)
/*----------------------------------------------------------------------
- Generate and send a message back to the pine development team
-
-Args: none
-
-Returns: none
-----*/
-void
-phone_home(char *addr)
-{
- char tmp[MAX_ADDRESS], revision[128];
- ENVELOPE *outgoing;
- BODY *body;
- NETMBX mb;
-
- outgoing = mail_newenvelope();
- if(!addr || !strindex(addr, '@')){
- snprintf(addr = tmp, sizeof(tmp), "alpine%s@%s", PHONE_HOME_VERSION, PHONE_HOME_HOST);
- tmp[sizeof(tmp)-1] = '\0';
- }
-
- rfc822_parse_adrlist(&outgoing->to, addr, ps_global->maildomain);
-
- outgoing->message_id = generate_message_id();
- outgoing->subject = cpystr("Document Request");
- outgoing->from = phone_home_from();
-
- body = mail_newbody();
- body->type = TYPETEXT;
-
- if((body->contents.text.data = (void *)so_get(PicoText,NULL,EDIT_ACCESS)) != NULL){
- so_puts((STORE_S *)body->contents.text.data, "Document request: ");
- so_puts((STORE_S *)body->contents.text.data, "Alpine-");
- so_puts((STORE_S *)body->contents.text.data, ALPINE_VERSION);
- get_alpine_revision_string(revision, sizeof(revision));
- so_puts((STORE_S *)body->contents.text.data, " (");
- so_puts((STORE_S *)body->contents.text.data, revision);
- so_puts((STORE_S *)body->contents.text.data, ")");
- if(ps_global->first_time_user)
- so_puts((STORE_S *)body->contents.text.data, " for New Users");
-
- if(ps_global->VAR_INBOX_PATH
- && ps_global->VAR_INBOX_PATH[0] == '{'
- && mail_valid_net_parse(ps_global->VAR_INBOX_PATH, &mb)){
- so_puts((STORE_S *)body->contents.text.data, " and ");
- so_puts((STORE_S *)body->contents.text.data, *mb.service ? mb.service : "UNKNOWN SERVICE");
- }
-
- if(ps_global->VAR_NNTP_SERVER && ps_global->VAR_NNTP_SERVER[0]
- && ps_global->VAR_NNTP_SERVER[0][0])
- so_puts((STORE_S *)body->contents.text.data, " and NNTP");
-
- (void) pine_simple_send(outgoing, &body, NULL,NULL,NULL,NULL, SS_NULLRP);
-
- q_status_message(SM_ORDER, 1, 3, "Thank you for being counted!");
- }
- else
- q_status_message(SM_ORDER | SM_DING, 3, 4,
- "Problem creating space for message text.");
-
- mail_free_envelope(&outgoing);
- pine_free_body(&body);
-
-}
-
-
-/*----------------------------------------------------------------------
Set up fields for passing to pico. Assumes first text part is
intended to be passed along for editing, and is in the form of
of a storage object brought into existence sometime before pico_send().
diff --git a/alpine/send.h b/alpine/send.h
index cdf03260..7499c9ca 100644
--- a/alpine/send.h
+++ b/alpine/send.h
@@ -47,7 +47,6 @@ char *pine_send_status(int, char *, char *, size_t, int *);
int confirm_daemon_send(void);
int build_address(char *, char **,char **, BUILDER_ARG *, int *);
void free_attachment_list(PATMT **);
-void phone_home(char *);
#endif /* PINE_SEND_INCLUDED */
diff --git a/pico/osdep/mswin.rc b/pico/osdep/mswin.rc
index 3f568c6b..d59a78c4 100644
--- a/pico/osdep/mswin.rc
+++ b/pico/osdep/mswin.rc
@@ -210,7 +210,7 @@ BEGIN
VALUE "FileDescription", "Pico\0"
VALUE "FileVersion", "5.10\0"
VALUE "InternalName", "pico\0"
- VALUE "LegalCopyright", "Copyright 2013-2020\0"
+ VALUE "LegalCopyright", "Copyright 2013-2020 Eduardo Chappa,\nCopyright 2006-2009 University of Washington\0"
VALUE "OriginalFilename", "pico.exe\0"
VALUE "ProductName", " pico\0"
VALUE "ProductVersion", "5.10\0"
diff --git a/pith/filter.c b/pith/filter.c
index 66abe420..fb8e5a89 100644
--- a/pith/filter.c
+++ b/pith/filter.c
@@ -7590,8 +7590,6 @@ html_element_comment(FILTER_S *f, char *s)
HD(f)->bitbucket = 0;
else if(!strucmp(s, "running"))
HD(f)->bitbucket = 0;
- else if(!strucmp(s, "PHONE_HOME") && ps_global->phone_home)
- HD(f)->bitbucket = 0;
#ifdef _WINDOWS
else if(!strucmp(s, "os_windows"))
HD(f)->bitbucket = 0;
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 27dadcf7..8618aeab 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 391 2020-01-18 02:21:08
+Alpine Commit 392 2020-01-18 13:08:29
============= h_news =================
<HTML>
<HEAD>
@@ -190,6 +190,11 @@ Based on code provided by Maciej W. Rozycki.
<LI> Add /tls1_3 flag for servers that support it. Read more information
in the secure protocols <A HREF="h_network_encryption_security">help</A>.
+<LI> To increase user's privacy, remove phone-home code that would prompt
+users to send an email message upon starting Alpine for the first time for
+purposes of counting. Your use of Alpine does not disclose information about
+you or your use of Alpine to the developers of Alpine.
+
<LI> New variable
<A HREF="h_config_encryption_range"><!--#echo var="VAR_encryption-protocol-range"--></A>
that allows users to configure versions of the SSL/TLS protocol that Alpine is
diff --git a/pith/send.c b/pith/send.c
index 1be50e14..c5993c67 100644
--- a/pith/send.c
+++ b/pith/send.c
@@ -210,13 +210,6 @@ static NETDRIVER piped_io = {
/*
- * Phone home hash controls
- */
-#define PH_HASHBITS 24
-#define PH_MAXHASH (1<<(PH_HASHBITS))
-
-
-/*
* postponed_stream - return stream associated with postponed messages
* in argument.
*/
@@ -1673,48 +1666,6 @@ update_answered_flags(REPLY_S *reply)
}
-/*
- * phone_home_from - make phone home request's from address IMpersonal.
- * Doesn't include user's personal name.
- */
-ADDRESS *
-phone_home_from(void)
-{
- ADDRESS *addr = mail_newaddr();
- char tmp[64];
-
- /* garble up mailbox name */
- snprintf(tmp, sizeof(tmp), "hash_%08u", phone_home_hash(ps_global->VAR_USER_ID));
- tmp[sizeof(tmp)-1] = '\0';
- addr->mailbox = cpystr(tmp);
- addr->host = cpystr(ps_global->maildomain);
- return(addr);
-}
-
-
-/*
- * one-way-hash a username into an 8-digit decimal number
- *
- * Corey Satten, corey@cac.washington.edu, 7/15/98
- */
-unsigned int
-phone_home_hash(char *s)
-{
- unsigned int h;
-
- for (h=0; *s; ++s) {
- if (h & 1)
- h = (h>>1) | (PH_MAXHASH/2);
- else
- h = (h>>1);
-
- h = ((h+1) * ((unsigned char) *s)) & (PH_MAXHASH - 1);
- }
-
- return (h);
-}
-
-
/*----------------------------------------------------------------------
Call the mailer, SMTP, sendmail or whatever
diff --git a/pith/send.h b/pith/send.h
index 46b87713..12252826 100644
--- a/pith/send.h
+++ b/pith/send.h
@@ -225,8 +225,6 @@ METAENV *pine_new_env(ENVELOPE *, char **, char ***, PINEFIELD *);
void pine_free_env(METAENV **);
int check_addresses(METAENV *);
void update_answered_flags(REPLY_S *);
-unsigned int phone_home_hash(char *);
-ADDRESS *phone_home_from(void);
int call_mailer(METAENV *, BODY *, char **, int, void (*)(char *, int),
void (*)(PIPE_S *, int, void *));
int write_postponed(METAENV *, BODY *);
diff --git a/pith/state.h b/pith/state.h
index c5f58407..b74a60c2 100644
--- a/pith/state.h
+++ b/pith/state.h
@@ -196,7 +196,6 @@ struct pine {
unsigned force_no_prefer_plain:1;
unsigned painted_body_on_startup:1;
- unsigned phone_home:1;
unsigned painted_footer_on_startup:1;
unsigned open_readonly_on_startup:1;
unsigned exit_if_no_pinerc:1;
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-21 18:12:05 +0000