Attachment #153291 for bug #197885

View | Details | Raw Unified | Return to bug 197885
Collapse All | Expand All




# $FreeBSD: head/mail/alpine/Makefile 363374 2014-07-29 19:11:51Z adamw $

PORTNAME?=	alpine
PORTVERSION=	2.20
PORTREVISION?=	0
CATEGORIES?=	mail news ipv6
MASTER_SITES=	http://patches.freeiz.com/alpine/release/src/
DIST_SUBDIR=	alpine-${PORTVERSION}

.if !defined(PICO_ALPINE_SLAVE)

PORTDOCSbase=	LICENSE NOTICE README
PORTDOCSdoc=	brochure.txt
PORTDOCShtml=	tech-notes/background.html tech-notes/cmd-line.html \
		tech-notes/config-notes.html tech-notes/config.html \
		tech-notes/index.html tech-notes/installation.html \
		tech-notes/introduction.html tech-notes/low-level.html \
		tech-notes/tech-notes.txt
PORTDOCS=	${PORTDOCSbase} ${PORTDOCSdoc} ${PORTDOCShtml}

CONFIGURE_ARGS+=--with-system-pinerc=${PREFIX}/etc/alpine.conf \

.endif

.if ${PORT_OPTIONS:MMAILDIR}
PATCH_SITES=		http://patches.freeiz.com/alpine/patches/alpine-${PORTVERSION}/
PATCHFILES+=		maildir.patch.gz
PATCH_DIST_ARGS+=	-E --quiet -d ${PATCH_WRKSRC} -p1
.endif

	    ${WRKSRC}/imap/src/osdep/unix/Makefile.presed \
	    > ${WRKSRC}/imap/src/osdep/unix/Makefile
	@for i in ${WRKSRC}/README ${WRKSRC}/doc/alpine.1 \
	    ${WRKSRC}/doc/*.txt \
	    ${WRKSRC}/doc/tech-notes/*.txt \
	    ${WRKSRC}/doc/tech-notes/*.html \
	    ${WRKSRC}/pith/pine.hlp ; do \
		${CP} $$i $$i.presed ; \
		${SED} -e "s:/usr/local/lib/:${PREFIX}/etc/:g" \

Lines 1-4 Link Here

(-)/home/marco/tmp/alpine/distinfo (-4 / +4 lines)
1	SHA256 (alpine-2.11/alpine-2.11.tar.xz) = fecc9ca5df03e0f368edec65cd61444325157b5635b5c92380cedf9c4ce8fbf6	1	SHA256 (alpine-2.20/alpine-2.20.tar.xz) = ed639b6e5bb97e6b0645c85262ca6a784316195d461ce8d8411999bf80449227
2	SIZE (alpine-2.11/alpine-2.11.tar.xz) = 4403188	2	SIZE (alpine-2.20/alpine-2.20.tar.xz) = 4841816
3	SHA256 (alpine-2.11/maildir.patch.gz) = 8de4e1f8e5d505e0071dfb573279b0472bdbca3d45a59bcc526a6a664cffde69	3	SHA256 (alpine-2.20/maildir.patch.gz) = 80c1a147d9092f463dce365f12b9e74f7d0a0c15e03267010f5dcb42a27493d3
4	SIZE (alpine-2.11/maildir.patch.gz) = 33737	4	SIZE (alpine-2.20/maildir.patch.gz) = 33935

Lines 1-11 Link Here

(-)/home/marco/tmp/alpine/files/patch-alpine__Makefile.am (-11 lines)
1	--- ./alpine/Makefile.am.orig 2014-05-25 19:16:59.000000000 -0500
2	+++ ./alpine/Makefile.am 2014-05-25 19:17:18.000000000 -0500
3	@@ -19,7 +19,7 @@
4	alpine_SOURCES = addrbook.c adrbkcmd.c after.c alpine.c arg.c busy.c colorconf.c \
5	confscroll.c context.c dispfilt.c flagmaint.c folder.c help.c imap.c \
6	init.c kblock.c keymenu.c ldapconf.c listsel.c mailcmd.c mailindx.c \
7	- mailpart.c mailview.c newuser.c pattern.c pipe.c print.c radio.c remote.c reply.c \
8	+ mailpart.c mailview.c pattern.c pipe.c print.c radio.c remote.c reply.c \
9	roleconf.c send.c setup.c signal.c status.c takeaddr.c titlebar.c smime.c newmail.c
10
11	alpine_LDADD = $(LDADD) $(INTLLIBS)




--- ./alpine/Makefile.in.orig	2013-08-14 23:36:01.000000000 -0500
+++ ./alpine/Makefile.in	2014-05-25 19:15:31.000000000 -0500
@@ -78,7 +78,7 @@
 	help.$(OBJEXT) imap.$(OBJEXT) init.$(OBJEXT) kblock.$(OBJEXT) \
 	keymenu.$(OBJEXT) ldapconf.$(OBJEXT) listsel.$(OBJEXT) \
 	mailcmd.$(OBJEXT) mailindx.$(OBJEXT) mailpart.$(OBJEXT) \
-	mailview.$(OBJEXT) newuser.$(OBJEXT) pattern.$(OBJEXT) \
+	mailview.$(OBJEXT) pattern.$(OBJEXT) \
 	pipe.$(OBJEXT) print.$(OBJEXT) radio.$(OBJEXT) \
 	remote.$(OBJEXT) reply.$(OBJEXT) roleconf.$(OBJEXT) \
 	send.$(OBJEXT) setup.$(OBJEXT) signal.$(OBJEXT) \
@@ -319,7 +319,7 @@
 alpine_SOURCES = addrbook.c adrbkcmd.c after.c alpine.c arg.c busy.c colorconf.c \
 	confscroll.c context.c dispfilt.c flagmaint.c folder.c help.c imap.c \
 	init.c kblock.c keymenu.c ldapconf.c listsel.c mailcmd.c mailindx.c \
-	mailpart.c mailview.c newuser.c pattern.c pipe.c print.c radio.c remote.c reply.c \
+	mailpart.c mailview.c pattern.c pipe.c print.c radio.c remote.c reply.c \
 	roleconf.c send.c setup.c signal.c status.c takeaddr.c titlebar.c smime.c newmail.c
 
 alpine_LDADD = $(LDADD) $(INTLLIBS)
@@ -453,7 +453,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mailpart.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mailview.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newmail.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newuser.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pattern.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print.Po@am__quote@




--- ./alpine/alpine.c.orig	2013-08-14 23:36:01.000000000 -0500
+++ ./alpine/alpine.c	2014-05-25 19:15:31.000000000 -0500
@@ -50,7 +50,6 @@
 #include "init.h"
 #include "remote.h"
 #include "pattern.h"
-#include "newuser.h"
 #include "setup.h"
 #include "adrbkcmd.h"
 #include "signal.h"
@@ -767,7 +766,6 @@
 	pine_state->mangled_header = 1;
 	show_main_screen(pine_state, 0, FirstMenu, &main_keymenu, 0,
 			 (Pos *) NULL);
-	new_user_or_version(pine_state);
 	ClearScreen();
     }
     




--- ./alpine/mailview.c.orig	2013-08-14 23:36:01.000000000 -0500
+++ ./alpine/mailview.c	2014-05-25 19:15:31.000000000 -0500
@@ -178,7 +178,6 @@
 int	    url_local_nntp(char *);
 int	    url_local_news(char *);
 int	    url_local_file(char *);
-int	    url_local_phone_home(char *);
 static int  print_to_printer(SCROLL_S *);
 int	    search_text(int, long, int, char **, Pos *, int *);
 void	    update_scroll_titlebar(long, int);
@@ -1603,7 +1602,6 @@
 	{"x-alpine-gripe:", 15, gripe_gripe_to},
 	{"x-alpine-help:", 14, url_local_helper},
 	{"x-pine-help:", 12, url_local_helper},
-	{"x-alpine-phone-home:", 20, url_local_phone_home},
 	{"x-alpine-config:", 16, url_local_config},
 	{"x-alpine-cert:", 14, url_local_certdetails},
 	{"#", 1, url_local_fragment},
@@ -2158,14 +2156,6 @@
 }
 
 
-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




--- ./alpine/makefile.wnt.orig	2013-08-14 23:36:01.000000000 -0500
+++ ./alpine/makefile.wnt	2014-05-25 19:15:31.000000000 -0500
@@ -44,7 +44,7 @@
 	addrbook.h adrbkcmd.h after.h alpine.h arg.h busy.h colorconf.h confscroll.h \
 	conftype.h context.h dispfilt.h flagmaint.h folder.h headers.h help.h imap.h \
 	init.h kblock.h keymenu.h ldapconf.h listsel.h mailcmd.h mailindx.h mailpart.h \
-	mailview.h newmail.h newuser.h pattern.h pipe.h print.h radio.h remote.h \
+	mailview.h newmail.h pattern.h pipe.h print.h radio.h remote.h \
 	reply.h roleconf.h \
 	send.h setup.h signal.h status.h takeaddr.h talk.h titlebar.h
 
@@ -52,7 +52,7 @@
 	confscroll.obj context.obj dispfilt.obj flagmaint.obj folder.obj help.obj \
 	imap.obj init.obj kblock.obj keymenu.obj ldapconf.obj listsel.obj mailcmd.obj \
 	mailindx.obj mailpart.obj mailview.obj newmail.obj \
-	newuser.obj pattern.obj pipe.obj \
+	pattern.obj pipe.obj \
 	print.obj radio.obj remote.obj reply.obj roleconf.obj \
 	send.obj setup.obj signal.obj status.obj takeaddr.obj titlebar.obj
 




--- ./alpine/send.c.orig	2013-08-14 23:36:01.000000000 -0500
+++ ./alpine/send.c	2014-05-25 19:15:31.000000000 -0500
@@ -71,8 +71,6 @@
     PARAMETER         *parameter;
 } BODY_PARTICULARS_S;
 
-#define	PHONE_HOME_VERSION	"-count"
-#define	PHONE_HOME_HOST		"docserver.cac.washington.edu"
 
 /*
  * macro to bind pico's headerentry pointer to PINEFIELD "extdata" hook
@@ -5481,63 +5479,6 @@
 
 
 /*----------------------------------------------------------------------
-     Generate and send a message back to the pine development team
-     
-Args: none
-
-Returns: none
-----*/      
-void
-phone_home(char *addr)
-{
-    char      tmp[MAX_ADDRESS];
-    ENVELOPE *outgoing;
-    BODY     *body;
-
-    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);
-	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] == '{')
-	  so_puts((STORE_S *)body->contents.text.data, " and IMAP");
-
-	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, "Thanks 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().

