sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

mail/alpine: 2.00 -> 2.11, stagify'ed, portlint'ed, new master site

Browse source 
Big thanks to Michelle for the biggest part of the work in getting
the port to StageAge. Thanks for Marco to take over as maintainer.

PR:		ports/190273
Submitted by:	Michelle Sullivan <michelle@sorbs.net>
Approved by:	Marco Beishuizen <mbeis@xs4all.nl> (incoming maintainer)
This commit is contained in:
Kurt Jaeger 2014-06-15 08:40:09 +00:00
parent 5c84d31c7d
commit dcfffec86a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=357844
20 changed files with 553 additions and 526 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
mail/alpine/Makefile
View file

@ -1,21 +1,26 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME?= alpine PORTNAME?= alpine
PORTVERSION= 2.00 PORTVERSION= 2.11
PORTREVISION?= 4 PORTREVISION?= 0
CATEGORIES?= mail news ipv6 CATEGORIES?= mail news ipv6
MASTER_SITES= ftp://ftp.cac.washington.edu/alpine/ MASTER_SITES= http://patches.freeiz.com/alpine/release/src/
DIST_SUBDIR= alpine-${PORTVERSION} EXTRACT_SUFX= .tar.xz
MAINTAINER= ports@FreeBSD.org MAINTAINER= mbeis@xs4all.nl
COMMENT?= Mail and news client descended from Pine COMMENT?= Mail and news client descended from Pine
OPTIONS_DEFINE+= THREADS MOUSE NLS ISPELL NOSPELL LICENSE= APACHE20
OPTIONS_DEFAULT+= THREADS MOUSE
OPTIONS_DEFINE= DOCS SSL THREADS MOUSE NLS ISPELL NOSPELL
OPTIONS_DEFAULT+= DOCS SSL THREADS MOUSE
SSL_DESC= Build with SSL (installs: security/openssl if pre 10.x)
MOUSE_DESC= Enable mouse support for xterm MOUSE_DESC= Enable mouse support for xterm
ISPELL_DESC= Use ispell instead of aspell as default speller ISPELL_DESC= Use ispell instead of aspell as default speller
NOSPELL_DESC= Use no default speller (overrides both) NOSPELL_DESC= Use no default speller (overrides both)
.if !defined(PICO_ALPINE_SLAVE) .if !defined(PICO_ALPINE_SLAVE)
OPTIONS_DEFINE+= PICO IPV6 LDAP PASSFILE CONS25 QUOTA MAILDIR SSL OPTIONS_DEFINE+= PICO IPV6 LDAP PASSFILE CONS25 QUOTA MAILDIR SSL
OPTIONS_DEFAULT+= PICO SSL OPTIONS_DEFAULT+= PICO SSL
PICO_DESC= Build and install pico, the default editor PICO_DESC= Build and install pico, the default editor
@ -25,45 +30,57 @@ QUOTA_DESC= Add a patch for disk quota checking on IMAP
MAILDIR_DESC= Add a patch for maildir support MAILDIR_DESC= Add a patch for maildir support
.endif .endif
USE_BZIP2= yes USES= libtool
MAKE_JOBS_UNSAFE= yes MAKE_JOBS_UNSAFE= yes
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
.if !defined(PICO_ALPINE_SLAVE) .if !defined(PICO_ALPINE_SLAVE)
PORTDOCSbase= LICENSE NOTICE README
PORTDOCSdoc= brochure.txt tech-notes.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
PORTDOCS= ${PORTDOCSbase} ${PORTDOCSdoc} ${PORTDOCShtml}
CONFIGURE_ARGS+=--with-system-pinerc=${PREFIX}/etc/alpine.conf \ CONFIGURE_ARGS+=--with-system-pinerc=${PREFIX}/etc/alpine.conf \
--with-system-fixed-pinerc=${PREFIX}/etc/alpine.conf.fixed \ --with-system-fixed-pinerc=${PREFIX}/etc/alpine.conf.fixed \
--with-password-prog=/usr/bin/passwd \ --with-password-prog=/usr/bin/passwd \
--with-system-mail-directory=/var/mail \ --with-system-mail-directory=/var/mail \
--enable-background-post --without-krb5 --without-tcl --enable-background-post --without-krb5 --without-tcl
NO_STAGE= yes
.endif .endif
CONFIGURE_ARGS+=--with-debug-level=2 CONFIGURE_ARGS+=--with-debug-level=2
MAKE_ARGS+= CC="${CC}" CXX="${CXX}" GCCCFLAGS="${CFLAGS}" MAKE_ARGS+= CC="${CC}" CXX="${CXX}" GCCCFLAGS="${CFLAGS}"
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MSSL}
USE_OPENSSL= yes USE_OPENSSL= yes
.if ${OSVERSION} < 1000000
# OpenSSL is pre v1.0 in FBSD9.x so the ports version needs to be used
WITH_OPENSSL_PORT= yes
.endif
CONFIGURE_ARGS+= --with-ssl-dir=${OPENSSLDIR} \
--with-ssl-include-dir=${OPENSSLINC} \
--with-ssl-lib-dir=${OPENSSLLIB} \
--with-ssl-certs-dir=${OPENSSLDIR}/certs
.else
CONFIGURE_ARGS+= --without-ssl
USE_OPENSSL= no
.endif
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${PORT_OPTIONS:MTHREADS} THREADS_CONFIGURE_WITH= pthread
CONFIGURE_ARGS+= --with-pthread MOUSE_CONFIGURE_ENABLE= mouse
.else NLS_CONFIGURE_ENABLE= nls
CONFIGURE_ARGS+= --without-pthread IPV6_CONFIGURE_WITH= ipv6
.endif
.if ${PORT_OPTIONS:MMOUSE}
CONFIGURE_ARGS+= --enable-mouse
.else
CONFIGURE_ARGS+= --disable-mouse
.endif
.if ${PORT_OPTIONS:MNLS}
CONFIGURE_ARGS+= --enable-nls
.else
CONFIGURE_ARGS+= --disable-nls
.endif
.if ! ${PORT_OPTIONS:MNOSPELL} .if ! ${PORT_OPTIONS:MNOSPELL}
.if ! ${PORT_OPTIONS:MISPELL} .if ! ${PORT_OPTIONS:MISPELL}
@ -84,15 +101,9 @@ CONFIGURE_ARGS+=--without-simple-spellcheck --without-interactive-spellcheck
RUN_DEPENDS+= pico:${PORTSDIR}/editors/pico-alpine RUN_DEPENDS+= pico:${PORTSDIR}/editors/pico-alpine
.endif .endif
.if ${PORT_OPTIONS:MIPV6}
CONFIGURE_ARGS+= --with-ipv6
.else
CONFIGURE_ARGS+= --without-ipv6
.endif
.if ${PORT_OPTIONS:MLDAP} .if ${PORT_OPTIONS:MLDAP}
USE_OPENLDAP= yes USE_OPENLDAP= yes
CONFIGURE_ARGS+= --with-ldap --with-ldap-dir=${LOCALBASE} CONFIGURE_ARGS+= --with-ldap-dir=${LOCALBASE}
.else .else
CONFIGURE_ARGS+= --without-ldap CONFIGURE_ARGS+= --without-ldap
.endif .endif
@ -102,35 +113,26 @@ ALPINE_PASSFILE?= .alpine.pwd
CONFIGURE_ARGS+= --with-passfile=.alpine.pwd CONFIGURE_ARGS+= --with-passfile=.alpine.pwd
.endif .endif
.if ${PORT_OPTIONS:MCONS25}
EXTRA_PATCHES= ${FILESDIR}/cons25-alpine_keymenu.c
.endif
.if ${PORT_OPTIONS:MQUOTA} || ${PORT_OPTIONS:MMAILDIR} .if ${PORT_OPTIONS:MQUOTA} || ${PORT_OPTIONS:MMAILDIR}
PATCH_SITES= ${MASTER_SITE_LOCAL} PATCH_SITES= ftp://ftp.cac.washington.edu/alpine/
PATCH_SITE_SUBDIR= dougb/alpine-${PORTVERSION}/ PATCH_SITE_SUBDIR= dougb/alpine-${PORTVERSION}/
PATCH_DIST_ARGS+= -E --quiet -d ${PATCH_WRKSRC} -p1 PATCH_DIST_ARGS+= -E --quiet -d ${PATCH_WRKSRC} -p1
.endif .endif
.if ${PORT_OPTIONS:MQUOTA} .if ${PORT_OPTIONS:MQUOTA}
PATCH_SITES= ftp://ftp.cac.washington.edu/alpine/alpine-2.00/
PATCHFILES+= quota.patch.gz PATCHFILES+= quota.patch.gz
.endif .endif
.if ${PORT_OPTIONS:MMAILDIR} .if ${PORT_OPTIONS:MMAILDIR}
PATCH_SITES= ftp://ftp.cac.washington.edu/alpine/alpine-2.00/
PATCHFILES+= maildir.patch.gz PATCHFILES+= maildir.patch.gz
.endif .endif
.if ${PORT_OPTIONS:MSSL} .if ${PORT_OPTIONS:MCONS25}
CONFIGURE_ARGS+= --with-ssl-dir=${OPENSSLDIR} \ EXTRA_PATCHES= ${FILESDIR}/cons25-alpine_keymenu.c
--with-ssl-include-dir=${OPENSSLINC} \
--with-ssl-lib-dir=${OPENSSLLIB} \
--with-ssl-certs-dir=${OPENSSLDIR}/certs
.else
CONFIGURE_ARGS+= --without-ssl
.endif .endif
MAN1= alpine.1 rpdump.1 rpload.1
pre-patch: pre-patch:
@${CHMOD} -R u+w ${WRKSRC} @${CHMOD} -R u+w ${WRKSRC}
@ -163,19 +165,23 @@ post-patch:
done done
post-install: post-install:
${STAGEDIR}${PREFIX}/bin/alpine -conf > ${STAGEDIR}${PREFIX}/etc/alpine.conf.sample
.if ${PORT_OPTIONS:MDOCS} .if ${PORT_OPTIONS:MDOCS}
${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} ${DOCSDIR} \ ${INSTALL} -d ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/tech-notes
${DOCSDIR}/tech-notes .for f in ${PORTDOCSbase}
${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/NOTICE ${DOCSDIR} .endfor
${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .for f in ${PORTDOCSdoc}
${INSTALL_DATA} ${WRKSRC}/doc/brochure.txt ${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/doc/$f ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/doc/tech-notes.txt ${DOCSDIR} .endfor
${INSTALL_DATA} ${WRKSRC}/doc/tech-notes/*.html ${DOCSDIR}/tech-notes .for f in ${PORTDOCShtml}
${INSTALL_MAN} ${WRKSRC}/doc/$f ${STAGEDIR}${DOCSDIR}/tech-notes
.endfor
.endif .endif
PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${CAT} ${PKGMESSAGE} # PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
# @${CAT} ${PKGMESSAGE}
.endif # !defined(PICO_ALPINE_SLAVE) .endif # !defined(PICO_ALPINE_SLAVE)
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

4
mail/alpine/distinfo
View file

@ -1,5 +1,5 @@
SHA256 (alpine-2.00/alpine-2.00.tar.bz2) = c85db8405af90375ba2440c85b7952d80996154e9916b83acca558dc82e0a2a6 SHA256 (alpine-2.11.tar.xz) = fecc9ca5df03e0f368edec65cd61444325157b5635b5c92380cedf9c4ce8fbf6
SIZE (alpine-2.00/alpine-2.00.tar.bz2) = 5222673 SIZE (alpine-2.11.tar.xz) = 4403188
SHA256 (alpine-2.00/quota.patch.gz) = 383717cbe36c62a6008f9d7e1ce56e755fc0ec49eef25fcf11f2cbebbbaffe12 SHA256 (alpine-2.00/quota.patch.gz) = 383717cbe36c62a6008f9d7e1ce56e755fc0ec49eef25fcf11f2cbebbbaffe12
SIZE (alpine-2.00/quota.patch.gz) = 3123 SIZE (alpine-2.00/quota.patch.gz) = 3123
SHA256 (alpine-2.00/maildir.patch.gz) = 60d98c7dca0932316e23ccb226b4db85d1896de9a1a37259a2afcea153be4477 SHA256 (alpine-2.00/maildir.patch.gz) = 60d98c7dca0932316e23ccb226b4db85d1896de9a1a37259a2afcea153be4477

11
mail/alpine/files/patch-alpine__Makefile.am Normal file
View file

@ -0,0 +1,11 @@
--- ./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)

28
mail/alpine/files/patch-alpine__Makefile.in Normal file
View file

@ -0,0 +1,28 @@
--- ./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@

18
mail/alpine/files/patch-alpine__alpine.c Normal file
View file

@ -0,0 +1,18 @@
--- ./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();
}

33
mail/alpine/files/patch-alpine__mailview.c Normal file
View file

@ -0,0 +1,33 @@
--- ./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

20
mail/alpine/files/patch-alpine__makefile.wnt Normal file
View file

@ -0,0 +1,20 @@
--- ./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

75
mail/alpine/files/patch-alpine__send.c Normal file
View file

@ -0,0 +1,75 @@
--- ./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().

10
mail/alpine/files/patch-alpine__send.h Normal file
View file

@ -0,0 +1,10 @@
--- ./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);

29
mail/alpine/files/patch-configure
View file

@ -1,29 +0,0 @@
--- configure.orig 2008-08-21 18:41:04.000000000 -0700
+++ configure 2008-09-05 22:36:00.000000000 -0700
@@ -23041,7 +23041,7 @@
case "$SPELLPROG" in
no)
;;
- yes)
+ yes|*aspell|*ispell)
# Extract the first word of "aspell", so it can be a program name with args.
set dummy aspell; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -23233,7 +23233,7 @@
case "$ISPELLPROG" in
no)
;;
- yes)
+ yes|*aspell|*ispell)
# Extract the first word of "aspell", so it can be a program name with args.
set dummy aspell; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -33251,7 +33251,7 @@
c_client_specials="${c_client_specials}SSLTYPE=none "
else
- if test -n "$alpine_SSLCERTS" -a -d "$alpine_SSLCERTS" ; then
+ if test -n "$alpine_SSLCERTS" ; then
certdir="$alpine_SSLCERTS"
elif test -n "$alpine_SSLDIR" -a -d "${alpine_SSLDIR}/certs" ; then
certdir="${alpine_SSLDIR}/certs"

381
mail/alpine/files/patch-newuser
View file

@ -1,381 +0,0 @@
diff -ur alpine/Makefile.am alpine/Makefile.am
--- alpine/Makefile.am 2008-06-03 08:54:15.000000000 -0700
+++ alpine/Makefile.am 2011-05-22 14:43:01.000000000 -0700
@@ -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
alpine_LDADD = $(LDADD) $(INTLLIBS)
diff -ur alpine/Makefile.in alpine/Makefile.in
--- alpine/Makefile.in 2008-06-03 08:54:15.000000000 -0700
+++ alpine/Makefile.in 2011-05-22 14:43:14.000000000 -0700
@@ -68,7 +68,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) \
@@ -271,7 +271,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
alpine_LDADD = $(LDADD) $(INTLLIBS)
@@ -388,7 +388,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mailindx.Po@am__quote@
@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)/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 -ur alpine/alpine.c alpine/alpine.c
--- alpine/alpine.c 2008-06-03 15:31:05.000000000 -0700
+++ alpine/alpine.c 2011-05-22 14:42:15.000000000 -0700
@@ -49,7 +49,6 @@
#include "init.h"
#include "remote.h"
#include "pattern.h"
-#include "newuser.h"
#include "setup.h"
#include "adrbkcmd.h"
#include "signal.h"
@@ -762,7 +761,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 -ur alpine/mailview.c alpine/mailview.c
--- alpine/mailview.c 2008-08-01 17:32:26.000000000 -0700
+++ alpine/mailview.c 2011-05-22 14:42:15.000000000 -0700
@@ -177,7 +177,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);
@@ -1697,7 +1696,6 @@
{"news:", 5, url_local_news},
{"x-alpine-gripe:", 15, gripe_gripe_to},
{"x-alpine-help:", 14, 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},
@@ -2252,14 +2250,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 -ur alpine/makefile.wnt alpine/makefile.wnt
--- alpine/makefile.wnt 2007-10-24 14:58:00.000000000 -0700
+++ alpine/makefile.wnt 2011-05-22 14:42:15.000000000 -0700
@@ -44,13 +44,13 @@
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 newuser.h pattern.h pipe.h print.h radio.h remote.h reply.h roleconf.h \
+ mailview.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
OFILES= addrbook.obj adrbkcmd.obj after.obj alpine.obj arg.obj busy.obj colorconf.obj \
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 newuser.obj pattern.obj pipe.obj \
+ mailindx.obj mailpart.obj mailview.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 -ur alpine/send.c alpine/send.c
--- alpine/send.c 2008-06-30 15:03:35.000000000 -0700
+++ alpine/send.c 2011-05-22 14:42:15.000000000 -0700
@@ -70,8 +70,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
@@ -5462,63 +5460,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 -ur alpine/send.h alpine/send.h
--- alpine/send.h 2007-08-16 15:25:10.000000000 -0700
+++ alpine/send.h 2011-05-22 14:42:15.000000000 -0700
@@ -41,7 +41,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 -ur pith/filter.c pith/filter.c
--- pith/filter.c 2008-08-21 16:50:47.000000000 -0700
+++ pith/filter.c 2011-05-22 14:42:15.000000000 -0700
@@ -7510,8 +7510,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 -ur pith/pine.hlp pith/pine.hlp
--- pith/pine.hlp 2008-08-22 17:07:05.000000000 -0700
+++ pith/pine.hlp 2011-05-22 14:42:15.000000000 -0700
@@ -1204,21 +1204,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 world-wide as a public service of the
-University of Washington in Seattle. In order to justify continuing
-development, it is helpful 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 development 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 ======
@@ -1238,21 +1224,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 world-wide as a public service of the
-University of Washington in Seattle. In order to justify continuing
-development, it is helpful 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 development 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 ======
@@ -1269,21 +1241,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 world-wide as a public service of the
-University of Washington in Seattle. In order to justify continuing
-development, it is helpful 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 development 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>
diff -ur pith/send.c pith/send.c
--- pith/send.c 2008-08-06 11:25:58.000000000 -0700
+++ pith/send.c 2011-05-22 14:42:15.000000000 -0700
@@ -209,13 +209,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.
*/
@@ -1676,48 +1669,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 -ur pith/send.h pith/send.h
--- pith/send.h 2008-06-30 15:03:35.000000000 -0700
+++ pith/send.h 2011-05-22 14:42:15.000000000 -0700
@@ -224,8 +224,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 -ur pith/state.h pith/state.h
--- pith/state.h 2008-06-03 08:54:15.000000000 -0700
+++ pith/state.h 2011-05-22 14:42:15.000000000 -0700
@@ -187,7 +187,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 -ur po/POTFILES.in po/POTFILES.in
--- po/POTFILES.in 2008-06-03 12:27:23.000000000 -0700
+++ po/POTFILES.in 2011-05-22 14:42:15.000000000 -0700
@@ -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

11
mail/alpine/files/patch-pith__filter.c Normal file
View file

@ -0,0 +1,11 @@
--- ./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;

181
mail/alpine/files/patch-pith__pine.hlp Normal file
View file

@ -0,0 +1,181 @@
--- ./pith/pine.hlp.orig 2013-08-14 23:36:22.000000000 -0500
+++ ./pith/pine.hlp 2014-05-25 19:15:32.000000000 -0500
@@ -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
@@ -976,8 +976,8 @@
postponed# ~/mail/postponed-msgs
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
+ + /usr/etc/mailcap + /usr/ports/mail/alpine/work/stage/usr/local/etc/mailcap
+ mimetypes# ~/.mime.types + /etc/mime.types + /usr/ports/mail/alpine/work/stage/usr/ports/mail/alpine/work/stage/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.
@@ -16075,7 +16036,7 @@
the pathname of the bogofilter program.
For example,
<P>
-<CENTER><SAMP>Command = /usr/local/bin/bogofilter</SAMP></CENTER>
+<CENTER><SAMP>Command = /usr/ports/mail/alpine/work/stage/usr/local/bin/bogofilter</SAMP></CENTER>
<P>
Exit status of zero is what you are interested in, so you'd set the
Exit Status Interval to
@@ -16136,7 +16097,7 @@
Instead of using just plain &quot;bogofilter&quot; as the Categorizer Command,
the &quot;-u&quot; argument will cause bogofilter to update the database.
<P>
-<CENTER><SAMP>Command = /usr/local/bin/bogofilter -u</SAMP></CENTER>
+<CENTER><SAMP>Command = /usr/ports/mail/alpine/work/stage/usr/local/bin/bogofilter -u</SAMP></CENTER>
<P>
You'd want a couple more aliases or shell scripts called something like
<EM>change_to_spam</EM>
@@ -16164,7 +16125,7 @@
This is usually ok.
However, in this case it is a problem because the command
<P>
-<CENTER><SAMP>Command = /usr/local/bin/bogofilter -u</SAMP></CENTER>
+<CENTER><SAMP>Command = /usr/ports/mail/alpine/work/stage/usr/local/bin/bogofilter -u</SAMP></CENTER>
<P>
has the side effect of updating the database.
So you run the risk of updating the database multiple times for a single
@@ -16210,7 +16171,7 @@
! Keyword pattern = Bogo
External Categorizer Commands =
- Command = /usr/local/bin/bogofilter -u
+ Command = /usr/ports/mail/alpine/work/stage/usr/local/bin/bogofilter -u
Exit Status Interval = (0,0)
Character Limit = <No Value Set: using "-1"> (optionally set this)
@@ -20763,7 +20724,7 @@
</PRE>
<!--chtml else-->
a colon (:) under UNIX; for example:<PRE>
- ~/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap
+ ~/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/ports/mail/alpine/work/stage/usr/local/etc/mailcap
</PRE>
<!--chtml endif-->
<P><UL>
@@ -26486,16 +26447,16 @@
<P>
So, here are some example entries:
<PRE>
-url-viewers = _TEST(&quot;test -n '$&#123;DISPLAY}'&quot;)_ /usr/local/bin/netscape
- &quot;/usr/local/bin/lynx _URL_&quot;
+url-viewers = _TEST(&quot;test -n '$&#123;DISPLAY}'&quot;)_ /usr/ports/mail/alpine/work/stage/usr/local/bin/netscape
+ &quot;/usr/ports/mail/alpine/work/stage/usr/local/bin/lynx _URL_&quot;
C:&#92;BIN&#92;NETSCAPE.BAT
</PRE>
<P>
This example shows that for the first viewer in the list to be used
the environment variable &quot;DISPLAY&quot; must be defined. If it
-is, then the path and file &quot;/usr/local/bin/netscape&quot; must exist.
+is, then the path and file &quot;/usr/ports/mail/alpine/work/stage/usr/local/bin/netscape&quot; must exist.
If neither condition is met,
-then the path and file &quot;/usr/local/bin/lynx&quot; must exist.
+then the path and file &quot;/usr/ports/mail/alpine/work/stage/usr/local/bin/lynx&quot; must exist.
If it does, then the &quot;_URL_&quot; token is replaced by the selected URL.
If the path to &quot;lynx&quot; is invalid,
then the final path and file C:&#92;BIN&#92;NETSCAPE.BAT must exist.
@@ -26588,10 +26549,10 @@
An example using the Korn shell and the Netscape browser (first entry wrapped
because of its length, but should all appear on one line):
<P>
-url-viewers = _TEST("test -L /myhomedir/.netscape/lock")_ &quot;/usr/local/bin/netscape -remote 'openURL(_URL_, new-window)' &amp;&quot;<BR>
+url-viewers = _TEST("test -L /myhomedir/.netscape/lock")_ &quot;/usr/ports/mail/alpine/work/stage/usr/local/bin/netscape -remote 'openURL(_URL_, new-window)' &amp;&quot;<BR>
-_TEST(&quot;test -n '$&#123;DISPLAY}'&quot;)_ &quot;/usr/local/bin/netscape &amp;&quot;<BR>
- &quot;/usr/local/bin/lynx '_URL_'&quot;
+_TEST(&quot;test -n '$&#123;DISPLAY}'&quot;)_ &quot;/usr/ports/mail/alpine/work/stage/usr/local/bin/netscape &amp;&quot;<BR>
+ &quot;/usr/ports/mail/alpine/work/stage/usr/local/bin/lynx '_URL_'&quot;
<P>
<!--chtml endif-->
<P>

65
mail/alpine/files/patch-pith__send.c Normal file
View file

@ -0,0 +1,65 @@
--- ./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

11
mail/alpine/files/patch-pith__send.h Normal file
View file

@ -0,0 +1,11 @@
--- ./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 *);

10
mail/alpine/files/patch-pith__state.h Normal file
View file

@ -0,0 +1,10 @@
--- ./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;

10
mail/alpine/files/patch-po__POTFILES.in Normal file
View file

@ -0,0 +1,10 @@
--- ./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

2
mail/alpine/pkg-descr
View file

@ -18,4 +18,4 @@ Alpine's basic feature set includes:
Alpine supports MIME (Multipurpose Internet Mail Extensions), an Internet Alpine supports MIME (Multipurpose Internet Mail Extensions), an Internet
Standard for representing multipart and multimedia data in email. Standard for representing multipart and multimedia data in email.
WWW: http://www.washington.edu/alpine/ WWW: http://patches.freeiz.com/alpine/

39
mail/alpine/pkg-install
View file

@ -1,39 +0,0 @@
#!/bin/sh
[ "$2" = 'POST-INSTALL' ] || exit 0
case "$1" in
alpine*) ;;
*) exit 0 ;;
esac
[ -x "${PKG_PREFIX}/bin/alpine" ] || exit 1
PATH=/bin:/usr/bin
export PATH
TDIR=`mktemp -d ${TMPDIR:-/tmp}/alpine-conf.XXXXXXXX`
if [ -s "${PKG_PREFIX}/etc/alpine.conf" ]; then
mv ${PKG_PREFIX}/etc/alpine.conf ${TDIR}/alpine.conf.installed
fi
${PKG_PREFIX}/bin/alpine -conf > ${TDIR}/alpine.conf.sample
install -o root -g wheel -m 444 ${TDIR}/alpine.conf.sample ${PKG_PREFIX}/etc/alpine.conf.sample
[ -s "${TDIR}/alpine.conf.installed" ] && mv ${TDIR}/alpine.conf.installed ${PKG_PREFIX}/etc/alpine.conf
${PKG_PREFIX}/bin/alpine -conf > ${TDIR}/alpine.conf
if [ -s "${PKG_PREFIX}/etc/alpine.conf" ]; then
if ! cmp -s ${TDIR}/alpine.conf ${PKG_PREFIX}/etc/alpine.conf; then
unlink ${PKG_PREFIX}/etc/alpine.conf
install -o root -g wheel -m 444 ${TDIR}/alpine.conf ${PKG_PREFIX}/etc/alpine.conf
fi
else
cp -p ${PKG_PREFIX}/etc/alpine.conf.sample ${PKG_PREFIX}/etc/alpine.conf
fi
rm -rf $TDIR
exit 0

