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

move to imap-2004e. SSL keys moved to /etc/ssl/private as described in ssl(8)

Browse Source
This commit is contained in:
jakob 2005-07-29 17:30:10 +00:00
parent 40f1a400d1
commit 902be5c89e
8 changed files with 48 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/imap-uw/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.45 2005/04/10 18:23:51 jakob Exp $
# $OpenBSD: Makefile,v 1.46 2005/07/29 17:30:10 jakob Exp $
COMMENT= "University of Washington IMAP4rev1/POP2/POP3 mail servers"
COMMENT-mailutil= "University of Washington IMAP4rev1/POP2/POP3 mail utility"
VERSION= 2004.357p0
DISTNAME= imap-2004c1
VERSION= 2004.357p1
DISTNAME= imap-2004e
PKGNAME= imap-uw-${VERSION}
PKGNAME-mailutil= mailutil-uw-${VERSION}

8
mail/imap-uw/distinfo
View File

@ -1,4 +1,4 @@
MD5 (imap-2004c1.tar.Z) = f0a1a2abfa4b1ed8074ce023724416f3
RMD160 (imap-2004c1.tar.Z) = 1975a484d7553eb9208cc0feca3561ac357ea54b
SHA1 (imap-2004c1.tar.Z) = 47009504d409c41c5ea7f5e2e77178ef60282e3e
SIZE (imap-2004c1.tar.Z) = 2227092
MD5 (imap-2004e.tar.Z) = deee044b2dcaf6fe12dc545673906ac5
RMD160 (imap-2004e.tar.Z) = 76c8596fe1a9a830bbd60fdafafb13f9bac42cd9
SHA1 (imap-2004e.tar.Z) = 3c5cf83489dd8ac4c2cfd43370fcec85db7bc372
SIZE (imap-2004e.tar.Z) = 2219840

17
mail/imap-uw/patches/patch-Makefile
View File

@ -1,7 +1,16 @@
$OpenBSD: patch-Makefile,v 1.5 2003/10/05 22:00:00 jakob Exp $
--- Makefile.orig Tue Jul 15 03:17:18 2003
+++ Makefile Sun Oct 5 23:44:26 2003
@@ -425,8 +425,6 @@ sslunix sslsco:
$OpenBSD: patch-Makefile,v 1.6 2005/07/29 17:30:11 jakob Exp $
--- Makefile.orig Sat Apr 30 22:50:20 2005
+++ Makefile Fri Jul 29 09:26:33 2005
@@ -311,7 +311,7 @@ aos art asv aux bsd cvx dpx dyn isc pyr
bsf bso: an
$(BUILD) BUILDTYPE=$@ \
- SPECIALS="GSSDIR=/usr SSLDIR=/usr SSLINCLUDE=/usr/include/openssl SSLCERTS=/etc/ssl/certs SSLKEYS=/etc/ssl/private LOCKPGM=/usr/sbin/mlock"
+ SPECIALS="GSSDIR=/usr SSLDIR=/usr SSLINCLUDE=/usr/include/openssl SSLCERTS=/etc/ssl SSLKEYS=/etc/ssl/private LOCKPGM=/usr/sbin/mlock"
cyg: an
$(BUILD) BUILDTYPE=cyg \
@@ -475,8 +475,6 @@ sslunix sslsco:
@echo ++ SSLTYPE=$(SSLTYPE).nopwd
@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@echo

8
mail/imap-uw/patches/patch-imapd.8
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-imapd.8,v 1.1 2004/07/18 22:19:03 jakob Exp $
$OpenBSD: patch-imapd.8,v 1.2 2005/07/29 17:30:11 jakob Exp $
--- src/imapd/imapd.8.orig Tue Jul 15 02:54:11 2003
+++ src/imapd/imapd.8 Sun Oct 5 23:44:26 2003
--- src/imapd/imapd.8.orig Tue May 18 19:46:54 2004
+++ src/imapd/imapd.8 Fri Jul 29 09:17:44 2005
@@ -1,9 +1,9 @@
-.TH IMAPD 8C "July 14, 2003"
-.TH IMAPD 8 "May 18, 2004"
+.TH IMAPD 8 "October 12, 1998"
.UC 5
.SH NAME

