20
20
9 files changed, 3 insertions(+), 178 deletions(-)
22
diff --git a/alpine/mailview.c b/alpine/mailview.c
23
index 35f5833..6b48860 100644
24
--- a/alpine/mailview.c
25
+++ b/alpine/mailview.c
22
Index: alpine-2.20+dfsg1/alpine/mailview.c
23
===================================================================
24
--- alpine-2.20+dfsg1.orig/alpine/mailview.c
25
+++ alpine-2.20+dfsg1/alpine/mailview.c
26
26
@@ -178,7 +178,6 @@ int url_local_imap(char *);
27
27
int url_local_nntp(char *);
28
28
int url_local_news(char *);
31
31
static int print_to_printer(SCROLL_S *);
32
32
int search_text(int, long, int, char **, Pos *, int *);
33
33
void update_scroll_titlebar(long, int);
34
@@ -1701,7 +1700,6 @@ url_local_handler(char *s)
34
@@ -1608,7 +1607,6 @@ url_local_handler(char *s)
35
35
{"x-alpine-gripe:", 15, gripe_gripe_to},
36
36
{"x-alpine-help:", 14, url_local_helper},
37
37
{"x-pine-help:", 12, url_local_helper},
39
39
{"x-alpine-config:", 16, url_local_config},
40
40
{"x-alpine-cert:", 14, url_local_certdetails},
41
41
{"#", 1, url_local_fragment},
42
@@ -2256,14 +2255,6 @@ url_local_fragment(char *fragment)
42
@@ -2163,14 +2161,6 @@ url_local_fragment(char *fragment)
55
55
* Format editorial comment referencing screen offering
56
56
* List-* header supplied commands
57
diff --git a/alpine/newuser.c b/alpine/newuser.c
58
index 381f21c..09a7991 100644
59
--- a/alpine/newuser.c
60
+++ b/alpine/newuser.c
57
Index: alpine-2.20+dfsg1/alpine/newuser.c
58
===================================================================
59
--- alpine-2.20+dfsg1.orig/alpine/newuser.c
60
+++ alpine-2.20+dfsg1/alpine/newuser.c
61
61
@@ -69,20 +69,6 @@ new_user_or_version(struct pine *ps)
99
99
if(ps->first_time_user)
100
100
clrbitn(NUOV_RELNOTES, sargs.keys.bitmap);
101
diff --git a/alpine/send.c b/alpine/send.c
102
index 3d670f0..f9c193d 100644
101
Index: alpine-2.20+dfsg1/alpine/send.c
102
===================================================================
103
--- alpine-2.20+dfsg1.orig/alpine/send.c
104
+++ alpine-2.20+dfsg1/alpine/send.c
105
105
@@ -71,9 +71,6 @@ typedef struct body_particulars {
106
106
PARAMETER *parameter;
107
107
} BODY_PARTICULARS_S;
109
109
-#define PHONE_HOME_VERSION "-count"
110
-#define PHONE_HOME_HOST "docserver.cac.washington.edu"
110
-#define PHONE_HOME_HOST "patches.freeiz.com"
113
113
* macro to bind pico's headerentry pointer to PINEFIELD "extdata" hook
115
@@ -5481,63 +5478,6 @@ pine_send_newsgroup_name(char *mailbox, char *group_name, size_t len)
118
/*----------------------------------------------------------------------
115
@@ -5480,63 +5477,6 @@ pine_send_newsgroup_name(char *mailbox,
119
-/*----------------------------------------------------------------------
119
120
- Generate and send a message back to the pine development team
158
159
- && ps_global->VAR_NNTP_SERVER[0][0])
159
160
- so_puts((STORE_S *)body->contents.text.data, " and NNTP");
161
- (void)pine_simple_send(outgoing, &body, NULL,NULL,NULL,NULL, SS_NULLRP);
162
- (void) pine_simple_send(outgoing, &body, NULL,NULL,NULL,NULL, SS_NULLRP);
163
164
- q_status_message(SM_ORDER, 1, 3, "Thanks for being counted!");
166
167
- q_status_message(SM_ORDER | SM_DING, 3, 4,
167
- "Problem creating space for message text.");
168
- "Problem creating space for message text.");
169
170
- mail_free_envelope(&outgoing);
170
171
- pine_free_body(&body);
175
-/*----------------------------------------------------------------------
176
/*----------------------------------------------------------------------
176
177
Set up fields for passing to pico. Assumes first text part is
177
178
intended to be passed along for editing, and is in the form of
178
of a storage object brought into existence sometime before pico_send().
179
diff --git a/alpine/send.h b/alpine/send.h
180
index 4d216dd..68cbec6 100644
183
@@ -42,7 +42,6 @@ int pine_simple_send(ENVELOPE *, BODY **, ACTION_S *, char *, char *, char *
179
Index: alpine-2.20+dfsg1/alpine/send.h
180
===================================================================
181
--- alpine-2.20+dfsg1.orig/alpine/send.h
182
+++ alpine-2.20+dfsg1/alpine/send.h
183
@@ -42,7 +42,6 @@ int pine_simple_send(ENVELOPE *, BOD
184
184
void pine_send(ENVELOPE *, BODY **, char *, ACTION_S *, char *, REPLY_S *,
185
185
REDRAFT_POS_S *, char *, PINEFIELD *, int);
186
186
int upload_msg_to_pico(char *, size_t, long *);
187
-void phone_home(char *);
187
-void phone_home(char *);
188
188
void create_message_body(BODY **, PATMT *, int);
189
189
char *pine_send_status(int, char *, char *, size_t, int *);
190
190
int confirm_daemon_send(void);
191
diff --git a/pith/filter.c b/pith/filter.c
192
index b8712b2..2ecee11 100644
195
@@ -7521,8 +7521,6 @@ html_element_comment(FILTER_S *f, char *s)
191
Index: alpine-2.20+dfsg1/pith/filter.c
192
===================================================================
193
--- alpine-2.20+dfsg1.orig/pith/filter.c
194
+++ alpine-2.20+dfsg1/pith/filter.c
195
@@ -7542,8 +7542,6 @@ html_element_comment(FILTER_S *f, char *
196
196
HD(f)->bitbucket = 0;
197
197
else if(!strucmp(s, "running"))
198
198
HD(f)->bitbucket = 0;
202
202
else if(!strucmp(s, "os_windows"))
203
203
HD(f)->bitbucket = 0;
204
diff --git a/pith/pine.hlp b/pith/pine.hlp
205
index 3af1062..19d86d4 100644
208
@@ -1322,18 +1322,6 @@ this link now to send a message to it:<BR>
204
Index: alpine-2.20+dfsg1/pith/pine.hlp
205
===================================================================
206
--- alpine-2.20+dfsg1.orig/pith/pine.hlp
207
+++ alpine-2.20+dfsg1/pith/pine.hlp
208
@@ -1650,19 +1650,6 @@ this link now to send a message to it:<B
209
209
We hope you will explore Alpine's many capabilities. From the MAIN MENU,
210
210
select Setup/Config to see many of the options available to you. Also note
211
211
that all screens have context-sensitive help text available.<P>
212
212
-<!--chtml if pinemode="phone_home"-->
213
213
-SPECIAL REQUEST:
214
-This software is made available as a public service of the
215
-University of Washington in Seattle. We are no longer actively developing
216
-the software, but it is still helpful to us to have an idea of how many
217
-people are using Alpine. Are you willing to be counted as an Alpine user? Pressing
214
-This software was originally created and maintained as a public
215
-service by the University of Washington until 2009; updates are made
216
-available as a public service of the Alpine community. It is always
217
-helpful to have an idea of how many users are using Alpine. Are you
218
-willing to be counted as an Alpine user? Pressing
218
219
-<A HREF="X-Alpine-Phone-Home:">Return</A>
219
220
-will send an anonymous (meaning, your real email address will not be revealed)
220
-message to the Alpine team at the University of Washington for purposes of tallying.
221
-message to the Alpine developers for purposes of tallying.
222
223
-<!--To Exit this screen and continue your Alpine session press "E".-->
223
224
-<!--chtml else-->
224
225
To Exit this screen and continue your Alpine session press "Return".
225
226
<!--chtml endif-->
227
@@ -1355,20 +1343,7 @@ Your Pine configuration file is automatically used for Alpine.
228
@@ -1684,21 +1671,7 @@ Your Pine configuration file is automati
228
229
The Release Notes may be viewed by pressing
229
230
"R" now or while in the MAIN MENU.
231
232
-<!--chtml if pinemode="phone_home"-->
232
233
-SPECIAL REQUEST:
233
-This software is made available as a public service of the
234
-University of Washington in Seattle. We are no longer actively developing
235
-the software, but it is still helpful to us to have an idea of how many
236
-people are using Alpine. Are you willing to be counted as an Alpine user? Pressing
234
-This software was originally created and maintained as a public
235
-service by the University of Washington until 2009; updates are made
236
-available as a public service of the Alpine community. It is always
237
-helpful to have an idea of how many users are using Alpine. Are you
238
-willing to be counted as an Alpine user? Pressing
237
239
-<A HREF="X-Alpine-Phone-Home:">Return</A>
238
240
-will send an anonymous (meaning, your real email address will not be revealed)
239
-message to the Alpine team at the University of Washington for purposes of tallying.
241
-message to the Alpine developers for purposes of tallying.
241
243
-<!--To Exit this screen and continue your Alpine session press "E".-->
242
244
-<!--chtml else-->
247
249
===== new_version_greeting ======
248
@@ -1385,20 +1360,7 @@ this version of Alpine before. This version's significant changes are
250
@@ -1715,21 +1688,7 @@ this version of Alpine before. This ver
249
251
documented in the Release Notes, which may be viewed by pressing
250
252
"R" now or while in the MAIN MENU.
252
254
-<!--chtml if pinemode="phone_home"-->
253
255
-SPECIAL REQUEST:
254
-This software is made available as a public service of the
255
-University of Washington in Seattle. We are no longer actively developing
256
-the software, but it is still helpful to us to have an idea of how many
257
-people are using Alpine. Are you willing to be counted as an Alpine user? Pressing
256
-This software was originally created and maintained as a public
257
-service by the University of Washington until 2009; updates are made
258
-available as a public service of the Alpine community. It is always
259
-helpful to have an idea of how many users are using Alpine. Are you
260
-willing to be counted as an Alpine user? Pressing
258
261
-<A HREF="X-Alpine-Phone-Home:">Return</A>
259
262
-will send an anonymous (meaning, your real email address will not be revealed)
260
-message to the Alpine team at the University of Washington for purposes of tallying.
263
-message to the Alpine developers for purposes of tallying.
262
265
-<!--To Exit this screen and continue your Alpine session press "E".-->
263
266
-<!--chtml else-->
264
267
To Exit this screen and continue your Alpine session press "Return".
269
diff --git a/pith/send.c b/pith/send.c
270
index a0c6043..ddf73bf 100644
273
@@ -1677,48 +1677,6 @@ update_answered_flags(REPLY_S *reply)
272
Index: alpine-2.20+dfsg1/pith/send.h
273
===================================================================
274
--- alpine-2.20+dfsg1.orig/pith/send.h
275
+++ alpine-2.20+dfsg1/pith/send.h
276
@@ -225,8 +225,6 @@ METAENV *pine_new_env(ENVELOPE *, cha
277
void pine_free_env(METAENV **);
278
int check_addresses(METAENV *);
279
void update_answered_flags(REPLY_S *);
280
-ADDRESS *phone_home_from(void);
281
-unsigned int phone_home_hash(char *);
282
int call_mailer(METAENV *, BODY *, char **, int, void (*)(char *, int),
283
void (*)(PIPE_S *, int, void *));
284
int write_postponed(METAENV *, BODY *);
285
Index: alpine-2.20+dfsg1/pith/state.h
286
===================================================================
287
--- alpine-2.20+dfsg1.orig/pith/state.h
288
+++ alpine-2.20+dfsg1/pith/state.h
289
@@ -193,7 +193,6 @@ struct pine {
290
unsigned force_prefer_plain:1;
291
unsigned force_no_prefer_plain:1;
293
- unsigned phone_home:1;
294
unsigned painted_body_on_startup:1;
295
unsigned painted_footer_on_startup:1;
296
unsigned open_readonly_on_startup:1;
297
--- alpine-2.20+dfsg1.orig/pith/send.c 2015-01-23 17:23:14.000000000 -0500
298
+++ alpine-2.20+dfsg1pith/send.c 2015-01-23 17:30:15.959071387 -0500
299
@@ -1681,48 +1681,6 @@
319
345
/*----------------------------------------------------------------------
320
346
Call the mailer, SMTP, sendmail or whatever
322
diff --git a/pith/send.h b/pith/send.h
323
index 69d763f..f4787bd 100644
326
@@ -225,8 +225,6 @@ METAENV *pine_new_env(ENVELOPE *, char **, char ***, PINEFIELD *);
327
void pine_free_env(METAENV **);
328
int check_addresses(METAENV *);
329
void update_answered_flags(REPLY_S *);
330
-ADDRESS *phone_home_from(void);
331
-unsigned int phone_home_hash(char *);
332
int call_mailer(METAENV *, BODY *, char **, int, void (*)(char *, int),
333
void (*)(PIPE_S *, int, void *));
334
int write_postponed(METAENV *, BODY *);
335
diff --git a/pith/state.h b/pith/state.h
336
index 93db4f4..efcab46 100644
339
@@ -190,7 +190,6 @@ struct pine {
340
unsigned force_prefer_plain:1;
341
unsigned force_no_prefer_plain:1;
343
- unsigned phone_home:1;
344
unsigned painted_body_on_startup:1;
345
unsigned painted_footer_on_startup:1;
346
unsigned open_readonly_on_startup:1;