diff options
author | thorpej <thorpej@pkgsrc.org> | 2005-03-06 17:03:06 +0000 |
---|---|---|
committer | thorpej <thorpej@pkgsrc.org> | 2005-03-06 17:03:06 +0000 |
commit | 0b9ad806b268c6bf20e20eab6b8e86423d5191a5 (patch) | |
tree | de80d19b42c62c7f200fa89518e0a090692e0b2d /mail/imap-uw | |
parent | d6917246eeea435ad6f8d35d90d994e1601787c5 (diff) | |
download | pkgsrc-0b9ad806b268c6bf20e20eab6b8e86423d5191a5.tar.gz |
Use the SSLKEYS variable to determine the location of the certificate
private key. Bump package revision to 2.
Diffstat (limited to 'mail/imap-uw')
-rw-r--r-- | mail/imap-uw/MESSAGE | 9 | ||||
-rw-r--r-- | mail/imap-uw/Makefile | 6 | ||||
-rw-r--r-- | mail/imap-uw/distinfo | 4 | ||||
-rw-r--r-- | mail/imap-uw/patches/patch-ab | 21 |
4 files changed, 21 insertions, 19 deletions
diff --git a/mail/imap-uw/MESSAGE b/mail/imap-uw/MESSAGE index 84036930dc9..d8d1951415e 100644 --- a/mail/imap-uw/MESSAGE +++ b/mail/imap-uw/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.2 2003/09/16 19:16:44 jmmv Exp $ +$NetBSD: MESSAGE,v 1.3 2005/03/06 17:03:06 thorpej Exp $ Add the following to /etc/services (if not already there): @@ -19,9 +19,10 @@ Add the following to /etc/inetd.conf: pop3s stream tcp nowait root ${PREFIX}/libexec/ipop3d ipop3d In order to use SSL, you will need to configure a certificate and store it -in the ${SSLCERTS} directory, using the imapd.pem name. -If you want to use an existing certificate, say from Apache, just copy it -there (you may need to concatenate .key and .crt files together). +in the ${SSLCERTS} directory, using the imapd.pem name. Place the key for +the certificate in the ${SSLKEYS} directory, also using the imapd.pem name. +If you want to use an existing certificate, say from Apache, just copy the +certificate and key files to the appropriate locations. To put the changes into effect, make inetd reload its configuration: On NetBSD 1.5 or later: diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile index a6a2ddbfbb5..6a4b5312b7b 100644 --- a/mail/imap-uw/Makefile +++ b/mail/imap-uw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.90 2005/03/05 22:01:47 adrianp Exp $ +# $NetBSD: Makefile,v 1.91 2005/03/06 17:03:06 thorpej Exp $ # ATTENTION: # The Kerberos support in this software is known to be problematic. If you # upgrade this package you *must* test it on a system with Kerberos libraries @@ -6,7 +6,7 @@ DISTNAME= imap-2004c1 PKGNAME= imap-uw-2004c1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail MASTER_SITES= ftp://ftp.cac.washington.edu/imap/ EXTRACT_SUFX= .tar.Z @@ -70,6 +70,7 @@ CCLIENT_MFILES= src/imapd/Makefile \ src/osdep/unix/Makefile MESSAGE_SUBST+= SSLCERTS="${SSLCERTS}" +MESSAGE_SUBST+= SSLKEYS="${SSLKEYS}" PLIST_SUBST+= CCLIENT_MAJOR="${CCLIENT_MAJOR}" PLIST_SUBST+= CCLIENT_MINOR="${CCLIENT_MINOR}" @@ -77,6 +78,7 @@ MANFILES= src/imapd/imapd.8 src/ipopd/ipopd.8 MAKE_ENV+= SSLDIR=${SSLBASE:Q} MAKE_ENV+= SSLCERTS=${SSLCERTS:Q} +MAKE_ENV+= SSLKEYS=${SSLKEYS:Q} MAKE_ENV+= CCLIENT_MAJOR=${CCLIENT_MAJOR:Q} MAKE_ENV+= CCLIENT_MINOR=${CCLIENT_MINOR:Q} MAKE_ENV+= CREATEPROTO=${IMAP_UW_CCLIENT_MBOX_FMT:Q}proto diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo index 45f7918221e..f042206bb55 100644 --- a/mail/imap-uw/distinfo +++ b/mail/imap-uw/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.20 2005/02/24 09:59:23 agc Exp $ +$NetBSD: distinfo,v 1.21 2005/03/06 17:03:06 thorpej Exp $ SHA1 (imap-2004c1.tar.Z) = 47009504d409c41c5ea7f5e2e77178ef60282e3e RMD160 (imap-2004c1.tar.Z) = 1975a484d7553eb9208cc0feca3561ac357ea54b Size (imap-2004c1.tar.Z) = 2227092 bytes SHA1 (patch-aa) = 2109d076b1f50ca461b2b2a00ee927207a64f766 -SHA1 (patch-ab) = 76af6b8772962e77925da19902285aabcebc7d76 +SHA1 (patch-ab) = 6fff315c4b61b11ed9c7cf5964bf198dc72783f7 SHA1 (patch-ac) = 8b4ea8c15929c65eda1b3444c68fdbf70fa68b6a SHA1 (patch-ad) = 3404de4e4acb456e3c7b34ca80b31b80b465b3e1 SHA1 (patch-ae) = 702473377ca66266bdb6d5d13045d279a38ea7de diff --git a/mail/imap-uw/patches/patch-ab b/mail/imap-uw/patches/patch-ab index b7258b5ec23..746ad1dd6e8 100644 --- a/mail/imap-uw/patches/patch-ab +++ b/mail/imap-uw/patches/patch-ab @@ -1,17 +1,16 @@ -$NetBSD: patch-ab,v 1.14 2004/08/12 12:13:54 adam Exp $ - ---- src/osdep/unix/Makefile.orig 2004-08-12 13:26:38.000000000 +0000 -+++ src/osdep/unix/Makefile -@@ -29,8 +29,6 @@ IP=4 +--- src/osdep/unix/Makefile.orig 2005-03-06 08:53:53.000000000 -0800 ++++ src/osdep/unix/Makefile 2005-03-06 08:56:06.000000000 -0800 +@@ -29,9 +29,6 @@ # Extended flags needed for SSL. You may need to modify. -SSLDIR=/usr/local/ssl -SSLCERTS=$(SSLDIR)/certs - SSLKEYS=$(SSLCERTS) +-SSLKEYS=$(SSLCERTS) SSLINCLUDE=$(SSLDIR)/include SSLLIB=$(SSLDIR)/lib -@@ -48,7 +46,7 @@ SSLRSA= # -lRSAglue -lrsaref + +@@ -48,7 +45,7 @@ SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\ -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\" -DSSL_KEY_DIRECTORY=\"$(SSLKEYS)\" @@ -20,7 +19,7 @@ $NetBSD: patch-ab,v 1.14 2004/08/12 12:13:54 adam Exp $ # Extended flags needed for non-standard passwd types. You may need to modify. -@@ -92,14 +90,14 @@ LOCKPGM=/etc/mlock +@@ -92,14 +89,14 @@ # set certain other formats (e.g. mbx and mx) as the EMPTYPROTO since these # formats can never be empty files. @@ -37,7 +36,7 @@ $NetBSD: patch-ab,v 1.14 2004/08/12 12:13:54 adam Exp $ LN=ln -s RANLIB=ranlib -@@ -391,9 +389,9 @@ gso: os_sol.h # GCC Solaris +@@ -391,9 +388,9 @@ SPOOLDIR=/var/spool MAILSPOOL=/var/mail \ ACTIVEFILE=/usr/share/news/active \ RSHPATH=/usr/bin/rsh \ @@ -49,7 +48,7 @@ $NetBSD: patch-ab,v 1.14 2004/08/12 12:13:54 adam Exp $ gsu: # GCC SUN-OS $(BUILD) `$(CAT) SPECIALS` OS=sun \ -@@ -483,9 +481,9 @@ neb: # NetBSD +@@ -483,9 +480,9 @@ $(BUILD) `$(CAT) SPECIALS` OS=bsi \ CRXTYPE=nfs \ SPOOLDIR=/var \ @@ -61,7 +60,7 @@ $NetBSD: patch-ab,v 1.14 2004/08/12 12:13:54 adam Exp $ BASELDFLAGS="-lcrypt" nec: # NEC UX -@@ -911,7 +909,7 @@ onceenv: +@@ -911,7 +908,7 @@ -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \ -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS |