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

- update to pine v4.50

Browse Source 
- split out pilot into separate package
- remove combined pine+pico package
- clean up patches
- remote c-client dependency, link statically
This commit is contained in:
jakob 2002-12-01 20:57:10 +00:00
parent 2a46e33813
commit dfadd29b24
35 changed files with 211 additions and 403 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
mail/pine/Makefile
View File

@ -1,22 +1,25 @@
# $OpenBSD: Makefile,v 1.46 2002/11/25 20:08:48 jakob Exp $
# $OpenBSD: Makefile,v 1.47 2002/12/01 20:57:10 jakob Exp $
COMMENT= "Program for Internet E-mail and News, with pico"
COMMENT= "program for Internet E-mail and News"
COMMENT-pico= "small text editor"
COMMENT-pine= "Program for Internet E-mail and News, without pico"
COMMENT-pilot= "file system browser"
CATEGORIES= mail news
VERSION= 4.50
PICO_VERSION= 4.3
PILOT_VERSION= 2.0
VERSION= 4.44
PICO_VERSION= 4.2
DISTNAME= pine${VERSION}
PKGNAME= pine+pico-${VERSION}p1
FULLPKGNAME-pico=pico-${PICO_VERSION}
PKGNAME-pine= pine-${VERSION}p1
PKGNAME= pine-${VERSION}
PKGNAME-pico= pico-${PICO_VERSION}
PKGNAME-pilot= pilot-${PILOT_VERSION}
MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \
ftp://ftp.sunet.se/pub/unix/mail/pine/
HOMEPAGE= http://www.washington.edu/pine/
BUILD_DEPENDS= :c-client->=4.41:mail/c-client
MAINTAINER= Jakob Schlyter <jakob@openbsd.org>
PERMIT_PACKAGE_CDROM= No
@ -29,27 +32,25 @@ NO_REGRESS= Yes
FLAVORS= ldap
FLAVOR?=
MULTI_PACKAGES= -pico -pine
MULTI_PACKAGES= -pico -pilot
SUBPACKAGE?=
.if ${SUBPACKAGE} == "-pico"
CATEGORIES= editors
.elif ${SUBPACKAGE} == "-pine"
CATEGORIES= mail news
LIB_DEPENDS= c-client.4:c-client->=4.41:mail/c-client
.else
CATEGORIES= mail news editors
LIB_DEPENDS= c-client.4:c-client->=4.41:mail/c-client
.elif ${SUBPACKAGE} == "-pilot"
CATEGORIES= sysutils
.endif
.if ${FLAVOR:L} == "ldap" && ${SUBPACKAGE} != "-pico"
.if ${FLAVOR:L} == "ldap" && ${SUBPACKAGE} == ""
LIB_DEPENDS+= ldap.2:openldap-client-2.*:databases/openldap
.endif
PINE_BUILD_FLAGS= CC="${CC}" LOCALBASE="${LOCALBASE}"
PINE_BUILD_FLAGS= CC="${CC}" EXTRACFLAGS="${CFLAGS}" \
SSLTYPE="unix" EXTRAAUTHENTICATORS="gss" \
LOCALBASE="${LOCALBASE}"
.if ${FLAVOR:L} == "ldap"
PINE_BUILD_FLAGS+= LDAPLIBS="-lldap -llber" \
PINE_BUILD_FLAGS+= LDAPLIBS="-L${LOCALBASE}/lib -lldap -llber" \
LDAPCFLAGS="-DENABLE_LDAP -I${LOCALBASE}/include"
.endif

6
mail/pine/distinfo
View File

@ -1,3 +1,3 @@
MD5 (pine4.44.tar.gz) = bb405bd52b9fd84b9a981626847cc098
RMD160 (pine4.44.tar.gz) = e089ed87fef3b366769ed560933fa4537582a1e8
SHA1 (pine4.44.tar.gz) = 0657a5bd51cacc300260224320ee114c0b2b26e5
MD5 (pine4.50.tar.gz) = 5f517297242f625de9a9ccbaf48578f0
RMD160 (pine4.50.tar.gz) = c4e78a60be061d4aa58aeb03669f148149498dda
SHA1 (pine4.50.tar.gz) = aeccc04b44be542a9318ae3a10d30b0c56e77309

64
mail/pine/patches/patch-build
View File

