cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to Pine 4.20

Browse Source
This commit is contained in:
brad 1999-10-27 12:18:58 +00:00
parent c0f123e6d9
commit 0dd77a62d9
7 changed files with 174 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mail/pine/Makefile
View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.10 1999/04/08 17:36:48 marc Exp $
#
# $OpenBSD: Makefile,v 1.11 1999/10/27 12:18:58 brad Exp $
DISTNAME= pine4.10
PKGNAME= pine-4.10
CATEGORIES= mail news
DISTNAME= pine4.20
PKGNAME= pine-4.20
CATEGORIES= mail news
MAINTAINER= marc@OpenBSD.ORG
MAINTAINER= ports@openbsd.org
MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \
ftp://ftp.sunet.se/pub/unix/mail/pine/
MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \
ftp://ftp.sunet.se/pub/unix/mail/pine/
do-install:
@${INSTALL_PROGRAM} \

6
mail/pine/files/md5
View File

@ -1,3 +1,3 @@
SHA1 (pine4.10.tar.gz) = dc5a558b4123d4e0aeacb6e04699be4696f9051c
RMD160 (pine4.10.tar.gz) = 4e9db11a4a4d2916dcd0e4714cba46627eec04b1
MD5 (pine4.10.tar.gz) = f871e201b4070da1f060f35d3b8f2ccd
MD5 (pine4.20.tar.gz) = 9b60a049e3575fc0b1a201f5f0105f14
RMD160 (pine4.20.tar.gz) = 89df02019103e6f546ae1661912e8e16324cd1ce
SHA1 (pine4.20.tar.gz) = 4c7af38052e9c8d62ee396b52437d51a18548885

26
mail/pine/patches/patch-aa
View File

@ -1,33 +1,25 @@
--- pine/mailcap.c.orig Wed Nov 18 13:00:15 1998
+++ pine/mailcap.c Mon Feb 8 09:17:46 1999
@@ -905,14 +905,18 @@
--- pine/mailcap.c.orig Fri Oct 22 19:36:41 1999
+++ pine/mailcap.c Fri Oct 22 19:42:53 1999
@@ -915,14 +915,18 @@
* have to put those outside of the single quotes.
* (The parm+1000 nonsense is to protect against
* malicious mail trying to overlow our buffer.)
+ *
+ * TCH - Change 2/8/1999
+ * Also quote the ` slash to prevent execution of arbirtrary code
+ *
+ * TCH - Change 2/8/1999
+ * Also quote the ` slash to prevent execution of arbirtrary code
*/
for(p = parm; *p && p < parm+1000; p++){
- if(*p == '\''){
+ if((*p == '\'')||(*p=='`')){
+ if((*p == '\'')||(*p=='`')){
*to++ = '\''; /* closing quote */
*to++ = '\\';
- *to++ = '\''; /* below will be opening quote */
- }
- *to++ = *p;
+ *to++ = *p; /* quoted character */
+ *to++ = *p; /* quoted character */
+ *to++ = '\''; /* opening quote */
+ } else
+ *to++ = *p;
+ *to++ = *p;
}
fs_give((void **) &parm);
@@ -954,7 +958,7 @@
*/
if(!used_tmp_file && tmp_file)
sprintf(to, MC_ADD_TMP, tmp_file);
-
+
return(cpystr(tmp_20k_buf));
}

41
mail/pine/patches/patch-ab
View File

