- Use PERL_LEVEL to distinguish installed perl version.

- Add WITH_SKIPLIST_MBOX to enable skiplist mboxlist.
- Add WITH_MURDER to enable murder.

2 files changed, 36 insertions, 2 deletions

diff --git a/mail/cyrus-imapd22/files/patch-bc b/mail/cyrus-imapd22/files/patch-bc
index ce5594805a0b..232ac2da797e 100644
--- a/mail/cyrus-imapd22/files/patch-bc
+++ b/mail/cyrus-imapd22/files/patch-bc
@@ -1,7 +1,7 @@
 Index: imap/Makefile.in
 diff -u imap/Makefile.in.orig imap/Makefile.in
---- imap/Makefile.in.orig	Fri Apr 19 02:35:26 2002
-+++ imap/Makefile.in	Thu May  2 04:02:37 2002
+--- imap/Makefile.in.orig	Fri Jul 26 06:07:05 2002
++++ imap/Makefile.in	Fri Sep 13 18:49:25 2002
 @@ -61,7 +61,7 @@
  CYRUS_USER=@cyrus_user@
  CYRUS_GROUP=@cyrus_group@
@@ -11,3 +11,18 @@ diff -u imap/Makefile.in.orig imap/Makefile.in
  CPPFLAGS = -I. -I.. -I../sieve -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../acap -I../acap @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
  IMAP_LIBS = @IMAP_LIBS@
  SIEVE_LIBS = @SIEVE_LIBS@
+@@ -244,12 +244,12 @@
+ mupdate: mupdate.o mupdate-slave.o mupdate-client.o libimap.a $(DEPLIBS)
+ 	$(CC) $(LDFLAGS) -o mupdate \
+ 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
+-	 libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
++	 libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
+ 
+ mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o libimap.a $(DEPLIBS)
+ 	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
+ 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
+-	 libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
++	 libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
+ 
+ pop3d: pop3d.o tls.o libimap.a $(DEPLIBS) $(SERVICE)
+ 	$(CC) $(LDFLAGS) -o pop3d pop3d.o tls.o $(SERVICE) \
diff --git a/mail/cyrus-imapd22/files/patch-master::service-thread.c b/mail/cyrus-imapd22/files/patch-master::service-thread.c
new file mode 100644
index 000000000000..ea5dfd8b0b2e
--- /dev/null
+++ b/mail/cyrus-imapd22/files/patch-master::service-thread.c
@@ -0,0 +1,19 @@
+Index: master/service-thread.c
+diff -u master/service-thread.c.orig master/service-thread.c
+--- master/service-thread.c.orig	Fri Sep 13 18:43:06 2002
++++ master/service-thread.c	Fri Sep 13 19:15:50 2002
+@@ -100,8 +100,13 @@
+     socklen_t len = sizeof(sin);
+     
+     /* is this a connection from the local host? */
++    memset(&sin, 0, len);
+     if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) {
+-	if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) {
++	switch (((struct sockaddr *)&sin)->sa_family) {
++	case AF_INET:
++	case AF_INET6:
++	    break;
++	default:
+ 	    return 1;
+ 	}
+     }