@ -1,64 +0,0 @@
$OpenBSD: patch-build,v 1.6 2001/11/19 02:01:58 brad Exp $
--- build.orig Sat Nov 17 20:56:27 2001
+++ build Sat Nov 17 21:01:46 2001
@@ -332,21 +332,6 @@ case $maketarg in
echo "Including SSL functionality"
fi
- if [ -s c-client ] ; then rm -f c-client ; fi
- ln -s imap/c-client c-client
- if [ -s mtest ] ; then rm -f mtest ; fi
- ln -s imap/mtest mtest
- if [ -s imapd ] ; then rm -f imapd ; fi
- ln -s imap/imapd imapd
- if [ -s ipopd ] ; then rm -f ipopd ; fi
- ln -s imap/ipopd ipopd
- echo "Making c-client library, imapd, and ipopd"
- echo $S1 $S2 $S3 $S4 $K1 > imap/SPECIALS
- cd $PHOME/imap
- eval echo eval make "$makeargs" "$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg
- eval make "$makeargs" "$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg
- echo ''
-
echo "Making Pico and Pilot"
cd $PHOME/pico
eval echo make "$makeargs" -f makefile.$picotarg
@@ -362,10 +347,6 @@ case $maketarg in
cd $PHOME/bin
rm -f pine mtest imapd pico pilot rpload rpdump ipop2d ipop3d
if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi
- if [ -s ../mtest/mtest ] ; then ln ../mtest/mtest mtest ; fi
- if [ -s ../imapd/imapd ] ; then ln ../imapd/imapd imapd ; fi
- if [ -s ../ipopd/ipop2d ] ; then ln ../ipopd/ipop2d ipop2d ; fi
- if [ -s ../ipopd/ipop3d ] ; then ln ../ipopd/ipop3d ipop3d ; fi
if [ -s ../pico/pico ] ; then ln ../pico/pico pico ; fi
if [ -s ../pico/pilot ] ; then ln ../pico/pilot pilot ; fi
if [ -s ../pine/rpload ] ; then ln ../pine/rpload rpload ; fi
@@ -373,7 +354,7 @@ case $maketarg in
cd $PHOME
echo ''
echo "Links to executables are in bin directory:"
- size bin/pine bin/mtest bin/imapd bin/pico bin/pilot bin/rpdump bin/rpload bin/ipop2d bin/ipop3d
+ size bin/pine bin/pico bin/pilot bin/rpdump bin/rpload
case $maketarg in
mnt) echo "Fixing stacksizes ..."
fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
@@ -409,16 +390,12 @@ case $maketarg in
clean) # This only sort of works
- rm -f c-client mtest imapd ipopd
- echo "Cleaning c-client and imapd"
- cd $PHOME/imap
- make clean
echo "Cleaning Pine"
cd $PHOME/pine
- make -f makefile.ult clean
+ make -f makefile.bso clean
echo "Cleaning pico"
cd $PHOME/pico
- make $makeargs -f makefile.ult clean
+ make $makeargs -f makefile.bso clean
echo "Done"
cd $PHOME
;;

6
mail/pine/patches/patch-doc_pine.1 → mail/pine/patches/patch-doc_pine_1
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-doc_pine.1,v 1.3 2001/09/27 16:52:40 brad Exp $
--- doc/pine.1.orig Fri Jun 22 19:47:06 2001
+++ doc/pine.1 Thu Sep 27 08:51:46 2001
$OpenBSD: patch-doc_pine_1,v 1.1 2002/12/01 20:57:10 jakob Exp $
--- doc/pine.1.orig Mon Nov 18 22:22:27 2002
+++ doc/pine.1 Sun Dec 1 15:17:46 2002
@@ -305,7 +305,7 @@ uses the following environment variables
.if n .ta 2.8i
.if t .ta 2.1i

