packages: courier-imap/courier-imap-certsdir.patch - partially merged in up...
zbyniu
zbyniu at pld-linux.org
Sat Feb 5 12:33:00 CET 2011
Author: zbyniu Date: Sat Feb 5 11:33:00 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- partially merged in upstream
---- Files affected:
packages/courier-imap:
courier-imap-certsdir.patch (1.6 -> 1.7)
---- Diffs:
================================================================
Index: packages/courier-imap/courier-imap-certsdir.patch
diff -u packages/courier-imap/courier-imap-certsdir.patch:1.6 packages/courier-imap/courier-imap-certsdir.patch:1.7
--- packages/courier-imap/courier-imap-certsdir.patch:1.6 Fri Jun 4 14:33:53 2010
+++ packages/courier-imap/courier-imap-certsdir.patch Sat Feb 5 12:32:55 2011
@@ -26,234 +26,6 @@
AC_ARG_WITH(mailer,
[ --with-mailer=prog Your mail submission program],
SENDMAIL="$withval",
---- courier-imap-4.3.0.orig/imap/imapd.cnf.openssl.in 2007-11-04 21:49:58.000000000 +0100
-+++ courier-imap-4.3.0/imap/imapd.cnf.openssl.in 2008-01-19 19:53:07.090124292 +0100
-@@ -1,5 +1,5 @@
-
--RANDFILE = @mydatadir@/imapd.rand
-+RANDFILE = @certsdir@/imapd.rand
-
- [ req ]
- default_bits = 1024
---- courier-imap-4.3.0.orig/imap/imapd-ssl.dist.in 2007-11-22 15:23:05.000000000 +0100
-+++ courier-imap-4.3.0/imap/imapd-ssl.dist.in 2008-01-19 19:53:22.977590279 +0100
-@@ -254,7 +254,7 @@
- #
- # This is an experimental feature.
-
--TLS_CERTFILE=@mydatadir@/imapd.pem
-+TLS_CERTFILE=@certsdir@/imapd.pem
-
- ##NAME: TLS_TRUSTCERTS:0
- #
---- courier-imap-4.3.0.orig/imap/mkimapdcert.in 2007-11-04 21:50:15.000000000 +0100
-+++ courier-imap-4.3.0/imap/mkimapdcert.in 2008-01-19 19:58:50.290723918 +0100
-@@ -18,41 +18,41 @@
-
- prefix="@prefix@"
-
--if test -f @mydatadir@/imapd.pem
-+if test -f @certsdir@/imapd.pem
- then
-- echo "@mydatadir@/imapd.pem already exists."
-+ echo "@certsdir@/imapd.pem already exists."
- exit 1
- fi
-
- umask 077
-
- cleanup() {
-- rm -f @mydatadir@/imapd.pem
-- rm -f @mydatadir@/imapd.rand
-- rm -f @mydatadir@/imapd.key
-- rm -f @mydatadir@/imapd.cert
-+ rm -f @certsdir@/imapd.pem
-+ rm -f @certsdir@/imapd.rand
-+ rm -f @certsdir@/imapd.key
-+ rm -f @certsdir@/imapd.cert
- exit 1
- }
-
--cd @mydatadir@
-+cd @certsdir@
-
- if test "@ssllib@" = "openssl"
- then
-- cp /dev/null @mydatadir@/imapd.pem
-- chmod 600 @mydatadir@/imapd.pem
-- chown @mailuser@ @mydatadir@/imapd.pem
-+ cp /dev/null @certsdir@/imapd.pem
-+ chmod 600 @certsdir@/imapd.pem
-+ chown @mailuser@ @certsdir@/imapd.pem
-
-- dd if=@RANDOMV@ of=@mydatadir@/imapd.rand count=1 2>/dev/null
-+ dd if=@RANDOMV@ of=@certsdir@/imapd.rand count=1 2>/dev/null
- @OPENSSL@ req -new -x509 -days 365 -nodes \
-- -config @sysconfdir@/imapd.cnf -out @mydatadir@/imapd.pem -keyout @mydatadir@/imapd.pem || cleanup
-- @OPENSSL@ gendh -rand @mydatadir@/imapd.rand 512 >>@mydatadir@/imapd.pem || cleanup
-- @OPENSSL@ x509 -subject -dates -fingerprint -noout -in @mydatadir@/imapd.pem || cleanup
-- rm -f @mydatadir@/imapd.rand
-+ -config @sysconfdir@/imapd.cnf -out @certsdir@/imapd.pem -keyout @certsdir@/imapd.pem || cleanup
-+ @OPENSSL@ gendh -rand @certsdir@/imapd.rand 512 >>@certsdir@/imapd.pem || cleanup
-+ @OPENSSL@ x509 -subject -dates -fingerprint -noout -in @certsdir@/imapd.pem || cleanup
-+ rm -f @certsdir@/imapd.rand
- else
-- cp /dev/null @mydatadir@/imapd.key
-- chmod 600 @mydatadir@/imapd.key
-- cp /dev/null @mydatadir@/imapd.cert
-- chmod 600 @mydatadir@/imapd.cert
-+ cp /dev/null @certsdir@/imapd.key
-+ chmod 600 @certsdir@/imapd.key
-+ cp /dev/null @certsdir@/imapd.cert
-+ chmod 600 @certsdir@/imapd.cert
-
- @CERTTOOL@ --generate-privkey --outfile imapd.key
- @CERTTOOL@ --generate-self-signed --load-privkey imapd.key --outfile imapd.cert --template @sysconfdir@/imapd.cnf
---- courier-imap-4.3.0.orig/imap/mkpop3dcert.in 2007-11-04 21:50:15.000000000 +0100
-+++ courier-imap-4.3.0/imap/mkpop3dcert.in 2008-01-19 19:59:17.935447993 +0100
-@@ -18,41 +18,41 @@
-
- prefix="@prefix@"
-
--if test -f @mydatadir@/pop3d.pem
-+if test -f @certsdir@/pop3d.pem
- then
-- echo "@mydatadir@/pop3d.pem already exists."
-+ echo "@certsdir@/pop3d.pem already exists."
- exit 1
- fi
-
- umask 077
-
- cleanup() {
-- rm -f @mydatadir@/pop3d.pem
-- rm -f @mydatadir@/pop3d.rand
-- rm -f @mydatadir@/pop3d.key
-- rm -f @mydatadir@/pop3d.cert
-+ rm -f @certsdir@/pop3d.pem
-+ rm -f @certsdir@/pop3d.rand
-+ rm -f @certsdir@/pop3d.key
-+ rm -f @certsdir@/pop3d.cert
- exit 1
- }
-
--cd @mydatadir@
-+cd @certsdir@
-
- if test "@ssllib@" = "openssl"
- then
-- cp /dev/null @mydatadir@/pop3d.pem
-- chmod 600 @mydatadir@/pop3d.pem
-- chown @mailuser@ @mydatadir@/pop3d.pem
-+ cp /dev/null @certsdir@/pop3d.pem
-+ chmod 600 @certsdir@/pop3d.pem
-+ chown @mailuser@ @certsdir@/pop3d.pem
-
-- dd if=@RANDOMV@ of=@mydatadir@/pop3d.rand count=1 2>/dev/null
-+ dd if=@RANDOMV@ of=@certsdir@/pop3d.rand count=1 2>/dev/null
- @OPENSSL@ req -new -x509 -days 365 -nodes \
-- -config @sysconfdir@/pop3d.cnf -out @mydatadir@/pop3d.pem -keyout @mydatadir@/pop3d.pem || cleanup
-- @OPENSSL@ gendh -rand @mydatadir@/pop3d.rand 512 >>@mydatadir@/pop3d.pem || cleanup
-- @OPENSSL@ x509 -subject -dates -fingerprint -noout -in @mydatadir@/pop3d.pem || cleanup
-- rm -f @mydatadir@/pop3d.rand
-+ -config @sysconfdir@/pop3d.cnf -out @certsdir@/pop3d.pem -keyout @certsdir@/pop3d.pem || cleanup
-+ @OPENSSL@ gendh -rand @certsdir@/pop3d.rand 512 >>@certsdir@/pop3d.pem || cleanup
-+ @OPENSSL@ x509 -subject -dates -fingerprint -noout -in @certsdir@/pop3d.pem || cleanup
-+ rm -f @certsdir@/pop3d.rand
- else
-- cp /dev/null @mydatadir@/pop3d.key
-- chmod 600 @mydatadir@/pop3d.key
-- cp /dev/null @mydatadir@/pop3d.cert
-- chmod 600 @mydatadir@/pop3d.cert
-+ cp /dev/null @certsdir@/pop3d.key
-+ chmod 600 @certsdir@/pop3d.key
-+ cp /dev/null @certsdir@/pop3d.cert
-+ chmod 600 @certsdir@/pop3d.cert
-
- @CERTTOOL@ --generate-privkey --outfile pop3d.key
- @CERTTOOL@ --generate-self-signed --load-privkey pop3d.key --outfile pop3d.cert --template @sysconfdir@/pop3d.cnf
---- courier-imap-4.3.0.orig/imap/pop3d.cnf.openssl.in 2007-11-04 21:49:58.000000000 +0100
-+++ courier-imap-4.3.0/imap/pop3d.cnf.openssl.in 2008-01-19 19:53:07.103458296 +0100
-@@ -1,5 +1,5 @@
-
--RANDFILE = @mydatadir@/pop3d.rand
-+RANDFILE = @certsdir@/pop3d.rand
-
- [ req ]
- default_bits = 1024
---- courier-imap-4.3.0.orig/imap/pop3d-ssl.dist.in 2007-11-22 15:23:06.000000000 +0100
-+++ courier-imap-4.3.0/imap/pop3d-ssl.dist.in 2008-01-19 19:55:43.177977173 +0100
-@@ -241,7 +241,7 @@
- #
- # This is an experimental feature.
-
--TLS_CERTFILE=@mydatadir@/pop3d.pem
-+TLS_CERTFILE=@certsdir@/pop3d.pem
-
- ##NAME: TLS_TRUSTCERTS:0
- #
---- courier-imap-4.8.0/imap/mkimapdcert.8.in~ 2010-02-20 06:12:44.000000000 +0200
-+++ courier-imap-4.8.0/imap/mkimapdcert.8.in 2010-06-04 15:18:37.508585518 +0300
-@@ -29,18 +29,18 @@
- .SH "DESCRIPTION"
- .PP
- IMAP over SSL requires a valid, signed, X\&.509 certificate\&. The default location for the certificate file is
-- at datadir@/imapd\&.pem\&.
-+ at certsdir@/imapd\&.pem\&.
- \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\&.
- .PP
-
-- at datadir@/imapd\&.pem
-+ at certsdir@/imapd\&.pem
- 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,
- \fBmkimapdcert\fR
- will not work if
--\fB at datadir@/imapd\&.pem\fR
-+\fB at certsdir@/imapd\&.pem\fR
- already exists\&.
- .PP
-
-@@ -50,7 +50,7 @@
- to be installed\&.
- .SH "FILES"
- .PP
-- at datadir@/imapd\&.pem
-+ at certsdir@/imapd\&.pem
- .RS 4
- X\&.509 certificate\&.
- .RE
---- courier-imap-4.8.0/imap/mkimapdcert.html.in~ 2010-02-20 06:12:44.000000000 +0200
-+++ courier-imap-4.8.0/imap/mkimapdcert.html.in 2010-06-04 15:19:24.774623744 +0300
-@@ -7,22 +7,22 @@
- --></head><body><div class="refentry" title="mkimapdcert"><a id="mkimapdcert" shape="rect"> </a><div class="titlepage"/><div class="refnamediv"><h2>Name</h2><p>mkimapdcert — create a test SSL certificate for IMAP over SSL</p></div><div class="refsynopsisdiv" title="Synopsis"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">@sbindir@/mkimapdcert</code> </p></div></div><div class="refsect1" title="DESCRIPTION"><a id="id381669" shape="rect"> </a><h2>DESCRIPTION</h2><p>
- IMAP over SSL requires a valid, signed, X.509 certificate. The default
- location for the certificate file is
--<code class="filename">@datadir@/imapd.pem</code>.
-+<code class="filename">@certsdir@/imapd.pem</code>.
- <span class="command"><strong>mkimapdcert</strong></span> 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.</p><p>
--<code class="filename">@datadir@/imapd.pem</code> must be owned by the
-+<code class="filename">@certsdir@/imapd.pem</code> must be owned by the
- @mailuser@ user and
- have no group or world permissions.
- The <span class="command"><strong>mkimapdcert</strong></span> command will
- enforce this. To prevent an unfortunate accident,
- <span class="command"><strong>mkimapdcert</strong></span>
--will not work if <span class="command"><strong>@datadir@/imapd.pem</strong></span> already exists.</p><p>
-+will not work if <span class="command"><strong>@certsdir@/imapd.pem</strong></span> already exists.</p><p>
- <span class="command"><strong>mkimapdcert</strong></span> requires
--<span class="application">OpenSSL</span> to be installed.</p></div><div class="refsect1" title="FILES"><a id="id397983" shape="rect"> </a><h2>FILES</h2><div class="variablelist"><dl><dt><span class="term">@datadir@/imapd.pem</span></dt><dd>
-+<span class="application">OpenSSL</span> to be installed.</p></div><div class="refsect1" title="FILES"><a id="id397983" shape="rect"> </a><h2>FILES</h2><div class="variablelist"><dl><dt><span class="term">@certsdir@/imapd.pem</span></dt><dd>
- X.509 certificate.
- </dd><dt><span class="term">@sysconfdir@/imapd.cnf</span></dt><dd>
- Parameters used by OpenSSL to
--- courier-imap-4.8.0/imap/mkpop3dcert.8.in~ 2010-02-20 06:12:44.000000000 +0200
+++ courier-imap-4.8.0/imap/mkpop3dcert.8.in 2010-06-04 15:19:49.481836220 +0300
@@ -29,18 +29,18 @@
@@ -287,32 +59,3 @@
.RS 4
X\&.509 certificate\&.
.RE
---- courier-imap-4.8.0/imap/mkpop3dcert.html.in~ 2010-02-20 06:12:44.000000000 +0200
-+++ courier-imap-4.8.0/imap/mkpop3dcert.html.in 2010-06-04 15:20:12.428930951 +0300
-@@ -7,22 +7,22 @@
- --></head><body><div class="refentry" title="mkpop3dcert"><a id="mkpop3dcert" shape="rect"> </a><div class="titlepage"/><div class="refnamediv"><h2>Name</h2><p>mkpop3dcert — create a test SSL certificate for POP3 over SSL</p></div><div class="refsynopsisdiv" title="Synopsis"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">@sbindir@/mkpop3dcert</code> </p></div></div><div class="refsect1" title="DESCRIPTION"><a id="id489121" shape="rect"> </a><h2>DESCRIPTION</h2><p>
- POP3 over SSL requires a valid, signed, X.509 certificate. The default
- location for the certificate file is
--<code class="filename">@datadir@/pop3d.pem</code>.
-+<code class="filename">@certsdir@/pop3d.pem</code>.
- <span class="command"><strong>mkpop3dcert</strong></span> 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.</p><p>
--<code class="filename">@datadir@/pop3d.pem</code> must be owned by the
-+<code class="filename">@certsdir@/pop3d.pem</code> must be owned by the
- @mailuser@ user and
- have no group or world permissions.
- The <span class="command"><strong>mkpop3dcert</strong></span> command will
- enforce this. To prevent an unfortunate accident,
- <span class="command"><strong>mkpop3dcert</strong></span>
--will not work if <span class="command"><strong>@datadir@/pop3d.pem</strong></span> already exists.</p><p>
-+will not work if <span class="command"><strong>@certsdir@/pop3d.pem</strong></span> already exists.</p><p>
- <span class="command"><strong>mkpop3dcert</strong></span> requires
--<span class="application">OpenSSL</span> to be installed.</p></div><div class="refsect1" title="FILES"><a id="id505435" shape="rect"> </a><h2>FILES</h2><div class="variablelist"><dl><dt><span class="term">@datadir@/pop3d.pem</span></dt><dd>
-+<span class="application">OpenSSL</span> to be installed.</p></div><div class="refsect1" title="FILES"><a id="id505435" shape="rect"> </a><h2>FILES</h2><div class="variablelist"><dl><dt><span class="term">@certsdir@/pop3d.pem</span></dt><dd>
- X.509 certificate.
- </dd><dt><span class="term">@sysconfdir@/pop3d.cnf</span></dt><dd>
- Parameters used by OpenSSL to
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/courier-imap/courier-imap-certsdir.patch?r1=1.6&r2=1.7&f=u
More information about the pld-cvs-commit
mailing list