21
mail/alpine/pkg-plist
View file

@ -1,21 +1,8 @@
@unexec /usr/bin/cmp -s %D/etc/alpine.conf %D/etc/alpine.conf.sample && /bin/unlink %D/etc/alpine.conf || true
bin/alpine bin/alpine
bin/rpdump bin/rpdump
bin/rpload bin/rpload
etc/alpine.conf.sample man/man1/alpine.1.gz
%%PORTDOCS%%%%DOCSDIR%%/LICENSE man/man1/rpdump.1.gz
%%PORTDOCS%%%%DOCSDIR%%/NOTICE man/man1/rpload.1.gz
%%PORTDOCS%%%%DOCSDIR%%/README @sample etc/alpine.conf.sample
%%PORTDOCS%%%%DOCSDIR%%/brochure.txt
%%PORTDOCS%%%%DOCSDIR%%/tech-notes.txt
%%PORTDOCS%%%%DOCSDIR%%/tech-notes/background.html
%%PORTDOCS%%%%DOCSDIR%%/tech-notes/cmd-line.html
%%PORTDOCS%%%%DOCSDIR%%/tech-notes/config-notes.html
%%PORTDOCS%%%%DOCSDIR%%/tech-notes/config.html
%%PORTDOCS%%%%DOCSDIR%%/tech-notes/index.html
%%PORTDOCS%%%%DOCSDIR%%/tech-notes/installation.html
%%PORTDOCS%%%%DOCSDIR%%/tech-notes/introduction.html
%%PORTDOCS%%%%DOCSDIR%%/tech-notes/low-level.html
%%PORTDOCS%%%%DOCSDIR%%/tech-notes/porting.html
%%PORTDOCS%%@dirrm %%DOCSDIR%%/tech-notes %%PORTDOCS%%@dirrm %%DOCSDIR%%/tech-notes
%%PORTDOCS%%@dirrm %%DOCSDIR%%