@ -1,6 +1,6 @@
--- pine/pine.hlp.orig Wed Sep 23 12:22:43 1998
+++ pine/pine.hlp Tue Jan 19 19:51:17 1999
@@ -847,9 +847,9 @@
--- pine/pine.hlp.orig Fri Oct 22 19:43:53 1999
+++ pine/pine.hlp Fri Oct 22 19:58:31 1999
@@ -489,9 +489,9 @@
executable &lt;Unix search path&gt;/pine
persnl cfg ~/.pinerc
@ -9,7 +9,40 @@
- local help /usr/local/lib/pine.info
+ global cfg /etc/pine.conf
+ fixed cfg /etc/pine.conf.fixed
+ local help /usr/local/share/doc/pine/
+ local help /etc/pine.info
interrupted ~/.pine-interrupted-mail
debug ~/.pine-debugN
@@ -929,9 +929,9 @@
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-->
-<!--chtml if [ -r /usr/local/lib/pine.info ]-->
+<!--chtml if [ -r /etc/pine.info ]-->
<HR WIDTH="75%">Local Support Contacts:<P>
-<!--#include file="/usr/local/lib/pine.info"-->
+<!--#include file="/etc/pine.info"-->
<HR WIDTH="75%">
<!--chtml endif-->
<P>
@@ -1019,7 +1019,7 @@
<OL>
<LI> <A HREF="#intro">Introduction</A>
<LI> <A HREF="#pine_help">Pine Help</A>
-<!--chtml if [ -r /usr/local/lib/pine.info ]-->
+<!--chtml if [ -r /etc/pine.info ]-->
<LI> <A HREF="#local_support">Local Support Contacts</A>
<!--chtml endif-->
<LI> <A HREF="#giving_cmds">Giving Commands in Pine</A>
@@ -1132,9 +1132,9 @@
at your site.)
-<!--chtml if [ -r /usr/local/lib/pine.info ]-->
+<!--chtml if [ -r /etc/pine.info ]-->
<H2><A NAME="local_support">Local Support Contacts</A></H2>
-<!--#include file="/usr/local/lib/pine.info"-->
+<!--#include file="/etc/pine.info"-->
<!--chtml endif-->
<H2><A NAME="giving_cmds">Giving Commands in Pine</A></H2>

20
mail/pine/patches/patch-ac
View File

@ -1,6 +1,15 @@
--- doc/pine.1.~1~ Thu Feb 4 10:42:05 1999
+++ doc/pine.1 Thu Apr 8 10:16:05 1999
@@ -294,11 +294,11 @@
--- doc/pine.1.orig Fri Oct 22 19:45:41 1999
+++ doc/pine.1 Fri Oct 22 20:00:55 1999
@@ -272,7 +272,7 @@
.if n .ta 2.8i
.if t .ta 2.1i
-/usr/spool/mail/xxxx Default folder for incoming mail.
+/var/mail/xxxx Default folder for incoming mail.
.br
~/mail Default directory for mail folders.
.br
@@ -296,13 +296,13 @@
.br
/etc/mime.types System-wide file ext. to MIME type mapping
.br
@ -13,5 +22,8 @@
-/usr/local/lib/pine.conf.fixed Non-overridable configuration file.
+/etc/pine.conf.fixed Non-overridable configuration file.
.br
/tmp/.\\usr\\spool\\mail\\xxxx Per-folder mailbox lock files.
-/tmp/.\\usr\\spool\\mail\\xxxx Per-folder mailbox lock files.
+/tmp/.\\var\\mail\\xxxx Per-folder mailbox lock files.
.br
~/.pine-interrupted-mail Message which was interrupted.
.br

158
mail/pine/patches/patch-ad
View File

