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

- remove pine; it has been replaced by alpine

Browse Source
This commit is contained in:
ajacoutot 2007-11-22 13:52:17 +00:00
parent 9a5230cc82
commit 25487464ef
20 changed files with 0 additions and 619 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
mail/pine/Makefile
View File

@ -1,69 +0,0 @@
# $OpenBSD: Makefile,v 1.73 2007/10/22 12:29:26 naddy Exp $
COMMENT-main= program for Internet E-mail and News
COMMENT-pico= small text editor
COMMENT-pilot= file system browser
CATEGORIES= mail news
CATEGORIES-pico= editors
CATEGORIES-pilot= sysutils
VERSION= 4.64
PICO_VERSION= 4.10
PILOT_VERSION= 2.0
DISTNAME= pine${VERSION}
PKGNAME-main= pine-${VERSION}p5
PKGNAME-pico= pico-${PICO_VERSION}p1
PKGNAME-pilot= pilot-${PILOT_VERSION}p1
MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \
ftp://ftp.sunet.se/pub/unix/mail/pine/
HOMEPAGE= http://www.washington.edu/pine/
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
PERMIT_PACKAGE_CDROM= No
PERMIT_PACKAGE_FTP= No
PERMIT_DISTFILES_CDROM= No
PERMIT_DISTFILES_FTP= No
WANTLIB= c
NO_REGRESS= Yes
VMEM_WARNING= Yes
FLAVORS= ldap
FLAVOR?=
MULTI_PACKAGES= -main -pico -pilot
WANTLIB-main= ${WANTLIB} crypto ssl termlib asn1 com_err des gssapi krb5
WANTLIB-pico= ${WANTLIB} termcap
WANTLIB-pilot= ${WANTLIB} termcap
PINE_BUILD_FLAGS= CC="${CC}" EXTRACFLAGS="${CFLAGS}" \
SSLTYPE="unix" LOCALBASE="${LOCALBASE}" \
EXTRAAUTHENTICATORS="gss"
.if ${FLAVOR:L:Mldap}
PINE_BUILD_FLAGS+= LDAPLIBS="-L${LOCALBASE}/lib -lldap -llber" \
LDAPCFLAGS="-DENABLE_LDAP -I${LOCALBASE}/include"
LIB_DEPENDS-main= lber.>=2,ldap.>=2:openldap-client-2.*:databases/openldap
.endif
do-build:
@sed -e s#!!PREFIX!!#${PREFIX}#g \
${WRKSRC}/doc/tech-notes.txt > ${WRKSRC}/doc/tech-notes.txt.new
@mv ${WRKSRC}/doc/tech-notes.txt.new ${WRKSRC}/doc/tech-notes.txt
@cd ${WRKSRC}; ./build ${PINE_BUILD_FLAGS} bso
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pine
${INSTALL_DATA} ${WRKSRC}/doc/tech-notes.txt ${PREFIX}/share/doc/pine
cd ${WRKSRC}/bin; ${INSTALL_PROGRAM} pico pilot pine rpdump rpload \
${PREFIX}/bin
cd ${WRKSRC}/doc; ${INSTALL_MAN} pico.1 pilot.1 pine.1 rpdump.1 rpload.1 \
${PREFIX}/man/man1
.include <bsd.port.mk>

5
mail/pine/distinfo
View File

@ -1,5 +0,0 @@
MD5 (pine4.64.tar.gz) = nMaHSWdfHDWiFHo10sWzRA==
RMD160 (pine4.64.tar.gz) = zeJFh1aUxikSbhPjc72mIvtY7j0=
SHA1 (pine4.64.tar.gz) = le2ekVXaKOQi5PLZuJiBhi3OnXs=
SHA256 (pine4.64.tar.gz) = wgBka8LnEoNwvjttKNJpRJhKDUADmCdi+X7kqhQtGD0=
SIZE (pine4.64.tar.gz) = 4218629

