4 files changed, 90 insertions, 37 deletions

diff --git a/mail/cyrus-imapd/files/cyrus.sh b/mail/cyrus-imapd/files/cyrus.sh
new file mode 100644
index 000000000000..9248623a8fe2
--- /dev/null
+++ b/mail/cyrus-imapd/files/cyrus.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+PREFIX=%%PREFIX%%
+
+case "$1" in
+
+start)
+	if [ -x ${PREFIX}/cyrus/bin/pwcheck ]
+	then
+		${PREFIX}/cyrus/bin/pwcheck & && echo -n " pwcheck"
+	fi
+	;;
+
+stop)
+	if [ -r /var/run/pwcheck.pid ]
+	then
+		kill `cat /var/run/pwcheck.pid` && echo -n " pwcheck"
+	fi
+	;;
+
+*)
+	echo "usage: $0 {start|stop}" 1>&2
+	exit 64
+	;;
+
+esac
+
diff --git a/mail/cyrus-imapd/files/patch-bb b/mail/cyrus-imapd/files/patch-bb
index 34ee5682c95b..b4ec10180d1f 100644
--- a/mail/cyrus-imapd/files/patch-bb
+++ b/mail/cyrus-imapd/files/patch-bb
@@ -1,13 +1,22 @@
---- cyradm/Makefile.in.orig	Sat Dec 21 02:07:57 1996
-+++ cyradm/Makefile.in	Wed Oct  8 13:56:57 1997
-@@ -21,8 +21,8 @@
- RANLIB = @RANLIB@
- 
- DEFS = @DEFS@
--CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ 
--LIBS = @LIBS@ @TCLLIBS@
-+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et -I$(prefix)/include/tcl8.1 @CPPFLAGS@ 
-+LIBS = @LIBS@ -L/usr/local/lib -ltcl81 -lm
- DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ 
- 
- CFLAGS = @CFLAGS@
+*** cyradm/Makefile.in.orig	Tue Jun  9 06:30:40 1998
+--- cyradm/Makefile.in	Wed Aug 26 11:35:46 1998
+***************
+*** 33,41 ****
+  RANLIB = @RANLIB@
+  
+  DEFS = @DEFS@ @TCL_DEFS@
+! CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@
+! # lazy approach to linking: just do it a lot
+! LIBS =  @TCL_LIBS@ @LIBS@ @TCL_LIBS@ @LIBS@
+  DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ 
+  
+  CFLAGS = @CFLAGS@
+--- 33,40 ----
+  RANLIB = @RANLIB@
+  
+  DEFS = @DEFS@ @TCL_DEFS@
+! CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et -I$(prefix)/include/tcl8.0 @CPPFLAGS@ 
+! LIBS = @LIBS@ -L/usr/local/lib -ltcl80 -lm
+  DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ 
+  
+  CFLAGS = @CFLAGS@
diff --git a/mail/cyrus-imapd/files/patch-bc b/mail/cyrus-imapd/files/patch-bc
index 8c548bfb290d..35f9f254c36a 100644
--- a/mail/cyrus-imapd/files/patch-bc
+++ b/mail/cyrus-imapd/files/patch-bc
@@ -1,11 +1,19 @@
---- imap/Makefile.in.orig	Thu Mar 13 10:23:01 1997
-+++ imap/Makefile.in	Wed Oct  8 13:56:57 1997
-@@ -34,7 +34,7 @@
- CYRUS_USER=@cyrus_user@
- CYRUS_GROUP=@cyrus_group@
- 
--DEFS = @DEFS@
-+DEFS = @DEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
- CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ 
- LIBS = @LIBS@ 
- DEPLIBS = ../et/libcom_err.a ../lib/libcyrus.a @DEPLIBS@
+*** imap/Makefile.in	Wed Aug 26 11:40:10 1998
+--- imap/Makefile.in.orig	Wed Aug 26 11:37:56 1998
+***************
+*** 47,53 ****
+  CYRUS_USER=@cyrus_user@
+  CYRUS_GROUP=@cyrus_group@
+  
+! DEFS = @DEFS@ @LOCALDEFS@
+  CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@
+  LIBS = @LIBS@ @COM_ERR_LIBS@
+  DEPLIBS = ../lib/libcyrus.a @DEPLIBS@
+--- 47,53 ----
+  CYRUS_USER=@cyrus_user@
+  CYRUS_GROUP=@cyrus_group@
+  
+! DEFS = @DEFS@ @LOCALDEFS@  -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
+  CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@
+  LIBS = @LIBS@ @COM_ERR_LIBS@
+  DEPLIBS = ../lib/libcyrus.a @DEPLIBS@
diff --git a/mail/cyrus-imapd/files/patch-bd b/mail/cyrus-imapd/files/patch-bd
index 3268e64bb08a..66480bf2bc2f 100644
--- a/mail/cyrus-imapd/files/patch-bd
+++ b/mail/cyrus-imapd/files/patch-bd
@@ -1,13 +1,22 @@
---- imap/config.c.orig	Sat Dec 21 02:08:11 1996
-+++ imap/config.c	Wed Oct  8 13:56:58 1997
-@@ -23,7 +23,9 @@
- 
- extern int errno;
- 
--#define CONFIG_FILENAME "/etc/imapd.conf"
-+#if !defined(CONFIG_FILENAME)
-+	#define CONFIG_FILENAME "/etc/imapd.conf"
-+#endif
- 
- struct configlist {
-     char *key;
+*** imap/config.c.orig	Fri May 15 23:48:14 1998
+--- imap/config.c	Wed Aug 26 11:44:18 1998
+***************
+*** 37,43 ****
+  
+  extern int errno;
+  
+! #define CONFIG_FILENAME "/etc/imapd.conf"
+  /* You'd think this'd be EX_CONFIG, but you'd be wrong.
+     If it's EX_CONFIG then sendmail's result is to fatally reject the
+     message; this isn't desireable, we just want to fail the message in a
+--- 37,46 ----
+  
+  extern int errno;
+  
+! #if !defined(CONFIG_FILENAME)
+! # define CONFIG_FILENAME "/etc/imapd.conf"
+! #endif
+! 
+  /* You'd think this'd be EX_CONFIG, but you'd be wrong.
+     If it's EX_CONFIG then sendmail's result is to fatally reject the
+     message; this isn't desireable, we just want to fail the message in a