imapd.patch 3.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114
  1. Index: et/com_err.c
  2. --- et/com_err.c.orig 2003-06-04 05:27:50.000000000 +0200
  3. +++ et/com_err.c 2004-02-02 19:56:00.000000000 +0100
  4. @@ -50,7 +50,7 @@
  5. #include <string.h>
  6. #include "mit-sipb-copyright.h"
  7. -#if defined(HAVE_STDARG_H) || defined(_WINDOWS)
  8. +#if defined(HAVE_STDARG_H) || defined(__STDC__) || defined(_WINDOWS)
  9. #include <stdarg.h>
  10. #else
  11. #include <varargs.h>
  12. Index: lib/cyrusdb_skiplist.c
  13. --- lib/cyrusdb_skiplist.c.orig 2003-12-15 17:04:35.000000000 +0100
  14. +++ lib/cyrusdb_skiplist.c 2004-02-02 19:56:00.000000000 +0100
  15. @@ -71,6 +71,11 @@
  16. #define PROB (0.5)
  17. +#ifdef __FreeBSD__
  18. +/* #define fdatasync(fd) fsync(fd) */
  19. +#define O_DSYNC 0
  20. +#endif
  21. +
  22. /*
  23. *
  24. * disk format; all numbers in network byte order
  25. Index: lib/prot.h
  26. --- lib/prot.h.orig 2003-10-22 20:50:12.000000000 +0200
  27. +++ lib/prot.h 2004-02-02 19:58:47.000000000 +0100
  28. @@ -49,6 +49,7 @@
  29. #include <time.h>
  30. #include <stdio.h>
  31. #include <stdlib.h>
  32. +#include <sys/time.h>
  33. #include <sasl/sasl.h>
  34. Index: perl/sieve/lib/isieve.c
  35. --- perl/sieve/lib/isieve.c.orig 2003-10-22 20:50:25.000000000 +0200
  36. +++ perl/sieve/lib/isieve.c 2004-02-02 20:01:21.000000000 +0100
  37. @@ -41,9 +41,7 @@
  38. /* $Id: imapd.patch,v 1.8 2004/02/02 20:45:59 rse Exp $ */
  39. -#ifdef HAVE_CONFIG_H
  40. -#include <config.h>
  41. -#endif
  42. +#include "../../../config.h"
  43. #ifdef HAVE_UNISTD_H
  44. #include <unistd.h>
  45. Index: perl/Makefile.in
  46. --- perl/Makefile.in.orig 2003-10-22 20:50:17.000000000 +0200
  47. +++ perl/Makefile.in 2004-02-02 21:23:32.000000000 +0100
  48. @@ -82,7 +82,8 @@
  49. BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
  50. OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
  51. SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
  52. - $(PERL) Makefile.PL PREFIX=$(prefix); \
  53. + $(PERL) Makefile.PL PREFIX=$(prefix) \
  54. + INSTALLDIRS="vendor" INSTALLMAN3DIR="none" INSTALLSITEMAN3DIR="none" INSTALLVENDORMAN3DIR="none"; \
  55. fi; \
  56. $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
  57. done
  58. Index: perl/sieve/Makefile.in
  59. --- perl/sieve/Makefile.in.orig 2003-10-22 20:50:24.000000000 +0200
  60. +++ perl/sieve/Makefile.in 2004-02-02 21:41:22.000000000 +0100
  61. @@ -84,7 +84,8 @@
  62. BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
  63. OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
  64. SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
  65. - $(PERL) Makefile.PL PREFIX=$(prefix); \
  66. + $(PERL) Makefile.PL PREFIX=$(prefix) \
  67. + INSTALLDIRS="vendor" INSTALLMAN3DIR="none" INSTALLSITEMAN3DIR="none" INSTALLVENDORMAN3DIR="none"; \
  68. fi; \
  69. $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
  70. done
  71. Index: imap/mboxname.c
  72. --- imap/mboxname.c.orig 2003-10-22 20:50:08.000000000 +0200
  73. +++ imap/mboxname.c 2004-03-10 21:08:47.000000000 +0100
  74. @@ -127,6 +127,7 @@
  75. domainlen = strlen(result);
  76. }
  77. }
  78. +#ifndef IGNMAD /* ignore mailbox@domain */
  79. if ((cp = strrchr(name, '@'))) {
  80. /* mailbox specified as mbox@domain */
  81. namelen = cp - name;
  82. @@ -149,6 +150,7 @@
  83. domainlen = strlen(result);
  84. }
  85. }
  86. +#endif /* IGNMAD */
  87. /* if no domain specified, we're in the default domain */
  88. }
  89. @@ -212,6 +214,7 @@
  90. domainlen = strlen(result);
  91. }
  92. }
  93. +#ifndef IGNMAD /* ignore mailbox@domain */
  94. if ((cp = strrchr(name, '@'))) {
  95. /* mailbox specified as mbox@domain */
  96. namelen = cp - name;
  97. @@ -234,6 +237,7 @@
  98. domainlen = strlen(result);
  99. }
  100. }
  101. +#endif /* IGNMAD */
  102. /* if no domain specified, we're in the default domain */
  103. }