- updated to 0.45.1

Changed files:
    courier-maildir.patch -> 1.3
    courier-no_res_query.patch -> 1.3
    courier-sendmail_dir.patch -> 1.2
    courier-withoutfam.patch -> 1.2

diff --git a/courier-maildir.patch b/courier-maildir.patch
index fb868f063883deca35ad3808e4a618be13590927..ec6dac285a4c66d2cf2a22be629985ed63f584b8 100644 (file)
--- a/courier-maildir.patch
+++ b/courier-maildir.patch
@@ -64,6 +64,24 @@ diff -Nur old/courier/pop3d-ssl.in new/courier/pop3d-ssl.in
        ;;
  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
+@@ -371,4 +371,4 @@
+ #
+ # MAILDIRPATH - directory name of the maildir directory.
+ #
+-MAILDIRPATH=Maildir
++MAILDIRPATH=Mail/Maildir
+diff -Nur old/imap/pop3d.dist.in new/imap/pop3d.dist.in
+--- old/imap/pop3d.dist.in     2004-01-25 05:40:04.000000000 +0000
++++ new/imap/pop3d.dist.in     2004-03-16 17:45:56.000000000 +0000
+@@ -145,4 +145,4 @@
+ #
+ # MAILDIRPATH - directory name of the maildir directory.
+ #
+-MAILDIRPATH=Maildir
++MAILDIRPATH=Mail/Maildir
 diff -Nur old/webmail/auth.c new/webmail/auth.c
 --- old/webmail/auth.c 2003-10-11 00:54:37.000000000 +0000
 +++ new/webmail/auth.c 2004-02-20 12:26:31.000000000 +0000

diff --git a/courier-no_res_query.patch b/courier-no_res_query.patch
index 0fe66fb50b6e4ee6f4a4a7dfe46ac53171d6b61b..a958f67b1db46d18e0854df6552535cb14461899 100644 (file)
--- a/courier-no_res_query.patch
+++ b/courier-no_res_query.patch
@@ -1,36 +1,82 @@
 diff -Nur old/authlib/configure.in new/authlib/configure.in
---- old/authlib/configure.in   2003-10-25 13:25:28.000000000 +0000
-+++ new/authlib/configure.in   2004-02-24 13:42:24.000000000 +0000
-@@ -384,14 +384,6 @@
-       saveLIBS="$LIBS"
+--- old/authlib/configure.in   2004-03-03 04:45:09.000000000 +0000
++++ new/authlib/configure.in   2004-03-16 21:35:08.000000000 +0000
+@@ -385,36 +385,6 @@
        LIBS="$NETLIBS $LIBS"
        LDAPLIBS=""
+ 
 -        AC_MSG_CHECKING(whether -lresolv is needed for res_query)
