From 956473f5963c339e5e2e05d57f7298c2a2c6c521 Mon Sep 17 00:00:00 2001 From: amateja Date: Sun, 24 May 2009 10:31:16 +0000 Subject: [PATCH] - adjusted for 4.5.0 Changed files: courier-imap-certsdir.patch -> 1.5 --- courier-imap-certsdir.patch | 104 ++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/courier-imap-certsdir.patch b/courier-imap-certsdir.patch index a0984ba..5a8a214 100644 --- a/courier-imap-certsdir.patch +++ b/courier-imap-certsdir.patch @@ -56,44 +56,44 @@ diff -urN courier-imap-4.3.0.orig/imap/mkimapdcert.8.in courier-imap-4.3.0/imap/ @@ -21,18 +21,18 @@ .SH "DESCRIPTION" .PP - IMAP over SSL requires a valid, signed, X.509 certificate. The default location for the certificate file is --\fI@datadir@/imapd.pem\fR. -+\fI@certsdir@/imapd.pem\fR. + IMAP over SSL requires a valid, signed, X\.509 certificate\. The default location for the certificate file is +-\fI@datadir@/imapd\.pem\fR\. ++\fI@certsdir@/imapd\.pem\fR\. \fBmkimapdcert\fR - generates a self\-signed X.509 certificate, mainly for testing. For production use the X.509 certificate must be signed by a recognized certificate authority, in order for mail clients to accept the certificate. + generates a self\-signed X\.509 certificate, mainly for testing\. For production use the X\.509 certificate must be signed by a recognized certificate authority, in order for mail clients to accept the certificate\. .PP - --\fI@datadir@/imapd.pem\fR -+\fI@certsdir@/imapd.pem\fR - must be owned by the @mailuser@ user and have no group or world permissions. The + +-\fI@datadir@/imapd\.pem\fR ++\fI@certsdir@/imapd\.pem\fR + must be owned by the @mailuser@ user and have no group or world permissions\. The \fBmkimapdcert\fR - command will enforce this. To prevent an unfortunate accident, + command will enforce this\. To prevent an unfortunate accident, \fBmkimapdcert\fR will not work if --\fB@datadir@/imapd.pem\fR -+\fB@certsdir@/imapd.pem\fR - already exists. +-\fB@datadir@/imapd\.pem\fR ++\fB@certsdir@/imapd\.pem\fR + already exists\. .PP - + @@ -42,7 +42,7 @@ - to be installed. + to be installed\. .SH "FILES" .PP --@datadir@/imapd.pem -+@certsdir@/imapd.pem +-@datadir@/imapd\.pem ++@certsdir@/imapd\.pem .RS 4 - X.509 certificate. + X\.509 certificate\. .RE diff -urN courier-imap-4.3.0.orig/imap/mkimapdcert.html.in courier-imap-4.3.0/imap/mkimapdcert.html.in --- courier-imap-4.3.0.orig/imap/mkimapdcert.html.in 2007-04-22 17:33:32.000000000 +0200 +++ courier-imap-4.3.0/imap/mkimapdcert.html.in 2008-01-19 19:54:30.834337552 +0100 @@ -7,22 +7,22 @@ - -->

Name

mkimapdcert — create a test SSL certificate for IMAP over SSL

Synopsis

@sbindir@/mkimapdcert

DESCRIPTION

+ -->

Name

mkimapdcert â~@~T create a test SSL certificate for IMAP over SSL

Synopsis

@sbindir@/mkimapdcert

DESCRIPTION

IMAP over SSL requires a valid, signed, X.509 certificate. The default location for the certificate file is -@datadir@/imapd.pem. +@certsdir@/imapd.pem. - mkimapdcert generates a self-signed X.509 certificate, + mkimapdcert generates a self-signed X.509 certificate, mainly for testing. For production use the X.509 certificate must be signed by a @@ -103,14 +103,14 @@ diff -urN courier-imap-4.3.0.orig/imap/mkimapdcert.html.in courier-imap-4.3.0/im +@certsdir@/imapd.pem must be owned by the @mailuser@ user and have no group or world permissions. - The mkimapdcert command will + The mkimapdcert command will enforce this. To prevent an unfortunate accident, - mkimapdcert --will not work if @datadir@/imapd.pem already exists.

-+will not work if @certsdir@/imapd.pem already exists.

- mkimapdcert requires --OpenSSL to be installed.

FILES

@datadir@/imapd.pem
-+OpenSSL to be installed.

FILES

@certsdir@/imapd.pem
+ mkimapdcert +-will not work if @datadir@/imapd.pem already exists.

++will not work if @certsdir@/imapd.pem already exists.

+ mkimapdcert requires +-OpenSSL to be installed.