30
mail/pine/patches/patch-doc_pine_1
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-doc_pine_1,v 1.2 2003/05/27 23:38:33 brad Exp $
--- doc/pine.1.orig Wed Apr 16 13:47:13 2003
+++ doc/pine.1 Tue May 27 10:30:11 2003
@@ -309,7 +309,7 @@ uses the following environment variables
.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
@@ -333,13 +333,13 @@ uses the following environment variables
.br
/etc/mime.types System-wide file ext. to MIME type mapping
.br
-/usr/local/lib/pine.info Local pointer to system administrator.
+/etc/pine.info Local pointer to system administrator.
.br
-/usr/local/lib/pine.conf System-wide configuration file.
+/etc/pine.conf System-wide configuration file.
.br
-/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/.\\var\\mail\\xxxx Per-folder mailbox lock files.
.br
~/.pine-interrupted-mail Message which was interrupted.
.br

235
mail/pine/patches/patch-doc_tech-notes_txt
View File

@ -1,235 +0,0 @@
$OpenBSD: patch-doc_tech-notes_txt,v 1.6 2005/11/23 13:44:25 jakob Exp $
--- doc/tech-notes.txt.orig Thu Sep 15 23:03:43 2005
+++ doc/tech-notes.txt Wed Nov 23 14:26:30 2005
@@ -333,14 +333,14 @@ SMTP and Sendmail
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
9. DF_SENDMAIL_PATH defined at compile time.
10. SENDMAIL and SENDMAILFLAGS defined at compile time.
@@ -664,20 +664,20 @@ Compile-time Options
SENDMAIL
SENDMAILFLAGS
Sets the name and flags for the local program that will be
- called to handle outgoing email. Default is /usr/lib/sendmail
+ called to handle outgoing email. Default is /usr/sbin/sendmail
-oi -oem -t. See the SMTP and Sendmail section for more
details.
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.
+ 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.
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
@@ -871,24 +871,24 @@ Installing Pine and Pico on UNIX Platfor
Installing _Pine_ and _Pico_ is remarkably simple. You take the
program files which you have just transferred or built and you move
them to the correct directory on your system. Most often the binaries
- go in /usr/local/bin though sometimes they are placed in /usr/bin. All
- the help text is compiled into _Pine_ so there are no _required_
+ go in !!PREFIX!!/bin though sometimes they are placed in /usr/bin.
+ All the help text is compiled into _Pine_ so there are no _required_
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
- 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 configuration 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
@@ -941,13 +941,14 @@ Installing IMAPd
When the _Pine_ distribution is built on a UNIX system, the IMAP
server binary, imapd, is compiled. Installing imapd requires placing
- the binary in the appropriate directory, usually /usr/etc, and adding
- entries to /etc/services and /etc/inetd.conf or their counterparts.
+ the binary in the appropriate directory, usually !!PREFIX!!/bin,
+ and adding entries to /etc/services and /etc/inetd.conf or their
+ counterparts.
The following line is appropriate for /etc/services:
imap 143/tcp # Mail transfer
and the next line is appropriate for /etc/inetd.conf:
- imap stream tcp nowait root /usr/etc/imapd imapd
+ imap stream tcp nowait root !!PREFIX!!/bin/imapd imapd
The /etc/inetd.conf file entry may vary on different versions of UNIX.
Some have a slightly different set of fields. Also the pathname in
@@ -976,11 +977,11 @@ Support Files and Environment Variables:
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.
- /usr/local/lib/pine.conf
+ /etc/pine.conf
Pine's global configuration file.
- /usr/local/lib/pine.conf.fixed
+ /etc/pine.conf.fixed
Non-overridable global configuration file.
- /usr/local/lib/pine.info
+ /etc/pine.info
Local pointer to system administrator.
~/.pinerc
Personal configuration file for each user.
@@ -1200,10 +1201,10 @@ Pine
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
A system configuration file is not required.
-convert_sigs _-p pinerc_
Convert signatures contained in signature files into literal
@@ -1318,9 +1319,9 @@ Pine
configuration folder.
-P _pinerc_
Uses the named file as the system wide configuration file
- instead of _/usr/local/lib/pine.conf_ on UNIX, or nothing on
- _PC-Pine_. Pinerc may be either a local file or a remote
- configuration folder.
+ instead of _/etc/pine.conf_ on UNIX, or nothing on _PC-Pine_.
+ Pinerc may be either a local file or a remote configuration
+ folder.
-passfile _passfile_
This tells _Pine_ what file should be used as the password
file. This should be a fully-qualified filename.
@@ -1526,8 +1527,8 @@ Pine Configuration
configuration. In most cases, the compiled-in preferences will suit
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.) The location of the pine.conf file
can be changed with the -P command line argument. Both _Pine_ and
@@ -3761,7 +3762,7 @@ General Configuration Variables
spell checker. If your Unix system has _ispell_ it is probably
reasonable to make it the default speller by configuring it as
the default in the system configuration file,
- /usr/local/lib/pine.conf.
+ /etc/pine.conf.
If this option is not set, then the system's _spell_ command is
used. The spell command does not work the same as the alternate
speller. It produces a list of misspelled words on its standard
@@ -4157,11 +4158,11 @@ General Configuration Variables
Now for an example:
url-viewers=_TEST("test -n '${DISPLAY}'")_ /usr/local/bin/netscape,
- /usr/local/bin/lynx, C:\BIN\NETSCAPE.BAT
+ /usr/bin/lynx, C:\BIN\NETSCAPE.BAT
This example shows that for the first browser in the list to be
used the environment variable DISPLAY must be defined. If it
is, then the file /usr/local/bin/netscape must exist. If either
- condition is not met, then the file /usr/local/bin/lynx must
+ condition is not met, then the file /usr/bin/lynx must
exist. If it doesn't, then the final path and file must exist.
Note that the last entry is a DOS/Windows path. This is one way
to support _Pine_ running on more than one architecture with
@@ -10121,10 +10122,10 @@ Configuration Inheritance
5. the system-wide _fixed_ configuration file (Unix _Pine_ only)
The fixed configuration file is normally
- /usr/local/lib/pine.conf.fixed.
+ /etc/pine.conf.fixed.
The system-wide configuration file is normally
- /usr/local/lib/pine.conf for Unix _Pine_ and is normally not set for
+ /etc/pine.conf for Unix _Pine_ and is normally not set for
_PC-Pine_. For _PC-Pine_, if the environment variable _$PINECONF_ is
set, that is used for the system-wide configuration. This location can
be set or changed on the command line with the -P flag. The
@@ -10384,17 +10385,16 @@ SMTP Servers
* 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.
- * An entry in /usr/local/lib/pine.conf,
- /usr/local/lib/pine.conf.fixed or ~/.pinerc.
+ * An entry in /etc/pine.conf,
+ /etc/pine.conf.fixed or ~/.pinerc.
_________________________________________________________________
MIME.Types file
_Pine_'s MIME-TYPE support is based on code contributed by Hans
Drexler &LT;drexler@mpi.nl&GT;. _Pine_ assigns MIME Content-Types
- according to file name extensions found in the system-wide files
- /usr/local/lib/mime.types and /etc/mime.types, and a user specific
- ~/.mime.types file.
+ according to file name extensions found in the system-wide file
+ /etc/mime.types, and a user specific ~/.mime.types file.
In DOS and OS/2, _Pine_ looks in the same directory as the PINERC file
and the same dir as PINE.EXE. This is similar to the UNIX situation
@@ -11569,7 +11569,7 @@ Printers and Printing
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.
+ 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_
@@ -12023,9 +12023,9 @@ Test Checklist
Error messages for incorrect terminal types (try "foo" and
"vt52")
___
- Reading of /usr/local/lib/pine.conf
+ Reading of /etc/pine.conf
___
- Fixing variables and features in /usr/local/lib/pine.conf.fixed
+ Fixing variables and features in /etc/pine.conf.fixed
___
Flag command (check message status changed in mail folder)
___

