update to c-client from pine 4.61. based on patch from Eduardo Alvarenga.
This commit is contained in:
jakob
parent
dad19ef41d
commit
da6b8fdd0e
@ -1,10 +1,9 @@
|
||||
# $tgId: obsd.ports,v 3.38 2002/11/27 19:37:23 tg Exp $
|
||||
# $OpenBSD: Makefile,v 1.29 2004/04/02 08:18:48 jakob Exp $
|
||||
# $OpenBSD: Makefile,v 1.30 2004/07/18 22:30:19 jakob Exp $
|
||||
|
||||
COMMENT= "University of Washington's c-client mail access routines"
|
||||
NO_REGRESS= Yes
|
||||
|
||||
VERSION= 4.58
|
||||
VERSION= 4.61
|
||||
DISTNAME= pine${VERSION}
|
||||
PKGNAME= c-client-${VERSION}
|
||||
CATEGORIES= mail devel
|
||||
@ -39,7 +38,7 @@ WRKDIST= ${WRKDIR}/${DISTNAME}/imap
|
||||
|
||||
HEADERS= c-client.h env.h env_unix.h flstring.h fs.h ftl.h imap4r1.h \
|
||||
linkage.c linkage.h mail.h misc.h nl.h nntp.h osdep.h \
|
||||
pop3.h rfc822.h smtp.h tcp.h utf8.h
|
||||
rfc822.h smtp.h tcp.h utf8.h
|
||||
|
||||
do-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/include/c-client
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (pine4.58.tar.gz) = 9fff1ca5fa2363f5684c144a9da4c7ef
|
||||
RMD160 (pine4.58.tar.gz) = 20573d54b99cad0bf57abeba322520de596902df
|
||||
SHA1 (pine4.58.tar.gz) = 1ebffc19fd4d58c0383c8d63bfa529559ab7c7d7
|
||||
MD5 (pine4.61.tar.gz) = 960e3e854f07fae5aaa9a40c4f887526
|
||||
RMD160 (pine4.61.tar.gz) = 3f4710c2dbf13b58c8a92be055a1bebcc132c6f3
|
||||
SHA1 (pine4.61.tar.gz) = b1563bcd46897c83eee6b1ec213ebc131f8bbccf
|
||||
|
||||
@ -1,7 +1,16 @@
|
||||
$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
|
||||
$OpenBSD: patch-Makefile,v 1.10 2004/07/18 22:30:19 jakob Exp $
|
||||
--- Makefile.orig Tue Apr 27 18:55:24 2004
|
||||
+++ Makefile Wed Jul 7 17:45:07 2004
|
||||
@@ -178,7 +178,7 @@ SSLTYPE=nopwd
|
||||
# 4 (default) IPv4 support only
|
||||
# 6 IPv6 and IPv4 support
|
||||
|
||||
-IP=4
|
||||
+IP=6
|
||||
|
||||
|
||||
# The following extra compilation flags are defined. None of these flags are
|
||||
@@ -270,7 +270,7 @@ BUILD=$(MAKE) build EXTRACFLAGS='$(EXTRA
|
||||
|
||||
# Make the IMAP Toolkit
|
||||
|
||||
@ -10,7 +19,7 @@ $OpenBSD: patch-Makefile,v 1.9 2004/04/02 08:18:48 jakob Exp $
|
||||
|
||||
c-client:
|
||||
@echo Not processed yet. In a first-time build, you must specify
|
||||
@@ -420,13 +420,7 @@ sslunix sslsco:
|
||||
@@ -442,13 +442,7 @@ sslunix sslsco:
|
||||
@echo ++ TLS/SSL encryption is supported
|
||||
@echo + Non-compliant:
|
||||
@echo ++ Unencrypted plaintext passwords are permitted
|
||||
@ -24,7 +33,7 @@ $OpenBSD: patch-Makefile,v 1.9 2004/04/02 08:18:48 jakob Exp $
|
||||
|
||||
sslnone:
|
||||
@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
@@ -462,7 +456,7 @@ an ua:
|
||||
@@ -484,7 +478,7 @@ an ua:
|
||||
$(TOOLS)/$@ "$(LN)" src/tmail tmail
|
||||
$(LN) $(TOOLS)/$@ .
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$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)
|
||||
$OpenBSD: patch-src_c-client_mail_c,v 1.3 2004/07/18 22:30:19 jakob Exp $
|
||||
--- src/c-client/mail.c.orig Wed Jul 7 17:12:16 2004
|
||||
+++ src/c-client/mail.c Wed Jul 7 17:11:58 2004
|
||||
@@ -3069,7 +3069,11 @@ void mail_dlog (char *string,long flag)
|
||||
{
|
||||
mm_dlog ((debugsensitive || !flag) ? string : "<suppressed>");
|
||||
}
|
||||
|
||||
@ -1,7 +1,13 @@
|
||||
$OpenBSD: patch-src_osdep_unix_Makefile,v 1.12 2004/06/09 07:25:26 pvalchev 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
|
||||
$OpenBSD: patch-src_osdep_unix_Makefile,v 1.13 2004/07/18 22:30:19 jakob Exp $
|
||||
--- src/osdep/unix/Makefile.orig Thu Apr 29 23:10:25 2004
|
||||
+++ src/osdep/unix/Makefile Wed Jul 7 17:49:39 2004
|
||||
@@ -24,13 +24,13 @@ EXTRAAUTHENTICATORS=
|
||||
EXTRADRIVERS=mbox
|
||||
PASSWDTYPE=std
|
||||
SSLTYPE=nopwd
|
||||
-IP=4
|
||||
+IP=6
|
||||
|
||||
|
||||
# Extended flags needed for SSL. You may need to modify.
|
||||
|
||||
@ -12,7 +18,7 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.12 2004/06/09 07:25:26 pvalchev Exp
|
||||
SSLKEYS=$(SSLCERTS)
|
||||
SSLINCLUDE=$(SSLDIR)/include
|
||||
SSLLIB=$(SSLDIR)/lib
|
||||
@@ -108,6 +108,7 @@ RANLIB=ranlib
|
||||
@@ -109,6 +109,7 @@ RANLIB=ranlib
|
||||
DEFAULTAUTHENTICATORS=md5 pla log
|
||||
DEFAULTDRIVERS=imap nntp pop3 mh mx mbx tenex mtx mmdf unix news phile
|
||||
|
||||
@ -20,15 +26,15 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.12 2004/06/09 07:25:26 pvalchev Exp
|
||||
|
||||
# Normally no need to change any of these
|
||||
|
||||
@@ -116,6 +117,7 @@ BINARIES=osdep.o mail.o misc.o newsrc.o
|
||||
@@ -117,6 +118,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
|
||||
unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
|
||||
+SOBINARIES=$(BINARIES:.o=.so)
|
||||
CFLAGS=-g
|
||||
|
||||
CAT=cat
|
||||
@@ -124,6 +126,11 @@ MV=mv
|
||||
@@ -125,6 +127,11 @@ MV=mv
|
||||
RM=rm -rf
|
||||
SH=sh
|
||||
|
||||
@ -40,7 +46,7 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.12 2004/06/09 07:25:26 pvalchev Exp
|
||||
|
||||
# Primary build command
|
||||
|
||||
@@ -235,7 +242,7 @@ bso: # OpenBSD
|
||||
@@ -236,7 +243,7 @@ bso: # OpenBSD
|
||||
SPOOLDIR=/var \
|
||||
ACTIVEFILE=/usr/local/news/lib/active \
|
||||
RSHPATH=/usr/bin/rsh \
|
||||
@ -49,7 +55,7 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.12 2004/06/09 07:25:26 pvalchev Exp
|
||||
|
||||
cvx: # Convex
|
||||
$(BUILD) `$(CAT) SPECIALS` OS=$@ \
|
||||
@@ -763,23 +770,33 @@ vu2: # VAX Ultrix 2.3, etc.
|
||||
@@ -786,23 +793,32 @@ vu2: # VAX Ultrix 2.3, etc.
|
||||
|
||||
# Build it!
|
||||
|
||||
@ -75,7 +81,6 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.12 2004/06/09 07:25:26 pvalchev Exp
|
||||
|
||||
+.c.so:
|
||||
+ `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $(PICFLAG) -DPIC $(@:.so=.c) -o $@
|
||||
+
|
||||
|
||||
# Cleanup
|
||||
|
||||
@ -85,16 +90,16 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.12 2004/06/09 07:25:26 pvalchev Exp
|
||||
|
||||
|
||||
# Dependencies
|
||||
@@ -813,7 +830,7 @@ utf8.o: mail.h misc.h osdep.h utf8.h
|
||||
@@ -835,7 +851,7 @@ utf8.o: mail.h misc.h osdep.h utf8.h
|
||||
|
||||
# OS-dependent
|
||||
|
||||
-osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
|
||||
+OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
|
||||
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 \
|
||||
osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c ip_unix.c\
|
||||
auths.c crexcl.c flocksim.c nfstest.c flcksafe.c fsync.c gethstid.c \
|
||||
@@ -826,12 +843,12 @@ osdep.o:mail.h misc.h env.h fs.h ftl.h n
|
||||
@@ -848,12 +864,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
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
$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 ()
|
||||
$OpenBSD: patch-src_osdep_unix_env_unix_c,v 1.2 2004/07/18 22:30:19 jakob Exp $
|
||||
--- src/osdep/unix/env_unix.c.orig Wed Jul 7 17:19:57 2004
|
||||
+++ src/osdep/unix/env_unix.c Wed Jul 7 17:20:32 2004
|
||||
@@ -797,15 +797,12 @@ char *myhomedir ()
|
||||
static char *mymailboxdir ()
|
||||
{
|
||||
char *home = myhomedir ();
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$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 @@
|
||||
$OpenBSD: patch-src_osdep_unix_kerb_mit_c,v 1.2 2004/07/18 22:30:19 jakob Exp $
|
||||
--- src/osdep/unix/kerb_mit.c.orig Wed Jul 7 17:20:47 2004
|
||||
+++ src/osdep/unix/kerb_mit.c Wed Jul 7 17:21:21 2004
|
||||
@@ -19,9 +19,13 @@
|
||||
*/
|
||||
|
||||
#define PROTOTYPE(x) x
|
||||
@ -11,7 +11,8 @@ $OpenBSD: patch-src_osdep_unix_kerb_mit_c,v 1.1 2004/04/02 08:18:48 jakob Exp $
|
||||
+#else
|
||||
#include <gssapi/gssapi_generic.h>
|
||||
#include <gssapi/gssapi_krb5.h>
|
||||
-
|
||||
+#endif
|
||||
|
||||
|
||||
long kerberos_server_valid (void);
|
||||
long kerberos_try_kinit (OM_uint32 error);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.5 2001/08/02 22:01:27 jakob Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.6 2004/07/18 22:30:20 jakob Exp $
|
||||
include/c-client/c-client.h
|
||||
include/c-client/env.h
|
||||
include/c-client/env_unix.h
|
||||
@ -13,7 +13,6 @@ include/c-client/misc.h
|
||||
include/c-client/nl.h
|
||||
include/c-client/nntp.h
|
||||
include/c-client/osdep.h
|
||||
include/c-client/pop3.h
|
||||
include/c-client/rfc822.h
|
||||
include/c-client/smtp.h
|
||||
include/c-client/tcp.h
|
||||
|
||||
Loading…
Reference in New Issue
Block a user