Author: andree Date: Sat Mar 5 18:28:55 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- merged from DEVEL
---- Files affected:
SOURCES:
courier-certs.patch (1.5 -> 1.6) , courier-maildir.patch (1.8 -> 1.9) ,
courier-start_scripts.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/courier-certs.patch
diff -u SOURCES/courier-certs.patch:1.5 SOURCES/courier-certs.patch:1.6
--- SOURCES/courier-certs.patch:1.5 Sun Jul 11 20:16:58 2004
+++ SOURCES/courier-certs.patch Sat Mar 5 19:28:49 2005
@@ -1,6 +1,6 @@
diff -Nur old/configure.in new/configure.in
---- old/configure.in 2004-05-16 02:40:19.000000000 +0000
-+++ new/configure.in 2004-05-25 07:37:13.000000000 +0000
+--- 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"
@@ -10,13 +10,13 @@
+
+AC_SUBST(certsdir)
+
- AC_ARG_WITH(userdb, [
- -- see INSTALL, or courier/doc/install.html for configuration options -- ], ,
- ac_configure_args="$ac_configure_args
--with-userdb=${sysconfdir}/userdb")
+ 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"
@@ -30,20 +30,20 @@
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
+--- 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
-+
- LIBAUTHMODULES=""
- for f in `echo $AUTHMODULES`
- do
++ # 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
@@ -149,20 +149,20 @@
[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 2004-05-24 21:25:31.000000000 +0000
-+++ new/courier/pop3d-ssl.in 2004-05-24 21:33:05.000000000 +0000
+--- 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
-+
- LIBAUTHMODULES=""
- for f in `echo $AUTHMODULES`
- do
++ # 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
================================================================
Index: SOURCES/courier-maildir.patch
diff -u SOURCES/courier-maildir.patch:1.8 SOURCES/courier-maildir.patch:1.9
--- SOURCES/courier-maildir.patch:1.8 Mon Aug 2 18:57:51 2004
+++ SOURCES/courier-maildir.patch Sat Mar 5 19:28:49 2005
@@ -37,51 +37,6 @@
##NAME: ESMTP_CORK:0
#
-diff -Nur old/courier/imapd.rc.in new/courier/imapd.rc.in
---- old/courier/imapd.rc.in 2003-11-29 02:16:15.000000000 +0000
-+++ new/courier/imapd.rc.in 2004-02-20 12:25:45.000000000 +0000
-@@ -49,7 +49,7 @@
- -maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
- -pid=$PIDFILE $TCPDOPTS \
- $PORT @libexecdir@/courier/imaplogin $LIBAUTHMODULES \
-- @bindir@/imapd Maildir"
-+ @bindir@/imapd Mail/Maildir"
- ;;
- stop)
- @sbindir@/couriertcpd -pid=$PIDFILE -stop
-diff -Nur old/courier/imapd-ssl.rc.in new/courier/imapd-ssl.rc.in
---- old/courier/imapd-ssl.rc.in 2003-11-29 02:16:15.000000000 +0000
-+++ new/courier/imapd-ssl.rc.in 2004-02-20 12:25:45.000000000 +0000
-@@ -50,7 +50,7 @@
- -pid=$SSLPIDFILE $TCPDOPTS \
- $SSLPORT $COURIERTLS -server -tcpd \
- @libexecdir@/courier/imaplogin $LIBAUTHMODULES \
-- @bindir@/imapd Maildir"
-+ @bindir@/imapd Mail/Maildir"
- ;;
- stop)
- @sbindir@/couriertcpd -pid=$SSLPIDFILE -stop
-diff -Nur old/courier/pop3d.in new/courier/pop3d.in
---- old/courier/pop3d.in 2003-11-28 01:04:59.000000000 +0000
-+++ new/courier/pop3d.in 2004-02-20 12:25:45.000000000 +0000
-@@ -77,4 +77,4 @@
- -maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
- -pid=$PIDFILE $TCPDOPTS -address=$ADDRESS $PORT \
- @libexecdir@/courier/courierpop3login $AUTHMODULELIST \
-- @libexecdir@/courier/courierpop3d Maildir"
-+ @libexecdir@/courier/courierpop3d Mail/Maildir"
-diff -Nur old/courier/pop3d-ssl.in new/courier/pop3d-ssl.in
---- old/courier/pop3d-ssl.in 2003-11-29 01:37:34.000000000 +0000
-+++ new/courier/pop3d-ssl.in 2004-02-20 12:25:45.000000000 +0000
-@@ -54,7 +54,7 @@
- -pid=$SSLPIDFILE $TCPDOPTS \
- $SSLPORT $COURIERTLS -server -tcpd \
- $libexecdir/courier/courierpop3login
$LIBAUTHMODULES \
-- $libexecdir/courier/courierpop3d Maildir"
-+ $libexecdir/courier/courierpop3d Mail/Maildir"
- ;;
- stop)
- @sbindir@/couriertcpd -pid=$SSLPIDFILE -stop
diff -Nur old/imap/imapd.dist.in new/imap/imapd.dist.in
--- old/imap/imapd.dist.in 2004-01-25 05:40:04.000000000 +0000
+++ new/imap/imapd.dist.in 2004-03-16 17:45:49.000000000 +0000
@@ -146,15 +101,6 @@
if (chdir(maildir)) return (-1);
maildir_loginexec();
return (0);
-@@ -111,7 +111,7 @@
- struct stat stat_buf;
-
- if (!p || !*p) p=getenv("MAILDIRPATH");
-- if (!p || !*p) p="Maildir";
-+ if (!p || !*p) p="Mail/Maildir";
-
- buf=malloc(strlen(h)+strlen(p)+sizeof(PASSFILE)+100);
-
diff -Nur old/webmail/sqwebmaild.dist.in new/webmail/sqwebmaild.dist.in
--- old/webmail/sqwebmaild.dist.in 2004-05-09 03:33:22.000000000 +0000
+++ new/webmail/sqwebmaild.dist.in 2004-05-28 10:50:17.000000000 +0000
================================================================
Index: SOURCES/courier-start_scripts.patch
diff -u SOURCES/courier-start_scripts.patch:1.3
SOURCES/courier-start_scripts.patch:1.4
--- SOURCES/courier-start_scripts.patch:1.3 Fri May 28 13:53:49 2004
+++ SOURCES/courier-start_scripts.patch Sat Mar 5 19:28:49 2005
@@ -69,8 +69,8 @@
+++ new/courier/webmaild.in 2004-05-28 11:50:57.000000000 +0000
@@ -42,5 +42,7 @@
stop)
- ${sbindir}/courierlogger -pid=${PIDFILE} -stop
- ${sbindir}/courierlogger -pid=${PIDFILE}.pcp -stop
+ @courierlogger@ -pid=${PIDFILE} -stop
+ @courierlogger@ -pid=${PIDFILE}.pcp -stop
+ rm -f ${PIDFILE}
+ rm -f ${PIDFILE}.pcp
;;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/courier-certs.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/SOURCES/courier-maildir.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/SOURCES/courier-start_scripts.patch?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