29
mail/pine/patches/patch-imap_src_osdep_unix_Makefile
View File

@ -1,29 +0,0 @@
$OpenBSD: patch-imap_src_osdep_unix_Makefile,v 1.4 2005/11/23 13:44:25 jakob Exp $
--- imap/src/osdep/unix/Makefile.orig Sat Apr 30 22:51:13 2005
+++ imap/src/osdep/unix/Makefile Wed Nov 23 14:27:16 2005
@@ -24,7 +24,7 @@ EXTRAAUTHENTICATORS=
EXTRADRIVERS=mbox
PASSWDTYPE=std
SSLTYPE=nopwd
-IP=4
+IP=6
# The optimization level here for GCC ports is set here for a reason. It's
@@ -36,13 +36,13 @@ IP=4
# -O3 seems to be safe, but empirical observation from our local expert
# indicates that in some (many?) cases -O3 code runs slower than -O2.
-GCCOPTLEVEL= -O2
+GCCOPTLEVEL=
# Extended flags needed for SSL. You may need to modify.
-SSLDIR=/usr/local/ssl
-SSLCERTS=$(SSLDIR)/certs
+SSLDIR=/usr
+SSLCERTS=/etc/ssl
SSLKEYS=$(SSLCERTS)
SSLINCLUDE=$(SSLDIR)/include
SSLLIB=$(SSLDIR)/lib