26
mail/pine/patches/patch-doc_tech-notes.txt → mail/pine/patches/patch-doc_tech-notes_txt
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-doc_tech-notes.txt,v 1.7 2002/01/13 09:03:25 brad Exp $
--- doc/tech-notes.txt.orig Tue Jan 8 19:07:54 2002
+++ doc/tech-notes.txt Sun Jan 13 02:25:47 2002
$OpenBSD: patch-doc_tech-notes_txt,v 1.1 2002/12/01 20:57:10 jakob Exp $
--- doc/tech-notes.txt.orig Mon Nov 18 22:24:41 2002
+++ doc/tech-notes.txt Sun Dec 1 15:17:46 2002
@@ -328,14 +328,14 @@ SMTP and Sendmail
sendmail-path, smtp-server, and compile-time options. The first
MTA specified in the following list is used:
@ -117,7 +117,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.7 2002/01/13 09:03:25 brad Exp $
Local pointer to system administrator.
~/.pinerc
Personal configuration file for each user.
@@ -1213,10 +1214,10 @@ Pine
@@ -1217,10 +1218,10 @@ Pine
Configuration: Prints a sample system configuration file to the
screen or standard output. To generate an initial system
configuration file, execute
@ -130,7 +130,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.7 2002/01/13 09:03:25 brad Exp $
A system configuration file is not required.
-convert_sigs _-p pinerc_
Convert signatures contained in signature files into literal
@@ -1323,9 +1324,9 @@ Pine
@@ -1327,9 +1328,9 @@ Pine
configuration folder.
-P _pinerc_
Uses the named file as the system wide configuration file
@ -143,7 +143,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.7 2002/01/13 09:03:25 brad Exp $
-passfile _passfile_
_PC-Pine_ only. This tells _PC-Pine_ what file should be used
as the password file. This should be a fully-qualified
@@ -1518,8 +1519,8 @@ Pine Configuration
@@ -1522,8 +1523,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
@ -154,7 +154,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.7 2002/01/13 09:03:25 brad Exp $
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
@@ -3032,7 +3033,7 @@ General Configuration Variables
@@ -3055,7 +3056,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,
@ -163,7 +163,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.7 2002/01/13 09:03:25 brad Exp $
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
@@ -3054,7 +3055,7 @@ General Configuration Variables
@@ -3077,7 +3078,7 @@ General Configuration Variables
set to zero ssh connections will be completely disabled.
_ssh-path_
Sets the name of the command used to open a UNIX secure shell
@ -172,7 +172,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.7 2002/01/13 09:03:25 brad Exp $
_standard-printer_
System-wide configuration file only. Specifies a list of
commands for category 2 of the _Setup/Printer_ screen, the
@@ -3129,11 +3130,11 @@ General Configuration Variables
@@ -3321,11 +3322,11 @@ General Configuration Variables
Now for an example:
url-viewers=_TEST("test -n '${DISPLAY}'")_ /usr/local/bin/netscape,
@ -186,7 +186,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.7 2002/01/13 09:03:25 brad Exp $
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
@@ -6889,10 +6890,10 @@ Configuration Inheritance
@@ -7543,10 +7544,10 @@ Configuration Inheritance
5. the system-wide _fixed_ configuration file (Unix _Pine_ only)
The fixed configuration file is normally
@ -199,7 +199,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.7 2002/01/13 09:03:25 brad Exp $
_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
@@ -7046,17 +7047,16 @@ SMTP Servers
@@ -7700,17 +7701,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.
@ -221,7 +221,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.7 2002/01/13 09:03:25 brad Exp $
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
@@ -8244,7 +8244,7 @@ Printers and Printing
@@ -8885,7 +8885,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
@ -230,7 +230,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.7 2002/01/13 09:03:25 brad Exp $
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_
@@ -8698,9 +8698,9 @@ Test Checklist
@@ -9339,9 +9339,9 @@ Test Checklist
Error messages for incorrect terminal types (try "foo" and
"vt52")
___