Lines 1-10 Link Here

(-)/home/marco/tmp/alpine/files/patch-alpine__send.h (-10 lines)
1	--- ./alpine/send.h.orig 2013-08-14 23:36:01.000000000 -0500
2	+++ ./alpine/send.h 2014-05-25 19:15:32.000000000 -0500
3	@@ -42,7 +42,6 @@
4	void pine_send(ENVELOPE , BODY , char , ACTION_S , char , REPLY_S *,
5	REDRAFT_POS_S , char , PINEFIELD *, int);
6	int upload_msg_to_pico(char , size_t, long );
7	-void phone_home(char *);
8	void create_message_body(BODY *, PATMT , int);
9	char pine_send_status(int, char , char , size_t, int );
10	int confirm_daemon_send(void);

Lines 1-11 Link Here

(-)/home/marco/tmp/alpine/files/patch-pith__filter.c (-11 lines)
1	--- ./pith/filter.c.orig 2013-08-14 23:36:22.000000000 -0500
2	+++ ./pith/filter.c 2014-05-25 19:15:32.000000000 -0500
3	@@ -7522,8 +7522,6 @@
4	HD(f)->bitbucket = 0;
5	else if(!strucmp(s, "running"))
6	HD(f)->bitbucket = 0;
7	- else if(!strucmp(s, "phone_home") && ps_global->phone_home)
8	- HD(f)->bitbucket = 0;
9	#ifdef _WINDOWS
10	else if(!strucmp(s, "os_windows"))
11	HD(f)->bitbucket = 0;