18
mail/pine/patches/patch-imap_src_osdep_unix_Makefile_gss
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-imap_src_osdep_unix_Makefile_gss,v 1.2 2003/05/30 20:44:10 brad Exp $
--- imap/src/osdep/unix/Makefile.gss.orig Wed Mar 5 00:26:40 2003
+++ imap/src/osdep/unix/Makefile.gss Tue May 27 11:28:20 2003
@@ -21,11 +21,10 @@
# Extended flags needed for additional authenticators. You may need to modify.
GSSDIR=/usr/local
-GSSCFLAGS= -I$(GSSDIR)/include -DGSS_C_NT_HOSTBASED_SERVICE=gss_nt_service_name
-GSSOLDLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err
-GSSNEWLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
+GSSCFLAGS= -I/usr/include/kerberosV -DHEIMDAL
+GSSLDFLAGS= -lgssapi -lkrb5 -lcom_err -lasn1 -ldes -lcrypto
gss: # GSSAPI Kerberos V flags
echo $(GSSCFLAGS) >> OSCFLAGS
- sh -c '(test -f $(GSSDIR)/lib/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' >> LDFLAGS
+ echo $(GSSLDFLAGS) >> LDFLAGS
echo "#include \"kerb_mit.c\"" >> auths.c

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

@ -1,20 +0,0 @@
$OpenBSD: patch-imap_src_osdep_unix_env_unix_c,v 1.4 2005/04/29 19:51:35 jakob Exp $
--- imap/src/osdep/unix/env_unix.c.orig Mon Sep 13 23:31:19 2004
+++ imap/src/osdep/unix/env_unix.c Fri Apr 29 19:49:47 2005
@@ -809,15 +809,12 @@ char *myhomedir ()
static char *mymailboxdir ()
{
char *home = myhomedir ();
- /* initialize if first time */
- if (!myMailboxDir && myHomeDir) {
if (mailsubdir) {
char tmp[MAILTMPLEN];
sprintf (tmp,"%s/%s",home,mailsubdir);
myMailboxDir = cpystr (tmp);/* use pre-defined subdirectory of home */
}
else myMailboxDir = cpystr (home);
- }
return myMailboxDir ? myMailboxDir : "";
}