10
mail/imap-uw/patches/patch-ipopd.8
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-ipopd.8,v 1.1 2004/07/18 22:19:03 jakob Exp $
$OpenBSD: patch-ipopd.8,v 1.2 2005/07/29 17:30:11 jakob Exp $
--- src/ipopd/ipopd.8.orig Tue Jul 15 02:54:25 2003
+++ src/ipopd/ipopd.8 Sun Oct 5 23:44:26 2003
--- src/ipopd/ipopd.8.orig Tue May 18 19:50:05 2004
+++ src/ipopd/ipopd.8 Fri Jul 29 09:17:44 2005
@@ -1,11 +1,11 @@
-.TH IPOPD 8C "July 14, 2003"
-.TH IPOPD 8 "May 18, 2004"
+.TH IPOPD 8 "January 16, 1992"
.UC 5
.SH NAME
@ -15,5 +15,5 @@ $OpenBSD: patch-ipopd.8,v 1.1 2004/07/18 22:19:03 jakob Exp $
-.B /usr/etc/ipop3d
+.B ipop3d
.SH DESCRIPTION
.I IPOP2d
.I ipop2d
and

25
mail/imap-uw/patches/patch-src_osdep_unix_Makefile
View File

@ -1,24 +1,23 @@
$OpenBSD: patch-src_osdep_unix_Makefile,v 1.5 2003/10/05 22:00:00 jakob Exp $
$OpenBSD: patch-src_osdep_unix_Makefile,v 1.6 2005/07/29 17:30:11 jakob Exp $
--- src/osdep/unix/Makefile.orig Tue Jul 15 03:24:24 2003
+++ src/osdep/unix/Makefile Sun Oct 5 23:45:11 2003
@@ -28,8 +28,8 @@ SSLTYPE=nopwd
--- src/osdep/unix/Makefile.orig Sat Apr 30 22:51:13 2005
+++ src/osdep/unix/Makefile Fri Jul 29 19:27:10 2005
@@ -36,14 +36,14 @@ IP=4
# -O3 seems to be safe, but empirical observation from our local expert
# indicates that in some (many?) cases -O3 code runs slower than -O2.
-GCCOPTLEVEL= -O2
+GCCOPTLEVEL=
# Extended flags needed for SSL. You may need to modify.
-SSLDIR=/usr/local/ssl
-SSLCERTS=$(SSLDIR)/certs
-SSLKEYS=$(SSLCERTS)
+SSLDIR=/usr
+SSLCERTS=/etc/ssl
SSLKEYS=$(SSLCERTS)
+SSLKEYS=$(SSLCERTS)/private
SSLINCLUDE=$(SSLDIR)/include
SSLLIB=$(SSLDIR)/lib
@@ -235,7 +235,7 @@ bso: # OpenBSD
SPOOLDIR=/var \
ACTIVEFILE=/usr/local/news/lib/active \
RSHPATH=/usr/bin/rsh \
- BASECFLAGS="-O2 -pipe"
+ BASECFLAGS="-pipe"
cvx: # Convex
$(BUILD) `$(CAT) SPECIALS` OS=$@ \

8
mail/imap-uw/patches/patch-src_osdep_unix_env_unix.c
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_osdep_unix_env_unix.c,v 1.5 2003/10/05 22:00:00 jakob Exp $
$OpenBSD: patch-src_osdep_unix_env_unix.c,v 1.6 2005/07/29 17:30:11 jakob Exp $
--- src/osdep/unix/env_unix.c.orig Tue Jul 15 03:30:00 2003
+++ src/osdep/unix/env_unix.c Sun Oct 5 23:44:26 2003
@@ -799,15 +799,12 @@ char *myhomedir ()
--- src/osdep/unix/env_unix.c.orig Mon Sep 13 23:31:19 2004
+++ src/osdep/unix/env_unix.c Fri Jul 29 09:17:44 2005
@@ -809,15 +809,12 @@ char *myhomedir ()
static char *mymailboxdir ()
{
char *home = myhomedir ();

5
mail/imap-uw/pkg/MESSAGE
View File

@ -17,6 +17,7 @@ To use SSL as default transport you need to add the lines below to
imaps stream tcp nowait root ${PREFIX}/libexec/imapd imapd
imaps stream tcp6 nowait root ${PREFIX}/libexec/imapd imapd
You also need to install files containing an RSA certificate and private key
to /etc/ssl/ipop3d.pem and /etc/ssl/imapd.pem. See ssl(8) for how to do this.
You also need to install files containing RSA certificates to
/etc/ssl/{imapd,ipop3d}.pem and files containing the corresponding private
keys to /etc/ssl/private/{imapd,ipop3d}.pem. See ssl(8) for how to do this.