update to c-client v4.50. mostly work by thorsten glaser.
This commit is contained in:
jakob
parent
e01485cc44
commit
66f66caf7f
@ -1,13 +1,15 @@
|
||||
# $OpenBSD: Makefile,v 1.24 2002/11/25 20:08:48 jakob Exp $
|
||||
# $tgId: obsd.ports,v 3.38 2002/11/27 19:37:23 tg Exp $
|
||||
# $OpenBSD: Makefile,v 1.25 2002/12/01 21:15:38 jakob Exp $
|
||||
|
||||
COMMENT= "University of Washington's c-client mail access routines"
|
||||
NO_REGRESS= Yes
|
||||
|
||||
VERSION= 4.44
|
||||
VERSION= 4.50
|
||||
DISTNAME= pine${VERSION}
|
||||
PKGNAME= c-client-${VERSION}
|
||||
CATEGORIES= mail devel
|
||||
MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \
|
||||
ftp://ftp.sunet.se/pub/unix/mail/pine/ \
|
||||
ftp://ftp.sunet.se/pub/unix/mail/pine/
|
||||
|
||||
HOMEPAGE= http://www.washington.edu/imap/
|
||||
|
||||
@ -25,8 +27,6 @@ MAKE_FLAGS= EXTRACFLAGS="${CFLAGS}" SHLIB="${SHLIB}" \
|
||||
SSLTYPE="unix" EXTRAAUTHENTICATORS="gss" \
|
||||
CC="${CC}"
|
||||
|
||||
NO_REGRESS= Yes
|
||||
|
||||
ALL_TARGET= bso
|
||||
|
||||
WRKDIST= ${WRKDIR}/${DISTNAME}/imap
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-Makefile,v 1.7 2001/11/19 01:56:13 brad Exp $
|
||||
--- Makefile.orig Tue Oct 23 00:48:10 2001
|
||||
+++ Makefile Sat Nov 17 19:11:39 2001
|
||||
@@ -253,7 +253,7 @@ BUILD=$(MAKE) build EXTRACFLAGS='$(EXTRA
|
||||
$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
|
||||
|
||||
# Make the IMAP Toolkit
|
||||
|
||||
@ -10,8 +10,22 @@ $OpenBSD: patch-Makefile,v 1.7 2001/11/19 01:56:13 brad Exp $
|
||||
|
||||
c-client:
|
||||
@echo Not processed yet. In a first-time build, you must specify
|
||||
@@ -374,7 +374,7 @@ an ua:
|
||||
$(TOOLS)/$@ "$(LN)" src/imapd imapd
|
||||
@@ -392,13 +392,7 @@ sslunix sslsco:
|
||||
@echo ++ TLS/SSL encryption is supported
|
||||
@echo + Non-compliant:
|
||||
@echo ++ Unencrypted plaintext passwords are permitted
|
||||
- @echo +
|
||||
- @echo + In order to rectify this problem, you MUST build with:
|
||||
- @echo ++ SSLTYPE=$(SSLTYPE).nopwd
|
||||
@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
- @echo
|
||||
- @echo Do you want to continue this build anyway? Type y or n please:
|
||||
- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac'
|
||||
|
||||
sslnone:
|
||||
@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
@@ -434,7 +428,7 @@ an ua:
|
||||
$(TOOLS)/$@ "$(LN)" src/tmail tmail
|
||||
$(LN) $(TOOLS)/$@ .
|
||||
|
||||
-build: OSTYPE rebuild rebuildclean bundled
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_c-client_auth_gss.c,v 1.2 2001/11/19 01:56:13 brad Exp $
|
||||
--- src/c-client/auth_gss.c.orig Fri Sep 28 21:16:11 2001
|
||||
+++ src/c-client/auth_gss.c Sat Nov 17 19:15:56 2001
|
||||
@@ -19,8 +19,19 @@
|
||||
$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
|
||||
@ -12,11 +12,6 @@ $OpenBSD: patch-src_c-client_auth_gss.c,v 1.2 2001/11/19 01:56:13 brad Exp $
|
||||
+#else
|
||||
#include <gssapi/gssapi_generic.h>
|
||||
#include <gssapi/gssapi_krb5.h>
|
||||
+#endif
|
||||
+
|
||||
+#ifdef HEIMDAL
|
||||
+#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE
|
||||
+#define KRB5_FCC_NOFILE KRB5_CC_NOTFOUND
|
||||
+#endif
|
||||
|
||||
long auth_gssapi_valid (void);
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_osdep_unix_Makefile,v 1.9 2001/11/27 15:10:00 brad Exp $
|
||||
--- src/osdep/unix/Makefile.orig Tue Nov 6 19:23:48 2001
|
||||
+++ src/osdep/unix/Makefile Tue Nov 27 07:05:26 2001
|
||||
@@ -28,8 +28,8 @@ SSLTYPE=none
|
||||
$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
|
||||
@@ -28,8 +28,8 @@ SSLTYPE=nopwd
|
||||
|
||||
# Extended flags needed for SSL. You may need to modify.
|
||||
|
||||
@ -20,7 +20,7 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.9 2001/11/27 15:10:00 brad Exp $
|
||||
|
||||
# Normally no need to change any of these
|
||||
|
||||
@@ -115,6 +116,7 @@ BINARIES=mail.o misc.o newsrc.o smanager
|
||||
@@ -115,6 +116,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
|
||||
@ -94,10 +94,15 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.9 2001/11/27 15:10:00 brad 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,7 +841,12 @@ osdep.o:mail.h misc.h env.h fs.h ftl.h n
|
||||
@@ -824,12 +841,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
|
||||
- @echo Building OS-dependent module
|
||||
- @echo If you get No such file error messages for files x509.h, ssl.h,
|
||||
- @echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL
|
||||
- @echo is not installed on your system. Either install OpenSSL first
|
||||
- @echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none
|
||||
- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
|
||||
+
|
||||
+osdep.o: $(OSDEPS)
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-src_osdep_unix_Makefile.gss,v 1.1 2001/09/27 16:28:09 brad Exp $
|
||||
--- src/osdep/unix/Makefile.gss.orig Tue Feb 6 17:28:53 2001
|
||||
+++ src/osdep/unix/Makefile.gss Wed Sep 26 23:49:57 2001
|
||||
@@ -21,11 +21,10 @@
|
||||
$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 @@
|
||||
# Extended flags needed for additional authenticators. You may need to modify.
|
||||
|
||||
GSSDIR=/usr/local
|
||||
-GSSCFLAGS= -I$(GSSDIR)/include
|
||||
-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
|
||||
@ -14,5 +14,5 @@ $OpenBSD: patch-src_osdep_unix_Makefile.gss,v 1.1 2001/09/27 16:28:09 brad Exp $
|
||||
gss: # GSSAPI Kerberos V flags
|
||||
echo $(GSSCFLAGS) >> OSCFLAGS
|
||||
- sh -c '(test -f $(GSSDIR)/lib/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' >> LDFLAGS
|
||||
-
|
||||
+ echo $(GSSLDFLAGS) >> LDFLAGS
|
||||
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
$OpenBSD: patch-src_osdep_unix_env_unix.c,v 1.5 2002/07/09 19:34:49 jakob Exp $
|
||||
|
||||
--- src/osdep/unix/env_unix.c.orig Thu Dec 21 01:12:13 2000
|
||||
+++ src/osdep/unix/env_unix.c Thu Jan 18 16:11:09 2001
|
||||
@@ -767,14 +767,12 @@
|
||||
$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 ();
|
||||
@ -16,8 +15,8 @@ $OpenBSD: patch-src_osdep_unix_env_unix.c,v 1.5 2002/07/09 19:34:49 jakob Exp $
|
||||
- }
|
||||
return myMailboxDir ? myMailboxDir : "";
|
||||
}
|
||||
|
||||
@@ -971,7 +971,8 @@ long dotlock_lock (char *file,DOTLOCK *b
|
||||
|
||||
@@ -1036,7 +1034,8 @@ long dotlock_lock (char *file,DOTLOCK *b
|
||||
}
|
||||
close (pi[0]); close (pi[1]);
|
||||
}
|
||||
@ -27,4 +26,3 @@ $OpenBSD: patch-src_osdep_unix_env_unix.c,v 1.5 2002/07/09 19:34:49 jakob Exp $
|
||||
sprintf (tmp,"Mailbox vulnerable - directory %.80s",base->lock);
|
||||
if (s = strrchr (tmp,'/')) *s = '\0';
|
||||
strcat (tmp," must have 1777 protection");
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user