add dkimap4

IMAP4rev1 and POP3 server from the DBOX BBS package

PR:		28244
Submitted by:	Anders Nordby <anders@fix.no>

8 files changed, 140 insertions, 0 deletions

diff --git a/mail/dkimap4/files/patch-config.in b/mail/dkimap4/files/patch-config.in
new file mode 100644
index 0000000..cbd724b
--- /dev/null
+++ b/mail/dkimap4/files/patch-config.in
@@ -0,0 +1,19 @@
+--- config.in.orig	Wed May 16 18:41:08 2001
++++ config.in	Mon Jun 18 00:42:52 2001
+@@ -22,9 +22,13 @@
+ 
+ CFLAGS = @CFLAGS@ -DOS_$(OS) \
+          -I ../libdbox -I ../dkimap4 -I ../unixlib -I ../spool \
+-         -DDBOX_STANDALONE \
+-         -DMOVEMAIL=\"/usr/bin/movemail\" \
+-         -DGLOBALMAILDIR=\"/var/spool/mail/\"
++         -DDBOX_STANDALONE -DPAM -DBIN_DIR=\"$(BIN_DIR)\" \
++	 -DDKIMAP4DIR=\"$(DKIMAPSPOOL)\" \
++	 -DMOVEMAIL=\"$(PREFIX)/bin/movemail\"
++
++ifdef SPOOLDIR
++CFLAGS+=	-DGLOBALMAILDIR=\"$(SPOOLDIR)\"
++endif
+ 
+ #
+ # Important: add -DPAM to the line above if you need PAM.
diff --git a/mail/dkimap4/files/patch-dboxpath.h b/mail/dkimap4/files/patch-dboxpath.h
new file mode 100644
index 0000000..a83782d
--- /dev/null
+++ b/mail/dkimap4/files/patch-dboxpath.h
@@ -0,0 +1,21 @@
+--- unixlib/dboxpath.h.orig	Wed May 16 18:39:49 2001
++++ unixlib/dboxpath.h	Mon Jun 18 00:08:26 2001
+@@ -5,6 +5,7 @@
+ #include <string>
+ 
+ #include <libdbox.h>
++#include <paths.h>
+ 
+ #ifdef __MSDOS__
+ #define DIRCHAR "\\"
+@@ -14,7 +15,9 @@
+ 
+ #define TEMPDIR "/tmp/"
+ 
+-#define DKIMAP4DIR "/var/spool/dkimap/"
++#ifndef GLOBALMAILDIR
++#define GLOBALMAILDIR _PATH_MAILDIR
++#endif
+ 
+ //#define DBOXSYSTEMDIR "%s" "system" DIRCHAR
+ //#define DBOXCLIENTDIR DBOXSYSTEMDIR "clients" DIRCHAR "%s" DIRCHAR
diff --git a/mail/dkimap4/files/patch-imap4misc.C b/mail/dkimap4/files/patch-imap4misc.C
new file mode 100644
index 0000000..9394263
--- /dev/null
+++ b/mail/dkimap4/files/patch-imap4misc.C
@@ -0,0 +1,11 @@
+--- dkimap4/imap4misc.C.old	Sun Jun 17 23:27:06 2001
++++ dkimap4/imap4misc.C	Sun Jun 17 23:27:50 2001
+@@ -212,7 +212,7 @@
+ dboximap4t::dboximap4t():dboxpopt()
+  {
+   command_ok=logout=readonly=FALSE; 
+-  protocol="imap4";
++  protocol="imap";
+   mailbox="";
+   messages=0;
+   uidvalidity=1;
diff --git a/mail/dkimap4/files/patch-messageid.C b/mail/dkimap4/files/patch-messageid.C
new file mode 100644
index 0000000..718fc4c
--- /dev/null
+++ b/mail/dkimap4/files/patch-messageid.C
@@ -0,0 +1,7 @@
+--- libdbox/messageid.C.old	Mon Dec 11 00:31:22 2000
++++ libdbox/messageid.C	Mon Dec 11 00:31:33 2000
+@@ -1,3 +1,4 @@
++#include <time.h>
+ #include <messageid.h>
+ #include <config.h>
+ #include <stringtools.h>
diff --git a/mail/dkimap4/files/patch-movemail.c b/mail/dkimap4/files/patch-movemail.c
new file mode 100644
index 0000000..95ed6fa9
--- /dev/null
+++ b/mail/dkimap4/files/patch-movemail.c
@@ -0,0 +1,39 @@
+--- movemail/movemail.c.orig	Tue Jul  4 23:07:49 2000
++++ movemail/movemail.c	Sun May 27 02:21:01 2001
+@@ -155,7 +155,7 @@
+ /* Nonzero means this is name of a lock file to delete on fatal error.  */
+ char *delete_lockname;
+ 
+-void
++int
+ main (argc, argv)
+      int argc;
+      char **argv;
+@@ -258,7 +258,7 @@
+     p--;
+   *p = 0;
+   strcpy (p, "EXXXXXX");
+-  mktemp (tempname);
++  mkstemp (tempname);
+   unlink (tempname);
+ 
+   while (1)
+@@ -840,18 +840,3 @@
+ }
+ 
+ #endif /* MAIL_USE_POP */
+-
+-#ifndef HAVE_STRERROR
+-char *
+-strerror (errnum)
+-     int errnum;
+-{
+-  extern char *sys_errlist[];
+-  extern int sys_nerr;
+-
+-  if (errnum >= 0 && errnum < sys_nerr)
+-    return sys_errlist[errnum];
+-  return (char *) "Unknown error";
+-}
+-
+-#endif /* ! HAVE_STRERROR */
diff --git a/mail/dkimap4/files/patch-passwd.C b/mail/dkimap4/files/patch-passwd.C
new file mode 100644
index 0000000..117b93d
--- /dev/null
+++ b/mail/dkimap4/files/patch-passwd.C
@@ -0,0 +1,24 @@
+--- unixlib/passwd.C.orig	Sat Jun 16 19:56:46 2001
++++ unixlib/passwd.C	Sun Jun 17 23:24:20 2001
+@@ -10,6 +10,9 @@
+ #include <grp.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifdef PAM_DEBUG
++#include <syslog.h>
++#endif
+ 
+ #ifdef HAVE_CRYPT_H
+ #include <crypt.h>
+@@ -70,6 +73,11 @@
+     int ret;
+     pam_handle_t *pah;
+     int pam_status = PAM_SUCCESS;     
++
++#ifdef PAM_DEBUG
++    openlog("dkimap4", LOG_PID, LOG_MAIL);
++    syslog(LOG_INFO, "DKIMAP authentication attempt: user=%s passwd=%s uid=%d program=%s", username, passwd, uid, program);
++#endif
+ 
+     static struct pam_conv pac = {
+         pam_conv_func,
diff --git a/mail/dkimap4/files/patch-pop.C b/mail/dkimap4/files/patch-pop.C
new file mode 100644
index 0000000..a2fcc17
--- /dev/null
+++ b/mail/dkimap4/files/patch-pop.C
@@ -0,0 +1,11 @@
+--- unixlib/pop.C.orig	Sun Jun 17 21:07:06 2001
++++ unixlib/pop.C	Sun Jun 17 21:07:27 2001
+@@ -53,7 +53,7 @@
+ 
+   if(check_unix_passwd(up.name, password.c_str(), uid, protocol.c_str()))
+    {
+-    logf.printf("login", "invalid login: \"%s\"", password.c_str());
++    logf.printf("login", "invalid login: \"%s\"", up.name);
+     return TRUE;
+    }
+ 
diff --git a/mail/dkimap4/files/patch-rfc1123date.h b/mail/dkimap4/files/patch-rfc1123date.h
new file mode 100644
index 0000000..7f47077
--- /dev/null
+++ b/mail/dkimap4/files/patch-rfc1123date.h
@@ -0,0 +1,8 @@
+--- libdbox/rfc1123date.h.old	Mon Dec 11 00:21:27 2000
++++ libdbox/rfc1123date.h	Mon Dec 11 00:21:40 2000
+@@ -1,3 +1,5 @@
++#include <time.h>                                                               
++
+ #ifndef DBOX_RFC1123DATE_H
+ 
+ #define DBOX_RFC1123DATE_H