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

sync c-client with pine v4.58

Browse Source
This commit is contained in:
jakob 2004-04-02 08:18:48 +00:00
parent fe1fb36ad6
commit d07f8e2cb2
11 changed files with 71 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/c-client/Makefile
View File

@ -1,10 +1,10 @@
# $tgId: obsd.ports,v 3.38 2002/11/27 19:37:23 tg Exp $
# $OpenBSD: Makefile,v 1.28 2003/06/15 21:41:16 jakob Exp $
# $OpenBSD: Makefile,v 1.29 2004/04/02 08:18:48 jakob Exp $
COMMENT= "University of Washington's c-client mail access routines"
NO_REGRESS= Yes
VERSION= 4.53
VERSION= 4.58
DISTNAME= pine${VERSION}
PKGNAME= c-client-${VERSION}
CATEGORIES= mail devel

6
mail/c-client/distinfo
View File

@ -1,3 +1,3 @@
MD5 (pine4.53.tar.gz) = 17d2ae323d6012e69c33cf0168dff59b
RMD160 (pine4.53.tar.gz) = 7ca5a1ec8491103bbd18b46a49d6b99be60b6d9c
SHA1 (pine4.53.tar.gz) = 2cf0ab8268a2294c608e099ef0caad7c915e2d5e
MD5 (pine4.58.tar.gz) = 9fff1ca5fa2363f5684c144a9da4c7ef
RMD160 (pine4.58.tar.gz) = 20573d54b99cad0bf57abeba322520de596902df
SHA1 (pine4.58.tar.gz) = 1ebffc19fd4d58c0383c8d63bfa529559ab7c7d7

12
mail/c-client/patches/patch-Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.8 2002/12/01 21:15:38 jakob Exp $
--- Makefile.orig Tue Nov 5 00:20:44 2002
+++ Makefile Mon Nov 25 20:24:53 2002
@@ -256,7 +256,7 @@ BUILD=$(MAKE) build EXTRACFLAGS='$(EXTRA
$OpenBSD: patch-Makefile,v 1.9 2004/04/02 08:18:48 jakob Exp $
--- Makefile.orig 2003-07-15 03:35:29.000000000 +0200
+++ Makefile 2004-04-01 15:01:19.000000000 +0200
@@ -257,7 +257,7 @@ BUILD=$(MAKE) build EXTRACFLAGS='$(EXTRA
# Make the IMAP Toolkit
@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile,v 1.8 2002/12/01 21:15:38 jakob Exp $
c-client:
@echo Not processed yet. In a first-time build, you must specify
@@ -392,13 +392,7 @@ sslunix sslsco:
@@ -420,13 +420,7 @@ sslunix sslsco:
@echo ++ TLS/SSL encryption is supported
@echo + Non-compliant:
@echo ++ Unencrypted plaintext passwords are permitted
@ -24,7 +24,7 @@ $OpenBSD: patch-Makefile,v 1.8 2002/12/01 21:15:38 jakob Exp $
sslnone:
@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -434,7 +428,7 @@ an ua:
@@ -462,7 +456,7 @@ an ua:
$(TOOLS)/$@ "$(LN)" src/tmail tmail
$(LN) $(TOOLS)/$@ .

18
mail/c-client/patches/patch-src_c-client_auth_gss.c
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-src_c-client_auth_gss.c,v 1.3 2002/12/01 21:15:38 jakob Exp $
--- src/c-client/auth_gss.c.orig Thu Nov 22 05:07:04 2001
+++ src/c-client/auth_gss.c Sun Dec 1 14:47:24 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,

8
mail/c-client/patches/patch-src_c-client_mail_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_c-client_mail_c,v 1.1 2003/06/20 13:41:02 henning Exp $
--- src/c-client/mail.c.orig Fri Jan 3 02:28:20 2003
+++ src/c-client/mail.c Fri Jun 20 15:31:10 2003
@@ -2798,7 +2798,11 @@ void mail_dlog (char *string,long flag)
$OpenBSD: patch-src_c-client_mail_c,v 1.2 2004/04/02 08:18:48 jakob Exp $
--- src/c-client/mail.c.orig 2003-09-09 19:18:53.000000000 +0200
+++ src/c-client/mail.c 2004-04-02 09:57:05.000000000 +0200
@@ -2970,7 +2970,11 @@ void mail_dlog (char *string,long flag)
{
mm_dlog ((debugsensitive || !flag) ? string : "<suppressed>");
}

