Hello...
Attached are two patches. the mandir patch is for 2.0.7 and 2.0.7cvs.
the configure script allows --mandir=DIR, but doesn't honor it. This
patch fixes it. The second patch is for the cvs tree. sieve/message.c
has a var = a ? b ? c that breaks compiling.
I started trying to switch to cyrus-imap several months ago. since then
I have changed jobs, so I am a little out of date with what needs what
versions. That said, I have bee able to compile the cvs tree, but I
can't get it to work. does the cvs tree support db3 v3.1.14? This is
what shipps with RedHat7. IIRC cyrus-imapd 2.0.x needed db 3.0.x. The
logs show a successful login, but nothing happens on the client side (
telnet host 110 ).
TIA
--
Christopher McCrory
"The guy that keeps the servers running"
[EMAIL PROTECTED]
http://www.pricegrabber.com
"Linux: Because rebooting is for adding new hardware"
diff -ruN cyrus-imapd-2.0.7.orig/Makefile.in cyrus-imapd-2.0.7/Makefile.in
--- cyrus-imapd-2.0.7.orig/Makefile.in Mon Sep 4 23:03:09 2000
+++ cyrus-imapd-2.0.7/Makefile.in Sun Oct 29 09:35:51 2000
@@ -56,6 +56,7 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
cyrus_prefix = @cyrus_prefix@
+mandir = @mandir@
VERSION = 2.0.7
@@ -94,10 +95,10 @@
$(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/bin
$(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/lib
$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/include/cyrus
- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man1
- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man3
- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man5
- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man8
+ $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man/man1
+ $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man/man3
+ $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man/man5
+ $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man/man8
@for d in $(SUBDIRS); \
do \
(cd $$d; echo "### Making" install "in" `pwd`; \
diff -ruN cyrus-imapd-2.0.7.orig/man/Makefile.in cyrus-imapd-2.0.7/man/Makefile.in
--- cyrus-imapd-2.0.7.orig/man/Makefile.in Tue May 23 13:56:25 2000
+++ cyrus-imapd-2.0.7/man/Makefile.in Sun Oct 29 09:36:16 2000
@@ -60,6 +60,7 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
cyrus_prefix = @cyrus_prefix@
+mandir = @mandir@
MAN1 = $(srcdir)/cyradm.1 $(srcdir)/imtest.1 $(srcdir)/installsieve.1
MAN3 = $(srcdir)/imclient.3
@@ -75,19 +76,19 @@
install:
for file in $(MAN1); \
do \
- $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man1 || exit 1; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man/man1 || exit 1; \
done
for file in $(MAN3); \
do \
- $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man3 || exit 1; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man/man3 || exit 1; \
done
for file in $(MAN5); \
do \
- $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man5 || exit 1; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man/man5 || exit 1; \
done
for file in $(MAN8); \
do \
- $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man8 || exit 1; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man/man8 || exit 1; \
done
.c.o:
diff -ruN cyrus-imapd-2.0.7cvs.orig/sieve/message.c
cyrus-imapd-2.0.7cvs/sieve/message.c
--- cyrus-imapd-2.0.7cvs.orig/sieve/message.c Thu Oct 26 16:09:27 2000
+++ cyrus-imapd-2.0.7cvs/sieve/message.c Sun Oct 29 20:18:10 2000
@@ -464,8 +464,8 @@
#define U_DOMAIN "unspecified-domain"
#define U_USER "unknown-user"
if (a->mailbox || a->domain) {
- char *m = a->mailbox ? a->mailbox ? U_USER;
- char *d = a->domain ? a->domain ? U_DOMAIN;
+ char *m = a->mailbox ? a->mailbox : U_USER;
+ char *d = a->domain ? a->domain : U_DOMAIN;
am->freeme = (char *) xmalloc(strlen(m) + strlen(d) + 2);
sprintf(am->freeme, "%s@%s", m, d);
