diff options
author | adam <adam@pkgsrc.org> | 2003-07-28 14:38:05 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2003-07-28 14:38:05 +0000 |
commit | 243468b0b10151d40151c5728932e3a409ff6fe8 (patch) | |
tree | 88c78749412731eda981651b518eae618a1b4791 /mail | |
parent | 9d1f374a55ee9aade43ddc96227680781563d2fc (diff) | |
download | pkgsrc-243468b0b10151d40151c5728932e3a409ff6fe8.tar.gz |
Changes:
imap-2002c is a minor release, released concurrently with Pine 4.55, and
contains primarily bugfixes. Programs written for imap-2002 will build
with this version without modification
imap-2002d is a minor release, released concurrently with Pine 4.56, and
contains primarily bugfixes. Programs written for imap-2002 should build
with this version without modification, with one exception. That exception
is the ngbogus envelope flag, which stopped being used in imap-2002c and is
now gone for good.
See RELNOTES for additional information
Diffstat (limited to 'mail')
-rw-r--r-- | mail/imap-uw/Makefile | 6 | ||||
-rw-r--r-- | mail/imap-uw/PLIST | 13 | ||||
-rw-r--r-- | mail/imap-uw/buildlink2.mk | 4 | ||||
-rw-r--r-- | mail/imap-uw/distinfo | 15 | ||||
-rw-r--r-- | mail/imap-uw/patches/patch-aa | 8 | ||||
-rw-r--r-- | mail/imap-uw/patches/patch-ab | 8 | ||||
-rw-r--r-- | mail/imap-uw/patches/patch-aj | 15 | ||||
-rw-r--r-- | mail/imap-uw/patches/patch-al | 56 |
8 files changed, 40 insertions, 85 deletions
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile index ef87ed50cae..6efe3bdb2f9 100644 --- a/mail/imap-uw/Makefile +++ b/mail/imap-uw/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.62 2003/07/17 21:46:15 grant Exp $ +# $NetBSD: Makefile,v 1.63 2003/07/28 14:38:05 adam Exp $ -DISTNAME= imap-2002b -PKGNAME= imap-uw-2002.2 +DISTNAME= imap-2002d +PKGNAME= imap-uw-2002.4 CATEGORIES= mail MASTER_SITES= ftp://ftp.cac.washington.edu/imap/ EXTRACT_SUFX= .tar.Z diff --git a/mail/imap-uw/PLIST b/mail/imap-uw/PLIST index bd157668276..dd41882c1c6 100644 --- a/mail/imap-uw/PLIST +++ b/mail/imap-uw/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2003/03/31 16:18:05 bouyer Exp $ +@comment $NetBSD: PLIST,v 1.5 2003/07/28 14:38:05 adam Exp $ include/c-client/c-client.h include/c-client/env.h include/c-client/env_unix.h @@ -51,12 +51,10 @@ share/doc/imap-uw/Y2K share/doc/imap-uw/bugs.txt share/doc/imap-uw/calendar.txt share/doc/imap-uw/commndmt.txt -share/doc/imap-uw/draft/imapbase.txt +share/doc/imap-uw/draft/compare.txt +share/doc/imap-uw/draft/i18n.txt share/doc/imap-uw/draft/sort.txt -share/doc/imap-uw/draft/thread.txt share/doc/imap-uw/draft/README -share/doc/imap-uw/draft/binary.txt -share/doc/imap-uw/draft/multapnd.txt share/doc/imap-uw/drivers.txt share/doc/imap-uw/formats.txt share/doc/imap-uw/imaprc.txt @@ -67,7 +65,6 @@ share/doc/imap-uw/naming.txt share/doc/imap-uw/rfc/rfc1731.txt share/doc/imap-uw/rfc/rfc1732.txt share/doc/imap-uw/rfc/rfc1733.txt -share/doc/imap-uw/rfc/rfc2060.txt share/doc/imap-uw/rfc/rfc2061.txt share/doc/imap-uw/rfc/rfc2062.txt share/doc/imap-uw/rfc/rfc2086.txt @@ -88,6 +85,10 @@ share/doc/imap-uw/rfc/rfc2595.txt share/doc/imap-uw/rfc/rfc2683.txt share/doc/imap-uw/rfc/rfc2971.txt share/doc/imap-uw/rfc/rfc3348.txt +share/doc/imap-uw/rfc/rfc3501.txt +share/doc/imap-uw/rfc/rfc3502.txt +share/doc/imap-uw/rfc/rfc3503.txt +share/doc/imap-uw/rfc/rfc3516.txt @dirrm share/doc/imap-uw/rfc @dirrm share/doc/imap-uw/draft @dirrm share/doc/imap-uw diff --git a/mail/imap-uw/buildlink2.mk b/mail/imap-uw/buildlink2.mk index 8d1959dae10..49c18610383 100644 --- a/mail/imap-uw/buildlink2.mk +++ b/mail/imap-uw/buildlink2.mk @@ -1,10 +1,10 @@ -# $NetBSD: buildlink2.mk,v 1.4 2003/01/23 07:37:16 martti Exp $ +# $NetBSD: buildlink2.mk,v 1.5 2003/07/28 14:38:05 adam Exp $ .if !defined(IMAP_UW_BUILDLINK2_MK) IMAP_UW_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= imap-uw -BUILDLINK_DEPENDS.imap-uw?= imap-uw>=2002.2 +BUILDLINK_DEPENDS.imap-uw?= imap-uw>=2002.4 BUILDLINK_PKGSRCDIR.imap-uw?= ../../mail/imap-uw EVAL_PREFIX+= BUILDLINK_PREFIX.imap-uw=imap-uw diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo index 4821a7fd3b7..557a3a0779f 100644 --- a/mail/imap-uw/distinfo +++ b/mail/imap-uw/distinfo @@ -1,13 +1,14 @@ -$NetBSD: distinfo,v 1.11 2003/04/10 14:56:21 fredb Exp $ +$NetBSD: distinfo,v 1.12 2003/07/28 14:38:05 adam Exp $ -SHA1 (imap-2002b.tar.Z) = c9ab145a8559670a6a994393d2b9614a5a1fde67 -Size (imap-2002b.tar.Z) = 2168106 bytes -SHA1 (patch-aa) = e9c0e8f2ded2fec60e507d0aace9a4f7e0af1820 -SHA1 (patch-ab) = 26f6385b145c7513091c91b01929a4709b75fcd4 +SHA1 (imap-2002d.tar.Z) = ec037715940f970c75f3f5fe892e9399b210281e +Size (imap-2002d.tar.Z) = 2155224 bytes +SHA1 (patch-aa) = 56b2c44cc02e658f85c56bd70229c7a0822891a0 +SHA1 (patch-ab) = 9ad48cbb090bfb7969be7349836d23f980d0888a SHA1 (patch-ac) = 8b4ea8c15929c65eda1b3444c68fdbf70fa68b6a SHA1 (patch-ad) = 3404de4e4acb456e3c7b34ca80b31b80b465b3e1 SHA1 (patch-ae) = 702473377ca66266bdb6d5d13045d279a38ea7de +SHA1 (patch-af) = 07e6b95a8aea0ea0ee6ccc20c1906ddf16ef6d61 SHA1 (patch-ai) = aaa778f60684c797cc53a109b8430fa05ec7f424 -SHA1 (patch-aj) = 5ce6d6b487e8f8535f7e22483796b6c01af9eb79 +SHA1 (patch-aj) = 0a728d3b5271c048275a4d41002877e86ac275b2 SHA1 (patch-ak) = a0a1a21ec22a92d086e665b263b51532207d0e3c -SHA1 (patch-al) = ea40f48394df229c03b028eb58d915b5dc5e162b +SHA1 (patch-al) = 25faa77e43754b6522e9562d7ebd388d9506bbfb diff --git a/mail/imap-uw/patches/patch-aa b/mail/imap-uw/patches/patch-aa index d004576cef9..89c8b992756 100644 --- a/mail/imap-uw/patches/patch-aa +++ b/mail/imap-uw/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.11 2002/12/11 12:21:23 tron Exp $ +$NetBSD: patch-aa,v 1.12 2003/07/28 14:38:05 adam Exp $ ---- Makefile.orig Tue Nov 5 01:19:13 2002 -+++ Makefile Wed Dec 11 12:21:53 2002 -@@ -396,9 +396,9 @@ +--- Makefile.orig 2003-07-28 14:34:21.000000000 +0200 ++++ Makefile 2003-07-28 14:34:21.000000000 +0200 +@@ -419,9 +419,9 @@ @echo + In order to rectify this problem, you MUST build with: @echo ++ SSLTYPE=$(SSLTYPE).nopwd @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/mail/imap-uw/patches/patch-ab b/mail/imap-uw/patches/patch-ab index 7cd6b5c7a72..a1ff56096e8 100644 --- a/mail/imap-uw/patches/patch-ab +++ b/mail/imap-uw/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.10 2003/01/23 01:25:11 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.11 2003/07/28 14:38:06 adam Exp $ ---- src/osdep/unix/Makefile.orig Wed Dec 11 12:15:02 2002 -+++ src/osdep/unix/Makefile Wed Dec 11 12:18:05 2002 +--- src/osdep/unix/Makefile.orig 2003-07-28 14:34:04.000000000 +0200 ++++ src/osdep/unix/Makefile 2003-07-28 14:34:38.000000000 +0200 @@ -28,8 +28,6 @@ # Extended flags needed for SSL. You may need to modify. @@ -61,7 +61,7 @@ $NetBSD: patch-ab,v 1.10 2003/01/23 01:25:11 dmcmahill Exp $ BASELDFLAGS="-lcrypt" nec: # NEC UX -@@ -876,7 +874,7 @@ +@@ -877,7 +875,7 @@ -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \ -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS diff --git a/mail/imap-uw/patches/patch-aj b/mail/imap-uw/patches/patch-aj index 46d45349e8f..66179ef4477 100644 --- a/mail/imap-uw/patches/patch-aj +++ b/mail/imap-uw/patches/patch-aj @@ -1,7 +1,7 @@ -$NetBSD: patch-aj,v 1.10 2003/04/10 14:56:21 fredb Exp $ +$NetBSD: patch-aj,v 1.11 2003/07/28 14:38:06 adam Exp $ ---- src/osdep/unix/Makefile.gss.orig Wed Oct 23 17:23:36 2002 -+++ src/osdep/unix/Makefile.gss Wed Oct 23 17:41:19 2002 +--- src/osdep/unix/Makefile.gss.orig 2003-07-28 15:34:51.000000000 +0200 ++++ src/osdep/unix/Makefile.gss 2003-07-28 15:37:26.000000000 +0200 @@ -20,12 +20,16 @@ # Extended flags needed for additional authenticators. You may need to modify. @@ -10,10 +10,6 @@ $NetBSD: patch-aj,v 1.10 2003/04/10 14:56:21 fredb Exp $ -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 -- --gss: # GSSAPI Kerberos V flags -- echo $(GSSCFLAGS) >> OSCFLAGS -- sh -c '(test -f $(GSSDIR)/lib/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' >> LDFLAGS +#GSSDIR=/usr/local +#GSSCFLAGS= -I$(GSSDIR)/include +#GSSOLDLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err @@ -22,8 +18,11 @@ $NetBSD: patch-aj,v 1.10 2003/04/10 14:56:21 fredb Exp $ +#gss: # GSSAPI Kerberos V flags +# echo $(GSSCFLAGS) >> OSCFLAGS +# sh -c '(test -f $(GSSDIR)/lib/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' >> LDFLAGS -+# +-gss: # GSSAPI Kerberos V flags +- echo $(GSSCFLAGS) >> OSCFLAGS +- sh -c '(test -f $(GSSDIR)/lib/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' >> LDFLAGS +gss: + echo "#include \"kerb_mit.c\"" >> auths.c + echo "-I/usr/include/krb5" >> OSCFLAGS + echo "-lgssapi -lkrb5 -lasn1 -lcrypto ${GSS_EXTRA_LDFLAGS} -lcom_err -lroken" >> LDFLAGS diff --git a/mail/imap-uw/patches/patch-al b/mail/imap-uw/patches/patch-al index 3c646f7c469..669f06f20d4 100644 --- a/mail/imap-uw/patches/patch-al +++ b/mail/imap-uw/patches/patch-al @@ -1,60 +1,14 @@ -$NetBSD: patch-al,v 1.2 2002/12/11 12:21:25 tron Exp $ +$NetBSD: patch-al,v 1.3 2003/07/28 14:38:06 adam Exp $ ---- src/c-client/auth_gss.c.orig Thu Nov 22 05:03:10 2001 -+++ src/c-client/auth_gss.c Wed Dec 11 12:13:50 2002 -@@ -18,9 +18,17 @@ +--- src/c-client/auth_gss.c.orig 2003-03-05 06:24:17.000000000 +0100 ++++ src/c-client/auth_gss.c 2003-07-28 15:40:16.000000000 +0200 +@@ -18,6 +18,9 @@ * CPYRIGHT, included with this Distribution. */ - + +#ifdef __NetBSD__ -+/* This is really Heimdal specific, but . . . */ +#include <gssapi/gssapi.h> -+#include <krb5/krb5.h> -+ -+#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE -+#else - #define PROTOTYPE(x) x - #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, -@@ -58,24 +66,28 @@ - krb5_context ctx; - krb5_keytab kt; - krb5_kt_cursor csr; -+ -+ /* make a context */ -+ if (krb5_init_context (&ctx)) -+ return NIL; - /* make service name */ - sprintf (tmp,"%s@%s",(char *) mail_parameters (NIL,GET_SERVICENAME,NIL), - mylocalhost ()); - buf.length = strlen (buf.value = tmp); - /* see if can build a name */ - if (gss_import_name (&smn,&buf,GSS_C_NT_HOSTBASED_SERVICE,&name) != -- GSS_S_COMPLETE) return NIL; -- /* make a context */ -- if (!krb5_init_context (&ctx)) { -+ GSS_S_COMPLETE) { -+ krb5_free_context (ctx); /* finished with context */ -+ return NIL; -+ } - /* get default keytab */ -- if (!krb5_kt_default (ctx,&kt)) { -- /* can do server if have good keytab */ -- if (!krb5_kt_start_seq_get (ctx,kt,&csr)) -+ if (!krb5_kt_default (ctx,&kt)) { -+ /* can do server if have good keytab */ -+ if (!krb5_kt_start_seq_get (ctx,kt,&csr)) - auth_gss.server = auth_gssapi_server; -- krb5_kt_close (ctx,kt); /* finished with keytab */ -- } -- krb5_free_context (ctx); /* finished with context */ -+ krb5_kt_close (ctx,kt); /* finished with keytab */ - } -+ krb5_free_context (ctx); /* finished with context */ - gss_release_name (&smn,&name);/* finished with name */ - return LONGT; - } |