22
mail/c-client/patches/patch-src_osdep_unix_Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_osdep_unix_Makefile,v 1.10 2002/12/01 21:15:38 jakob Exp $
--- src/osdep/unix/Makefile.orig Tue Oct 15 02:44:49 2002
+++ src/osdep/unix/Makefile Sun Dec 1 14:45:09 2002
$OpenBSD: patch-src_osdep_unix_Makefile,v 1.11 2004/04/02 08:18:48 jakob Exp $
--- src/osdep/unix/Makefile.orig 2003-07-15 03:35:30.000000000 +0200
+++ src/osdep/unix/Makefile 2004-04-02 09:58:52.000000000 +0200
@@ -28,8 +28,8 @@ SSLTYPE=nopwd
# Extended flags needed for SSL. You may need to modify.
@ -9,10 +9,10 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.10 2002/12/01 21:15:38 jakob Exp $
-SSLCERTS=$(SSLDIR)/certs
+SSLDIR=/usr
+SSLCERTS=/etc/ssl
SSLKEYS=$(SSLCERTS)
SSLINCLUDE=$(SSLDIR)/include
SSLLIB=$(SSLDIR)/lib
@@ -107,6 +107,7 @@ RANLIB=ranlib
@@ -108,6 +108,7 @@ RANLIB=ranlib
DEFAULTAUTHENTICATORS=md5 pla log
DEFAULTDRIVERS=imap nntp pop3 mh mx mbx tenex mtx mmdf unix news phile
@ -20,7 +20,7 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.10 2002/12/01 21:15:38 jakob Exp $
# Normally no need to change any of these
@@ -115,6 +116,7 @@ BINARIES=osdep.o mail.o misc.o newsrc.o
@@ -116,6 +117,7 @@ BINARIES=osdep.o mail.o misc.o newsrc.o
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
@ -28,7 +28,7 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.10 2002/12/01 21:15:38 jakob Exp $
CFLAGS=-g
CAT=cat
@@ -123,6 +125,11 @@ MV=mv
@@ -124,6 +126,11 @@ MV=mv
RM=rm -rf
SH=sh
@ -40,7 +40,7 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.10 2002/12/01 21:15:38 jakob Exp $
# Primary build command
@@ -234,7 +241,7 @@ bso: # OpenBSD
@@ -235,7 +242,7 @@ bso: # OpenBSD
SPOOLDIR=/var \
ACTIVEFILE=/usr/local/news/lib/active \
RSHPATH=/usr/bin/rsh \
@ -49,7 +49,7 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.10 2002/12/01 21:15:38 jakob Exp $
cvx: # Convex
$(BUILD) `$(CAT) SPECIALS` OS=$@ \
@@ -762,23 +769,33 @@ vu2: # VAX Ultrix 2.3, etc.
@@ -763,23 +770,33 @@ vu2: # VAX Ultrix 2.3, etc.
# Build it!
@ -85,7 +85,7 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.10 2002/12/01 21:15:38 jakob Exp $
# Dependencies
@@ -812,7 +829,7 @@ utf8.o: mail.h misc.h osdep.h utf8.h
@@ -813,7 +830,7 @@ utf8.o: mail.h misc.h osdep.h utf8.h
# OS-dependent
@ -94,7 +94,7 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.10 2002/12/01 21:15:38 jakob Exp $
osdep.h env_unix.h tcp_unix.h \
osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c \
auths.c crexcl.c flocksim.c nfstest.c flcksafe.c fsync.c gethstid.c \
@@ -824,12 +841,12 @@ osdep.o:mail.h misc.h env.h fs.h ftl.h n
@@ -826,12 +843,12 @@ osdep.o:mail.h misc.h env.h fs.h ftl.h n
write.c sslstdio.c \
strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
OSCFLAGS

12
mail/c-client/patches/patch-src_osdep_unix_Makefile.gss
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_osdep_unix_Makefile.gss,v 1.2 2002/12/01 21:15:38 jakob Exp $
--- src/osdep/unix/Makefile.gss.orig Thu Nov 22 04:08:21 2001
+++ src/osdep/unix/Makefile.gss Mon Nov 25 20:21:19 2002
@@ -21,11 +21,9 @@
$OpenBSD: patch-src_osdep_unix_Makefile.gss,v 1.3 2004/04/02 08:18:48 jakob Exp $
--- src/osdep/unix/Makefile.gss.orig Wed Mar 5 00:26:40 2003
+++ 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
@ -9,10 +9,10 @@ $OpenBSD: patch-src_osdep_unix_Makefile.gss,v 1.2 2002/12/01 21:15:38 jakob Exp
-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=
+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

28
mail/c-client/patches/patch-src_osdep_unix_env_unix.c
View File

@ -1,28 +0,0 @@
$OpenBSD: patch-src_osdep_unix_env_unix.c,v 1.6 2002/12/01 21:15:38 jakob Exp $
--- src/osdep/unix/env_unix.c.orig Wed Oct 30 18:06:12 2002
+++ src/osdep/unix/env_unix.c Mon Nov 25 20:06:58 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");

20
mail/c-client/patches/patch-src_osdep_unix_env_unix_c Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-src_osdep_unix_env_unix_c,v 1.1 2004/04/02 08:18:48 jakob Exp $
--- src/osdep/unix/env_unix.c.orig Tue Jul 15 03:35:30 2003
+++ src/osdep/unix/env_unix.c Sat Sep 20 00:08:13 2003
@@ -799,15 +799,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 : "";
}

17
mail/c-client/patches/patch-src_osdep_unix_kerb_mit_c Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-src_osdep_unix_kerb_mit_c,v 1.1 2004/04/02 08:18:48 jakob Exp $
--- src/osdep/unix/kerb_mit.c.orig Thu Apr 17 09:29:01 2003
+++ 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);

4
mail/c-client/pkg/PFRAG.shared
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2000/09/15 09:44:12 brad Exp $
@comment $OpenBSD: PFRAG.shared,v 1.2 2004/04/02 08:18:48 jakob Exp $
lib/${SHLIB}
DYNLIBDIR(%B)
DYNLIBDIR(%D/lib)