--- pith/pine.hlp.orig	2013-08-15 06:36:22.000000000 +0200
+++ pith/pine.hlp	2014-06-23 11:40:52.000000000 +0200
@@ -881,13 +881,13 @@
       config file from command line or provided
       by "PINECONF" environment variable
 <!--chtml else-->
-      pine.conf file
+      alpine.conf file
 <!--chtml endif-->
  <LI> personal configuration file
  <LI> personal exceptions configuration file
  <LI> command-line options
  <!--chtml if pinemode="os_windows"--><!--chtml else-->
- <LI> system-wide pine.conf.fixed file<!--chtml endif-->
+ <LI> system-wide alpine.conf.fixed file<!--chtml endif-->
 </UL>
 <P>
 The values in both the personal configuration file and the
@@ -977,7 +977,7 @@
  sentmail#      ~/mail/sent-mail
  mailcap#       ~/.mailcap + /etc/mailcap
                            + /usr/etc/mailcap + /usr/local/etc/mailcap
- mimetypes#     ~/.mime.types + /etc/mime.types + /usr/local/lib/mime.types
+ mimetypes#     ~/.mime.types + /etc/mime.types + /usr/local/etc/mime.types
 
  news-spool	varies across Unix flavors, e.g. /var/spool/news or /usr/spool/news
  active-news	varies across Unix flavors, e.g. /usr/lib/news/active
@@ -1367,20 +1367,7 @@
 We hope you will explore Alpine's many capabilities. From the MAIN MENU,
 select Setup/Config to see many of the options available to you. Also note
 that all screens have context-sensitive help text available.<P>
-<!--chtml if pinemode="phone_home"-->
-SPECIAL REQUEST:
-This software is made available as a public service of the
-University of Washington in Seattle. We are no longer actively developing
-the software, but it is still helpful to us to have an idea of how many
-people are using Alpine. Are you willing to be counted as an Alpine user? Pressing 
-<A HREF="X-Alpine-Phone-Home:">Return</A>
-will send an anonymous (meaning, your real email address will not be revealed) 
-message to the Alpine team at the University of Washington for purposes of tallying.
-<P>
-<!--To Exit this screen and continue your Alpine session press "E".-->
-<!--chtml else-->
 To Exit this screen and continue your Alpine session press "Return".
-<!--chtml endif-->
 </BODY>
 </HTML>
 ===== new_alpine_user_greeting ======
@@ -1400,20 +1387,7 @@
 The Release Notes may be viewed by pressing 
 &quot;R&quot; now or while in the MAIN MENU.
 <P>
-<!--chtml if pinemode="phone_home"-->
-SPECIAL REQUEST:
-This software is made available as a public service of the
-University of Washington in Seattle. We are no longer actively developing
-the software, but it is still helpful to us to have an idea of how many
-people are using Alpine. Are you willing to be counted as an Alpine user? Pressing 
-<A HREF="X-Alpine-Phone-Home:">Return</A>
-will send an anonymous (meaning, your real email address will not be revealed) 
-message to the Alpine team at the University of Washington for purposes of tallying.
-<P>
-<!--To Exit this screen and continue your Alpine session press "E".-->
-<!--chtml else-->
 To Exit this screen and continue your Alpine session press "Return".
-<!--chtml endif-->
 </BODY>
 </HTML>
 ===== new_version_greeting ======
