Attachment 153291 Details for Bug 197885 – Upgrade alpine port 2.11 > 2.20

[patch] Upgrade alpine port 2.11 > 2.20

alpine.diff (text/plain), 22.34 KB, created by Marco Beishuizen on 2015-02-21 23:02:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marco Beishuizen

Created: 2015-02-21 23:02:41 UTC

Size: 22.34 KB

patch

obsolete

>diff -r -u -N /usr/ports/mail/alpine/Makefile /home/marco/tmp/alpine/Makefile
>--- /usr/ports/mail/alpine/Makefile	2014-07-29 21:11:51.000000000 +0200
>+++ /home/marco/tmp/alpine/Makefile	2015-02-21 22:12:26.000000000 +0100
>@@ -1,8 +1,8 @@
> # $FreeBSD: head/mail/alpine/Makefile 363374 2014-07-29 19:11:51Z adamw $
> 
> PORTNAME?=	alpine
>-PORTVERSION=	2.11
>-PORTREVISION?=	2
>+PORTVERSION=	2.20
>+PORTREVISION?=	0
> CATEGORIES?=	mail news ipv6
> MASTER_SITES=	http://patches.freeiz.com/alpine/release/src/
> DIST_SUBDIR=	alpine-${PORTVERSION}
>@@ -38,11 +38,12 @@
> .if !defined(PICO_ALPINE_SLAVE)
> 
> PORTDOCSbase=	LICENSE NOTICE README
>-PORTDOCSdoc=	brochure.txt tech-notes.txt
>+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/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 \
>@@ -113,7 +114,7 @@
> .endif
> 
> .if ${PORT_OPTIONS:MMAILDIR}
>-PATCH_SITES=		http://patches.freeiz.com/alpine/patches/alpine-2.11/
>+PATCH_SITES=		http://patches.freeiz.com/alpine/patches/alpine-${PORTVERSION}/
> PATCHFILES+=		maildir.patch.gz
> PATCH_DIST_ARGS+=	-E --quiet -d ${PATCH_WRKSRC} -p1
> .endif
>@@ -142,7 +143,9 @@
> 	 ${WRKSRC}/imap/src/osdep/unix/Makefile.presed \
> 	 > ${WRKSRC}/imap/src/osdep/unix/Makefile
> 	@for i in ${WRKSRC}/README ${WRKSRC}/doc/alpine.1 \
>-	 ${WRKSRC}/doc/tech-notes.txt ${WRKSRC}/doc/tech-notes/*.html \
>+	 ${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" \
>diff -r -u -N /usr/ports/mail/alpine/distinfo /home/marco/tmp/alpine/distinfo
>--- /usr/ports/mail/alpine/distinfo	2014-07-17 20:30:26.000000000 +0200
>+++ /home/marco/tmp/alpine/distinfo	2015-02-19 21:12:16.000000000 +0100
>@@ -1,4 +1,4 @@
>-SHA256 (alpine-2.11/alpine-2.11.tar.xz) = fecc9ca5df03e0f368edec65cd61444325157b5635b5c92380cedf9c4ce8fbf6
>-SIZE (alpine-2.11/alpine-2.11.tar.xz) = 4403188
>-SHA256 (alpine-2.11/maildir.patch.gz) = 8de4e1f8e5d505e0071dfb573279b0472bdbca3d45a59bcc526a6a664cffde69
>-SIZE (alpine-2.11/maildir.patch.gz) = 33737
>+SHA256 (alpine-2.20/alpine-2.20.tar.xz) = ed639b6e5bb97e6b0645c85262ca6a784316195d461ce8d8411999bf80449227
>+SIZE (alpine-2.20/alpine-2.20.tar.xz) = 4841816
>+SHA256 (alpine-2.20/maildir.patch.gz) = 80c1a147d9092f463dce365f12b9e74f7d0a0c15e03267010f5dcb42a27493d3
>+SIZE (alpine-2.20/maildir.patch.gz) = 33935
>diff -r -u -N /usr/ports/mail/alpine/files/patch-alpine__Makefile.am /home/marco/tmp/alpine/files/patch-alpine__Makefile.am
>--- /usr/ports/mail/alpine/files/patch-alpine__Makefile.am	2014-06-15 10:40:09.000000000 +0200
>+++ /home/marco/tmp/alpine/files/patch-alpine__Makefile.am	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- ./alpine/Makefile.am.orig	2014-05-25 19:16:59.000000000 -0500
>-+++ ./alpine/Makefile.am	2014-05-25 19:17:18.000000000 -0500
>-@@ -19,7 +19,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)
>diff -r -u -N /usr/ports/mail/alpine/files/patch-alpine__Makefile.in /home/marco/tmp/alpine/files/patch-alpine__Makefile.in
>--- /usr/ports/mail/alpine/files/patch-alpine__Makefile.in	2014-06-15 10:40:09.000000000 +0200
>+++ /home/marco/tmp/alpine/files/patch-alpine__Makefile.in	1970-01-01 01:00:00.000000000 +0100
>@@ -1,28 +0,0 @@
>---- ./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@
>diff -r -u -N /usr/ports/mail/alpine/files/patch-alpine__alpine.c /home/marco/tmp/alpine/files/patch-alpine__alpine.c
>--- /usr/ports/mail/alpine/files/patch-alpine__alpine.c	2014-06-15 10:40:09.000000000 +0200
>+++ /home/marco/tmp/alpine/files/patch-alpine__alpine.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,18 +0,0 @@
>---- ./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();
>- }
>- 
>diff -r -u -N /usr/ports/mail/alpine/files/patch-alpine__mailview.c /home/marco/tmp/alpine/files/patch-alpine__mailview.c
>--- /usr/ports/mail/alpine/files/patch-alpine__mailview.c	2014-06-15 10:40:09.000000000 +0200
>+++ /home/marco/tmp/alpine/files/patch-alpine__mailview.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,33 +0,0 @@
>---- ./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
>diff -r -u -N /usr/ports/mail/alpine/files/patch-alpine__makefile.wnt /home/marco/tmp/alpine/files/patch-alpine__makefile.wnt
>--- /usr/ports/mail/alpine/files/patch-alpine__makefile.wnt	2014-06-15 10:40:09.000000000 +0200
>+++ /home/marco/tmp/alpine/files/patch-alpine__makefile.wnt	1970-01-01 01:00:00.000000000 +0100
>@@ -1,20 +0,0 @@
>---- ./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
>- 
>diff -r -u -N /usr/ports/mail/alpine/files/patch-alpine__send.c /home/marco/tmp/alpine/files/patch-alpine__send.c
>--- /usr/ports/mail/alpine/files/patch-alpine__send.c	2014-06-15 10:40:09.000000000 +0200
>+++ /home/marco/tmp/alpine/files/patch-alpine__send.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,75 +0,0 @@
>---- ./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().
>diff -r -u -N /usr/ports/mail/alpine/files/patch-alpine__send.h /home/marco/tmp/alpine/files/patch-alpine__send.h
>--- /usr/ports/mail/alpine/files/patch-alpine__send.h	2014-06-15 10:40:09.000000000 +0200
>+++ /home/marco/tmp/alpine/files/patch-alpine__send.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,10 +0,0 @@
>---- ./alpine/send.h.orig	2013-08-14 23:36:01.000000000 -0500
>-+++ ./alpine/send.h	2014-05-25 19:15:32.000000000 -0500
>-@@ -42,7 +42,6 @@
>- void	 pine_send(ENVELOPE *, BODY **, char *, ACTION_S *, char *, REPLY_S *,
>- 		 REDRAFT_POS_S *, char *, PINEFIELD *, int);
>- int	 upload_msg_to_pico(char *, size_t, long *);
>--void	 phone_home(char *);
>- void create_message_body(BODY **, PATMT *, int);
>- char	 *pine_send_status(int, char *, char *, size_t, int *);
>- int	 confirm_daemon_send(void);
>diff -r -u -N /usr/ports/mail/alpine/files/patch-pith__filter.c /home/marco/tmp/alpine/files/patch-pith__filter.c
>--- /usr/ports/mail/alpine/files/patch-pith__filter.c	2014-06-15 10:40:09.000000000 +0200
>+++ /home/marco/tmp/alpine/files/patch-pith__filter.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- ./pith/filter.c.orig	2013-08-14 23:36:22.000000000 -0500
>-+++ ./pith/filter.c	2014-05-25 19:15:32.000000000 -0500
>-@@ -7522,8 +7522,6 @@
>- 		 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 -r -u -N /usr/ports/mail/alpine/files/patch-pith__pine.hlp /home/marco/tmp/alpine/files/patch-pith__pine.hlp
>--- /usr/ports/mail/alpine/files/patch-pith__pine.hlp	2014-06-23 13:57:44.000000000 +0200
>+++ /home/marco/tmp/alpine/files/patch-pith__pine.hlp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,99 +0,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
>- 
>-- pine.conf file
>-+ alpine.conf file
>- 
>- <LI> personal configuration file
>- <LI> personal exceptions configuration file
>- <LI> command-line options
>- 
>-- <LI> system-wide pine.conf.fixed file
>-+ <LI> system-wide alpine.conf.fixed file
>- </UL>
>- 
>- 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.
>--
>--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 "Return".
>--
>- </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.
>- 
>--
>--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 "Return".
>--
>- </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.
>- 
>--
>--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 "Return".
>--
>- </BODY>
>- </HTML>
>- 
>-@@ -2709,7 +2670,7 @@
>- system configuration file, execute
>- 
>- <PRE><CODE>
>--		pine -P old-pine.conf -conf > 
>-+		pine -P old-alpine.conf -conf > 
>- </CODE></PRE>
>- 
>- A system configuration file is not required.
>diff -r -u -N /usr/ports/mail/alpine/files/patch-pith__send.c /home/marco/tmp/alpine/files/patch-pith__send.c
>--- /usr/ports/mail/alpine/files/patch-pith__send.c	2014-06-15 10:40:09.000000000 +0200
>+++ /home/marco/tmp/alpine/files/patch-pith__send.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,65 +0,0 @@
>---- ./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
>- 
>diff -r -u -N /usr/ports/mail/alpine/files/patch-pith__send.h /home/marco/tmp/alpine/files/patch-pith__send.h
>--- /usr/ports/mail/alpine/files/patch-pith__send.h	2014-06-15 10:40:09.000000000 +0200
>+++ /home/marco/tmp/alpine/files/patch-pith__send.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- ./pith/send.h.orig	2013-08-14 23:36:50.000000000 -0500
>-+++ ./pith/send.h	2014-05-25 19:15:32.000000000 -0500
>-@@ -225,8 +225,6 @@
>- void	 pine_free_env(METAENV **);
>- int	 check_addresses(METAENV *);
>- void	 update_answered_flags(REPLY_S *);
>--ADDRESS	 *phone_home_from(void);
>--unsigned int phone_home_hash(char *);
>- int call_mailer(METAENV *, BODY *, char **, int, void (*)(char *, int),
>- 			void (*)(PIPE_S *, int, void *));
>- int write_postponed(METAENV *, BODY *);
>diff -r -u -N /usr/ports/mail/alpine/files/patch-pith__state.h /home/marco/tmp/alpine/files/patch-pith__state.h
>--- /usr/ports/mail/alpine/files/patch-pith__state.h	2014-06-15 10:40:09.000000000 +0200
>+++ /home/marco/tmp/alpine/files/patch-pith__state.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,10 +0,0 @@
>---- ./pith/state.h.orig	2013-08-14 23:36:50.000000000 -0500
>-+++ ./pith/state.h	2014-05-25 19:15:32.000000000 -0500
>-@@ -193,7 +193,6 @@
>- unsigned	 force_prefer_plain:1;
>- unsigned	 force_no_prefer_plain:1;
>- 
>-- unsigned	 phone_home:1;
>- unsigned painted_body_on_startup:1;
>- unsigned painted_footer_on_startup:1;
>- unsigned open_readonly_on_startup:1;
>diff -r -u -N /usr/ports/mail/alpine/files/patch-po__POTFILES.in /home/marco/tmp/alpine/files/patch-po__POTFILES.in
>--- /usr/ports/mail/alpine/files/patch-po__POTFILES.in	2014-06-15 10:40:09.000000000 +0200
>+++ /home/marco/tmp/alpine/files/patch-po__POTFILES.in	1970-01-01 01:00:00.000000000 +0100
>@@ -1,10 +0,0 @@
>---- ./po/POTFILES.in.orig	2013-08-14 23:36:22.000000000 -0500
>-+++ ./po/POTFILES.in	2014-05-25 19:15:32.000000000 -0500
>-@@ -50,7 +50,6 @@
>- alpine/context.c
>- alpine/pine-use.c
>- alpine/imap.c
>--alpine/newuser.c
>- alpine/help.c
>- alpine/print.c
>- alpine/smime.c
>diff -r -u -N /usr/ports/mail/alpine/pkg-plist /home/marco/tmp/alpine/pkg-plist
>--- /usr/ports/mail/alpine/pkg-plist	2014-11-22 19:42:44.000000000 +0100
>+++ /home/marco/tmp/alpine/pkg-plist	2015-02-21 22:20:17.000000000 +0100
>@@ -1,7 +1,7 @@
> bin/alpine
> bin/rpdump
> bin/rpload
>+%%ETCDIR%%.conf.sample
> man/man1/alpine.1.gz
> man/man1/rpdump.1.gz
>-man/man1/rpload.1.gz
>-@sample etc/alpine.conf.sample
>+man/man1/rpload.1.gz
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 197885: 153291