--        AC_TRY_LINK_FUNC(res_query,
+-      AC_LINK_IFELSE(AC_LANG_PROGRAM([
+-#if HAVE_NETINET_IN_H
+-#include <netinet/in.h>
+-#endif
+-#include <resolv.h>
+-
+-void (*func)()= (void (*)())res_query;
+-],
+-                      [  (*func)(); ]),
 -              AC_MSG_RESULT(no),
+-              [
 -              LIBS="-lresolv $LIBS"
--              AC_TRY_LINK_FUNC(res_query,
--                      LDAPLIBS="-lresolv $LDAPLIBS" HAVE_LDAP=1
--                      AC_MSG_RESULT(yes),
--                      AC_MSG_ERROR(Cannot find function res_query)))
+-
+-              AC_LINK_IFELSE(AC_LANG_PROGRAM([
+-#if HAVE_NETINET_IN_H
+-#include <netinet/in.h>
+-#endif
+-#include <resolv.h>
+-
+-void (*func)()= (void (*)())res_query;
+-],
+-                      [  (*func)(); ]), [
+-                      LDAPLIBS="-lresolv $LDAPLIBS"
+-                      HAVE_LDAP=1
+-                      AC_MSG_RESULT(yes)
+-                      ],
+-                      AC_MSG_ERROR(Cannot find function res_query))
+-                      ])
+-
        AC_CHECK_LIB(lber, ber_scanf,
                [ LDAPLIBS="-llber $LDAPLIBS" LIBS="-llber $LIBS" ])
        AC_CHECK_LIB(ldap, ldap_open,
 diff -Nur old/courier/configure.in new/courier/configure.in
---- old/courier/configure.in   2003-10-30 00:53:31.000000000 +0000
-+++ new/courier/configure.in   2004-02-24 13:40:33.000000000 +0000
-@@ -248,14 +248,6 @@
- LDAPLIBS=""
+--- old/courier/configure.in   2004-03-07 04:39:48.000000000 +0000
++++ new/courier/configure.in   2004-03-16 21:35:21.000000000 +0000
+@@ -251,38 +251,6 @@
  AC_CHECK_LIB(lber, ber_scanf,
        [ LDAPLIBS="-llber" LIBS="-llber $LIBS" ])
--AC_MSG_CHECKING(whether -lresolv is needed for res_query)
--AC_TRY_LINK_FUNC(res_query,
--              AC_MSG_RESULT(no),
--              LIBS="-lresolv $LIBS"
--              AC_TRY_LINK_FUNC(res_query,
--                      LDAPLIBS="-lresolv $LDAPLIBS"
--                      AC_MSG_RESULT(yes),
--                      AC_MSG_ERROR(Cannot find function res_query)))
+ 
+-
+-        AC_MSG_CHECKING(whether -lresolv is needed for res_query)
+-      AC_LINK_IFELSE(AC_LANG_PROGRAM([
+-
+-#if HAVE_NETINET_IN_H
+-#include <netinet/in.h>
+-#endif
+-#include <resolv.h>
+-
+-void (*func)()= (void (*)())res_query;
+-],
+-                      [  (*func)(); ]),
+-              AC_MSG_RESULT(no),
+-              [
+-              LIBS="-lresolv $LIBS"
+-
+-              AC_LINK_IFELSE(AC_LANG_PROGRAM([
+-#if HAVE_NETINET_IN_H
+-#include <netinet/in.h>
+-#endif
+-#include <resolv.h>
+-
+-void (*func)()= (void (*)())res_query;
+-],
+-                      [  (*func)(); ]), [
+-                      LDAPLIBS="-lresolv $LDAPLIBS"
+-                      HAVE_LDAP=1
+-                      AC_MSG_RESULT(yes)
+-                      ],
+-                      AC_MSG_ERROR(Cannot find function res_query))
+-                      ])
+-
  AC_CHECK_LIB(ldap, ldap_open,
        [ LDAPLIBS="-lldap $LDAPLIBS" ; LIBS="-lldap $LIBS" ])
  AC_CHECK_FUNC(ldap_search_st, HAVE_LDAP=1, HAVE_LDAP=0)

diff --git a/courier-sendmail_dir.patch b/courier-sendmail_dir.patch
index 622995e2bf7f8c877e7428c7e3aae6c18f9bb507..961ed8efb354e71d46a1ba3db9c043c059c0ff31 100644 (file)
--- a/courier-sendmail_dir.patch
+++ b/courier-sendmail_dir.patch
@@ -1,20 +1,21 @@
 diff -Nur old/courier/Makefile.am new/courier/Makefile.am
---- old/courier/Makefile.am    2003-11-15 21:04:45.000000000 +0000
-+++ new/courier/Makefile.am    2004-02-25 00:36:06.000000000 +0000
-@@ -50,14 +50,14 @@
+--- old/courier/Makefile.am    2004-01-11 05:37:59.000000000 +0000
++++ new/courier/Makefile.am    2004-03-16 18:20:36.000000000 +0000
+@@ -51,7 +51,7 @@
  extrabin=maildrop lockmail reformail reformime mailbot mimegpg \
-       imapd makemime deliverquota maildirmake maildirkw
+       imapd makemime deliverquota maildirmake maildiracl maildirkw
  
 -bin_PROGRAMS=cancelmsg mailq sendmail \
 +bin_PROGRAMS=cancelmsg mailq \
        testmxlookup dotforward \
        couriermlm \
        courier-config @couriertls@ @EXTRABIN@
- 
- extrasbin=couriertcpd courierlogger userdbpw
+@@ -60,7 +60,7 @@
+       authenumerate$(EXEEXT) \
+       sharedindexsplit sharedindexinstall
  
 -sbin_PROGRAMS=courier showconfig showmodules \
-+sbin_PROGRAMS=courier showconfig showmodules sendmail\
++sbin_PROGRAMS=courier showconfig showmodules sendmail \
        @COURIERLDAPALIASD@ @EXTRASBIN@
  
  sysconf_DATA=pop3d.authpam imapd.authpam webmail.authpam imapd.cnf pop3d.cnf \

diff --git a/courier-withoutfam.patch b/courier-withoutfam.patch
index d2121b703c2723f6cbb0c43d36aec2ffa4bafd17..b5be9381e28360fe44b90dd7c25936ea3a1b0d73 100644 (file)
--- a/courier-withoutfam.patch
+++ b/courier-withoutfam.patch
@@ -1,10 +1,10 @@
 diff -Nur old/maildir/configure.in new/maildir/configure.in
---- old/maildir/configure.in   2003-01-30 06:33:31.000000000 +0000
-+++ new/maildir/configure.in   2003-12-15 11:15:36.000000000 +0000
-@@ -59,20 +59,7 @@
+--- old/maildir/configure.in   2004-01-11 02:59:03.000000000 +0000
++++ new/maildir/configure.in   2004-03-16 18:16:07.000000000 +0000
+@@ -60,20 +60,7 @@
  dnl Checks for library functions.
  AC_CHECK_HEADER(fam.h, :, :)
- AC_CHECK_FUNCS(symlink readlink strcasecmp)
+ AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes)
 -AC_CHECK_LIB(fam, FAMOpen,  [
 -                      LIBFAM=-lfam
 -                      AC_DEFINE_UNQUOTED(HAVE_FAM,1,