@@ -1430,20 +1404,7 @@
 documented in the Release Notes, which may be viewed by pressing 
 &quot;R&quot; now or while in the MAIN MENU.
 <P>
-<!--chtml if pinemode="phone_home"-->
-SPECIAL REQUEST:
-This software is made available as a public service of the
-University of Washington in Seattle. We are no longer actively developing
-the software, but it is still helpful to us to have an idea of how many
-people are using Alpine. Are you willing to be counted as an Alpine user? Pressing 
-<A HREF="X-Alpine-Phone-Home:">Return</A>
-will send an anonymous (meaning, your real email address will not be revealed) 
-message to the Alpine team at the University of Washington for purposes of tallying.
-
-<!--To Exit this screen and continue your Alpine session press "E".-->
-<!--chtml else-->
 To Exit this screen and continue your Alpine session press "Return".
-<!--chtml endif-->
 </BODY>
 </HTML>
 
@@ -2709,7 +2670,7 @@
 system configuration file, execute
 
 <PRE><CODE>
-		pine -P old-pine.conf -conf > <!--#echo var="PINE_CONF_PATH"-->
+		pine -P old-alpine.conf -conf > <!--#echo var="PINE_CONF_PATH"-->
 </CODE></PRE>
 <P>
 A system configuration file is not required.




--- ./pith/send.c.orig	2013-08-14 23:36:22.000000000 -0500
+++ ./pith/send.c	2014-05-25 19:15:32.000000000 -0500
@@ -210,13 +210,6 @@
 
 
 /*
- * Phone home hash controls
- */
-#define PH_HASHBITS	24
-#define PH_MAXHASH	(1<<(PH_HASHBITS))
-
-
-/*
  * postponed_stream - return stream associated with postponed messages
  *                    in argument.
  */
@@ -1677,48 +1670,6 @@
 }
 
 