12
mail/pine/patches/patch-imap_src_osdep_unix_env_unix_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-imap_src_osdep_unix_env_unix_h,v 1.1 2005/11/23 13:44:25 jakob Exp $
--- imap/src/osdep/unix/env_unix.h.orig Sat Feb 23 05:03:45 2002
+++ imap/src/osdep/unix/env_unix.h Wed Nov 23 14:26:30 2005
@@ -56,7 +56,7 @@ typedef struct dotlock_base {
* for they are subtle and quick to anger.
*/
-#define MANDATORYLOCKPROT 0666 /* don't change this */
+#define MANDATORYLOCKPROT 0600 /* don't change this */
/* Function prototypes */

17
mail/pine/patches/patch-imap_src_osdep_unix_kerb_mit_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-imap_src_osdep_unix_kerb_mit_c,v 1.1 2003/04/17 08:17:04 jakob Exp $
--- imap/src/osdep/unix/kerb_mit.c.orig Thu Apr 17 09:29:01 2003
+++ imap/src/osdep/unix/kerb_mit.c Thu Apr 17 09:29:19 2003
@@ -19,8 +19,13 @@
*/
#define PROTOTYPE(x) x
+#ifdef HEIMDAL
+#include <gssapi.h>
+#include <krb5.h>
+#else
#include <gssapi/gssapi_generic.h>
#include <gssapi/gssapi_krb5.h>
+#endif
long kerberos_server_valid (void);

28
mail/pine/patches/patch-pico_osdep_spell_unx
View File

@ -1,28 +0,0 @@
$OpenBSD: patch-pico_osdep_spell_unx,v 1.2 2003/05/27 23:38:33 brad Exp $
--- pico/osdep/spell.unx.orig Thu Dec 12 17:18:52 2002
+++ pico/osdep/spell.unx Tue May 27 10:30:15 2003
@@ -84,6 +84,14 @@ spell(f, n)
setimark(0, 1);
emlwrite("Checking spelling...", NULL); /* greetings */
+ if((sp = (char *)getenv("SPELL")) == NULL)
+ sp = SPELLER;
+
+ /* This code only works with "spell", which doesn't exist, and
+ alt_speller is only set via command line -s argument. */
+ if (strstr(sp, "ispell") != NULL)
+ alt_speller = sp;
+
if(alt_speller)
return(alt_editor(1, 0)); /* f == 1 means fork speller */
@@ -91,9 +99,6 @@ spell(f, n)
emlwrite("Can't write temp file for spell checker", NULL);
return(-1);
}
-
- if((sp = (char *)getenv("SPELL")) == NULL)
- sp = SPELLER;
if(fexist(sp, "x", (off_t *)NULL) != FIOSUC){
emlwrite("\007Spell-checking file \"%s\" not found", sp);

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

@ -1,26 +0,0 @@
$OpenBSD: patch-pine_mailcap_c,v 1.4 2005/04/29 19:51:35 jakob Exp $
--- pine/mailcap.c.orig Wed Nov 3 21:11:17 2004
+++ pine/mailcap.c Fri Apr 29 19:49:47 2005
@@ -993,14 +993,18 @@ mc_cmd_bldr(controlstring, type, subtype
* 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 arbitrary code
*/
for(p = parm; *p && p < parm+1000; p++){
- if(*p == '\''){
+ if((*p == '\'') || (*p=='`')) {
*to++ = '\''; /* closing quote */
*to++ = '\\';
- *to++ = '\''; /* below will be opening quote */
- }
- *to++ = *p;
+ *to++ = *p; /* quoted character */
+ *to++ = '\''; /* opening quote */
+ } else
+ *to++ = *p;
}
fs_give((void **) &parm);

32
mail/pine/patches/patch-pine_mailview_c
View File

@ -1,32 +0,0 @@
$OpenBSD: patch-pine_mailview_c,v 1.4 2005/11/23 13:44:25 jakob Exp $
--- pine/mailview.c.orig Tue Sep 20 20:26:20 2005
+++ pine/mailview.c Wed Nov 23 14:26:30 2005
@@ -4392,6 +4392,9 @@ url_hilite(linenum, line, ins, local)
char buf[256], color[256];
HANDLE_S *h;
+ if (line == NULL)
+ return (-1);
+
for(lp = line; ; lp = up + n){
/* scan for all of them so we can choose the first */
if(F_ON(F_VIEW_SEL_URL,ps_global))
@@ -4467,6 +4470,9 @@ url_hilite_hdr(linenum, line, ins, local
static int check_for_urls = 0;
register char *lp;
+ if (line == NULL)
+ return (-1);
+
if(isspace((unsigned char)*line)) /* continuation, check or not
depending on last line */
lp = line;
@@ -4510,7 +4516,7 @@ url_hilite_abook(linenum, line, ins, loc
{
register char *lp;
- if((lp = strchr(line, ':')) &&
+ if(line && (lp = strchr(line, ':')) &&
!strncmp(line, AB_COMMENT_STR, strlen(AB_COMMENT_STR)))
(void) url_hilite(linenum, lp + 1, ins, local);

49
mail/pine/patches/patch-pine_pine_hlp
View File

@ -1,49 +0,0 @@
$OpenBSD: patch-pine_pine_hlp,v 1.8 2005/11/23 13:44:25 jakob Exp $
--- pine/pine.hlp.orig Wed Sep 28 19:56:29 2005
+++ pine/pine.hlp Wed Nov 23 14:26:30 2005
@@ -1010,8 +1010,7 @@ Unix Pine:
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
+ mimetypes# ~/.mime.types + /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
@@ -19356,7 +19355,7 @@ a semi-colon (;) under Windows; for exam
</PRE>
<!--chtml else-->
a colon (:) under UNIX; for example:<PRE>
- ~/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap
+ ~/.mailcap:/etc/mailcap
</PRE>
<!--chtml endif-->
<P><UL>
@@ -24599,7 +24598,7 @@ argument (see the &quot;lynx&quot; examp
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;
+ &quot;/usr/bin/lynx _URL_&quot;
C:&#92;BIN&#92;NETSCAPE.BAT
</PRE>
<P>
@@ -24607,7 +24606,7 @@ This example shows that for the first vi
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.
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/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.
@@ -24703,7 +24702,7 @@ because of its length, but should all ap
URL-Viewers = _TEST("test -L /myhomedir/.netscape/lock")_ &quot;/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;
+ &quot;/usr/bin/lynx '_URL_'&quot;
<P>
<!--chtml endif-->
<P>

17
mail/pine/pkg/DESCR-main
View File

@ -1,17 +0,0 @@
Pine is a tool for reading, sending, and managing electronic messages.
It was designed specifically with novice computer users in mind, but can
be tailored to accommodate the needs of "power users" as well. Pine uses
Internet message protocols (e.g. RFC-822, SMTP, MIME, IMAP, NNTP) and runs
on Unix and PCs. This package also includes the IMAP daemon, a POP2
server, and a POP3 server, but not the pico editor.
If you want to use the spell checking feature of pine, install ispell and
set the environment variable SPELL to "${PREFIX}/ispell -l".
An optional configuration file "pine.conf" can be put into /etc to set
system wide defaults. The format of this file is identical to the .pinerc
file that is auto-generated by pine in your home directory.
Flavors:
ldap build with support for LDAP

3
mail/pine/pkg/DESCR-pico
View File

@ -1,3 +0,0 @@
Pico is a small text editor distributed as part of the pine mail program.
It is a separate program that may be installed and used without using
pine.

3
mail/pine/pkg/DESCR-pilot
View File

@ -1,3 +0,0 @@
Pilot is a simple, display-oriented file system browser based on the Pine
message system composer. As with Pine, commands are displayed at the
bottom of the screen, and context-sensitive help is provided.

7
mail/pine/pkg/MESSAGE-main
View File

@ -1,7 +0,0 @@
Some documentation for pine can be found in
${PREFIX}/share/doc/pine as well as pine(1).
Please read the documentation for instruction on how to make/update
the configuration files:
${SYSCONFDIR}/pine.conf
${SYSCONFDIR}/pine.conf.fixed

13
mail/pine/pkg/PLIST-main
View File

@ -1,13 +0,0 @@
@comment $OpenBSD: PLIST-main,v 1.4 2007/10/20 22:09:08 deraadt Exp $
@pkgpath ${BASE_PKGPATH}
@pkgpath ${BASE_PKGPATH},kerberos
bin/pine
bin/rpdump
bin/rpload
@man man/man1/pine.1
@man man/man1/rpdump.1
@man man/man1/rpload.1
share/doc/pine/
share/doc/pine/tech-notes.txt
@extra ${SYSCONFDIR}/pine.conf
@extra ${SYSCONFDIR}/pine.conf.fixed

3
mail/pine/pkg/PLIST-pico
View File

@ -1,3 +0,0 @@
@comment $OpenBSD: PLIST-pico,v 1.3 2004/09/15 09:09:44 espie Exp $
bin/pico
@man man/man1/pico.1

3
mail/pine/pkg/PLIST-pilot
View File

@ -1,3 +0,0 @@
@comment $OpenBSD: PLIST-pilot,v 1.2 2004/09/15 09:09:44 espie Exp $
bin/pilot
@man man/man1/pilot.1