- add files generating certs

Changed files:
    courier-certs.patch -> 1.2

diff --git a/courier-certs.patch b/courier-certs.patch
index 15bfbc4008da397d4eebe0cd06a37fbac87aeaf7..de48c2a82795d62560606b4a380f53d9492b4b33 100644 (file)
--- a/courier-certs.patch
+++ b/courier-certs.patch
@@ -1,12 +1,12 @@
 diff -Nur old/configure.in new/configure.in
 --- old/configure.in   2004-05-16 02:40:19.000000000 +0000
-+++ new/configure.in   2004-05-24 20:57:17.000000000 +0000
++++ new/configure.in   2004-05-25 07:37:13.000000000 +0000
 @@ -58,6 +58,11 @@
  eval "localstatedir=$localstatedir"
  eval "datadir=$datadir"
  
 +AC_ARG_WITH(certsdir, [  --with-certsdir Directory where certs are created ],
-+certsdir="$withval", certsdir=$sysconfdir/certs)
++certsdir="$withval", certsdir=$datadir)
 +
 +AC_SUBST(certsdir)
 +
@@ -15,19 +15,20 @@ diff -Nur old/configure.in new/configure.in
        ac_configure_args="$ac_configure_args --with-userdb=${sysconfdir}/userdb")
 diff -Nur old/courier/configure.in new/courier/configure.in
 --- old/courier/configure.in   2004-05-02 14:59:42.000000000 +0000
-+++ new/courier/configure.in   2004-05-24 21:29:43.000000000 +0000
-@@ -576,6 +576,11 @@
++++ new/courier/configure.in   2004-05-25 07:38:14.000000000 +0000
+@@ -575,6 +575,12 @@
+ 
  eval "exec_prefix=$exec_prefix"
  eval "bindir=$bindir"
- 
++eval "datadir=$datadir"
++
 +AC_ARG_WITH(certsdir, [ --with-certsdir Directory where certs are created ],
-+certsdir="$withval", certsdir=$sysconfdir/certs)
++certsdir="$withval", certsdir=$datadir)
 +
 +AC_SUBST(certsdir)
-+
+ 
  MAILDROP="$bindir/maildrop"
  AC_SUBST(MAILDROP)
- 
 diff -Nur old/courier/imapd-ssl.rc.in new/courier/imapd-ssl.rc.in
 --- old/courier/imapd-ssl.rc.in        2004-05-24 21:25:19.000000000 +0000
 +++ new/courier/imapd-ssl.rc.in        2004-05-24 21:32:29.000000000 +0000
@@ -45,13 +46,13 @@ diff -Nur old/courier/imapd-ssl.rc.in new/courier/imapd-ssl.rc.in
        do
 diff -Nur old/courier/module.esmtp/configure.in new/courier/module.esmtp/configure.in
 --- old/courier/module.esmtp/configure.in      2004-05-11 00:16:05.000000000 +0000
-+++ new/courier/module.esmtp/configure.in      2004-05-24 20:57:47.000000000 +0000
++++ new/courier/module.esmtp/configure.in      2004-05-25 07:37:36.000000000 +0000
 @@ -300,6 +300,11 @@
  eval "datadir=$datadir"
  eval "localstatedir=$localstatedir"
  
 +AC_ARG_WITH(certsdir, [  --with-certsdir Directory where certs are created ],
-+certsdir="$withval", certsdir=$sysconfdir/certs)
++certsdir="$withval", certsdir=$datadir
 +
 +AC_SUBST(certsdir)
 +
@@ -84,6 +85,47 @@ diff -Nur old/courier/module.esmtp/esmtpd-ssl.in new/courier/module.esmtp/esmtpd
        ;;
  stop)
        ${sbindir}/couriertcpd -pid=$SSLPIDFILE -stop
