-diff -urN courier-0.64.2.orig//configure.in courier-0.64.2/configure.in
---- courier-0.64.2.orig//configure.in 2010-03-16 23:13:38.000000000 +0100
-+++ courier-0.64.2/configure.in 2010-05-08 23:31:10.332622817 +0200
-@@ -70,6 +70,11 @@
- eval "localstatedir=$localstatedir"
- eval "datadir=$datadir"
-
-+AC_ARG_WITH(certsdir, [ --with-certsdir Directory where certs are created ],
-+certsdir="$withval", certsdir=$datadir)
-+
-+AC_SUBST(certsdir)
-+
- AC_ARG_WITH(makedatprog, [], ,
- ac_configure_args="$ac_configure_args --with-makedatprog=${libexecdir}/courier/makedatprog")
-
diff -urN courier-0.64.2.orig//courier/configure.in courier-0.64.2/courier/configure.in
--- courier-0.64.2.orig//courier/configure.in 2010-01-09 22:13:40.000000000 +0100
+++ courier-0.64.2/courier/configure.in 2010-05-08 23:31:10.355976183 +0200
dnl
dnl Check what libraries are available
dnl
-diff -urN courier-0.64.2.orig//courier/module.esmtp/esmtpd.cnf.openssl.in courier-0.64.2/courier/module.esmtp/esmtpd.cnf.openssl.in
---- courier-0.64.2.orig//courier/module.esmtp/esmtpd.cnf.openssl.in 2007-11-04 22:17:03.000000000 +0100
-+++ courier-0.64.2/courier/module.esmtp/esmtpd.cnf.openssl.in 2010-05-08 23:31:10.355976183 +0200
-@@ -1,5 +1,5 @@
-
--RANDFILE = @mydatadir@/esmtpd.rnd
-+RANDFILE = @certsdir@/esmtpd.rnd
-
- [ req ]
- default_bits = 1024
diff -urN courier-0.64.2.orig//courier/module.esmtp/esmtpd.dist.in courier-0.64.2/courier/module.esmtp/esmtpd.dist.in
--- courier-0.64.2.orig//courier/module.esmtp/esmtpd.dist.in 2010-02-02 23:30:00.000000000 +0100
+++ courier-0.64.2/courier/module.esmtp/esmtpd.dist.in 2010-05-08 23:31:10.355976183 +0200
then
echo -n " generating-IMAP-SSL-certificate..."
-diff -urN courier-0.64.2.orig//imap/configure.in courier-0.64.2/imap/configure.in
---- courier-0.64.2.orig//imap/configure.in 2009-12-25 23:15:10.000000000 +0100
-+++ courier-0.64.2/imap/configure.in 2010-05-08 23:31:10.355976183 +0200
-@@ -284,6 +284,11 @@
- mydatadir="$datadir"
- AC_SUBST(mydatadir) # Avoid useless autoconf warning
-
-+AC_ARG_WITH(certsdir, [ --with-certsdir Directory where certs are created ],
-+certsdir="$withval", certsdir=$datadir)
-+
-+AC_SUBST(certsdir)
-+
- #
- # Check for PAM configuration flavor
-
-diff -urN courier-0.64.2.orig//imap/imapd.cnf.openssl.in courier-0.64.2/imap/imapd.cnf.openssl.in
---- courier-0.64.2.orig//imap/imapd.cnf.openssl.in 2007-11-04 21:49:58.000000000 +0100
-+++ courier-0.64.2/imap/imapd.cnf.openssl.in 2010-05-08 23:31:10.355976183 +0200
-@@ -1,5 +1,5 @@
-
--RANDFILE = @mydatadir@/imapd.rand
-+RANDFILE = @certsdir@/imapd.rand
-
- [ req ]
- default_bits = 1024
-diff -urN courier-0.64.2.orig//imap/imapd-ssl.dist.in courier-0.64.2/imap/imapd-ssl.dist.in
---- courier-0.64.2.orig//imap/imapd-ssl.dist.in 2010-05-08 23:28:14.469307022 +0200
-+++ courier-0.64.2/imap/imapd-ssl.dist.in 2010-05-08 23:31:10.359913750 +0200
-@@ -260,7 +260,7 @@
- #
- # This is an experimental feature.
-
--TLS_CERTFILE=@mydatadir@/imapd.pem
-+TLS_CERTFILE=@certsdir@/imapd.pem
-
- ##NAME: TLS_TRUSTCERTS:0
- #
-diff -urN courier-0.64.2.orig//imap/mkimapdcert.8.in courier-0.64.2/imap/mkimapdcert.8.in
---- courier-0.64.2.orig//imap/mkimapdcert.8.in 2010-02-20 05:11:46.000000000 +0100
-+++ courier-0.64.2/imap/mkimapdcert.8.in 2010-05-08 23:31:45.213634288 +0200
-@@ -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
--@datadir@/imapd\&.pem\&.
-+@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
-
--@datadir@/imapd\&.pem
-+@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@datadir@/imapd\&.pem\fR
-+\fB@certsdir@/imapd\&.pem\fR
- already exists\&.
- .PP
-
-@@ -50,7 +50,7 @@
- to be installed\&.
- .SH "FILES"
- .PP
--@datadir@/imapd\&.pem
-+@certsdir@/imapd\&.pem
- .RS 4
- X\&.509 certificate\&.
- .RE
-diff -urN courier-0.64.2.orig//imap/mkimapdcert.html.in courier-0.64.2/imap/mkimapdcert.html.in
---- courier-0.64.2.orig//imap/mkimapdcert.html.in 2010-02-20 05:11:46.000000000 +0100
-+++ courier-0.64.2/imap/mkimapdcert.html.in 2010-05-08 23:31:51.539285741 +0200
-@@ -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="id328148" 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="id344462" 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="id344462" 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
-diff -urN courier-0.64.2.orig//imap/mkimapdcert.in courier-0.64.2/imap/mkimapdcert.in
---- courier-0.64.2.orig//imap/mkimapdcert.in 2007-11-04 21:49:58.000000000 +0100
-+++ courier-0.64.2/imap/mkimapdcert.in 2010-05-08 23:31:10.359913750 +0200
-@@ -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
-diff -urN courier-0.64.2.orig//imap/mkpop3dcert.8.in courier-0.64.2/imap/mkpop3dcert.8.in
---- courier-0.64.2.orig//imap/mkpop3dcert.8.in 2010-02-20 05:11:46.000000000 +0100
-+++ courier-0.64.2/imap/mkpop3dcert.8.in 2010-05-08 23:31:57.363659801 +0200
-@@ -29,18 +29,18 @@
- .SH "DESCRIPTION"
- .PP
- POP3 over SSL requires a valid, signed, X\&.509 certificate\&. The default location for the certificate file is
--@datadir@/pop3d\&.pem\&.
-+@certsdir@/pop3d\&.pem\&.
- \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\&.
- .PP
-
--@datadir@/pop3d\&.pem
-+@certsdir@/pop3d\&.pem
- 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,
- \fBmkpop3dcert\fR
- will not work if
--\fB@datadir@/pop3d\&.pem\fR
-+\fB@certsdir@/pop3d\&.pem\fR
- already exists\&.
- .PP
-
-@@ -50,7 +50,7 @@
- to be installed\&.
- .SH "FILES"
- .PP
--@datadir@/pop3d\&.pem
-+@certsdir@/pop3d\&.pem
- .RS 4
- X\&.509 certificate\&.
- .RE
-diff -urN courier-0.64.2.orig//imap/mkpop3dcert.html.in courier-0.64.2/imap/mkpop3dcert.html.in
---- courier-0.64.2.orig//imap/mkpop3dcert.html.in 2010-02-20 05:11:46.000000000 +0100
-+++ courier-0.64.2/imap/mkpop3dcert.html.in 2010-05-08 23:32:03.082617460 +0200
-@@ -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="id435600" 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="id451914" 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="id451914" 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
-diff -urN courier-0.64.2.orig//imap/mkpop3dcert.in courier-0.64.2/imap/mkpop3dcert.in
---- courier-0.64.2.orig//imap/mkpop3dcert.in 2007-11-04 21:49:58.000000000 +0100
-+++ courier-0.64.2/imap/mkpop3dcert.in 2010-05-08 23:31:10.359913750 +0200
-@@ -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
-diff -urN courier-0.64.2.orig//imap/pop3d.cnf.openssl.in courier-0.64.2/imap/pop3d.cnf.openssl.in
---- courier-0.64.2.orig//imap/pop3d.cnf.openssl.in 2007-11-04 21:49:58.000000000 +0100
-+++ courier-0.64.2/imap/pop3d.cnf.openssl.in 2010-05-08 23:31:10.359913750 +0200
-@@ -1,5 +1,5 @@
-
--RANDFILE = @mydatadir@/pop3d.rand
-+RANDFILE = @certsdir@/pop3d.rand
-
- [ req ]
- default_bits = 1024
-diff -urN courier-0.64.2.orig//imap/pop3d-ssl.dist.in courier-0.64.2/imap/pop3d-ssl.dist.in
---- courier-0.64.2.orig//imap/pop3d-ssl.dist.in 2010-05-08 23:28:14.479307068 +0200
-+++ courier-0.64.2/imap/pop3d-ssl.dist.in 2010-05-08 23:31:10.359913750 +0200
-@@ -248,7 +248,7 @@
- #
- # This is an experimental feature.
-
--TLS_CERTFILE=@mydatadir@/pop3d.pem
-+TLS_CERTFILE=@certsdir@/pop3d.pem
-
- ##NAME: TLS_TRUSTCERTS:0
- #
projects / packages / courier.git / commitdiff