FILES

@datadir@/imapd.pem
++OpenSSL to be installed.

FILES

@certsdir@/imapd.pem
X.509 certificate.
@sysconfdir@/imapd.cnf
Parameters used by OpenSSL to @@ -184,44 +184,44 @@ diff -urN courier-imap-4.3.0.orig/imap/mkpop3dcert.8.in courier-imap-4.3.0/imap/ @@ -21,18 +21,18 @@ .SH "DESCRIPTION" .PP - POP3 over SSL requires a valid, signed, X.509 certificate. The default location for the certificate file is --\fI@datadir@/pop3d.pem\fR. -+\fI@certsdir@/pop3d.pem\fR. + POP3 over SSL requires a valid, signed, X\.509 certificate\. The default location for the certificate file is +-\fI@datadir@/pop3d\.pem\fR\. ++\fI@certsdir@/pop3d\.pem\fR\. \fBmkpop3dcert\fR - generates a self\-signed X.509 certificate, mainly for testing. For production use the X.509 certificate must be signed by a recognized certificate authority, in order for mail clients to accept the certificate. + generates a self\-signed X\.509 certificate, mainly for testing\. For production use the X\.509 certificate must be signed by a recognized certificate authority, in order for mail clients to accept the certificate\. .PP - --\fI@datadir@/pop3d.pem\fR -+\fI@certsdir@/pop3d.pem\fR - must be owned by the @mailuser@ user and have no group or world permissions. The + +-\fI@datadir@/pop3d\.pem\fR ++\fI@certsdir@/pop3d\.pem\fR + must be owned by the @mailuser@ user and have no group or world permissions\. The \fBmkpop3dcert\fR - command will enforce this. To prevent an unfortunate accident, + command will enforce this\. To prevent an unfortunate accident, \fBmkpop3dcert\fR will not work if --\fB@datadir@/pop3d.pem\fR -+\fB@certsdir@/pop3d.pem\fR - already exists. +-\fB@datadir@/pop3d\.pem\fR ++\fB@certsdir@/pop3d\.pem\fR + already exists\. .PP - + @@ -42,7 +42,7 @@ - to be installed. + to be installed\. .SH "FILES" .PP --@datadir@/pop3d.pem -+@certsdir@/pop3d.pem +-@datadir@/pop3d\.pem ++@certsdir@/pop3d\.pem .RS 4 - X.509 certificate. + X\.509 certificate\. .RE diff -urN courier-imap-4.3.0.orig/imap/mkpop3dcert.html.in courier-imap-4.3.0/imap/mkpop3dcert.html.in --- courier-imap-4.3.0.orig/imap/mkpop3dcert.html.in 2007-04-22 17:33:35.000000000 +0200 +++ courier-imap-4.3.0/imap/mkpop3dcert.html.in 2008-01-19 19:55:15.619924063 +0100 @@ -7,22 +7,22 @@ - -->

Name

mkpop3dcert — create a test SSL certificate for POP3 over SSL

Synopsis

@sbindir@/mkpop3dcert

DESCRIPTION

+ -->

Name

mkpop3dcert â~@~T create a test SSL certificate for POP3 over SSL

Synopsis

@sbindir@/mkpop3dcert

DESCRIPTION

POP3 over SSL requires a valid, signed, X.509 certificate. The default location for the certificate file is -@datadir@/pop3d.pem. +@certsdir@/pop3d.pem. - mkpop3dcert generates a self-signed X.509 certificate, + mkpop3dcert generates a self-signed X.509 certificate, mainly for testing. For production use the X.509 certificate must be signed by a @@ -231,14 +231,14 @@ diff -urN courier-imap-4.3.0.orig/imap/mkpop3dcert.html.in courier-imap-4.3.0/im +@certsdir@/pop3d.pem must be owned by the @mailuser@ user and have no group or world permissions. - The mkpop3dcert command will + The mkpop3dcert command will enforce this. To prevent an unfortunate accident, - mkpop3dcert --will not work if @datadir@/pop3d.pem already exists.

-+will not work if @certsdir@/pop3d.pem already exists.

- mkpop3dcert requires --OpenSSL to be installed.

FILES

@datadir@/pop3d.pem
-+OpenSSL to be installed.

FILES

@certsdir@/pop3d.pem
+ mkpop3dcert +-will not work if @datadir@/pop3d.pem already exists.

++will not work if @certsdir@/pop3d.pem already exists.

+ mkpop3dcert requires +-OpenSSL to be installed.

FILES

@datadir@/pop3d.pem
++OpenSSL to be installed.

FILES

@certsdir@/pop3d.pem
X.509 certificate.
@sysconfdir@/pop3d.cnf
Parameters used by OpenSSL to -- 2.43.0