18
mail/pine/patches/patch-imap_src_c-client_auth_gss_c Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-imap_src_c-client_auth_gss_c,v 1.1 2002/12/01 20:57:10 jakob Exp $
--- imap/src/c-client/auth_gss.c.orig Thu Nov 22 05:07:04 2001
+++ imap/src/c-client/auth_gss.c Sun Dec 1 15:17:47 2002
@@ -19,8 +19,14 @@
*/
#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 auth_gssapi_valid (void);
long auth_gssapi_client (authchallenge_t challenger,authrespond_t responder,

23
mail/pine/patches/patch-imap_src_osdep_unix_Makefile Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-imap_src_osdep_unix_Makefile,v 1.1 2002/12/01 20:57:10 jakob Exp $
--- imap/src/osdep/unix/Makefile.orig Tue Oct 15 02:44:49 2002
+++ imap/src/osdep/unix/Makefile Sun Dec 1 15:17:47 2002
@@ -28,8 +28,8 @@ SSLTYPE=nopwd
# Extended flags needed for SSL. You may need to modify.
-SSLDIR=/usr/local/ssl
-SSLCERTS=$(SSLDIR)/certs
+SSLDIR=/usr
+SSLCERTS=/etc/ssl
SSLINCLUDE=$(SSLDIR)/include
SSLLIB=$(SSLDIR)/lib
@@ -234,7 +234,7 @@ bso: # OpenBSD
SPOOLDIR=/var \
ACTIVEFILE=/usr/local/news/lib/active \
RSHPATH=/usr/bin/rsh \
- BASECFLAGS="-O2 -pipe"
+ BASECFLAGS="-pipe"
cvx: # Convex
$(BUILD) `$(CAT) SPECIALS` OS=$@ \

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

@ -0,0 +1,18 @@
$OpenBSD: patch-imap_src_osdep_unix_Makefile_gss,v 1.1 2002/12/01 20:57:10 jakob Exp $
--- imap/src/osdep/unix/Makefile.gss.orig Thu Nov 22 05:08:43 2001
+++ imap/src/osdep/unix/Makefile.gss Sun Dec 1 15:17:47 2002
@@ -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= -lkafs -lkrb -lgssapi -lkrb5 -lasn1 -lcom_err -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

28
mail/pine/patches/patch-imap_src_osdep_unix_env_unix_c Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-imap_src_osdep_unix_env_unix_c,v 1.1 2002/12/01 20:57:10 jakob Exp $
--- imap/src/osdep/unix/env_unix.c.orig Wed Oct 30 19:06:34 2002
+++ imap/src/osdep/unix/env_unix.c Sun Dec 1 15:17:47 2002
@@ -773,14 +773,12 @@ char *myhomedir ()
static char *mymailboxdir ()
{
char *home = myhomedir ();
- if (!myMailboxDir && home) { /* initialize if first time */
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 : "";
}
@@ -1036,7 +1034,8 @@ long dotlock_lock (char *file,DOTLOCK *b
}
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",base->lock);
if (s = strrchr (tmp,'/')) *s = '\0';
strcat (tmp," must have 1777 protection");

10
mail/pine/patches/patch-pico_osdep_spell.unx → mail/pine/patches/patch-pico_osdep_spell_unx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-pico_osdep_spell.unx,v 1.2 2001/09/27 16:52:40 brad Exp $
--- pico/osdep/spell.unx.orig Thu Aug 27 18:57:49 1998
+++ pico/osdep/spell.unx Thu Sep 27 08:51:48 2001
@@ -85,6 +85,14 @@ spell(f, n)
$OpenBSD: patch-pico_osdep_spell_unx,v 1.1 2002/12/01 20:57:10 jakob Exp $
--- pico/osdep/spell.unx.orig Wed Apr 3 22:10:57 2002
+++ pico/osdep/spell.unx Sun Dec 1 15:17:46 2002
@@ -84,6 +84,14 @@ spell(f, n)
setimark(0, 1);
emlwrite("Checking spelling...", NULL); /* greetings */
@ -16,7 +16,7 @@ $OpenBSD: patch-pico_osdep_spell.unx,v 1.2 2001/09/27 16:52:40 brad Exp $
if(alt_speller)
return(alt_editor(1, 0)); /* f == 1 means fork speller */
@@ -92,9 +100,6 @@ spell(f, n)
@@ -91,9 +99,6 @@ spell(f, n)
emlwrite("Can't write temp file for spell checker", NULL);
return(-1);
}

14
mail/pine/patches/patch-pine_bldaddr_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-pine_bldaddr_c,v 1.1 2002/11/25 17:08:37 brad Exp $
--- pine/bldaddr.c.orig Thu Jun 21 13:53:24 2001
+++ pine/bldaddr.c Mon Nov 25 11:55:38 2002
@@ -7263,8 +7263,8 @@ est_size(a)
for(; a; a = a->next){
/* two times personal for possible quoting */
- cnt += 2 * (a->personal ? strlen(a->personal) : 0);
- cnt += (a->mailbox ? strlen(a->mailbox) : 0);
+ cnt += 2 * (a->personal ? (strlen(a->personal)+1) : 0);
+ cnt += 2 * (a->mailbox ? (strlen(a->mailbox)+1) : 0);
cnt += (a->adl ? strlen(a->adl) : 0);
cnt += (a->host ? strlen(a->host) : 0);

19
mail/pine/patches/patch-pine_headers.h
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-pine_headers.h,v 1.2 2001/09/27 16:52:40 brad Exp $
--- pine/headers.h.orig Mon Nov 13 15:40:18 2000
+++ pine/headers.h Thu Sep 27 08:51:48 2001
@@ -59,12 +59,12 @@ is os-xxx.h. (Don't edit osdep.h; edit o
#include "../pico/headers.h"
-#include "../c-client/mail.h"
+#include "c-client/mail.h"
#include "os.h"
-#include "../c-client/rfc822.h"
-#include "../c-client/misc.h"
+#include "c-client/rfc822.h"
+#include "c-client/misc.h"
#ifdef ENABLE_LDAP

12
mail/pine/patches/patch-pine_init.c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-pine_init.c,v 1.2 2001/09/27 16:52:40 brad Exp $
--- pine/init.c.orig Wed Aug 1 20:10:31 2001
+++ pine/init.c Thu Sep 27 08:51:49 2001
@@ -65,7 +65,7 @@ static char rcsid[] = "$Id: init.c,v 4.6
#include "headers.h"
-#include "../c-client/imap4r1.h" /* for LEVELSTATUS() */
+#include "c-client/imap4r1.h" /* for LEVELSTATUS() */
typedef enum {Sapling, Seedling, Seasoned} FeatureLevel;

16
mail/pine/patches/patch-pine_mailcap.c → mail/pine/patches/patch-pine_mailcap_c
View File

@ -1,24 +1,24 @@
$OpenBSD: patch-pine_mailcap.c,v 1.3 2001/09/27 16:52:40 brad Exp $
--- pine/mailcap.c.orig Thu Jun 21 13:53:31 2001
+++ pine/mailcap.c Thu Sep 27 08:51:49 2001
@@ -917,14 +917,18 @@ mc_cmd_bldr(controlstring, type, subtype
$OpenBSD: patch-pine_mailcap_c,v 1.1 2002/12/01 20:57:10 jakob Exp $
--- pine/mailcap.c.orig Mon Nov 18 22:47:22 2002
+++ pine/mailcap.c Sun Dec 1 15:17:46 2002
@@ -921,14 +921,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 arbirtrary code
+ * Also quote the ` slash to prevent execution of arbitrary 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++ = '\''; /* opening quote */
+ *to++ = *p; /* quoted character */
+ *to++ = '\''; /* opening quote */
+ } else
+ *to++ = *p;
}

12
mail/pine/patches/patch-pine_mailcmd.c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-pine_mailcmd.c,v 1.2 2001/09/27 16:52:40 brad Exp $
--- pine/mailcmd.c.orig Fri Aug 17 14:12:26 2001
+++ pine/mailcmd.c Thu Sep 27 08:51:50 2001
@@ -51,7 +51,7 @@ static char rcsid[] = "$Id: mailcmd.c,v
====*/
#include "headers.h"
-#include "../c-client/imap4r1.h"
+#include "c-client/imap4r1.h"
/*

12
mail/pine/patches/patch-pine_mailindx.c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-pine_mailindx.c,v 1.2 2001/09/27 16:52:40 brad Exp $
--- pine/mailindx.c.orig Tue Aug 7 18:51:55 2001
+++ pine/mailindx.c Thu Sep 27 08:51:51 2001
@@ -50,7 +50,7 @@ static char rcsid[] = "$Id: mailindx.c,v
====*/
#include "headers.h"
-#include "../c-client/imap4r1.h"
+#include "c-client/imap4r1.h"
/*
* Some common Command Bindings

31
mail/pine/patches/patch-pine_makefile.bso
View File

@ -1,31 +0,0 @@
$OpenBSD: patch-pine_makefile.bso,v 1.8 2002/06/05 19:46:37 brad Exp $
--- pine/makefile.bso.orig Tue Oct 23 18:24:45 2001
+++ pine/makefile.bso Sat Nov 17 20:22:04 2001
@@ -50,7 +50,7 @@ OPTIMIZE= # -O
PROFILE= # -pg
DEBUG= -DDEBUG # -g
-CCLIENTDIR= ../c-client
+CCLIENTDIR= $(LOCALBASE)/include/c-client
PICODIR= ../pico
# Only need to uncomment next two lines if you run make from this directory
@@ -61,13 +61,12 @@ PICODIR= ../pico
LDAPOFILES= addrbook.o adrbkcmd.o args.o bldaddr.o init.o \
mailview.o other.o pine.o strings.o takeaddr.o
-STDLIBS= -ltermlib
-LOCLIBS= -lpico $(CCLIENTDIR)/c-client.a
-LOCLIBDIR= -L$(PICODIR)
-LIBS= $(LOCLIBDIR) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
- `cat $(CCLIENTDIR)/LDFLAGS`
+STDLIBS= -ltermlib -lssl -lgssapi -lkrb -lkrb5 -lasn1 -lcrypto -lcom_err -lkafs -ldes
+LOCLIBS= -lpico -lc-client
+LOCLIBDIR= -L$(PICODIR) -L$(LOCALBASE)/lib
+LIBS= $(LOCLIBDIR) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS)
-STDCFLAGS= -DBSDI -DSYSTYPE=\"BSO\" -DMOUSE
+STDCFLAGS= -DBSDI -DSYSTYPE=\"BSO\" -DMOUSE -I$(LOCALBASE)/include
CFLAGS+= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
$(STDCFLAGS)

12
mail/pine/patches/patch-pine_osdep_os-bso.h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-pine_osdep_os-bso.h,v 1.2 2001/09/27 16:52:40 brad Exp $
--- pine/osdep/os-bso.h.orig Fri Sep 15 06:32:42 2000
+++ pine/osdep/os-bso.h Fri Sep 15 06:32:55 2000
@@ -40,7 +40,7 @@
#ifndef _OS_INCLUDED
#define _OS_INCLUDED
-#include "../c-client/osdep.h"
+#include "c-client/osdep.h"
/*----------------------------------------------------------------------

21
mail/pine/patches/patch-pine_other_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-pine_other_c,v 1.1 2002/12/01 20:57:10 jakob Exp $
--- pine/other.c.orig Fri Oct 11 19:47:21 2002
+++ pine/other.c Sun Dec 1 15:17:46 2002
@@ -6095,7 +6095,7 @@ take_export_tool(ps, cmd, cl, flags)
for(; ctmp; ctmp = next_confline(ctmp)){
if(!(ctmp->flags & CF_NOSELECT) && ctmp->value){
ctmp->d.t.selected = 1;
- if(ctmp->value);
+ if(ctmp->value)
ctmp->value[1] = 'X';
}
}
@@ -6111,7 +6111,7 @@ take_export_tool(ps, cmd, cl, flags)
for(; ctmp; ctmp = next_confline(ctmp)){
if(!(ctmp->flags & CF_NOSELECT) && ctmp->value){
ctmp->d.t.selected = 0;
- if(ctmp->value);
+ if(ctmp->value)
ctmp->value[1] = SPACE;
}
}

21
mail/pine/patches/patch-pine_pine.c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-pine_pine.c,v 1.5 2001/11/22 20:29:20 brad Exp $
--- pine/pine.c.orig Mon Nov 19 14:54:04 2001
+++ pine/pine.c Thu Nov 22 15:23:41 2001
@@ -40,7 +40,7 @@ static char rcsid[] = "$Id: pine.c,v 4.5
----------------------------------------------------------------------*/
#include "headers.h"
-#include "../c-client/imap4r1.h"
+#include "c-client/imap4r1.h"
/*
@@ -409,7 +409,7 @@ main(argc, argv)
#endif
/*------- Set up c-client drivers -------*/
-#include "../c-client/linkage.c"
+#include "c-client/linkage.c"
/*
* Lookups of long login names which don't exist are very slow in aix.
* This would normally get set in system-wide config if not needed.

34
mail/pine/patches/patch-pine_pine.hlp → mail/pine/patches/patch-pine_pine_hlp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-pine_pine.hlp,v 1.9 2002/01/13 09:03:25 brad Exp $
--- pine/pine.hlp.orig Tue Jan 8 15:55:03 2002
+++ pine/pine.hlp Sun Jan 13 02:25:58 2002
@@ -606,9 +606,9 @@ Unix Pine:
$OpenBSD: patch-pine_pine_hlp,v 1.1 2002/12/01 20:57:10 jakob Exp $
--- pine/pine.hlp.orig Wed Nov 13 23:55:49 2002
+++ pine/pine.hlp Sun Dec 1 15:17:47 2002
@@ -584,9 +584,9 @@ Unix Pine:
executable &lt;Unix search path&gt;/pine
persnl cfg ~/.pinerc
except cfg ~/.pinercex
@ -14,7 +14,7 @@ $OpenBSD: patch-pine_pine.hlp,v 1.9 2002/01/13 09:03:25 brad Exp $
interrupted ~/.pine-interrupted-mail
debug ~/.pine-debugN
@@ -620,8 +620,7 @@ Unix Pine:
@@ -598,8 +598,7 @@ Unix Pine:
postponed# ~/mail/postponed-msgs
sentmail# ~/mail/sent-mail
mailcap# ~/.mailcap + /etc/mailcap
@ -24,7 +24,7 @@ $OpenBSD: patch-pine_pine.hlp,v 1.9 2002/01/13 09:03:25 brad Exp $
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
@@ -1079,9 +1078,9 @@ contact email address may have been set
@@ -1057,9 +1056,9 @@ contact email address may have been set
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-->
@ -36,7 +36,7 @@ $OpenBSD: patch-pine_pine.hlp,v 1.9 2002/01/13 09:03:25 brad Exp $
<HR WIDTH="75%">
<!--chtml endif-->
<P>
@@ -1169,7 +1168,7 @@ To Exit this screen and continue your Pi
@@ -1147,7 +1146,7 @@ To Exit this screen and continue your Pi
<OL>
<LI> <A HREF="#intro">Introduction</A>
<LI> <A HREF="#pine_help">Pine Help</A>
@ -45,7 +45,7 @@ $OpenBSD: patch-pine_pine.hlp,v 1.9 2002/01/13 09:03:25 brad Exp $
<LI> <A HREF="#local_support">Local Support Contacts</A>
<!--chtml endif-->
<LI> <A HREF="#giving_cmds">Giving Commands in Pine</A>
@@ -1280,9 +1279,9 @@ copy of Pine you are using has been prop
@@ -1259,9 +1258,9 @@ copy of Pine you are using has been prop
at your site.)
@ -57,7 +57,7 @@ $OpenBSD: patch-pine_pine.hlp,v 1.9 2002/01/13 09:03:25 brad Exp $
<!--chtml endif-->
<H2><A NAME="giving_cmds">Giving Commands in Pine</A></H2>
@@ -1962,7 +1961,7 @@ screen or standard output. To generate a
@@ -1945,7 +1944,7 @@ screen or standard output. To generate a
file, execute
<PRE><CODE>
@ -66,7 +66,7 @@ $OpenBSD: patch-pine_pine.hlp,v 1.9 2002/01/13 09:03:25 brad Exp $
</CODE></PRE>
<P>
@@ -1970,7 +1969,7 @@ To generate a system configuration file
@@ -1953,7 +1952,7 @@ To generate a system configuration file
system configuration file, execute
<PRE><CODE>
@ -75,7 +75,7 @@ $OpenBSD: patch-pine_pine.hlp,v 1.9 2002/01/13 09:03:25 brad Exp $
</CODE></PRE>
<P>
A system configuration file is not required.
@@ -2122,7 +2121,7 @@ Pinerc may be either a local file or a r
@@ -2112,7 +2111,7 @@ Pinerc may be either a local file or a r
<DT> -P <EM>pinerc</EM>
<DD> Uses the named file as the system wide configuration file instead of
@ -84,7 +84,7 @@ $OpenBSD: patch-pine_pine.hlp,v 1.9 2002/01/13 09:03:25 brad Exp $
Pinerc may be either a local file or a remote configuration folder.
<P>
@@ -2830,10 +2829,10 @@ In increasing order of precedence they a
@@ -2822,10 +2821,10 @@ In increasing order of precedence they a
</OL>
<P>
The fixed configuration file is normally
@ -97,7 +97,7 @@ $OpenBSD: patch-pine_pine.hlp,v 1.9 2002/01/13 09:03:25 brad Exp $
set for PC-Pine.
For PC-Pine, if the environment variable <EM>$PINECONF</EM> is set, that
is used for the system-wide configuration.
@@ -14177,7 +14176,7 @@ a semi-colon (;) under Windows; for exam
@@ -15072,7 +15071,7 @@ a semi-colon (;) under Windows; for exam
</PRE>
<!--chtml else-->
a colon (:) under UNIX; for example:<PRE>
@ -106,7 +106,7 @@ $OpenBSD: patch-pine_pine.hlp,v 1.9 2002/01/13 09:03:25 brad Exp $
</PRE>
<!--chtml endif-->
<P><UL>
@@ -16781,7 +16780,7 @@ the fourth is for the connection method
@@ -17753,7 +17752,7 @@ the fourth is for the connection method
<H1>OPTION: ssh-path</H1>
Sets the name of the command used to open a UNIX secure shell
@ -115,7 +115,7 @@ $OpenBSD: patch-pine_pine.hlp,v 1.9 2002/01/13 09:03:25 brad Exp $
<P>
<UL>
<LI><A HREF="h_finding_help">Finding more information and requesting help</A>
@@ -17560,7 +17559,7 @@ argument (see the &quot;lynx&quot; examp
@@ -18861,7 +18860,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
@ -124,7 +124,7 @@ $OpenBSD: patch-pine_pine.hlp,v 1.9 2002/01/13 09:03:25 brad Exp $
C:&#92;BIN&#92;NETSCAPE.BAT
</PRE>
<P>
@@ -17568,7 +17567,7 @@ This example shows that for the first vi
@@ -18869,7 +18868,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,
@ -133,7 +133,7 @@ $OpenBSD: patch-pine_pine.hlp,v 1.9 2002/01/13 09:03:25 brad Exp $
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.
@@ -17664,7 +17663,7 @@ because of its length, but should all ap
@@ -18965,7 +18964,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>

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

@ -1,12 +0,0 @@
$OpenBSD: patch-pine_rpdump_c,v 1.1 2001/09/27 16:52:40 brad Exp $
--- pine/rpdump.c.orig Thu Sep 27 10:08:40 2001
+++ pine/rpdump.c Thu Sep 27 10:10:09 2001
@@ -114,7 +114,7 @@ main(argc, argv)
RemoteType rtype;
unsigned long i;
-#include "../c-client/linkage.c"
+#include "c-client/linkage.c"
if(parse_args(argc, argv, &force, &local, &remote)){
fprintf(stderr, ustr, argv[0]);

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

@ -1,12 +0,0 @@
$OpenBSD: patch-pine_rpload_c,v 1.1 2001/09/27 16:52:40 brad Exp $
--- pine/rpload.c.orig Thu Sep 27 10:03:49 2001
+++ pine/rpload.c Thu Sep 27 10:04:07 2001
@@ -117,7 +117,7 @@ main(argc, argv)
char *local = NULL, *remote = NULL, *special_hdr = NULL;
RemoteType rt, type = NotSet;
-#include "../c-client/linkage.c"
+#include "c-client/linkage.c"
if(parse_args(argc, argv, &force, &trimsize, &local, &remote, &type)){
fprintf(stderr, ustr, argv[0]);

14
mail/pine/patches/patch-pine_send.c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-pine_send.c,v 1.2 2001/09/27 16:52:40 brad Exp $
--- pine/send.c.orig Mon Aug 27 13:54:33 2001
+++ pine/send.c Thu Sep 27 08:51:54 2001
@@ -47,8 +47,8 @@ static char rcsid[] = "$Id: send.c,v 4.6
====*/
#include "headers.h"
-#include "../c-client/smtp.h"
-#include "../c-client/nntp.h"
+#include "c-client/smtp.h"
+#include "c-client/nntp.h"
#ifndef TCPSTREAM

2
mail/pine/pkg/DEINSTALL
View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: DEINSTALL,v 1.2 2000/07/10 22:54:33 brad Exp $
# $OpenBSD: DEINSTALL,v 1.3 2002/12/01 20:57:10 jakob Exp $
#
# pine de-installation

24
mail/pine/pkg/DEINSTALL-pine
View File

@ -1,24 +0,0 @@
#!/bin/sh
# $OpenBSD: DEINSTALL-pine,v 1.1 2000/10/05 18:01:50 marc Exp $
#
# pine de-installation
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
if [ -f /etc/pine.conf -o -f /etc/pine.conf.fixed ]; then
echo
echo "+---------------"
echo "| To completely deinstall the $1 package you need to perform"
echo "| this step as root:"
echo "|"
echo "| rm -rf /etc/pine.*"
echo "|"
echo "| Do not do this if you plan on re-installing $1"
echo "| at some future time."
echo "+---------------"
echo
fi
exit 0

34
mail/pine/pkg/DESCR
View File

@ -1,24 +1,24 @@
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 Pico editor, the IMAP daemon, a POP2 server,
and a POP3 server.
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".
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.
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.
Also included in dot.pinerc.pgp.sample are example entries needed to
add to your .pinerc to activate the pgp add on scripts pgpdecode,
pgpencode, and pgpsign.
Also included in dot.pinerc.pgp.sample are example entries needed to add
to your .pinerc to activate the pgp add on scripts pgpdecode, pgpencode,
and pgpsign.
Flavors:
ldap - Build with support for LDAP.
ldap build with support for LDAP
WWW: ${HOMEPAGE}

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

@ -1,5 +1,5 @@
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.
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.
WWW: ${HOMEPAGE}

5
mail/pine/pkg/DESCR-pilot Normal file
View File

@ -0,0 +1,5 @@
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.
WWW: ${HOMEPAGE}

24
mail/pine/pkg/DESCR-pine
View File

@ -1,24 +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.
Also included in dot.pinerc.pgp.sample are example entries needed to
add to your .pinerc to activate the pgp add on scripts pgpdecode,
pgpencode, and pgpsign.
Flavors:
ldap - Build with support for LDAP.
WWW: ${HOMEPAGE}

7
mail/pine/pkg/MESSAGE-pine
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 /etc/pine.conf and /etc/pine.conf.fixed
+---------------

10
mail/pine/pkg/PLIST
View File

@ -1,17 +1,13 @@
@comment $OpenBSD: PLIST,v 1.10 2001/09/27 16:52:40 brad Exp $
@pkgcfl pine-*
@pkgcfl pico-*
bin/pico
bin/pilot
@comment $OpenBSD: PLIST,v 1.11 2002/12/01 20:57:10 jakob Exp $
bin/pine
bin/pgpencrypt
bin/pgpdecode
bin/pgpsign
bin/rpdump
bin/rpload
man/man1/pico.1
man/man1/pilot.1
man/man1/pine.1
man/man1/rpdump.1
man/man1/rpload.1
share/doc/pine/tech-notes.txt
share/doc/pine/dot.pinerc.pgp.sample
@dirrm share/doc/pine

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

@ -1,4 +1,3 @@
@comment $OpenBSD: PLIST-pico,v 1.1 2000/09/03 17:20:34 espie Exp $
@pkgcfl pine+pico-*
@comment $OpenBSD: PLIST-pico,v 1.2 2002/12/01 20:57:10 jakob Exp $
bin/pico
man/man1/pico.1

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

@ -0,0 +1,3 @@
@comment $OpenBSD: PLIST-pilot,v 1.1 2002/12/01 20:57:10 jakob Exp $
bin/pilot
man/man1/pilot.1

14
mail/pine/pkg/PLIST-pine
View File

@ -1,14 +0,0 @@
@comment $OpenBSD: PLIST-pine,v 1.2 2001/09/27 16:52:40 brad Exp $
@pkgcfl pine+pico-*
bin/pilot
bin/pine
bin/pgpencrypt
bin/pgpdecode
bin/pgpsign
bin/rpdump
bin/rpload
man/man1/pilot.1
man/man1/pine.1
share/doc/pine/tech-notes.txt
share/doc/pine/dot.pinerc.pgp.sample
@dirrm share/doc/pine