-/*
- * 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[32];
-
-    /* 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
      

Lines 1-11 Link Here

(-)/home/marco/tmp/alpine/files/patch-pith__send.h (-11 lines)
1	--- ./pith/send.h.orig 2013-08-14 23:36:50.000000000 -0500
2	+++ ./pith/send.h 2014-05-25 19:15:32.000000000 -0500
3	@@ -225,8 +225,6 @@
4	void pine_free_env(METAENV **);
5	int check_addresses(METAENV *);
6	void update_answered_flags(REPLY_S *);
7	-ADDRESS *phone_home_from(void);
8	-unsigned int phone_home_hash(char *);
9	int call_mailer(METAENV , BODY , char *, int, void ()(char *, int),
10	void ()(PIPE_S , int, void *));
11	int write_postponed(METAENV , BODY );

Lines 1-10 Link Here

(-)/home/marco/tmp/alpine/files/patch-pith__state.h (-10 lines)
1	--- ./pith/state.h.orig 2013-08-14 23:36:50.000000000 -0500
2	+++ ./pith/state.h 2014-05-25 19:15:32.000000000 -0500
3	@@ -193,7 +193,6 @@
4	unsigned force_prefer_plain:1;
5	unsigned force_no_prefer_plain:1;
6
7	- unsigned phone_home:1;
8	unsigned painted_body_on_startup:1;
9	unsigned painted_footer_on_startup:1;
10	unsigned open_readonly_on_startup:1;

Lines 1-10 Link Here

(-)/home/marco/tmp/alpine/files/patch-po__POTFILES.in (-10 lines)
1	--- ./po/POTFILES.in.orig 2013-08-14 23:36:22.000000000 -0500
2	+++ ./po/POTFILES.in 2014-05-25 19:15:32.000000000 -0500
3	@@ -50,7 +50,6 @@
4	alpine/context.c
5	alpine/pine-use.c
6	alpine/imap.c
7	-alpine/newuser.c
8	alpine/help.c
9	alpine/print.c
10	alpine/smime.c

Lines 1-7 Link Here

(-)/home/marco/tmp/alpine/pkg-plist (-2 / +2 lines)
1	bin/alpine	1	bin/alpine
2	bin/rpdump	2	bin/rpdump
3	bin/rpload	3	bin/rpload
		4	%%ETCDIR%%.conf.sample
4	man/man1/alpine.1.gz	5	man/man1/alpine.1.gz
5	man/man1/rpdump.1.gz	6	man/man1/rpdump.1.gz
6	man/man1/rpload.1.gz	7	man/man1/rpload.1.gz
7	@sample etc/alpine.conf.sample

Return to bug 197885

Lines 1-8 Link Here

(-)/home/marco/tmp/alpine/Makefile (-6 / +9 lines)
1	# $FreeBSD: head/mail/alpine/Makefile 363374 2014-07-29 19:11:51Z adamw $	1	# $FreeBSD: head/mail/alpine/Makefile 363374 2014-07-29 19:11:51Z adamw $
2		2
3	PORTNAME?= alpine	3	PORTNAME?= alpine
4	PORTVERSION= 2.11	4	PORTVERSION= 2.20
5	PORTREVISION?= 2	5	PORTREVISION?= 0
6	CATEGORIES?= mail news ipv6	6	CATEGORIES?= mail news ipv6
7	MASTER_SITES= http://patches.freeiz.com/alpine/release/src/	7	MASTER_SITES= http://patches.freeiz.com/alpine/release/src/
8	DIST_SUBDIR= alpine-${PORTVERSION}	8	DIST_SUBDIR= alpine-${PORTVERSION}
Lines 38-48 Link Here
38	.if !defined(PICO_ALPINE_SLAVE)	38	.if !defined(PICO_ALPINE_SLAVE)
39		39
40	PORTDOCSbase= LICENSE NOTICE README	40	PORTDOCSbase= LICENSE NOTICE README
41	PORTDOCSdoc= brochure.txt tech-notes.txt	41	PORTDOCSdoc= brochure.txt
42	PORTDOCShtml= tech-notes/background.html tech-notes/cmd-line.html \	42	PORTDOCShtml= tech-notes/background.html tech-notes/cmd-line.html \
43	tech-notes/config-notes.html tech-notes/config.html \	43	tech-notes/config-notes.html tech-notes/config.html \
44	tech-notes/index.html tech-notes/installation.html \	44	tech-notes/index.html tech-notes/installation.html \
45	tech-notes/introduction.html tech-notes/low-level.html	45	tech-notes/introduction.html tech-notes/low-level.html \
		46	tech-notes/tech-notes.txt
46	PORTDOCS= ${PORTDOCSbase} ${PORTDOCSdoc} ${PORTDOCShtml}	47	PORTDOCS= ${PORTDOCSbase} ${PORTDOCSdoc} ${PORTDOCShtml}
47		48
48	CONFIGURE_ARGS+=--with-system-pinerc=${PREFIX}/etc/alpine.conf \	49	CONFIGURE_ARGS+=--with-system-pinerc=${PREFIX}/etc/alpine.conf \
Lines 113-119 Link Here
113	.endif	114	.endif
114		115
115	.if ${PORT_OPTIONS:MMAILDIR}	116	.if ${PORT_OPTIONS:MMAILDIR}
116	PATCH_SITES= http://patches.freeiz.com/alpine/patches/alpine-2.11/	117	PATCH_SITES= http://patches.freeiz.com/alpine/patches/alpine-${PORTVERSION}/
117	PATCHFILES+= maildir.patch.gz	118	PATCHFILES+= maildir.patch.gz
118	PATCH_DIST_ARGS+= -E --quiet -d ${PATCH_WRKSRC} -p1	119	PATCH_DIST_ARGS+= -E --quiet -d ${PATCH_WRKSRC} -p1
119	.endif	120	.endif
Lines 142-148 Link Here
142	${WRKSRC}/imap/src/osdep/unix/Makefile.presed \	143	${WRKSRC}/imap/src/osdep/unix/Makefile.presed \
143	> ${WRKSRC}/imap/src/osdep/unix/Makefile	144	> ${WRKSRC}/imap/src/osdep/unix/Makefile
144	@for i in ${WRKSRC}/README ${WRKSRC}/doc/alpine.1 \	145	@for i in ${WRKSRC}/README ${WRKSRC}/doc/alpine.1 \
145	${WRKSRC}/doc/tech-notes.txt ${WRKSRC}/doc/tech-notes/*.html \	146	${WRKSRC}/doc/*.txt \
		147	${WRKSRC}/doc/tech-notes/*.txt \
		148	${WRKSRC}/doc/tech-notes/*.html \
146	${WRKSRC}/pith/pine.hlp ; do \	149	${WRKSRC}/pith/pine.hlp ; do \
147	${CP} $$i $$i.presed ; \	150	${CP} $$i $$i.presed ; \
148	${SED} -e "s:/usr/local/lib/:${PREFIX}/etc/:g" \	151	${SED} -e "s:/usr/local/lib/:${PREFIX}/etc/:g" \

Lines 1-28 Link Here

(-)/home/marco/tmp/alpine/files/patch-alpine__Makefile.in (-28 lines)
1	--- ./alpine/Makefile.in.orig 2013-08-14 23:36:01.000000000 -0500
2	+++ ./alpine/Makefile.in 2014-05-25 19:15:31.000000000 -0500
3	@@ -78,7 +78,7 @@
4	help.$(OBJEXT) imap.$(OBJEXT) init.$(OBJEXT) kblock.$(OBJEXT) \
5	keymenu.$(OBJEXT) ldapconf.$(OBJEXT) listsel.$(OBJEXT) \
6	mailcmd.$(OBJEXT) mailindx.$(OBJEXT) mailpart.$(OBJEXT) \
7	- mailview.$(OBJEXT) newuser.$(OBJEXT) pattern.$(OBJEXT) \
8	+ mailview.$(OBJEXT) pattern.$(OBJEXT) \
9	pipe.$(OBJEXT) print.$(OBJEXT) radio.$(OBJEXT) \
10	remote.$(OBJEXT) reply.$(OBJEXT) roleconf.$(OBJEXT) \
11	send.$(OBJEXT) setup.$(OBJEXT) signal.$(OBJEXT) \
12	@@ -319,7 +319,7 @@
13	alpine_SOURCES = addrbook.c adrbkcmd.c after.c alpine.c arg.c busy.c colorconf.c \
14	confscroll.c context.c dispfilt.c flagmaint.c folder.c help.c imap.c \
15	init.c kblock.c keymenu.c ldapconf.c listsel.c mailcmd.c mailindx.c \
16	- mailpart.c mailview.c newuser.c pattern.c pipe.c print.c radio.c remote.c reply.c \
17	+ mailpart.c mailview.c pattern.c pipe.c print.c radio.c remote.c reply.c \
18	roleconf.c send.c setup.c signal.c status.c takeaddr.c titlebar.c smime.c newmail.c
19
20	alpine_LDADD = $(LDADD) $(INTLLIBS)
21	@@ -453,7 +453,6 @@
22	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mailpart.Po@am__quote@
23	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mailview.Po@am__quote@
24	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newmail.Po@am__quote@
25	-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newuser.Po@am__quote@
26	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pattern.Po@am__quote@
27	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe.Po@am__quote@
28	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print.Po@am__quote@

Lines 1-18 Link Here

(-)/home/marco/tmp/alpine/files/patch-alpine__alpine.c (-18 lines)
1	--- ./alpine/alpine.c.orig 2013-08-14 23:36:01.000000000 -0500
2	+++ ./alpine/alpine.c 2014-05-25 19:15:31.000000000 -0500
3	@@ -50,7 +50,6 @@
4	#include "init.h"
5	#include "remote.h"
6	#include "pattern.h"
7	-#include "newuser.h"
8	#include "setup.h"
9	#include "adrbkcmd.h"
10	#include "signal.h"
11	@@ -767,7 +766,6 @@
12	pine_state->mangled_header = 1;
13	show_main_screen(pine_state, 0, FirstMenu, &main_keymenu, 0,
14	(Pos *) NULL);
15	- new_user_or_version(pine_state);
16	ClearScreen();
17	}
18

Lines 1-33 Link Here

(-)/home/marco/tmp/alpine/files/patch-alpine__mailview.c (-33 lines)
1	--- ./alpine/mailview.c.orig 2013-08-14 23:36:01.000000000 -0500
2	+++ ./alpine/mailview.c 2014-05-25 19:15:31.000000000 -0500
3	@@ -178,7 +178,6 @@
4	int url_local_nntp(char *);
5	int url_local_news(char *);
6	int url_local_file(char *);
7	-int url_local_phone_home(char *);
8	static int print_to_printer(SCROLL_S *);
9	int search_text(int, long, int, char *, Pos , int *);
10	void update_scroll_titlebar(long, int);
11	@@ -1603,7 +1602,6 @@
12	{"x-alpine-gripe:", 15, gripe_gripe_to},
13	{"x-alpine-help:", 14, url_local_helper},
14	{"x-pine-help:", 12, url_local_helper},
15	- {"x-alpine-phone-home:", 20, url_local_phone_home},
16	{"x-alpine-config:", 16, url_local_config},
17	{"x-alpine-cert:", 14, url_local_certdetails},
18	{"#", 1, url_local_fragment},
19	@@ -2158,14 +2156,6 @@
20	}
21
22
23	-int
24	-url_local_phone_home(char *url)
25	-{
26	- phone_home(url + strlen("x-alpine-phone-home:"));
27	- return(2);
28	-}
29	-
30	-
31	/*
32	* Format editorial comment referencing screen offering
33	* List-* header supplied commands

Lines 1-20 Link Here

(-)/home/marco/tmp/alpine/files/patch-alpine__makefile.wnt (-20 lines)
1	--- ./alpine/makefile.wnt.orig 2013-08-14 23:36:01.000000000 -0500
2	+++ ./alpine/makefile.wnt 2014-05-25 19:15:31.000000000 -0500
3	@@ -44,7 +44,7 @@
4	addrbook.h adrbkcmd.h after.h alpine.h arg.h busy.h colorconf.h confscroll.h \
5	conftype.h context.h dispfilt.h flagmaint.h folder.h headers.h help.h imap.h \
6	init.h kblock.h keymenu.h ldapconf.h listsel.h mailcmd.h mailindx.h mailpart.h \
7	- mailview.h newmail.h newuser.h pattern.h pipe.h print.h radio.h remote.h \
8	+ mailview.h newmail.h pattern.h pipe.h print.h radio.h remote.h \
9	reply.h roleconf.h \
10	send.h setup.h signal.h status.h takeaddr.h talk.h titlebar.h
11
12	@@ -52,7 +52,7 @@
13	confscroll.obj context.obj dispfilt.obj flagmaint.obj folder.obj help.obj \
14	imap.obj init.obj kblock.obj keymenu.obj ldapconf.obj listsel.obj mailcmd.obj \
15	mailindx.obj mailpart.obj mailview.obj newmail.obj \
16	- newuser.obj pattern.obj pipe.obj \
17	+ pattern.obj pipe.obj \
18	print.obj radio.obj remote.obj reply.obj roleconf.obj \
19	send.obj setup.obj signal.obj status.obj takeaddr.obj titlebar.obj
20

Lines 1-75 Link Here

(-)/home/marco/tmp/alpine/files/patch-alpine__send.c (-75 lines)
1	--- ./alpine/send.c.orig 2013-08-14 23:36:01.000000000 -0500
2	+++ ./alpine/send.c 2014-05-25 19:15:31.000000000 -0500
3	@@ -71,8 +71,6 @@
4	PARAMETER *parameter;
5	} BODY_PARTICULARS_S;
6
7	-#define PHONE_HOME_VERSION "-count"
8	-#define PHONE_HOME_HOST "docserver.cac.washington.edu"
9
10	/*
11	* macro to bind pico's headerentry pointer to PINEFIELD "extdata" hook
12	@@ -5481,63 +5479,6 @@
13
14
15	/*----------------------------------------------------------------------
16	- Generate and send a message back to the pine development team
17	-
18	-Args: none
19	-
20	-Returns: none
21	-----*/
22	-void
23	-phone_home(char *addr)
24	-{
25	- char tmp[MAX_ADDRESS];
26	- ENVELOPE *outgoing;
27	- BODY *body;
28	-
29	- outgoing = mail_newenvelope();
30	- if(!addr \|\| !strindex(addr, '@')){
31	- snprintf(addr = tmp, sizeof(tmp), "alpine%s@%s", PHONE_HOME_VERSION, PHONE_HOME_HOST);
32	- tmp[sizeof(tmp)-1] = '\0';
33	- }
34	-
35	- rfc822_parse_adrlist(&outgoing->to, addr, ps_global->maildomain);
36	-
37	- outgoing->message_id = generate_message_id();
38	- outgoing->subject = cpystr("Document Request");
39	- outgoing->from = phone_home_from();
40	-
41	- body = mail_newbody();
42	- body->type = TYPETEXT;
43	-
44	- if((body->contents.text.data = (void *)so_get(PicoText,NULL,EDIT_ACCESS)) != NULL){
45	- so_puts((STORE_S *)body->contents.text.data, "Document request: ");
46	- so_puts((STORE_S *)body->contents.text.data, "Alpine-");
47	- so_puts((STORE_S *)body->contents.text.data, ALPINE_VERSION);
48	- if(ps_global->first_time_user)
49	- so_puts((STORE_S *)body->contents.text.data, " for New Users");
50	-
51	- if(ps_global->VAR_INBOX_PATH && ps_global->VAR_INBOX_PATH[0] == '{')
52	- so_puts((STORE_S *)body->contents.text.data, " and IMAP");
53	-
54	- if(ps_global->VAR_NNTP_SERVER && ps_global->VAR_NNTP_SERVER[0]
55	- && ps_global->VAR_NNTP_SERVER[0][0])
56	- so_puts((STORE_S *)body->contents.text.data, " and NNTP");
57	-
58	- (void)pine_simple_send(outgoing, &body, NULL,NULL,NULL,NULL, SS_NULLRP);
59	-
60	- q_status_message(SM_ORDER, 1, 3, "Thanks for being counted!");
61	- }
62	- else
63	- q_status_message(SM_ORDER \| SM_DING, 3, 4,
64	- "Problem creating space for message text.");
65	-
66	- mail_free_envelope(&outgoing);
67	- pine_free_body(&body);
68	-
69	-}
70	-
71	-
72	-/*----------------------------------------------------------------------
73	Set up fields for passing to pico. Assumes first text part is
74	intended to be passed along for editing, and is in the form of
75	of a storage object brought into existence sometime before pico_send().

Lines 1-99 Link Here

(-)/home/marco/tmp/alpine/files/patch-pith__pine.hlp (-99 lines)
1	--- pith/pine.hlp.orig 2013-08-15 06:36:22.000000000 +0200
2	+++ pith/pine.hlp 2014-06-23 11:40:52.000000000 +0200
3	@@ -881,13 +881,13 @@
4	config file from command line or provided
5	by "PINECONF" environment variable
6	<!--chtml else-->
7	- pine.conf file
8	+ alpine.conf file
9	<!--chtml endif-->
10	<LI> personal configuration file
11	<LI> personal exceptions configuration file
12	<LI> command-line options
13	<!--chtml if pinemode="os_windows"--><!--chtml else-->
14	- <LI> system-wide pine.conf.fixed file<!--chtml endif-->
15	+ <LI> system-wide alpine.conf.fixed file<!--chtml endif-->
16	</UL>
17	<P>
18	The values in both the personal configuration file and the
19	@@ -977,7 +977,7 @@
20	sentmail# ~/mail/sent-mail
21	mailcap# ~/.mailcap + /etc/mailcap
22	+ /usr/etc/mailcap + /usr/local/etc/mailcap
23	- mimetypes# ~/.mime.types + /etc/mime.types + /usr/local/lib/mime.types
24	+ mimetypes# ~/.mime.types + /etc/mime.types + /usr/local/etc/mime.types
25
26	news-spool varies across Unix flavors, e.g. /var/spool/news or /usr/spool/news
27	active-news varies across Unix flavors, e.g. /usr/lib/news/active
28	@@ -1367,20 +1367,7 @@
29	We hope you will explore Alpine's many capabilities. From the MAIN MENU,
30	select Setup/Config to see many of the options available to you. Also note
31	that all screens have context-sensitive help text available.<P>
32	-<!--chtml if pinemode="phone_home"-->
33	-SPECIAL REQUEST:
34	-This software is made available as a public service of the
35	-University of Washington in Seattle. We are no longer actively developing
36	-the software, but it is still helpful to us to have an idea of how many
37	-people are using Alpine. Are you willing to be counted as an Alpine user? Pressing
38	-<A HREF="X-Alpine-Phone-Home:">Return</A>
39	-will send an anonymous (meaning, your real email address will not be revealed)
40	-message to the Alpine team at the University of Washington for purposes of tallying.
41	-<P>
42	-<!--To Exit this screen and continue your Alpine session press "E".-->
43	-<!--chtml else-->
44	To Exit this screen and continue your Alpine session press "Return".
45	-<!--chtml endif-->
46	</BODY>
47	</HTML>
48	===== new_alpine_user_greeting ======
49	@@ -1400,20 +1387,7 @@
50	The Release Notes may be viewed by pressing
51	"R" now or while in the MAIN MENU.
52	<P>
53	-<!--chtml if pinemode="phone_home"-->
54	-SPECIAL REQUEST:
55	-This software is made available as a public service of the
56	-University of Washington in Seattle. We are no longer actively developing
57	-the software, but it is still helpful to us to have an idea of how many
58	-people are using Alpine. Are you willing to be counted as an Alpine user? Pressing
59	-<A HREF="X-Alpine-Phone-Home:">Return</A>
60	-will send an anonymous (meaning, your real email address will not be revealed)
61	-message to the Alpine team at the University of Washington for purposes of tallying.
62	-<P>
63	-<!--To Exit this screen and continue your Alpine session press "E".-->
64	-<!--chtml else-->
65	To Exit this screen and continue your Alpine session press "Return".
66	-<!--chtml endif-->
67	</BODY>
68	</HTML>
69	===== new_version_greeting ======
70	@@ -1430,20 +1404,7 @@
71	documented in the Release Notes, which may be viewed by pressing
72	"R" now or while in the MAIN MENU.
73	<P>
74	-<!--chtml if pinemode="phone_home"-->
75	-SPECIAL REQUEST:
76	-This software is made available as a public service of the
77	-University of Washington in Seattle. We are no longer actively developing
78	-the software, but it is still helpful to us to have an idea of how many
79	-people are using Alpine. Are you willing to be counted as an Alpine user? Pressing
80	-<A HREF="X-Alpine-Phone-Home:">Return</A>
81	-will send an anonymous (meaning, your real email address will not be revealed)
82	-message to the Alpine team at the University of Washington for purposes of tallying.
83	-
84	-<!--To Exit this screen and continue your Alpine session press "E".-->
85	-<!--chtml else-->
86	To Exit this screen and continue your Alpine session press "Return".
87	-<!--chtml endif-->
88	</BODY>
89	</HTML>
90
91	@@ -2709,7 +2670,7 @@
92	system configuration file, execute
93
94	<PRE><CODE>
95	- pine -P old-pine.conf -conf > <!--#echo var="PINE_CONF_PATH"-->
96	+ pine -P old-alpine.conf -conf > <!--#echo var="PINE_CONF_PATH"-->
97	</CODE></PRE>
98	<P>
99	A system configuration file is not required.

Lines 1-65 Link Here

(-)/home/marco/tmp/alpine/files/patch-pith__send.c (-65 lines)
1	--- ./pith/send.c.orig 2013-08-14 23:36:22.000000000 -0500
2	+++ ./pith/send.c 2014-05-25 19:15:32.000000000 -0500
3	@@ -210,13 +210,6 @@
4
5
6	/*
7	- * Phone home hash controls
8	- */
9	-#define PH_HASHBITS 24
10	-#define PH_MAXHASH (1<<(PH_HASHBITS))
11	-
12	-
13	-/*
14	* postponed_stream - return stream associated with postponed messages
15	* in argument.
16	*/
17	@@ -1677,48 +1670,6 @@
18	}
19
20
21	-/*
22	- * phone_home_from - make phone home request's from address IMpersonal.
23	- * Doesn't include user's personal name.
24	- */
25	-ADDRESS *
26	-phone_home_from(void)
27	-{
28	- ADDRESS *addr = mail_newaddr();
29	- char tmp[32];
30	-
31	- /* garble up mailbox name */
32	- snprintf(tmp, sizeof(tmp), "hash_%08u", phone_home_hash(ps_global->VAR_USER_ID));
33	- tmp[sizeof(tmp)-1] = '\0';
34	- addr->mailbox = cpystr(tmp);
35	- addr->host = cpystr(ps_global->maildomain);
36	- return(addr);
37	-}
38	-
39	-
40	-/*
41	- * one-way-hash a username into an 8-digit decimal number
42	- *
43	- * Corey Satten, corey@cac.washington.edu, 7/15/98
44	- */
45	-unsigned int
46	-phone_home_hash(char *s)
47	-{
48	- unsigned int h;
49	-
50	- for (h=0; *s; ++s) {
51	- if (h & 1)
52	- h = (h>>1) \| (PH_MAXHASH/2);
53	- else
54	- h = (h>>1);
55	-
56	- h = ((h+1) * ((unsigned char) *s)) & (PH_MAXHASH - 1);
57	- }
58	-
59	- return (h);
60	-}
61	-
62	-
63	/*----------------------------------------------------------------------
64	Call the mailer, SMTP, sendmail or whatever
65