Author: andree Date: Fri Mar 4 19:55:22 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - updated to 0.49.0
---- Files affected: SOURCES: courier-certs.patch (1.5.2.1 -> 1.5.2.2) ---- Diffs: ================================================================ Index: SOURCES/courier-certs.patch diff -u SOURCES/courier-certs.patch:1.5.2.1 SOURCES/courier-certs.patch:1.5.2.2 --- SOURCES/courier-certs.patch:1.5.2.1 Fri Dec 10 01:33:14 2004 +++ SOURCES/courier-certs.patch Fri Mar 4 20:55:17 2005 @@ -1,7 +1,22 @@ +diff -Nur old/configure.in new/configure.in +--- old/configure.in 2005-03-01 03:16:43.000000000 +0000 ++++ new/configure.in 2005-03-04 19:53:15.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=$datadir) ++ ++AC_SUBST(certsdir) ++ + AC_ARG_WITH(makedatprog, [], , + ac_configure_args="$ac_configure_args --with-makedatprog=${libexecdir}/courier/makedatprog") + 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-25 07:38:14.000000000 +0000 -@@ -575,6 +575,12 @@ +--- old/courier/configure.in 2005-03-01 03:16:43.000000000 +0000 ++++ new/courier/configure.in 2005-03-04 19:46:17.000000000 +0000 +@@ -462,6 +462,12 @@ eval "exec_prefix=$exec_prefix" eval "bindir=$bindir" @@ -14,6 +29,21 @@ 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 2005-02-16 23:42:13.000000000 +0000 ++++ new/courier/imapd-ssl.rc.in 2005-03-04 19:47:54.000000000 +0000 +@@ -28,6 +28,11 @@ + + case $1 in + start) ++ # If we do not have a certificate, make one up. ++ if [ ! -f @certsdir@/imapd.pem ]; then ++ @sbindir@/mkimapdcert ++ fi ++ + umask $IMAP_UMASK + @ULIMIT@ $IMAP_ULIMITD + @SETENV@ -i @SHELL@ -c " set -a ; 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-25 07:46:38.000000000 +0000 @@ -118,6 +148,21 @@ [EMAIL PROTECTED]@ gendh -rand @certsdir@/esmtpd.rand 512 >>@certsdir@/esmtpd.pem || cleanup [EMAIL PROTECTED]@ 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 2005-02-16 23:42:13.000000000 +0000 ++++ new/courier/pop3d-ssl.in 2005-03-04 19:48:23.000000000 +0000 +@@ -29,6 +29,11 @@ + + case $1 in + start) ++ # If we do not have a certificate, make one up. ++ if [ ! -f @certsdir@/pop3d.pem ]; then ++ @sbindir@/mkpop3dcert ++ fi ++ + exec @SETENV@ -i PATH="$PATH" SHELL="$SHELL" \ + @SHELL@ -c " set -a ; \ + [EMAIL PROTECTED]@ ; \ diff -Nur old/courier.sysvinit.in new/courier.sysvinit.in --- old/courier.sysvinit.in 2004-05-02 14:24:06.000000000 +0000 +++ new/courier.sysvinit.in 2004-05-24 20:56:37.000000000 +0000 @@ -448,47 +493,3 @@ ##NAME: TLS_TRUSTCERTS:0 # -diff -Nur old/configure.in new/configure.in ---- old/configure.in 2004-11-30 03:49:35.000000000 +0000 -+++ new/configure.in 2004-12-10 00:06:49.022895256 +0000 -@@ -58,6 +58,10 @@ - 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 -Nur old/courier/imapd-ssl.rc.in new/courier/imapd-ssl.rc.in ---- old/courier/imapd-ssl.rc.in 2004-11-25 05:12:26.000000000 +0000 -+++ new/courier/imapd-ssl.rc.in 2004-12-10 00:07:59.961111008 +0000 -@@ -28,6 +28,11 @@ - - case $1 in - start) -+ # If we do not have a certificate, make one up. -+ if [ ! -f @certsdir@/imapd.pem ]; then -+ @sbindir@/mkimapdcert -+ fi -+ - umask $IMAP_UMASK - @ULIMIT@ $IMAP_ULIMITD - @SETENV@ - @SHELL@ -c " set -a ; -diff -Nur old/courier/pop3d-ssl.in new/courier/pop3d-ssl.in ---- old/courier/pop3d-ssl.in 2004-10-23 16:18:19.000000000 +0000 -+++ new/courier/pop3d-ssl.in 2004-12-10 00:08:41.200841616 +0000 -@@ -29,6 +29,11 @@ - - case $1 in - start) -+ # If we do not have a certificate, make one up. -+ if [ ! -f @certsdir@/pop3d.pem ]; then -+ @sbindir@/mkpop3dcert -+ fi -+ - exec @SETENV@ - PATH="$PATH" SHELL="$SHELL" \ - @SHELL@ -c " set -a ; \ - [EMAIL PROTECTED]@ ; \ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/courier-certs.patch?r1=1.5.2.1&r2=1.5.2.2&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit