mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00
Code Issues Releases Activity

Update to version 4.10.

Browse Source 
PR:		10286
Submitted by:	maintainer
This commit is contained in:
Steve Price 1999-03-15 01:41:19 +00:00
parent 877112a97a
commit 7e03a84d91
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=17199
13 changed files with 174 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mail/pine4/Makefile
View File

@ -1,14 +1,14 @@
# New ports collection makefile for: pine
# http://www.washington.edu/pine/
# Version required: 4.05
# Version required: 4.10
# Date created: 09 July 1998
# Whom: Adrian Penisoara <ady@freebsd.ady.ro>
#
# $Id: Makefile,v 1.28 1999/01/13 02:47:31 scrappy Exp $
# $Id: Makefile,v 1.29 1999/03/11 21:47:15 scrappy Exp $
#
DISTNAME= pine4.05
PKGNAME= pine-4.05
DISTNAME= pine4.10
PKGNAME= pine-4.10
CATEGORIES= mail news
MASTER_SITES= ftp://ftp.cac.washington.edu/pine/
@ -68,9 +68,5 @@ do-install:
post-install:
${PREFIX}/bin/pine -P ${PREFIX}/etc/pine.conf -conf >${WRKSRC}/pine.conf
${INSTALL_DATA} ${WRKSRC}/pine.conf ${PREFIX}/etc/pine.conf
@${ECHO} " - - - - - - - - - - - - - - - - - - - - - - - - -"
@${ECHO} " If Pine exits with \"Received abort signal\" try"
@${ECHO} " disabling the \"quell-folder-internal-msg\" feature"
@${ECHO} " - - - - - - - - - - - - - - - - - - - - - - - - -"
.include <bsd.port.mk>

4
mail/pine4/distinfo
View File

@ -1,2 +1,2 @@
MD5 (pine4.05.tar.gz) = 84dc37198853959188a551eb4ee8aa00
SIZE (pine4.05.tar.gz) = 2699212
MD5 (pine4.10.tar.gz) = f871e201b4070da1f060f35d3b8f2ccd
SIZE (pine4.10.tar.gz) = 2827865

98
mail/pine4/files/patch-aa Normal file
View File

