ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/mports/trunk/mail/alpine/files/patch-newuser
Revision: 16349
Committed: Sun Apr 20 18:32:36 2014 UTC (10 years ago) by laffer1
File size: 15044 byte(s)
Log Message:
remove cvs2svn:cvs-rev prop

File Contents

# Content
1 diff -ur /home/dougb-f/alpine-2.00/alpine/Makefile.am ./alpine/Makefile.am
2 --- /home/dougb-f/alpine-2.00/alpine/Makefile.am 2008-06-03 08:54:15.000000000 -0700
3 +++ ./alpine/Makefile.am 2011-05-22 14:43:01.000000000 -0700
4 @@ -19,7 +19,7 @@
5 alpine_SOURCES = addrbook.c adrbkcmd.c after.c alpine.c arg.c busy.c colorconf.c \
6 confscroll.c context.c dispfilt.c flagmaint.c folder.c help.c imap.c \
7 init.c kblock.c keymenu.c ldapconf.c listsel.c mailcmd.c mailindx.c \
8 - mailpart.c mailview.c newuser.c pattern.c pipe.c print.c radio.c remote.c reply.c \
9 + mailpart.c mailview.c pattern.c pipe.c print.c radio.c remote.c reply.c \
10 roleconf.c send.c setup.c signal.c status.c takeaddr.c titlebar.c smime.c
11
12 alpine_LDADD = $(LDADD) $(INTLLIBS)
13 diff -ur /home/dougb-f/alpine-2.00/alpine/Makefile.in ./alpine/Makefile.in
14 --- /home/dougb-f/alpine-2.00/alpine/Makefile.in 2008-06-03 08:54:15.000000000 -0700
15 +++ ./alpine/Makefile.in 2011-05-22 14:43:14.000000000 -0700
16 @@ -68,7 +68,7 @@
17 help.$(OBJEXT) imap.$(OBJEXT) init.$(OBJEXT) kblock.$(OBJEXT) \
18 keymenu.$(OBJEXT) ldapconf.$(OBJEXT) listsel.$(OBJEXT) \
19 mailcmd.$(OBJEXT) mailindx.$(OBJEXT) mailpart.$(OBJEXT) \
20 - mailview.$(OBJEXT) newuser.$(OBJEXT) pattern.$(OBJEXT) \
21 + mailview.$(OBJEXT) pattern.$(OBJEXT) \
22 pipe.$(OBJEXT) print.$(OBJEXT) radio.$(OBJEXT) \
23 remote.$(OBJEXT) reply.$(OBJEXT) roleconf.$(OBJEXT) \
24 send.$(OBJEXT) setup.$(OBJEXT) signal.$(OBJEXT) \
25 @@ -271,7 +271,7 @@
26 alpine_SOURCES = addrbook.c adrbkcmd.c after.c alpine.c arg.c busy.c colorconf.c \
27 confscroll.c context.c dispfilt.c flagmaint.c folder.c help.c imap.c \
28 init.c kblock.c keymenu.c ldapconf.c listsel.c mailcmd.c mailindx.c \
29 - mailpart.c mailview.c newuser.c pattern.c pipe.c print.c radio.c remote.c reply.c \
30 + mailpart.c mailview.c pattern.c pipe.c print.c radio.c remote.c reply.c \
31 roleconf.c send.c setup.c signal.c status.c takeaddr.c titlebar.c smime.c
32
33 alpine_LDADD = $(LDADD) $(INTLLIBS)
34 @@ -388,7 +388,6 @@
35 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mailindx.Po@am__quote@
36 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mailpart.Po@am__quote@
37 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mailview.Po@am__quote@
38 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newuser.Po@am__quote@
39 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pattern.Po@am__quote@
40 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe.Po@am__quote@
41 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print.Po@am__quote@
42 diff -ur /home/dougb-f/alpine-2.00/alpine/alpine.c ./alpine/alpine.c
43 --- /home/dougb-f/alpine-2.00/alpine/alpine.c 2008-06-03 15:31:05.000000000 -0700
44 +++ ./alpine/alpine.c 2011-05-22 14:42:15.000000000 -0700
45 @@ -49,7 +49,6 @@
46 #include "init.h"
47 #include "remote.h"
48 #include "pattern.h"
49 -#include "newuser.h"
50 #include "setup.h"
51 #include "adrbkcmd.h"
52 #include "signal.h"
53 @@ -762,7 +761,6 @@
54 pine_state->mangled_header = 1;
55 show_main_screen(pine_state, 0, FirstMenu, &main_keymenu, 0,
56 (Pos *) NULL);
57 - new_user_or_version(pine_state);
58 ClearScreen();
59 }
60
61 diff -ur /home/dougb-f/alpine-2.00/alpine/mailview.c ./alpine/mailview.c
62 --- /home/dougb-f/alpine-2.00/alpine/mailview.c 2008-08-01 17:32:26.000000000 -0700
63 +++ ./alpine/mailview.c 2011-05-22 14:42:15.000000000 -0700
64 @@ -177,7 +177,6 @@
65 int url_local_nntp(char *);
66 int url_local_news(char *);
67 int url_local_file(char *);
68 -int url_local_phone_home(char *);
69 static int print_to_printer(SCROLL_S *);
70 int search_text(int, long, int, char **, Pos *, int *);
71 void update_scroll_titlebar(long, int);
72 @@ -1697,7 +1696,6 @@
73 {"news:", 5, url_local_news},
74 {"x-alpine-gripe:", 15, gripe_gripe_to},
75 {"x-alpine-help:", 14, url_local_helper},
76 - {"x-alpine-phone-home:", 20, url_local_phone_home},
77 {"x-alpine-config:", 16, url_local_config},
78 {"x-alpine-cert:", 14, url_local_certdetails},
79 {"#", 1, url_local_fragment},
80 @@ -2252,14 +2250,6 @@
81 }
82
83
84 -int
85 -url_local_phone_home(char *url)
86 -{
87 - phone_home(url + strlen("x-alpine-phone-home:"));
88 - return(2);
89 -}
90 -
91 -
92 /*
93 * Format editorial comment referencing screen offering
94 * List-* header supplied commands
95 diff -ur /home/dougb-f/alpine-2.00/alpine/makefile.wnt ./alpine/makefile.wnt
96 --- /home/dougb-f/alpine-2.00/alpine/makefile.wnt 2007-10-24 14:58:00.000000000 -0700
97 +++ ./alpine/makefile.wnt 2011-05-22 14:42:15.000000000 -0700
98 @@ -44,13 +44,13 @@
99 addrbook.h adrbkcmd.h after.h alpine.h arg.h busy.h colorconf.h confscroll.h \
100 conftype.h context.h dispfilt.h flagmaint.h folder.h headers.h help.h imap.h \
101 init.h kblock.h keymenu.h ldapconf.h listsel.h mailcmd.h mailindx.h mailpart.h \
102 - mailview.h newuser.h pattern.h pipe.h print.h radio.h remote.h reply.h roleconf.h \
103 + mailview.h pattern.h pipe.h print.h radio.h remote.h reply.h roleconf.h \
104 send.h setup.h signal.h status.h takeaddr.h talk.h titlebar.h
105
106 OFILES= addrbook.obj adrbkcmd.obj after.obj alpine.obj arg.obj busy.obj colorconf.obj \
107 confscroll.obj context.obj dispfilt.obj flagmaint.obj folder.obj help.obj \
108 imap.obj init.obj kblock.obj keymenu.obj ldapconf.obj listsel.obj mailcmd.obj \
109 - mailindx.obj mailpart.obj mailview.obj newuser.obj pattern.obj pipe.obj \
110 + mailindx.obj mailpart.obj mailview.obj pattern.obj pipe.obj \
111 print.obj radio.obj remote.obj reply.obj roleconf.obj \
112 send.obj setup.obj signal.obj status.obj takeaddr.obj titlebar.obj
113
114 diff -ur /home/dougb-f/alpine-2.00/alpine/send.c ./alpine/send.c
115 --- /home/dougb-f/alpine-2.00/alpine/send.c 2008-06-30 15:03:35.000000000 -0700
116 +++ ./alpine/send.c 2011-05-22 14:42:15.000000000 -0700
117 @@ -70,8 +70,6 @@
118 PARAMETER *parameter;
119 } BODY_PARTICULARS_S;
120
121 -#define PHONE_HOME_VERSION "-count"
122 -#define PHONE_HOME_HOST "docserver.cac.washington.edu"
123
124 /*
125 * macro to bind pico's headerentry pointer to PINEFIELD "extdata" hook
126 @@ -5462,63 +5460,6 @@
127
128
129 /*----------------------------------------------------------------------
130 - Generate and send a message back to the pine development team
131 -
132 -Args: none
133 -
134 -Returns: none
135 -----*/
136 -void
137 -phone_home(char *addr)
138 -{
139 - char tmp[MAX_ADDRESS];
140 - ENVELOPE *outgoing;
141 - BODY *body;
142 -
143 - outgoing = mail_newenvelope();
144 - if(!addr || !strindex(addr, '@')){
145 - snprintf(addr = tmp, sizeof(tmp), "alpine%s@%s", PHONE_HOME_VERSION, PHONE_HOME_HOST);
146 - tmp[sizeof(tmp)-1] = '\0';
147 - }
148 -
149 - rfc822_parse_adrlist(&outgoing->to, addr, ps_global->maildomain);
150 -
151 - outgoing->message_id = generate_message_id();
152 - outgoing->subject = cpystr("Document Request");
153 - outgoing->from = phone_home_from();
154 -
155 - body = mail_newbody();
156 - body->type = TYPETEXT;
157 -
158 - if((body->contents.text.data = (void *)so_get(PicoText,NULL,EDIT_ACCESS)) != NULL){
159 - so_puts((STORE_S *)body->contents.text.data, "Document request: ");
160 - so_puts((STORE_S *)body->contents.text.data, "Alpine-");
161 - so_puts((STORE_S *)body->contents.text.data, ALPINE_VERSION);
162 - if(ps_global->first_time_user)
163 - so_puts((STORE_S *)body->contents.text.data, " for New Users");
164 -
165 - if(ps_global->VAR_INBOX_PATH && ps_global->VAR_INBOX_PATH[0] == '{')
166 - so_puts((STORE_S *)body->contents.text.data, " and IMAP");
167 -
168 - if(ps_global->VAR_NNTP_SERVER && ps_global->VAR_NNTP_SERVER[0]
169 - && ps_global->VAR_NNTP_SERVER[0][0])
170 - so_puts((STORE_S *)body->contents.text.data, " and NNTP");
171 -
172 - (void)pine_simple_send(outgoing, &body, NULL,NULL,NULL,NULL, SS_NULLRP);
173 -
174 - q_status_message(SM_ORDER, 1, 3, "Thanks for being counted!");
175 - }
176 - else
177 - q_status_message(SM_ORDER | SM_DING, 3, 4,
178 - "Problem creating space for message text.");
179 -
180 - mail_free_envelope(&outgoing);
181 - pine_free_body(&body);
182 -
183 -}
184 -
185 -
186 -/*----------------------------------------------------------------------
187 Set up fields for passing to pico. Assumes first text part is
188 intended to be passed along for editing, and is in the form of
189 of a storage object brought into existence sometime before pico_send().
190 diff -ur /home/dougb-f/alpine-2.00/alpine/send.h ./alpine/send.h
191 --- /home/dougb-f/alpine-2.00/alpine/send.h 2007-08-16 15:25:10.000000000 -0700
192 +++ ./alpine/send.h 2011-05-22 14:42:15.000000000 -0700
193 @@ -41,7 +41,6 @@
194 void pine_send(ENVELOPE *, BODY **, char *, ACTION_S *, char *, REPLY_S *,
195 REDRAFT_POS_S *, char *, PINEFIELD *, int);
196 int upload_msg_to_pico(char *, size_t, long *);
197 -void phone_home(char *);
198 void create_message_body(BODY **, PATMT *, int);
199 char *pine_send_status(int, char *, char *, size_t, int *);
200 int confirm_daemon_send(void);
201 diff -ur /home/dougb-f/alpine-2.00/pith/filter.c ./pith/filter.c
202 --- /home/dougb-f/alpine-2.00/pith/filter.c 2008-08-21 16:50:47.000000000 -0700
203 +++ ./pith/filter.c 2011-05-22 14:42:15.000000000 -0700
204 @@ -7510,8 +7510,6 @@
205 HD(f)->bitbucket = 0;
206 else if(!strucmp(s, "running"))
207 HD(f)->bitbucket = 0;
208 - else if(!strucmp(s, "phone_home") && ps_global->phone_home)
209 - HD(f)->bitbucket = 0;
210 #ifdef _WINDOWS
211 else if(!strucmp(s, "os_windows"))
212 HD(f)->bitbucket = 0;
213 diff -ur /home/dougb-f/alpine-2.00/pith/pine.hlp ./pith/pine.hlp
214 --- /home/dougb-f/alpine-2.00/pith/pine.hlp 2008-08-22 17:07:05.000000000 -0700
215 +++ ./pith/pine.hlp 2011-05-22 14:42:15.000000000 -0700
216 @@ -1204,21 +1204,7 @@
217 We hope you will explore Alpine's many capabilities. From the MAIN MENU,
218 select Setup/Config to see many of the options available to you. Also note
219 that all screens have context-sensitive help text available.<P>
220 -<!--chtml if pinemode="phone_home"-->
221 -SPECIAL REQUEST:
222 -This software is made available world-wide as a public service of the
223 -University of Washington in Seattle. In order to justify continuing
224 -development, it is helpful to have an idea of how many people are using
225 -Alpine. Are you willing to be counted as an Alpine user? Pressing
226 -<A HREF="X-Alpine-Phone-Home:">Return</A>
227 -will send an anonymous (meaning, your real email address will not be revealed)
228 -message to the Alpine development team at the University of Washington for
229 -purposes of tallying.
230 -<P>
231 -<!--To Exit this screen and continue your Alpine session press "E".-->
232 -<!--chtml else-->
233 To Exit this screen and continue your Alpine session press "Return".
234 -<!--chtml endif-->
235 </BODY>
236 </HTML>
237 ===== new_alpine_user_greeting ======
238 @@ -1238,21 +1224,7 @@
239 The Release Notes may be viewed by pressing
240 &quot;R&quot; now or while in the MAIN MENU.
241 <P>
242 -<!--chtml if pinemode="phone_home"-->
243 -SPECIAL REQUEST:
244 -This software is made available world-wide as a public service of the
245 -University of Washington in Seattle. In order to justify continuing
246 -development, it is helpful to have an idea of how many people are using
247 -Alpine. Are you willing to be counted as an Alpine user? Pressing
248 -<A HREF="X-Alpine-Phone-Home:">Return</A>
249 -will send an anonymous (meaning, your real email address will not be revealed)
250 -message to the Alpine development team at the University of Washington for
251 -purposes of tallying.
252 -<P>
253 -<!--To Exit this screen and continue your Alpine session press "E".-->
254 -<!--chtml else-->
255 To Exit this screen and continue your Alpine session press "Return".
256 -<!--chtml endif-->
257 </BODY>
258 </HTML>
259 ===== new_version_greeting ======
260 @@ -1269,21 +1241,7 @@
261 documented in the Release Notes, which may be viewed by pressing
262 &quot;R&quot; now or while in the MAIN MENU.
263 <P>
264 -<!--chtml if pinemode="phone_home"-->
265 -SPECIAL REQUEST:
266 -This software is made available world-wide as a public service of the
267 -University of Washington in Seattle. In order to justify continuing
268 -development, it is helpful to have an idea of how many people are using
269 -Alpine. Are you willing to be counted as an Alpine user? Pressing
270 -<A HREF="X-Alpine-Phone-Home:">Return</A>
271 -will send an anonymous (meaning, your real email address will not be revealed)
272 -message to the Alpine development team at the University of Washington for
273 -purposes of tallying.
274 -
275 -<!--To Exit this screen and continue your Alpine session press "E".-->
276 -<!--chtml else-->
277 To Exit this screen and continue your Alpine session press "Return".
278 -<!--chtml endif-->
279 </BODY>
280 </HTML>
281
282 diff -ur /home/dougb-f/alpine-2.00/pith/send.c ./pith/send.c
283 --- /home/dougb-f/alpine-2.00/pith/send.c 2008-08-06 11:25:58.000000000 -0700
284 +++ ./pith/send.c 2011-05-22 14:42:15.000000000 -0700
285 @@ -209,13 +209,6 @@
286
287
288 /*
289 - * Phone home hash controls
290 - */
291 -#define PH_HASHBITS 24
292 -#define PH_MAXHASH (1<<(PH_HASHBITS))
293 -
294 -
295 -/*
296 * postponed_stream - return stream associated with postponed messages
297 * in argument.
298 */
299 @@ -1676,48 +1669,6 @@
300 }
301
302
303 -/*
304 - * phone_home_from - make phone home request's from address IMpersonal.
305 - * Doesn't include user's personal name.
306 - */
307 -ADDRESS *
308 -phone_home_from(void)
309 -{
310 - ADDRESS *addr = mail_newaddr();
311 - char tmp[32];
312 -
313 - /* garble up mailbox name */
314 - snprintf(tmp, sizeof(tmp), "hash_%08u", phone_home_hash(ps_global->VAR_USER_ID));
315 - tmp[sizeof(tmp)-1] = '\0';
316 - addr->mailbox = cpystr(tmp);
317 - addr->host = cpystr(ps_global->maildomain);
318 - return(addr);
319 -}
320 -
321 -
322 -/*
323 - * one-way-hash a username into an 8-digit decimal number
324 - *
325 - * Corey Satten, corey@cac.washington.edu, 7/15/98
326 - */
327 -unsigned int
328 -phone_home_hash(char *s)
329 -{
330 - unsigned int h;
331 -
332 - for (h=0; *s; ++s) {
333 - if (h & 1)
334 - h = (h>>1) | (PH_MAXHASH/2);
335 - else
336 - h = (h>>1);
337 -
338 - h = ((h+1) * ((unsigned char) *s)) & (PH_MAXHASH - 1);
339 - }
340 -
341 - return (h);
342 -}
343 -
344 -
345 /*----------------------------------------------------------------------
346 Call the mailer, SMTP, sendmail or whatever
347
348 diff -ur /home/dougb-f/alpine-2.00/pith/send.h ./pith/send.h
349 --- /home/dougb-f/alpine-2.00/pith/send.h 2008-06-30 15:03:35.000000000 -0700
350 +++ ./pith/send.h 2011-05-22 14:42:15.000000000 -0700
351 @@ -224,8 +224,6 @@
352 void pine_free_env(METAENV **);
353 int check_addresses(METAENV *);
354 void update_answered_flags(REPLY_S *);
355 -ADDRESS *phone_home_from(void);
356 -unsigned int phone_home_hash(char *);
357 int call_mailer(METAENV *, BODY *, char **, int, void (*)(char *, int),
358 void (*)(PIPE_S *, int, void *));
359 int write_postponed(METAENV *, BODY *);
360 diff -ur /home/dougb-f/alpine-2.00/pith/state.h ./pith/state.h
361 --- /home/dougb-f/alpine-2.00/pith/state.h 2008-06-03 08:54:15.000000000 -0700
362 +++ ./pith/state.h 2011-05-22 14:42:15.000000000 -0700
363 @@ -187,7 +187,6 @@
364 unsigned force_prefer_plain:1;
365 unsigned force_no_prefer_plain:1;
366
367 - unsigned phone_home:1;
368 unsigned painted_body_on_startup:1;
369 unsigned painted_footer_on_startup:1;
370 unsigned open_readonly_on_startup:1;
371 diff -ur /home/dougb-f/alpine-2.00/po/POTFILES.in ./po/POTFILES.in
372 --- /home/dougb-f/alpine-2.00/po/POTFILES.in 2008-06-03 12:27:23.000000000 -0700
373 +++ ./po/POTFILES.in 2011-05-22 14:42:15.000000000 -0700
374 @@ -50,7 +50,6 @@
375 alpine/context.c
376 alpine/pine-use.c
377 alpine/imap.c
378 -alpine/newuser.c
379 alpine/help.c
380 alpine/print.c
381 alpine/smime.c