@ -1,56 +1,77 @@
--- doc/tech-notes.txt.~1~ Thu Feb 4 15:16:28 1999
+++ doc/tech-notes.txt Thu Apr 8 10:03:41 1999
@@ -328,14 +328,14 @@
sendmail-path, smtp-server, and compile-time options. The first
MTA specified in the following list is used:
--- doc/tech-notes.txt.orig Fri Oct 22 20:01:56 1999
+++ doc/tech-notes.txt Fri Oct 22 20:09:14 1999
@@ -324,14 +324,14 @@
sendmail-path, smtp-server, and compile-time options. The
first MTA specified in the following list is used:
- 1. sendmail-path in /usr/local/lib/pine.conf.fixed
- 2. smtp-server in /usr/local/pine.conf.fixed
+ 1. sendmail-path in /etc/pine.conf.fixed
+ 2. smtp-server in /etc/pine.conf.fixed
3. sendmail-path specified on the command line.
4. smtp-server specified on the command line.
5. sendmail-path in the user's .pinerc file.
6. smtp-server in the user's .pinerc file.
- 7. sendmail-path in /usr/local/lib/pine.conf
- 8. smtp-server in /usr/local/pine.conf
+ 7. sendmail-path in /etc/pine.conf
+ 8. smtp-server in /etc/pine.conf
- 1. _sendmail-path_ in /usr/local/lib/pine.conf.fixed
- 2. _smtp-server_ in /usr/local/pine.conf.fixed
+ 1. _sendmail-path_ in /etc/pine.conf.fixed
+ 2. _smtp-server_ in /etc/pine.conf.fixed
3. _sendmail-path_ specified on the command line.
4. _smtp-server_ specified on the command line.
5. _sendmail-path_ in the user's .pinerc file.
6. _smtp-server_ in the user's .pinerc file.
- 7. _sendmail-path_ in /usr/local/lib/pine.conf
- 8. _smtp-server_ in /usr/local/pine.conf
+ 7. _sendmail-path_ in /etc/pine.conf
+ 8. _smtp-server_ in /etc/pine.conf
9. DF_SENDMAIL_PATH defined at compile time.
10. SENDMAIL and SENDMAILFLAGS defined at compile time.
@@ -661,14 +661,14 @@
@@ -644,14 +644,14 @@
SYSTEM_PINERC
The name of the file which holds Pine configuration information for
all users on the system. Default on UNIX systems is
- /usr/local/lib/pine.conf.
+ /etc/pine.conf.
The name of the file which holds _Pine_ configuration
information for all users on the system. Default on UNIX
- systems is /usr/local/lib/pine.conf.
+ systems is /etc/pine.conf.
SYSTEM_PINERC_FIXED
The name of the file which holds the same type of information as for
SYSTEM_PINERC, but only for variables that the administrator wants to
keep fixed. That is, users are not allowed to change variables that
are specified in the FIXED file. Default on UNIX systems is
- /usr/local/lib/pine.conf.fixed.
+ /etc/pine.conf.fixed.
The name of the file which holds the same type of information
as for SYSTEM_PINERC, but only for variables that the
administrator wants to keep fixed. That is, users are not
allowed to change variables that are specified in the FIXED
file. Default on UNIX systems is
- /usr/local/lib/pine.conf.fixed.
+ /etc/pine.conf.fixed.
There are a couple of more obscure options which are in the source
code because a few people have asked for them or because we changed
@@ -808,8 +808,8 @@
files.
@@ -787,19 +787,18 @@
auxiliary files.
There are, however, three optional auxiliary files:
- /usr/local/lib/pine.info, /usr/local/lib/pine.conf, and
- /usr/local/lib/pine.conf.fixed. The file pine.info contains text on
+ /etc/pine.info, /etc/pine.conf, and
+ /etc/pine.conf.fixed. The file pine.info contains text on
how to get further help on the local system. It is part of the help
text for the main menu and should probably refer to the local help
desk or the system administrator. If this file doesn't exist a generic
@@ -938,11 +938,11 @@
This section lists the various files which Pine uses which are not
- how to get further help on the local system. It is part of the help
- text for the main menu and should probably refer to the local help
- desk or the system administrator. If this file doesn't exist a generic
- version which suggests ``talking to the computer support staff at your
- site'' is shown. The file pine.conf is used to set system-wide default
- configurations for _Pine_. The file pine.conf.fixed is also used to
- set system-wide default configurations for _Pine_. The difference
- between these two files is that configuration variables set in the
- pine.conf.fixed file may not normally be over-ridden by a user. See
- the section on Pine Configuration later in this document for details
- about the pine.conf and pine.conf.fixed files.
+ /etc/pine.info, /etc/pine.conf, and /etc/pine.conf.fixed. The file
+ pine.info contains text on how to get further help on the local system.
+ It is part of the help text for the main menu and should probably refer
+ to the local help desk or the system administrator. If this file doesn't
+ exist a generic version which suggests ``talking to the computer support
+ staff at your site'' is shown. The file pine.conf is used to set system-wide
+ default configurations for _Pine_. The file pine.conf.fixed is also used
+ to set system-wide default configurations for _Pine_. The difference between
+ these two files is that configuration variables set in the pine.conf.fixed
+ file may not normally be over-ridden by a user. See the section on Pine
+ Configuration later in this document for details about the pine.conf and
+ pine.conf.fixed files.
_________________________________________________________________
Installing PC-Pine
@@ -909,11 +908,11 @@
This section lists the various files which _Pine_ uses which are not
email folders. All of these are the default names of files, they may
vary based on Pine's configuration.
vary based on _Pine_'s configuration.
- /usr/local/lib/pine.conf
+ /etc/pine.conf
Pine's global configuration file.
@ -62,41 +83,42 @@
Local pointer to system administrator.
~/.pinerc
Personal configuration file for each user.
@@ -1091,11 +1091,11 @@
@@ -1072,10 +1071,10 @@
Configuration: Prints a sample system configuration file to the
screen or standard output. To generate an initial system
configuration file, execute
- pine -conf > /usr/local/lib/pine.conf
+ pine -conf > /etc/pine.conf
To generate a system configuration file using settings from an
old system configuration file, execute
- pine -P old-pine.conf -conf > /usr/local/lib/pine.conf
+ pine -P old-pine.conf -conf > /etc/pine.conf
-create_lu addrbook sort-order
Create auxiliary index (LookUp) file for addrbook and sort
addrbook in sort-order, which may be dont-sort, nickname,
@@ -1163,7 +1163,7 @@
-create_lu _addrbook sort-order_
Create auxiliary index (LookUp) file for _addrbook_ and sort
_addrbook_ in _sort-order,_ which may be _dont-sort_,
@@ -1157,7 +1156,7 @@
uses.
-P file
-P _file_
Uses the named file as the system wide configuration file
- instead of /usr/local/lib/pine.conf. UNIX Pine only.
+ instead of /etc/pine.conf. UNIX Pine only.
-pinerc file
Output fresh pinerc configuration to file, preserving the
settings of variables that the user has made. Use file set to
@@ -1312,8 +1312,8 @@
- instead of _/usr/local/lib/pine.conf_. _UNIX Pine only._
+ instead of _/etc/pine.conf_. _UNIX Pine only._
-pinerc _file_
Output fresh pinerc configuration to _file,_ preserving the
settings of variables that the user has made. Use _file_ set to
@@ -1310,9 +1309,9 @@
configuration. In most cases, the compiled-in preferences will suit
users and administrators just fine. When running Pine on a UNIX
users and administrators just fine. When running _Pine_ on a UNIX
system, the default built-in configuration can be changed by setting
- variables in the system configuration files, /usr/local/lib/pine.conf
- or /usr/local/lib/pine.conf.fixed. (Actually, these files are whatever
+ variables in the system configuration files, /etc/pine.conf
+ or /etc/pine.conf.fixed. (Actually, these files are whatever
the definitions for SYSTEM_PINERC and SYSTEM_PINERC_FIXED in
pine/osdep/os-xxx.h are set to.) Both Pine and PC-Pine also use
- the definitions for SYSTEM_PINERC and SYSTEM_PINERC_FIXED in
+ variables in the system configuration files, /etc/pine.conf or
+ /etc/pine.conf.fixed. (Actually, these files are whatever the
+ definitions for SYSTEM_PINERC and SYSTEM_PINERC_FIXED in
pine/osdep/os-xxx.h are set to.) Both _Pine_ and _PC-Pine_ also use
personal (user-based) configuration files. On UNIX machines, the
@@ -4925,8 +4925,8 @@
personal configuration file is the file ~/.pinerc. For _PC-Pine_
@@ -5635,8 +5634,8 @@
* A program that implements the SMTP or ESMTP protocol via stdio.
* An entry in /etc/services for the alternate service.
* An entry in /etc/inetd.conf for the alternate service.
@ -104,19 +126,19 @@
- /usr/local/lib/pine.conf.fixed or ~/.pinerc.
+ * An entry in /etc/pine.conf,
+ /etc/pine.conf.fixed or ~/.pinerc.
_________________________________________________________________
@@ -5970,7 +5970,7 @@
MIME.Types file
@@ -6788,7 +6787,7 @@
The second selection is the standard UNIX print command. The default
is lpr, but it can be changed on a system basis to anything so desired
- in /usr/local/lib/pine.conf.
+ in /etc/pine.conf.
is _lpr_, but it can be changed on a system basis to anything so
- desired in /usr/local/lib/pine.conf.
+ desired in /etc/pine.conf.
The third selection is the user's personal choice for a UNIX print
command. The text to be printed is piped into the command. Enscript or
@@ -6430,9 +6430,9 @@
command. The text to be printed is piped into the command. _Enscript_
@@ -7242,9 +7241,9 @@
Error messages for incorrect terminal types (try "foo" and
"vt52")
___

12
mail/pine/patches/patch-ae Normal file
View File

@ -0,0 +1,12 @@
--- imap/src/osdep/unix/env_unix.c.orig Sat Oct 23 01:12:43 1999
+++ imap/src/osdep/unix/env_unix.c Sat Oct 23 01:14:55 1999
@@ -825,7 +825,8 @@
}
close (pi[0]); close (pi[1]);
}
- if (lockEaccesError) {/* punt silently if paranoid site */
+ if (strncmp(base->lock,"/var/mail/",10) && lockEaccesError) {
+ /* punt silently if paranoid site */
sprintf (tmp,"Mailbox vulnerable - directory %.80s",hitch);
if (s = strrchr (tmp,'/')) *s = '\0';
strcat (tmp," must have 1777 protection");