@ -0,0 +1,98 @@
Patch posted on BUGTRAQ & pine-info mailing lists which fixes the
so-called "remote exploit in pine" bug.
More info: http://www.washington.edu/pine/pine-info/1999.02/msg00056.html
*** ./pine/init.c.orig Tue Jan 26 11:57:56 1999
--- ./pine/init.c Tue Feb 9 19:23:06 1999
***************
*** 1791,1796 ****
--- 1791,1798 ----
F_QUELL_PARTIAL_FETCH, NO_HELP, PREF_NONE},
{"save-aggregates-copy-sequence",
F_AGG_SEQ_COPY, NO_HELP, PREF_NONE},
+ {"enable-mailcap-param-substitution",
+ F_DO_MAILCAP_PARAM_SUBST, NO_HELP, PREF_NONE},
{"termdef-takes-precedence",
F_TCAP_WINS, NO_HELP, PREF_NONE}
};
*** ./pine/mailcap.c.orig Wed Nov 18 10:00:15 1998
--- ./pine/mailcap.c Tue Feb 9 19:23:40 1999
***************
*** 739,745 ****
dprint(5, (debugfile, "- mc_passes_test -\n"));
if(mc->testcommand && *mc->testcommand)
! cmd = mc_bld_test_cmd(mc->testcommand, type, subtype, params);
if(!mc->testcommand || !cmd || !*cmd){
if(cmd)
--- 739,746 ----
dprint(5, (debugfile, "- mc_passes_test -\n"));
if(mc->testcommand && *mc->testcommand)
! if(!(cmd = mc_bld_test_cmd(mc->testcommand, type, subtype, params)))
! return(FALSE); /* couldn't be built */
if(!mc->testcommand || !cmd || !*cmd){
if(cmd)
***************
*** 794,800 ****
if(needsterm)
*needsterm = mc->needsterminal;
! command = mc_cmd_bldr(mc->command, type, subtype, params, tmp_file);
dprint(5, (debugfile, "built command: %s\n", command));
--- 795,802 ----
if(needsterm)
*needsterm = mc->needsterminal;
! if(!(command = mc_cmd_bldr(mc->command, type, subtype, params, tmp_file)))
! command = cpystr("");
dprint(5, (debugfile, "built command: %s\n", command));
***************
*** 871,876 ****
--- 873,884 ----
break;
case '{': /* insert requested MIME param */
+ if(F_OFF(F_DO_MAILCAP_PARAM_SUBST, ps_global)){
+ dprint(2,
+ (debugfile, "mc_cmd_bldr: param subs %s\n", from));
+ return(NULL);
+ }
+
s = strindex(from, '}');
if(!s){
q_status_message1(SM_ORDER, 0, 4,
***************
*** 956,962 ****
sprintf(to, MC_ADD_TMP, tmp_file);
return(cpystr(tmp_20k_buf));
! }
/*
--- 964,970 ----
sprintf(to, MC_ADD_TMP, tmp_file);
return(cpystr(tmp_20k_buf));
! }
/*
*** ./pine/pine.h.orig Thu Jan 28 16:52:00 1999
--- ./pine/pine.h Tue Feb 9 19:23:21 1999
***************
*** 886,891 ****
--- 886,892 ----
F_SHOW_TEXTPLAIN_INT,
F_ROLE_CONFIRM_DEFAULT,
F_NO_FCC_ATTACH,
+ F_DO_MAILCAP_PARAM_SUBST,
#ifdef ENABLE_LDAP
F_ADD_LDAP_TO_ABOOK,
#endif

14
mail/pine4/files/patch-ac
View File

@ -1,5 +1,5 @@
*** pine/osdep/os-bsf.h.orig Wed Aug 12 00:50:27 1998
--- pine/osdep/os-bsf.h Sat Sep 12 17:26:37 1998
*** pine/osdep/os-bsf.h.orig Thu Oct 8 00:51:40 1998
--- pine/osdep/os-bsf.h Tue Feb 9 20:15:18 1999
***************
*** 74,80 ****
default-composer-hdrs or customized-hdrs to get at it. Instead of
@ -7,7 +7,7 @@
changing is to put the feature "no-allow-changing-from" in the
! /usr/local/lib/pine.conf.fixed file.
----*/
/* #define NEVER_ALLOW_CHANGING_FROM /* probably not needed */
/* #define NEVER_ALLOW_CHANGING_FROM */
--- 74,80 ----
default-composer-hdrs or customized-hdrs to get at it. Instead of
@ -15,14 +15,14 @@
changing is to put the feature "no-allow-changing-from" in the
! @@PREFIX@@/etc/pine.conf.fixed file.
----*/
/* #define NEVER_ALLOW_CHANGING_FROM /* probably not needed */
/* #define NEVER_ALLOW_CHANGING_FROM */
***************
*** 87,93 ****
NOTE: You'll also have to make sure the appropriate osdep/postreap.*
file is included in the os-*.ic file for your system.
----*/
! /* #define BACKGROUND_POST /* comment out to disable posting from child */
! /* #define BACKGROUND_POST */
@ -30,7 +30,7 @@
NOTE: You'll also have to make sure the appropriate osdep/postreap.*
file is included in the os-*.ic file for your system.
----*/
! #define BACKGROUND_POST /* comment out to disable posting from child */
! #define BACKGROUND_POST
@ -58,7 +58,7 @@
/*----------------------------------------------------------------------
If no nntp-servers are defined, this program will be used to post news.
----*/
! #define SENDNEWS "/usr/local/news/inews -h" /* news posting cmd */
! #define SENDNEWS "/usr/local/news/inews -h"
/*--------- Program employed by users to change their password ---------*/

12
mail/pine4/files/patch-af
View File

@ -1,7 +1,7 @@
*** imap/src/osdep/unix/Makefile.orig Thu Jul 9 00:49:11 1998
--- imap/src/osdep/unix/Makefile Sun Jul 12 22:10:04 1998
*** imap/src/osdep/unix/Makefile.orig Wed Jan 27 01:19:19 1999
--- imap/src/osdep/unix/Makefile Tue Feb 9 21:32:44 1999
***************
*** 75,81 ****
*** 82,88 ****
# Commands possibly overriden by the individual port
ARRC=ar rc
@ -9,7 +9,7 @@
LN=ln -s
RANLIB=ranlib
--- 75,81 ----
--- 82,88 ----
# Commands possibly overriden by the individual port
ARRC=ar rc
@ -18,7 +18,7 @@
RANLIB=ranlib
***************
*** 93,99 ****
*** 100,106 ****
dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
@ -26,7 +26,7 @@
MAKE=make
MV=mv
RM=rm -rf
--- 93,99 ----
--- 100,106 ----
dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o

16
mail/pine4/files/patch-ai
View File

@ -1,7 +1,7 @@
*** pine/send.c.orig Tue Sep 15 22:12:31 1998
--- pine/send.c Sun Sep 20 00:41:41 1998
*** pine/send.c.orig Thu Feb 4 20:17:39 1999
--- pine/send.c Tue Feb 9 21:34:37 1999
***************
*** 6736,6748 ****
*** 7083,7095 ****
body->subtype = cpystr("octet-stream");
}
@ -15,7 +15,7 @@
}
}
--- 6736,6752 ----
--- 7083,7099 ----
body->subtype = cpystr("octet-stream");
}
@ -34,7 +34,7 @@
}
***************
*** 7573,7579 ****
*** 8034,8040 ****
switch (body->encoding) { /* all else needs filtering */
case ENC8BIT: /* encode 8BIT into QUOTED-PRINTABLE */
@ -42,7 +42,7 @@
break;
case ENCBINARY: /* encode binary into BASE64 */
--- 7577,7584 ----
--- 8038,8045 ----
switch (body->encoding) { /* all else needs filtering */
case ENC8BIT: /* encode 8BIT into QUOTED-PRINTABLE */
@ -52,7 +52,7 @@
case ENCBINARY: /* encode binary into BASE64 */
***************
*** 7656,7662 ****
*** 8136,8142 ****
&& !(so_puts(so, "Content-Transfer-Encoding: ")
&& so_puts(so, body_encodings[(body->encoding==ENCBINARY)
? ENCBASE64
@ -60,7 +60,7 @@
? ENCQUOTEDPRINTABLE
: (body->encoding <= ENCMAX)
? body->encoding
--- 7661,7667 ----
--- 8141,8147 ----
&& !(so_puts(so, "Content-Transfer-Encoding: ")
&& so_puts(so, body_encodings[(body->encoding==ENCBINARY)
? ENCBASE64

12
mail/pine4/files/patch-ak
View File

@ -1,9 +1,9 @@
*** imap/Makefile.orig Sat Aug 8 05:32:23 1998
--- imap/Makefile Thu Sep 3 19:36:35 1998
*** imap/Makefile.orig Thu Jan 28 01:33:11 1999
--- imap/Makefile Tue Feb 9 21:35:37 1999
***************
*** 253,264 ****
*** 379,390 ****
$(TOOLS)/$@ "$(LN)" src/charset c-client
$(LN) `pwd`/src/kerberos/* c-client
sh -c '(test -d src/kerberos) && ($(LN) `pwd`/src/kerberos/* c-client) || true'
$(TOOLS)/$@ "$(LN)" src/osdep/$(SYSTEM) c-client
! $(TOOLS)/$@ "$(LN)" src/mtest mtest
! $(TOOLS)/$@ "$(LN)" src/ipopd ipopd
@ -14,9 +14,9 @@
OSTYPE:
@echo Building c-client for $(OS)...
--- 253,264 ----
--- 379,390 ----
$(TOOLS)/$@ "$(LN)" src/charset c-client
$(LN) `pwd`/src/kerberos/* c-client
sh -c '(test -d src/kerberos) && ($(LN) `pwd`/src/kerberos/* c-client) || true'
$(TOOLS)/$@ "$(LN)" src/osdep/$(SYSTEM) c-client
! # $(TOOLS)/$@ "$(LN)" src/mtest mtest
! # $(TOOLS)/$@ "$(LN)" src/ipopd ipopd

16
mail/pine4/files/patch-al
View File

@ -1,5 +1,5 @@
*** build.orig Fri Sep 4 03:01:15 1998
--- build Sun Sep 20 00:52:36 1998
*** build.orig Wed Dec 16 01:53:29 1998
--- build Tue Feb 9 21:38:45 1999
***************
*** 80,87 ****
pine The Pine mailer. Once compiled this should work just fine on
@ -20,7 +20,7 @@
pico The standalone editor similar to the Pine message composer.
This is a very simple straight forward text editor.
***************
*** 274,284 ****
*** 277,287 ****
if [ -s c-client ] ; then rm -f c-client ; fi
ln -s imap/c-client c-client
@ -32,7 +32,7 @@
eval echo make "$makeargs" "$K1" "$K2" $ccltarg
cd $PHOME/imap
eval make "$makeargs" "$K1" "$K2" $ccltarg
--- 274,284 ----
--- 277,287 ----
if [ -s c-client ] ; then rm -f c-client ; fi
ln -s imap/c-client c-client
@ -45,7 +45,7 @@
cd $PHOME/imap
eval make "$makeargs" "$K1" "$K2" $ccltarg
***************
*** 299,312 ****
*** 302,315 ****
cd $PHOME/bin
rm -f pine mtest imapd pico pilot
if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi
@ -60,7 +60,7 @@
echo "Done"
;;
--- 299,312 ----
--- 302,315 ----
cd $PHOME/bin
rm -f pine mtest imapd pico pilot
if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi
@ -76,7 +76,7 @@
;;
***************
*** 317,326 ****
*** 320,329 ****
make clean
echo "Cleaning Pine"
cd $PHOME/pine
@ -87,7 +87,7 @@
echo "Done"
cd $PHOME
;;
--- 317,326 ----
--- 320,329 ----
make clean
echo "Cleaning Pine"
cd $PHOME/pine

8
mail/pine4/files/patch-am
View File

@ -1,7 +1,7 @@
*** pine/pine.h.orig Wed Sep 16 07:14:56 1998
--- pine/pine.h Sun Sep 20 00:43:14 1998
*** pine/pine.h.orig Mon Feb 22 14:49:07 1999
--- pine/pine.h Mon Feb 22 14:49:57 1999
***************
*** 2346,2352 ****
*** 2588,2594 ****
} ATABLE_S;
@ -9,7 +9,7 @@
#define TAG_INVON '\001' /* Supported character attributes */
#define TAG_INVOFF '\002'
#define TAG_BOLDON '\003'
--- 2346,2352 ----
--- 2588,2594 ----
} ATABLE_S;

38
mail/pine4/files/patch-as
View File

@ -1,7 +1,7 @@
*** pine/init.c.orig Wed Sep 2 20:39:42 1998
--- pine/init.c Wed Sep 16 21:08:19 1998
*** pine/init.c.orig Tue Jan 26 21:57:56 1999
--- pine/init.c Tue Feb 9 22:14:08 1999
***************
*** 319,325 ****
*** 326,332 ****
/*----------------------------------------------------------------------
These are the variables that control a number of pine functions. They
@ -9,7 +9,7 @@
be set by the user while in Pine. Eventually all the local ones should
be so and maybe the global ones too.
--- 319,325 ----
--- 326,332 ----
/*----------------------------------------------------------------------
These are the variables that control a number of pine functions. They
@ -18,8 +18,8 @@
be so and maybe the global ones too.
***************
*** 578,583 ****
--- 578,586 ----
*** 597,602 ****
--- 597,605 ----
#ifdef DF_SMTP_SERVER
GLO_SMTP_SERVER = parse_list(DF_SMTP_SERVER, 1, NULL);
#endif
@ -29,20 +29,8 @@
/* Set the default mail directory */
build_path(buf, GLO_MAIL_DIRECTORY, "[]");
*** pine/other.c.orig Thu Jul 16 04:09:27 1998
--- pine/other.c Tue Jul 21 15:03:18 1998
***************
*** 696,702 ****
|| (F) == F_DISABLE_DFLT_IN_BUG_RPT \
|| (F) == F_DISABLE_ALARM \
|| (F) == F_ALLOW_CHANGING_FROM \
- || (F) == F_TCAP_WINS \
|| (F) == F_QUELL_PARTIAL_FETCH \
|| (F) == F_AGG_SEQ_COPY)
--- 696,701 ----
*** pico/edef.h.orig Thu Apr 23 02:53:44 1998
--- pico/edef.h Tue Jul 21 14:33:38 1998
--- pico/edef.h Tue Feb 9 22:14:08 1999
***************
*** 59,65 ****
int ComposerEditing = FALSE; /* TRUE if message line is open */
@ -60,10 +48,10 @@
int sgarbf = TRUE; /* TRUE if screen is garbage */
int mpresf = FALSE; /* TRUE if message in last line */
int clexec = FALSE; /* command line execution flag */
*** pico/main.c.orig Thu Jul 16 11:30:47 1998
--- pico/main.c Tue Jul 21 14:33:38 1998
*** pico/main.c.orig Tue Feb 9 21:46:54 1999
--- pico/main.c Tue Feb 9 22:14:08 1999
***************
*** 424,430 ****
*** 443,449 ****
gmode ^= MDSSPD;
break;
case 'q': /* -q for termcap takes precedence */
@ -71,7 +59,7 @@
break;
case 'w': /* -w turn off word wrap */
gmode ^= MDWRAP;
--- 424,430 ----
--- 443,449 ----
gmode ^= MDSSPD;
break;
case 'q': /* -q for termcap takes precedence */
@ -79,8 +67,8 @@
break;
case 'w': /* -w turn off word wrap */
gmode ^= MDWRAP;
*** pico/pilot.c.orig Thu Jul 16 11:30:46 1998
--- pico/pilot.c Tue Jul 21 14:33:38 1998
*** pico/pilot.c.orig Mon Aug 24 20:37:39 1998
--- pico/pilot.c Tue Feb 9 22:14:09 1999
***************
*** 222,228 ****
sup_keyhelp = !sup_keyhelp;

24
mail/pine4/files/patch-at
View File

@ -1,7 +1,7 @@
*** pine/pine.hlp.orig Wed Sep 23 22:22:43 1998
--- pine/pine.hlp Mon Sep 28 22:23:33 1998
*** pine/pine.hlp.orig Fri Feb 5 01:07:54 1999
--- pine/pine.hlp Tue Feb 9 22:10:02 1999
***************
*** 847,855 ****
*** 455,463 ****
executable &lt;Unix search path&gt;/pine
persnl cfg ~/.pinerc
@ -11,7 +11,7 @@
interrupted ~/.pine-interrupted-mail
debug ~/.pine-debugN
--- 847,855 ----
--- 455,463 ----
executable &lt;Unix search path&gt;/pine
persnl cfg ~/.pinerc
@ -22,7 +22,7 @@
interrupted ~/.pine-interrupted-mail
debug ~/.pine-debugN
***************
*** 861,868 ****
*** 469,476 ****
postponed# ~/mail/postponed-msgs
sentmail# ~/mail/sent-mail
mailcap# ~/.mailcap + /etc/mailcap
@ -31,7 +31,7 @@
news-spool varies across Unix flavors, e.g. /usr/spool/news or /var/news
active-news varies across Unix flavors, e.g. /usr/lib/news/active
--- 861,868 ----
--- 469,476 ----
postponed# ~/mail/postponed-msgs
sentmail# ~/mail/sent-mail
mailcap# ~/.mailcap + /etc/mailcap
@ -41,7 +41,7 @@
news-spool varies across Unix flavors, e.g. /usr/spool/news or /var/news
active-news varies across Unix flavors, e.g. /usr/lib/news/active
***************
*** 1416,1424 ****
*** 856,864 ****
this link now to send a message to it:<BR>
<A HREF="X-Pine-Gripe:_LOCAL_ADDRESS_?local"><!--#echo var="_LOCAL_FULLNAME_"--></A><P>
<!--chtml endif-->
@ -51,7 +51,7 @@
<HR WIDTH="75%">
<!--chtml endif-->
<P>
--- 1416,1424 ----
--- 856,864 ----
this link now to send a message to it:<BR>
<A HREF="X-Pine-Gripe:_LOCAL_ADDRESS_?local"><!--#echo var="_LOCAL_FULLNAME_"--></A><P>
<!--chtml endif-->
@ -62,7 +62,7 @@
<!--chtml endif-->
<P>
***************
*** 1505,1511 ****
*** 945,951 ****
<OL>
<LI> <A HREF="#intro">Introduction</A>
<LI> <A HREF="#pine_help">Pine Help</A>
@ -70,7 +70,7 @@
<LI> <A HREF="#local_support">Local Support Contacts</A>
<!--chtml endif-->
<LI> <A HREF="#giving_cmds">Giving Commands in Pine</A>
--- 1505,1511 ----
--- 945,951 ----
<OL>
<LI> <A HREF="#intro">Introduction</A>
<LI> <A HREF="#pine_help">Pine Help</A>
@ -79,7 +79,7 @@
<!--chtml endif-->
<LI> <A HREF="#giving_cmds">Giving Commands in Pine</A>
***************
*** 1612,1620 ****
*** 1052,1060 ****
at your site.)
@ -89,7 +89,7 @@
<!--chtml endif-->
<H2><A NAME="giving_cmds">Giving Commands in Pine</A></H2>
--- 1612,1620 ----
--- 1052,1060 ----
at your site.)

8
mail/pine4/files/patch-au
View File

@ -1,7 +1,7 @@
*** doc/pine.1.orig Wed Sep 2 21:31:57 1998
--- doc/pine.1 Sat Sep 12 21:58:23 1998
*** doc/pine.1.orig Thu Feb 4 20:42:05 1999
--- doc/pine.1 Tue Feb 9 22:11:26 1999
***************
*** 271,281 ****
*** 294,304 ****
.br
/etc/mime.types System-wide file ext. to MIME type mapping
.br
@ -13,7 +13,7 @@
.br
/tmp/.\\usr\\spool\\mail\\xxxx Per-folder mailbox lock files.
.br
--- 271,281 ----
--- 294,304 ----
.br
/etc/mime.types System-wide file ext. to MIME type mapping
.br

4
mail/pine4/files/patch-av
View File

@ -1,5 +1,5 @@
*** pine/mailcap.c.orig Wed Aug 19 03:47:42 1998
--- pine/mailcap.c Sat Sep 12 22:00:48 1998
*** pine/mailcap.c.orig Wed Nov 18 20:00:15 1998
--- pine/mailcap.c Thu Feb 11 23:43:54 1999
***************
*** 61,67 ****