+diff -Nur old/courier/module.esmtp/mkesmtpdcert.in new/courier/module.esmtp/mkesmtpdcert.in
+--- old/courier/module.esmtp/mkesmtpdcert.in   2000-09-18 17:24:01.000000000 +0000
++++ new/courier/module.esmtp/mkesmtpdcert.in   2004-05-25 07:31:21.000000000 +0000
+@@ -11,25 +11,25 @@
+ 
+ test -x @OPENSSL@ || exit 0
+ 
+-if test -f @datadir@/esmtpd.pem
++if test -f @certsdir@/esmtpd.pem
+ then
+-      echo "@datadir@/esmtpd.pem already exists."
++      echo "@certsdir@/esmtpd.pem already exists."
+       exit 1
+ fi
+ 
+-cp /dev/null @datadir@/esmtpd.pem
+-chmod 600 @datadir@/esmtpd.pem
+-chown @mailuser@ @datadir@/esmtpd.pem
++cp /dev/null @certsdir@/esmtpd.pem
++chmod 600 @certsdir@/esmtpd.pem
++chown @mailuser@ @certsdir@/esmtpd.pem
+ 
+ cleanup() {
+-      rm -f @datadir@/esmtpd.rand
+-      rm -f @datadir@/esmtpd.pem
++      rm -f @certsdir@/esmtpd.rand
++      rm -f @certsdir@/esmtpd.pem
+       exit 1
+ }
+ 
+-dd if=@RANDOMV@ of=@datadir@/esmtpd.rand count=1 2>/dev/null
++dd if=@RANDOMV@ of=@certsdir@/esmtpd.rand count=1 2>/dev/null
+ @OPENSSL@ req -new -x509 -days 365 -nodes \
+-      -config @sysconfdir@/esmtpd.cnf -out @datadir@/esmtpd.pem -keyout @datadir@/esmtpd.pem || cleanup
+-@OPENSSL@ gendh -rand @datadir@/esmtpd.rand 512 >>@datadir@/esmtpd.pem || cleanup
+-@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @datadir@/esmtpd.pem || cleanup
+-rm -f @datadir@/esmtpd.rand
++      -config @sysconfdir@/esmtpd.cnf -out @certsdir@/esmtpd.pem -keyout @certsdir@/esmtpd.pem || cleanup
++@OPENSSL@ gendh -rand @certsdir@/esmtpd.rand 512 >>@certsdir@/esmtpd.pem || cleanup
++@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @certsdir@/esmtpd.pem || cleanup
++rm -f @certsdir@/esmtpd.rand
 diff -Nur old/courier/pop3d-ssl.in new/courier/pop3d-ssl.in
 --- old/courier/pop3d-ssl.in   2004-05-24 21:25:31.000000000 +0000
 +++ new/courier/pop3d-ssl.in   2004-05-24 21:33:05.000000000 +0000
@@ -140,13 +182,13 @@ diff -Nur old/courier.sysvinit.in new/courier.sysvinit.in
  
 diff -Nur old/imap/configure.in new/imap/configure.in
 --- old/imap/configure.in      2004-05-16 02:38:13.000000000 +0000
-+++ new/imap/configure.in      2004-05-24 20:57:12.000000000 +0000
++++ new/imap/configure.in      2004-05-25 07:37:24.000000000 +0000
 @@ -283,6 +283,11 @@
  eval "sysconfdir=$sysconfdir"
  eval "localstatedir=$localstatedir"
  
 +AC_ARG_WITH(certsdir, [  --with-certsdir Directory where certs are created ],
-+certsdir="$withval", certsdir=$sysconfdir/certs)
++certsdir="$withval", certsdir=$datadir)
 +
 +AC_SUBST(certsdir)
 +
@@ -165,6 +207,238 @@ diff -Nur old/imap/imapd-ssl.dist.in new/imap/imapd-ssl.dist.in
  
  ##NAME: TLS_TRUSTCERTS:0
  #
