2 files changed, 77 insertions, 0 deletions
diff --git a/cyrus-imapd/cyrus-imapd-2.2.5/autotools.patch b/cyrus-imapd/cyrus-imapd-2.2.5/autotools.patch
index e69de29bb2..379d57d9c0 100644
--- a/cyrus-imapd/cyrus-imapd-2.2.5/autotools.patch
+++ b/cyrus-imapd/cyrus-imapd-2.2.5/autotools.patch
@@ -0,0 +1,69 @@
+--- tmp/base/cyrus-imapd-2.2.5-r0/cyrus-imapd-2.2.5/configure.in	2004-05-28 14:03:00.000000000 -0400
++++ cyrus-imapd-2.2.5/configure.in	2004-06-04 21:42:20.745944000 -0400
+@@ -997,6 +997,16 @@
+ IMAP_COM_ERR_LIBS="${COM_ERR_LIBS}"
+ IMAP_LIBS="${LIB_SASL} ${LIBS}"
+ 
++if test "x$BUILD_CC" = "x"; then
++  BUILD_CC="$(CC)"
++fi 
++if test "x$BUILD_CFLAGS" = "x"; then
++  BUILD_CFLAGS="$(CFLAGS)"
++fi 
++if test "x$BUILD_LDFLAGS" = "x"; then
++  BUILD_LDFLAGS="$(LDFLAGS)"
++fi 
++
+ AC_SUBST(LIB_RT)
+ AC_SUBST(IMAP_COM_ERR_LIBS)
+ AC_SUBST(IMAP_LIBS)
+@@ -1010,6 +1020,9 @@
+ AC_SUBST(PERL_SUBDIRS)
+ AC_SUBST(PERL_DEPSUBDIRS)
+ AC_SUBST(PERL)
++AC_SUBST(BUILD_CC)
++AC_SUBST(BUILD_LDFLAGS)
++AC_SUBST(BUILD_CFLAGS)
+ 
+ AH_TOP([
+ /* $Id$ */
+--- tmp/base/cyrus-imapd-2.2.5-r0/cyrus-imapd-2.2.5/lib/Makefile.in	2004-05-28 14:03:04.000000000 -0400
++++ cyrus-imapd-2.2.5/lib/Makefile.in	2004-06-04 21:40:57.325068000 -0400
+@@ -53,6 +53,7 @@
+ VPATH = @srcdir@
+ 
+ CC = @CC@
++BUILD_CC = @BUILD_CC@
+ 
+ INSTALL = @INSTALL@
+ RANLIB = @RANLIB@
+@@ -63,7 +64,9 @@
+ 
+ MAKEDEPEND_CFLAGS = @CFLAGS@
+ CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
++BUILD_CFLAGS = @BUILD_CFLAGS@
+ LDFLAGS = @LDFLAGS@
++BUILD_LDFLAGS = @BUILD_LDFLAGS@
+ 
+ SHELL = /bin/sh
+ MAKEDEPEND = @MAKEDEPEND@
+@@ -149,8 +152,17 @@
+ #	./mkchartable -m $(srcdir)/charset/unicode.map $(srcdir)/charset/*.t >x-chartables.h
+ #	mv x-chartables.h chartables.h
+ 
+-mkchartable: mkchartable.o xmalloc.o assert.o
+-	$(CC) $(LDFLAGS) -o mkchartable mkchartable.o xmalloc.o assert.o
++mkchartable: mkchartable.native.o xmalloc.native.o assert.native.o
++	$(BUILD_CC) $(BUILD_LDFLAGS) -o mkchartable mkchartable.native.o xmalloc.native.o assert.native.o
++
++xmalloc.native.o: xmalloc.c
++	$(BUILD_CC) $(BUILD_CFLAGS) -c -o xmalloc.native.o xmalloc.c
++
++assert.native.o: assert.c
++	$(BUILD_CC) $(BUILD_CFLAGS) -c -o assert.native.o assert.c
++
++mkchartable.native.o: mkchartable.c
++	$(BUILD_CC) $(BUILD_CFLAGS) -c -o mkchartable.native.o mkchartable.c
+ 
+ clean:
+ 	rm -f *.o *.a chartable.c Makefile.bak mkchartable makedepend.log \
diff --git a/cyrus-imapd/cyrus-imapd-2.2.5/tail.patch b/cyrus-imapd/cyrus-imapd-2.2.5/tail.patch
index e69de29bb2..38a3ecbac6 100644
--- a/cyrus-imapd/cyrus-imapd-2.2.5/tail.patch
+++ b/cyrus-imapd/cyrus-imapd-2.2.5/tail.patch
@@ -0,0 +1,8 @@
+--- cyrus-imapd-2.2.5/imap/xversion.sh.orig	2003-10-22 20:03:00 +0200
++++ cyrus-imapd-2.2.5/imap/xversion.sh	2004-08-26 16:57:29 +0200
+@@ -22,4 +22,4 @@
+ 	match ($0, pattern) {
+ 	    printf "\"%s\"\n", substr($0, RSTART, RLENGTH)
+ 	}' pattern="$DATEPAT $TIMEPAT" | \
+-	sort | tail -1 >> xversion.h
++	sort | tail -n 1 >> xversion.h