+diff -Nur old/imap/mkimapdcert.8.in new/imap/mkimapdcert.8.in
+--- old/imap/mkimapdcert.8.in  2004-01-14 00:51:10.000000000 +0000
++++ new/imap/mkimapdcert.8.in  2004-05-25 07:32:16.000000000 +0000
+@@ -18,7 +18,7 @@
+ .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\&.
+ \fBmkimapdcert\fR generates a self-signed X.509 certificate,
+ mainly for
+ testing.
+@@ -26,19 +26,19 @@
+ recognized certificate authority, in order for mail clients to accept the
+ certificate.
+ .PP
+-\fI@datadir@/imapd.pem\fR must be owned by the
++\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,
+ \fBmkimapdcert\fR
+-will not work if \fB@datadir@/imapd.pem\fR already exists.
++will not work if \fB@certsdir@/imapd.pem\fR already exists.
+ .PP
+ \fBmkimapdcert\fR requires
+ \fBOpenSSL\fR to be installed.
+ .SH "FILES"
+ .TP
+-\fB@datadir@/imapd.pem\fR
++\fB@certsdir@/imapd.pem\fR
+ X.509 certificate.
+ .TP
+ \fB@sysconfdir@/imapd.cnf\fR
+diff -Nur old/imap/mkimapdcert.html.in new/imap/mkimapdcert.html.in
+--- old/imap/mkimapdcert.html.in       2004-01-14 00:51:16.000000000 +0000
++++ new/imap/mkimapdcert.html.in       2004-05-25 07:32:37.000000000 +0000
+@@ -57,7 +57,7 @@
+ location for the certificate file is
+ <TT
+ CLASS="FILENAME"
+->@datadir@/imapd.pem</TT
++>@certsdir@/imapd.pem</TT
+ >.
+ <B
+ CLASS="COMMAND"
+@@ -71,7 +71,7 @@
+ ><P
+ ><TT
+ CLASS="FILENAME"
+->@datadir@/imapd.pem</TT
++>@certsdir@/imapd.pem</TT
+ > must be owned by the
+ @mailuser@ user and
+ have no group or world permissions.
+@@ -86,7 +86,7 @@
+ >
+ will not work if <B
+ CLASS="COMMAND"
+->@datadir@/imapd.pem</B
++>@certsdir@/imapd.pem</B
+ > already exists.</P
+ ><P
+ ><B
+@@ -111,7 +111,7 @@
+ CLASS="VARIABLELIST"
+ ><DL
+ ><DT
+->@datadir@/imapd.pem</DT
++>@certsdir@/imapd.pem</DT
+ ><DD
+ ><P
+ >X.509 certificate.</P
+diff -Nur old/imap/mkimapdcert.in new/imap/mkimapdcert.in
+--- old/imap/mkimapdcert.in    2001-08-26 16:16:42.000000000 +0000
++++ new/imap/mkimapdcert.in    2004-05-25 07:33:42.000000000 +0000
+@@ -13,26 +13,26 @@
+ 
+ prefix="@prefix@"
+ 
+-if test -f @datadir@/imapd.pem
++if test -f @certsdir@/imapd.pem
+ then
+-      echo "@datadir@/imapd.pem already exists."
++      echo "@certsdir@/imapd.pem already exists."
+       exit 1
+ fi
+ 
+-cp /dev/null @datadir@/imapd.pem
+-chmod 600 @datadir@/imapd.pem
+-chown @mailuser@ @datadir@/imapd.pem
++cp /dev/null @certsdir@/imapd.pem
++chmod 600 @certsdir@/imapd.pem
++chown @mailuser@ @certsdir@/imapd.pem
+ 
+ cleanup() {
+-      rm -f @datadir@/imapd.pem
+-      rm -f @datadir@/imapd.rand
++      rm -f @certsdir@/imapd.pem
++      rm -f @certsdir@/imapd.rand
+       exit 1
+ }
+ 
+-cd @datadir@
+-dd if=@RANDOMV@ of=@datadir@/imapd.rand count=1 2>/dev/null
++cd @certsdir@
++dd if=@RANDOMV@ of=@certsdir@/imapd.rand count=1 2>/dev/null
+ @OPENSSL@ req -new -x509 -days 365 -nodes \
+-      -config @sysconfdir@/imapd.cnf -out @datadir@/imapd.pem -keyout @datadir@/imapd.pem || cleanup
+-@OPENSSL@ gendh -rand @datadir@/imapd.rand 512 >>@datadir@/imapd.pem || cleanup
+-@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @datadir@/imapd.pem || cleanup
+-rm -f @datadir@/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
+diff -Nur old/imap/mkpop3dcert.8.in new/imap/mkpop3dcert.8.in
+--- old/imap/mkpop3dcert.8.in  2004-01-14 00:51:13.000000000 +0000
++++ new/imap/mkpop3dcert.8.in  2004-05-25 07:34:07.000000000 +0000
+@@ -18,7 +18,7 @@
+ .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\&.
+ \fBmkpop3dcert\fR generates a self-signed X.509 certificate,
+ mainly for
+ testing.
+@@ -26,19 +26,19 @@
+ recognized certificate authority, in order for mail clients to accept the
+ certificate.
+ .PP
+-\fI@datadir@/pop3d.pem\fR must be owned by the
++\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,
+ \fBmkpop3dcert\fR
+-will not work if \fB@datadir@/pop3d.pem\fR already exists.
++will not work if \fB@certsdir@/pop3d.pem\fR already exists.
+ .PP
+ \fBmkpop3dcert\fR requires
+ \fBOpenSSL\fR to be installed.
+ .SH "FILES"
+ .TP
+-\fB@datadir@/pop3d.pem\fR
++\fB@certsdir@/pop3d.pem\fR
+ X.509 certificate.
+ .TP
+ \fB@sysconfdir@/pop3d.cnf\fR
+diff -Nur old/imap/mkpop3dcert.html.in new/imap/mkpop3dcert.html.in
+--- old/imap/mkpop3dcert.html.in       2004-01-14 00:51:17.000000000 +0000
++++ new/imap/mkpop3dcert.html.in       2004-05-25 07:34:26.000000000 +0000
+@@ -57,7 +57,7 @@
+ location for the certificate file is
+ <TT
+ CLASS="FILENAME"
+->@datadir@/pop3d.pem</TT
++>@certsdir@/pop3d.pem</TT
+ >.
+ <B
+ CLASS="COMMAND"
+@@ -71,7 +71,7 @@
+ ><P
+ ><TT
+ CLASS="FILENAME"
+->@datadir@/pop3d.pem</TT
++>@certsdir@/pop3d.pem</TT
+ > must be owned by the
+ @mailuser@ user and
+ have no group or world permissions.
+@@ -86,7 +86,7 @@
+ >
+ will not work if <B
+ CLASS="COMMAND"
+->@datadir@/pop3d.pem</B
++>@certsdir@/pop3d.pem</B
+ > already exists.</P
+ ><P
+ ><B
+@@ -111,7 +111,7 @@
+ CLASS="VARIABLELIST"
+ ><DL
+ ><DT
+->@datadir@/pop3d.pem</DT
++>@certsdir@/pop3d.pem</DT
+ ><DD
+ ><P
+ >X.509 certificate.</P
+diff -Nur old/imap/mkpop3dcert.in new/imap/mkpop3dcert.in
+--- old/imap/mkpop3dcert.in    2000-10-06 17:50:37.000000000 +0000
++++ new/imap/mkpop3dcert.in    2004-05-25 07:35:23.000000000 +0000
+@@ -13,25 +13,25 @@
+ 
+ prefix="@prefix@"
+ 
+-if test -f @datadir@/pop3d.pem
++if test -f @certsdir@/pop3d.pem
+ then
+-      echo "@datadir@/pop3d.pem already exists."
++      echo "@certsdir@/pop3d.pem already exists."
+       exit 1
+ fi
+ 
+-cp /dev/null @datadir@/pop3d.pem
+-chmod 600 @datadir@/pop3d.pem
+-chown @mailuser@ @datadir@/pop3d.pem
++cp /dev/null @certsdir@/pop3d.pem
++chmod 600 @certsdir@/pop3d.pem
++chown @mailuser@ @certsdir@/pop3d.pem
+ 
+ cleanup() {
+-      rm -f @datadir@/pop3d.pem
+-      rm -f @datadir@/pop3d.rand
++      rm -f @certsdir@/pop3d.pem
++      rm -f @certsdir@/pop3d.rand
+       exit 1
+ }
+ 
+-dd if=@RANDOMV@ of=@datadir@/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 @datadir@/pop3d.pem -keyout @datadir@/pop3d.pem || cleanup
+-@OPENSSL@ gendh -rand @datadir@/pop3d.rand 512 >>@datadir@/pop3d.pem || cleanup
+-@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @datadir@/pop3d.pem || cleanup
+-rm -f @datadir@/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
 diff -Nur old/imap/pop3d-ssl.dist.in new/imap/pop3d-ssl.dist.in
 --- old/imap/pop3d-ssl.dist.in 2004-01-25 05:40:04.000000000 +0000
 +++ new/imap/pop3d-ssl.dist.in 2004-05-24 20:57:32.000000000 +0000